From 7ad640ab2c9d14075048c91bb3e28c4b2f02f260 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 7 Jun 2024 15:57:15 +0800 Subject: [PATCH 1/4] supports multiselection for loading file into folder --- .../client/ayon_aftereffects/plugins/load/load_file.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py index 05749885c9..0340bf39e2 100644 --- a/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py +++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py @@ -2,7 +2,7 @@ import re from ayon_core.pipeline import get_representation_path from ayon_aftereffects import api -from ayon_aftereffects.api.lib import get_unique_layer_name +from ayon_aftereffects.api.lib import get_unique_layer_name, maintained_selection class FileLoader(api.AfterEffectsLoader): @@ -24,6 +24,10 @@ class FileLoader(api.AfterEffectsLoader): def load(self, context, name=None, namespace=None, data=None): stub = self.get_stub() + selected_folders = stub.get_selected_items( + comps=False, folders=True, footages=False) + if selected_folders: + stub.select_items([folder.id for folder in selected_folders]) layers = stub.get_items(comps=True, folders=True, footages=True) existing_layers = [layer.name for layer in layers] comp_name = get_unique_layer_name( @@ -31,7 +35,6 @@ class FileLoader(api.AfterEffectsLoader): context["folder"]["name"], name ) ) - import_options = {} path = self.filepath_from_context(context) @@ -51,7 +54,7 @@ class FileLoader(api.AfterEffectsLoader): comp = stub.import_file(path, stub.LOADED_ICON + comp_name, import_options) - + print("comp", comp) if not comp: self.log.warning( "Representation `{}` is failing to load".format(path)) @@ -60,7 +63,6 @@ class FileLoader(api.AfterEffectsLoader): self[:] = [comp] namespace = namespace or comp_name - return api.containerise( name, namespace, From 1f70637fed54cd3c64d34192b4fecdf0e551a660 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 7 Jun 2024 16:04:34 +0800 Subject: [PATCH 2/4] ruff cosmetic fix --- .../client/ayon_aftereffects/plugins/load/load_file.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py index 0340bf39e2..35c765d7a4 100644 --- a/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py +++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py @@ -2,7 +2,7 @@ import re from ayon_core.pipeline import get_representation_path from ayon_aftereffects import api -from ayon_aftereffects.api.lib import get_unique_layer_name, maintained_selection +from ayon_aftereffects.api.lib import get_unique_layer_name class FileLoader(api.AfterEffectsLoader): @@ -35,6 +35,7 @@ class FileLoader(api.AfterEffectsLoader): context["folder"]["name"], name ) ) + import_options = {} path = self.filepath_from_context(context) From 8fed343484ce828fb071f520951c1b58ef979d90 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 7 Jun 2024 16:37:16 +0800 Subject: [PATCH 3/4] bump addons version --- server_addon/aftereffects/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_addon/aftereffects/package.py b/server_addon/aftereffects/package.py index 8e4e70fc3b..37a54b4212 100644 --- a/server_addon/aftereffects/package.py +++ b/server_addon/aftereffects/package.py @@ -1,6 +1,6 @@ name = "aftereffects" title = "AfterEffects" -version = "0.2.0" +version = "0.2.1" client_dir = "ayon_aftereffects" From 9b0f17e636d3d6071390d76b7a44c64aba0bc274 Mon Sep 17 00:00:00 2001 From: Kayla Man <64118225+moonyuet@users.noreply.github.com> Date: Fri, 7 Jun 2024 22:50:31 +0800 Subject: [PATCH 4/4] Update server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py --- .../client/ayon_aftereffects/plugins/load/load_file.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py index 35c765d7a4..d259a6fa2e 100644 --- a/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py +++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py @@ -55,7 +55,6 @@ class FileLoader(api.AfterEffectsLoader): comp = stub.import_file(path, stub.LOADED_ICON + comp_name, import_options) - print("comp", comp) if not comp: self.log.warning( "Representation `{}` is failing to load".format(path))