From f861dfa73d8a17c33e82c263f01341e410401b44 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 11 Jun 2024 12:47:49 +0200 Subject: [PATCH 1/5] Fix refactor of `remove_unused_media_pool_items` location --- .../plugins/inventory/remove_unused_media_pool_items.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/plugins/inventory/remove_unused_media_pool_items.py (100%) diff --git a/client/ayon_core/hosts/resolve/plugins/inventory/remove_unused_media_pool_items.py b/server_addon/resolve/client/ayon_resolve/plugins/inventory/remove_unused_media_pool_items.py similarity index 100% rename from client/ayon_core/hosts/resolve/plugins/inventory/remove_unused_media_pool_items.py rename to server_addon/resolve/client/ayon_resolve/plugins/inventory/remove_unused_media_pool_items.py From d39acab7158387fcd42499c921ab92fd6fff9221 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 11 Jun 2024 12:51:39 +0200 Subject: [PATCH 2/5] Fix usage of undefined variable --- .../resolve/client/ayon_resolve/plugins/load/load_media.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py index c1016ce053..d5dbfa8934 100644 --- a/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py +++ b/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py @@ -280,7 +280,10 @@ class LoadMedia(LoaderPlugin): item.SetMetadata(lib.pype_tag_name, json.dumps(data)) self._set_metadata(media_pool_item=item, context=context) - self._set_colorspace_from_representation(item, representation) + self._set_colorspace_from_representation( + item, + representation=context["representation"] + ) # If no specific colorspace is set then we want to preserve the # colorspace a user might have set before the clip replacement From 14781e795c317f534b29c384663a446a854c8b10 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 11 Jun 2024 12:51:53 +0200 Subject: [PATCH 3/5] Cosmetics --- .../resolve/client/ayon_resolve/plugins/load/load_media.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py index d5dbfa8934..114e8dca79 100644 --- a/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py +++ b/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py @@ -62,15 +62,18 @@ def set_colorspace(media_pool_item, colorspace, mode="davinciYRGBColorManagedv2"): """Set MediaPoolItem colorspace. + This implements a workaround that you cannot set the input colorspace unless the Resolve project's color science mode is set to `davinciYRGBColorManagedv2`. + Args: media_pool_item (MediaPoolItem): The media pool item. colorspace (str): The colorspace to apply. mode (Optional[str]): The Resolve project color science mode to be in while setting the colorspace. Defaults to 'davinciYRGBColorManagedv2' + Returns: bool: Whether applying the colorspace succeeded. """ From 7a72ecb7fbbe024dca908bb1cfec7284964133ea Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 11 Jun 2024 12:53:57 +0200 Subject: [PATCH 4/5] Fix refactor of imports --- .../resolve/client/ayon_resolve/plugins/load/load_media.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py index 114e8dca79..6d42061eb0 100644 --- a/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py +++ b/server_addon/resolve/client/ayon_resolve/plugins/load/load_media.py @@ -12,13 +12,13 @@ from ayon_core.pipeline import ( get_representation_path, registered_host ) -from ayon_core.hosts.resolve.api import lib -from ayon_core.hosts.resolve.api.pipeline import AVALON_CONTAINER_ID from ayon_core.lib.transcoding import ( VIDEO_EXTENSIONS, IMAGE_EXTENSIONS ) from ayon_core.lib import BoolDef +from ayon_resolve.api import lib +from ayon_resolve.api.pipeline import AVALON_CONTAINER_ID class MetadataEntry(TypedDict): From a51b2b4e3e17bc80c4f66e8177f24b158841a140 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 11 Jun 2024 12:56:13 +0200 Subject: [PATCH 5/5] Add selected to label --- .../plugins/inventory/remove_unused_media_pool_items.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_addon/resolve/client/ayon_resolve/plugins/inventory/remove_unused_media_pool_items.py b/server_addon/resolve/client/ayon_resolve/plugins/inventory/remove_unused_media_pool_items.py index 6698508d24..7ea55dc1ff 100644 --- a/server_addon/resolve/client/ayon_resolve/plugins/inventory/remove_unused_media_pool_items.py +++ b/server_addon/resolve/client/ayon_resolve/plugins/inventory/remove_unused_media_pool_items.py @@ -6,7 +6,7 @@ from ayon_core.pipeline.load.utils import remove_container class RemoveUnusedMedia(InventoryAction): - label = "Remove Unused Media" + label = "Remove Unused Selected Media" icon = "trash" @staticmethod