From 41bee8c211c778ed0cfd2beaed825beadc0d7db0 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 17:29:22 +0200 Subject: [PATCH 1/4] move resolve code next to server code --- .../resolve/client/ayon_resolve}/README.markdown | 0 .../resolve/client/ayon_resolve}/RESOLVE_API_v19.0B-build20.txt | 0 .../resolve/client/ayon_resolve}/__init__.py | 0 .../resolve => server_addon/resolve/client/ayon_resolve}/addon.py | 0 .../resolve/client/ayon_resolve}/api/__init__.py | 0 .../resolve/client/ayon_resolve}/api/action.py | 0 .../resolve/client/ayon_resolve}/api/lib.py | 0 .../resolve/client/ayon_resolve}/api/menu.py | 0 .../resolve/client/ayon_resolve}/api/menu_style.qss | 0 .../resolve/client/ayon_resolve}/api/pipeline.py | 0 .../resolve/client/ayon_resolve}/api/plugin.py | 0 .../resolve/client/ayon_resolve}/api/testing_utils.py | 0 .../resolve/client/ayon_resolve}/api/todo-rendering.py | 0 .../resolve/client/ayon_resolve}/api/utils.py | 0 .../resolve/client/ayon_resolve}/api/workio.py | 0 .../client/ayon_resolve}/hooks/pre_resolve_last_workfile.py | 0 .../resolve/client/ayon_resolve}/hooks/pre_resolve_setup.py | 0 .../resolve/client/ayon_resolve}/hooks/pre_resolve_startup.py | 0 .../resolve/client/ayon_resolve}/otio/__init__.py | 0 .../resolve/client/ayon_resolve}/otio/davinci_export.py | 0 .../resolve/client/ayon_resolve}/otio/davinci_import.py | 0 .../resolve/client/ayon_resolve}/otio/utils.py | 0 .../client/ayon_resolve}/plugins/create/create_shot_clip.py | 0 .../resolve/client/ayon_resolve}/plugins/load/load_clip.py | 0 .../client/ayon_resolve}/plugins/load/load_editorial_package.py | 0 .../client/ayon_resolve}/plugins/publish/extract_workfile.py | 0 .../client/ayon_resolve}/plugins/publish/precollect_instances.py | 0 .../client/ayon_resolve}/plugins/publish/precollect_workfile.py | 0 .../resolve/client/ayon_resolve}/startup.py | 0 .../resolve/client/ayon_resolve}/utility_scripts/AYON__Menu.py | 0 .../client/ayon_resolve}/utility_scripts/ayon_startup.scriptlib | 0 .../client/ayon_resolve}/utility_scripts/develop/OTIO_export.py | 0 .../client/ayon_resolve}/utility_scripts/develop/OTIO_import.py | 0 .../utility_scripts/develop/OpenPype_sync_util_scripts.py | 0 .../resolve => server_addon/resolve/client/ayon_resolve}/utils.py | 0 35 files changed, 0 insertions(+), 0 deletions(-) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/README.markdown (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/RESOLVE_API_v19.0B-build20.txt (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/__init__.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/addon.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/api/__init__.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/api/action.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/api/lib.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/api/menu.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/api/menu_style.qss (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/api/pipeline.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/api/plugin.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/api/testing_utils.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/api/todo-rendering.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/api/utils.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/api/workio.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/hooks/pre_resolve_last_workfile.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/hooks/pre_resolve_setup.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/hooks/pre_resolve_startup.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/otio/__init__.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/otio/davinci_export.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/otio/davinci_import.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/otio/utils.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/plugins/create/create_shot_clip.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/plugins/load/load_clip.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/plugins/load/load_editorial_package.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/plugins/publish/extract_workfile.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/plugins/publish/precollect_instances.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/plugins/publish/precollect_workfile.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/startup.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/utility_scripts/AYON__Menu.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/utility_scripts/ayon_startup.scriptlib (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/utility_scripts/develop/OTIO_export.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/utility_scripts/develop/OTIO_import.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/utility_scripts/develop/OpenPype_sync_util_scripts.py (100%) rename {client/ayon_core/hosts/resolve => server_addon/resolve/client/ayon_resolve}/utils.py (100%) diff --git a/client/ayon_core/hosts/resolve/README.markdown b/server_addon/resolve/client/ayon_resolve/README.markdown similarity index 100% rename from client/ayon_core/hosts/resolve/README.markdown rename to server_addon/resolve/client/ayon_resolve/README.markdown diff --git a/client/ayon_core/hosts/resolve/RESOLVE_API_v19.0B-build20.txt b/server_addon/resolve/client/ayon_resolve/RESOLVE_API_v19.0B-build20.txt similarity index 100% rename from client/ayon_core/hosts/resolve/RESOLVE_API_v19.0B-build20.txt rename to server_addon/resolve/client/ayon_resolve/RESOLVE_API_v19.0B-build20.txt diff --git a/client/ayon_core/hosts/resolve/__init__.py b/server_addon/resolve/client/ayon_resolve/__init__.py similarity index 100% rename from client/ayon_core/hosts/resolve/__init__.py rename to server_addon/resolve/client/ayon_resolve/__init__.py diff --git a/client/ayon_core/hosts/resolve/addon.py b/server_addon/resolve/client/ayon_resolve/addon.py similarity index 100% rename from client/ayon_core/hosts/resolve/addon.py rename to server_addon/resolve/client/ayon_resolve/addon.py diff --git a/client/ayon_core/hosts/resolve/api/__init__.py b/server_addon/resolve/client/ayon_resolve/api/__init__.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/__init__.py rename to server_addon/resolve/client/ayon_resolve/api/__init__.py diff --git a/client/ayon_core/hosts/resolve/api/action.py b/server_addon/resolve/client/ayon_resolve/api/action.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/action.py rename to server_addon/resolve/client/ayon_resolve/api/action.py diff --git a/client/ayon_core/hosts/resolve/api/lib.py b/server_addon/resolve/client/ayon_resolve/api/lib.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/lib.py rename to server_addon/resolve/client/ayon_resolve/api/lib.py diff --git a/client/ayon_core/hosts/resolve/api/menu.py b/server_addon/resolve/client/ayon_resolve/api/menu.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/menu.py rename to server_addon/resolve/client/ayon_resolve/api/menu.py diff --git a/client/ayon_core/hosts/resolve/api/menu_style.qss b/server_addon/resolve/client/ayon_resolve/api/menu_style.qss similarity index 100% rename from client/ayon_core/hosts/resolve/api/menu_style.qss rename to server_addon/resolve/client/ayon_resolve/api/menu_style.qss diff --git a/client/ayon_core/hosts/resolve/api/pipeline.py b/server_addon/resolve/client/ayon_resolve/api/pipeline.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/pipeline.py rename to server_addon/resolve/client/ayon_resolve/api/pipeline.py diff --git a/client/ayon_core/hosts/resolve/api/plugin.py b/server_addon/resolve/client/ayon_resolve/api/plugin.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/plugin.py rename to server_addon/resolve/client/ayon_resolve/api/plugin.py diff --git a/client/ayon_core/hosts/resolve/api/testing_utils.py b/server_addon/resolve/client/ayon_resolve/api/testing_utils.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/testing_utils.py rename to server_addon/resolve/client/ayon_resolve/api/testing_utils.py diff --git a/client/ayon_core/hosts/resolve/api/todo-rendering.py b/server_addon/resolve/client/ayon_resolve/api/todo-rendering.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/todo-rendering.py rename to server_addon/resolve/client/ayon_resolve/api/todo-rendering.py diff --git a/client/ayon_core/hosts/resolve/api/utils.py b/server_addon/resolve/client/ayon_resolve/api/utils.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/utils.py rename to server_addon/resolve/client/ayon_resolve/api/utils.py diff --git a/client/ayon_core/hosts/resolve/api/workio.py b/server_addon/resolve/client/ayon_resolve/api/workio.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/workio.py rename to server_addon/resolve/client/ayon_resolve/api/workio.py diff --git a/client/ayon_core/hosts/resolve/hooks/pre_resolve_last_workfile.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_last_workfile.py similarity index 100% rename from client/ayon_core/hosts/resolve/hooks/pre_resolve_last_workfile.py rename to server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_last_workfile.py diff --git a/client/ayon_core/hosts/resolve/hooks/pre_resolve_setup.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py similarity index 100% rename from client/ayon_core/hosts/resolve/hooks/pre_resolve_setup.py rename to server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py diff --git a/client/ayon_core/hosts/resolve/hooks/pre_resolve_startup.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py similarity index 100% rename from client/ayon_core/hosts/resolve/hooks/pre_resolve_startup.py rename to server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py diff --git a/client/ayon_core/hosts/resolve/otio/__init__.py b/server_addon/resolve/client/ayon_resolve/otio/__init__.py similarity index 100% rename from client/ayon_core/hosts/resolve/otio/__init__.py rename to server_addon/resolve/client/ayon_resolve/otio/__init__.py diff --git a/client/ayon_core/hosts/resolve/otio/davinci_export.py b/server_addon/resolve/client/ayon_resolve/otio/davinci_export.py similarity index 100% rename from client/ayon_core/hosts/resolve/otio/davinci_export.py rename to server_addon/resolve/client/ayon_resolve/otio/davinci_export.py diff --git a/client/ayon_core/hosts/resolve/otio/davinci_import.py b/server_addon/resolve/client/ayon_resolve/otio/davinci_import.py similarity index 100% rename from client/ayon_core/hosts/resolve/otio/davinci_import.py rename to server_addon/resolve/client/ayon_resolve/otio/davinci_import.py diff --git a/client/ayon_core/hosts/resolve/otio/utils.py b/server_addon/resolve/client/ayon_resolve/otio/utils.py similarity index 100% rename from client/ayon_core/hosts/resolve/otio/utils.py rename to server_addon/resolve/client/ayon_resolve/otio/utils.py diff --git a/client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py b/server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py similarity index 100% rename from client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py rename to server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py diff --git a/client/ayon_core/hosts/resolve/plugins/load/load_clip.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py similarity index 100% rename from client/ayon_core/hosts/resolve/plugins/load/load_clip.py rename to server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py diff --git a/client/ayon_core/hosts/resolve/plugins/load/load_editorial_package.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py similarity index 100% rename from client/ayon_core/hosts/resolve/plugins/load/load_editorial_package.py rename to server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py diff --git a/client/ayon_core/hosts/resolve/plugins/publish/extract_workfile.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py similarity index 100% rename from client/ayon_core/hosts/resolve/plugins/publish/extract_workfile.py rename to server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py diff --git a/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py similarity index 100% rename from client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py rename to server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py diff --git a/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py similarity index 100% rename from client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py rename to server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py diff --git a/client/ayon_core/hosts/resolve/startup.py b/server_addon/resolve/client/ayon_resolve/startup.py similarity index 100% rename from client/ayon_core/hosts/resolve/startup.py rename to server_addon/resolve/client/ayon_resolve/startup.py diff --git a/client/ayon_core/hosts/resolve/utility_scripts/AYON__Menu.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py similarity index 100% rename from client/ayon_core/hosts/resolve/utility_scripts/AYON__Menu.py rename to server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py diff --git a/client/ayon_core/hosts/resolve/utility_scripts/ayon_startup.scriptlib b/server_addon/resolve/client/ayon_resolve/utility_scripts/ayon_startup.scriptlib similarity index 100% rename from client/ayon_core/hosts/resolve/utility_scripts/ayon_startup.scriptlib rename to server_addon/resolve/client/ayon_resolve/utility_scripts/ayon_startup.scriptlib diff --git a/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_export.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py similarity index 100% rename from client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_export.py rename to server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py diff --git a/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_import.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py similarity index 100% rename from client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_import.py rename to server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py diff --git a/client/ayon_core/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py similarity index 100% rename from client/ayon_core/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py rename to server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py diff --git a/client/ayon_core/hosts/resolve/utils.py b/server_addon/resolve/client/ayon_resolve/utils.py similarity index 100% rename from client/ayon_core/hosts/resolve/utils.py rename to server_addon/resolve/client/ayon_resolve/utils.py From e883ac4c812a62afe3a97af23da6f6bfff9c2907 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 17:36:37 +0200 Subject: [PATCH 2/4] updated package.py --- server_addon/resolve/package.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server_addon/resolve/package.py b/server_addon/resolve/package.py index cf92413bce..993f700e40 100644 --- a/server_addon/resolve/package.py +++ b/server_addon/resolve/package.py @@ -1,3 +1,10 @@ name = "resolve" title = "DaVinci Resolve" -version = "0.1.0" +version = "0.2.0" + +client_dir = "ayon_resolve" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} From e16ce8f80c8523e2e74fe32845e94e72833c0f9a Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 17:37:08 +0200 Subject: [PATCH 3/4] fixed imports --- server_addon/resolve/client/ayon_resolve/__init__.py | 9 ++++++++- server_addon/resolve/client/ayon_resolve/addon.py | 6 ++++-- server_addon/resolve/client/ayon_resolve/api/pipeline.py | 6 ++---- server_addon/resolve/client/ayon_resolve/api/utils.py | 8 ++++---- .../client/ayon_resolve/hooks/pre_resolve_setup.py | 2 +- .../client/ayon_resolve/hooks/pre_resolve_startup.py | 5 ++--- .../ayon_resolve/plugins/create/create_shot_clip.py | 4 ++-- .../client/ayon_resolve/plugins/load/load_clip.py | 4 ++-- .../ayon_resolve/plugins/load/load_editorial_package.py | 2 +- .../ayon_resolve/plugins/publish/extract_workfile.py | 2 +- .../ayon_resolve/plugins/publish/precollect_instances.py | 2 +- .../ayon_resolve/plugins/publish/precollect_workfile.py | 4 ++-- server_addon/resolve/client/ayon_resolve/startup.py | 6 +++--- .../client/ayon_resolve/utility_scripts/AYON__Menu.py | 2 +- .../ayon_resolve/utility_scripts/develop/OTIO_export.py | 2 +- .../ayon_resolve/utility_scripts/develop/OTIO_import.py | 2 +- .../develop/OpenPype_sync_util_scripts.py | 4 ++-- server_addon/resolve/client/ayon_resolve/utils.py | 4 ++-- server_addon/resolve/client/ayon_resolve/version.py | 3 +++ 19 files changed, 43 insertions(+), 34 deletions(-) create mode 100644 server_addon/resolve/client/ayon_resolve/version.py diff --git a/server_addon/resolve/client/ayon_resolve/__init__.py b/server_addon/resolve/client/ayon_resolve/__init__.py index b4a994bbaa..ba9afb67d5 100644 --- a/server_addon/resolve/client/ayon_resolve/__init__.py +++ b/server_addon/resolve/client/ayon_resolve/__init__.py @@ -1,6 +1,13 @@ -from .addon import ResolveAddon +from .version import __version__ +from .addon import ( + RESOLVE_ADDON_ROOT, + ResolveAddon, +) __all__ = ( + "__version__", + + "RESOLVE_ADDON_ROOT", "ResolveAddon", ) diff --git a/server_addon/resolve/client/ayon_resolve/addon.py b/server_addon/resolve/client/ayon_resolve/addon.py index 1354caabb2..706d2802b0 100644 --- a/server_addon/resolve/client/ayon_resolve/addon.py +++ b/server_addon/resolve/client/ayon_resolve/addon.py @@ -2,18 +2,20 @@ import os from ayon_core.addon import AYONAddon, IHostAddon -from .utils import RESOLVE_ROOT_DIR +from .version import __version__ +from .utils import RESOLVE_ADDON_ROOT class ResolveAddon(AYONAddon, IHostAddon): name = "resolve" + version = __version__ host_name = "resolve" def get_launch_hook_paths(self, app): if app.host_name != self.host_name: return [] return [ - os.path.join(RESOLVE_ROOT_DIR, "hooks") + os.path.join(RESOLVE_ADDON_ROOT, "hooks") ] def get_workfile_extensions(self): diff --git a/server_addon/resolve/client/ayon_resolve/api/pipeline.py b/server_addon/resolve/client/ayon_resolve/api/pipeline.py index 15e4f1203d..d6d6dc799e 100644 --- a/server_addon/resolve/client/ayon_resolve/api/pipeline.py +++ b/server_addon/resolve/client/ayon_resolve/api/pipeline.py @@ -57,7 +57,7 @@ class ResolveHost(HostBase, IWorkfileHost, ILoadHost): """ - log.info("ayon_core.hosts.resolve installed") + log.info("ayon_resolve installed") pyblish.register_host(self.name) pyblish.register_plugin_path(PUBLISH_PATH) @@ -246,9 +246,7 @@ def on_pyblish_instance_toggled(instance, old_value, new_value): log.info("instance toggle: {}, old_value: {}, new_value:{} ".format( instance, old_value, new_value)) - from ayon_core.hosts.resolve.api import ( - set_publish_attribute - ) + from ayon_resolve.api import set_publish_attribute # Whether instances should be passthrough based on new value timeline_item = instance.data["item"] diff --git a/server_addon/resolve/client/ayon_resolve/api/utils.py b/server_addon/resolve/client/ayon_resolve/api/utils.py index 030534370b..d63ade9d51 100644 --- a/server_addon/resolve/client/ayon_resolve/api/utils.py +++ b/server_addon/resolve/client/ayon_resolve/api/utils.py @@ -13,11 +13,11 @@ log = Logger.get_logger(__name__) def get_resolve_module(): - from ayon_core.hosts.resolve import api + from ayon_resolve import api # dont run if already loaded if api.bmdvr: log.info(("resolve module is assigned to " - f"`ayon_core.hosts.resolve.api.bmdvr`: {api.bmdvr}")) + f"`ayon_resolve.api.bmdvr`: {api.bmdvr}")) return api.bmdvr try: """ @@ -78,6 +78,6 @@ def get_resolve_module(): api.bmdvr = bmdvr api.bmdvf = bmdvf log.info(("Assigning resolve module to " - f"`ayon_core.hosts.resolve.api.bmdvr`: {api.bmdvr}")) + f"`ayon_resolve.api.bmdvr`: {api.bmdvr}")) log.info(("Assigning resolve module to " - f"`ayon_core.hosts.resolve.api.bmdvf`: {api.bmdvf}")) + f"`ayon_resolve.api.bmdvf`: {api.bmdvf}")) diff --git a/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py index f45e28d5ab..ffd34d7b8d 100644 --- a/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py +++ b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py @@ -2,7 +2,7 @@ import os from pathlib import Path import platform from ayon_applications import PreLaunchHook, LaunchTypes -from ayon_core.hosts.resolve.utils import setup +from ayon_resolve.utils import setup class PreLaunchResolveSetup(PreLaunchHook): diff --git a/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py index 300564f7cc..b357b10056 100644 --- a/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py +++ b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py @@ -1,7 +1,7 @@ import os from ayon_applications import PreLaunchHook, LaunchTypes -import ayon_core.hosts.resolve +from ayon_resolve import RESOLVE_ADDON_ROOT class PreLaunchResolveStartup(PreLaunchHook): @@ -15,8 +15,7 @@ class PreLaunchResolveStartup(PreLaunchHook): def execute(self): # Set the openpype prelaunch startup script path for easy access # in the LUA .scriptlib code - op_resolve_root = os.path.dirname(ayon_core.hosts.resolve.__file__) - script_path = os.path.join(op_resolve_root, "startup.py") + script_path = os.path.join(RESOLVE_ADDON_ROOT, "startup.py") key = "AYON_RESOLVE_STARTUP_SCRIPT" self.launch_context.env[key] = script_path diff --git a/server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py b/server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py index cbc03da3b6..da98c8de7d 100644 --- a/server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py +++ b/server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py @@ -1,6 +1,6 @@ # from pprint import pformat -from ayon_core.hosts.resolve.api import plugin, lib -from ayon_core.hosts.resolve.api.lib import ( +from ayon_resolve.api import plugin, lib +from ayon_resolve.api.lib import ( get_video_track_names, create_bin, ) diff --git a/server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py index 2ce1c43957..7e3a5a254e 100644 --- a/server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py +++ b/server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py @@ -1,7 +1,7 @@ import ayon_api -from ayon_core.hosts.resolve.api import lib, plugin -from ayon_core.hosts.resolve.api.pipeline import ( +from ayon_resolve.api import lib, plugin +from ayon_resolve.api.pipeline import ( containerise, update_container, ) diff --git a/server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py index 33395534fa..234e7b7f71 100644 --- a/server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py +++ b/server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py @@ -5,7 +5,7 @@ from ayon_core.pipeline import ( get_representation_path, ) -from ayon_core.hosts.resolve.api import lib +from ayon_resolve.api import lib class LoadEditorialPackage(load.LoaderPlugin): diff --git a/server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py index 48ebdee7e3..77d14ccdc5 100644 --- a/server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py +++ b/server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py @@ -2,7 +2,7 @@ import os import pyblish.api from ayon_core.pipeline import publish -from ayon_core.hosts.resolve.api.lib import get_project_manager +from ayon_resolve.api.lib import get_project_manager class ExtractWorkfile(publish.Extractor): diff --git a/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py index caa79c85c0..10e1eba3e3 100644 --- a/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py +++ b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py @@ -3,7 +3,7 @@ from pprint import pformat import pyblish from ayon_core.pipeline import AYON_INSTANCE_ID, AVALON_INSTANCE_ID -from ayon_core.hosts.resolve.api.lib import ( +from ayon_resolve.api.lib import ( get_current_timeline_items, get_timeline_item_pype_tag, publish_clip_color, diff --git a/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py index 6158cf1d61..a388d4bc59 100644 --- a/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py +++ b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py @@ -3,8 +3,8 @@ from pprint import pformat from ayon_core.pipeline import get_current_folder_path -from ayon_core.hosts.resolve import api as rapi -from ayon_core.hosts.resolve.otio import davinci_export +from ayon_resolve import api as rapi +from ayon_resolve.otio import davinci_export class PrecollectWorkfile(pyblish.api.ContextPlugin): diff --git a/server_addon/resolve/client/ayon_resolve/startup.py b/server_addon/resolve/client/ayon_resolve/startup.py index 3ad0a6bf7b..7f0bd59055 100644 --- a/server_addon/resolve/client/ayon_resolve/startup.py +++ b/server_addon/resolve/client/ayon_resolve/startup.py @@ -11,7 +11,7 @@ This code runs in a separate process to the main Resolve process. """ import os from ayon_core.lib import Logger -import ayon_core.hosts.resolve.api +import ayon_resolve.api log = Logger.get_logger(__name__) @@ -27,7 +27,7 @@ def ensure_installed_host(): if host: return host - host = ayon_core.hosts.resolve.api.ResolveHost() + host = ayon_resolve.api.ResolveHost() install_host(host) return registered_host() @@ -35,7 +35,7 @@ def ensure_installed_host(): def launch_menu(): print("Launching Resolve AYON menu..") ensure_installed_host() - ayon_core.hosts.resolve.api.launch_ayon_menu() + ayon_resolve.api.launch_ayon_menu() def open_workfile(path): diff --git a/server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py index b10b477beb..670544d605 100644 --- a/server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py +++ b/server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py @@ -8,7 +8,7 @@ log = Logger.get_logger(__name__) def main(env): - from ayon_core.hosts.resolve.api import ResolveHost, launch_ayon_menu + from ayon_resolve.api import ResolveHost, launch_ayon_menu # activate resolve from openpype host = ResolveHost() diff --git a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py index c1c83eb060..4572d1354d 100644 --- a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py +++ b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import os -from ayon_core.hosts.resolve.otio import davinci_export as otio_export +from ayon_resolve.otio import davinci_export as otio_export resolve = bmd.scriptapp("Resolve") # noqa fu = resolve.Fusion() diff --git a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py index 5bbdd73402..17de1b6fc3 100644 --- a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py +++ b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import os -from ayon_core.hosts.resolve.otio import davinci_import as otio_import +from ayon_resolve.otio import davinci_import as otio_import resolve = bmd.scriptapp("Resolve") # noqa fu = resolve.Fusion() diff --git a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py index c394238860..5a069aff9e 100644 --- a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py +++ b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py @@ -6,8 +6,8 @@ from ayon_core.pipeline import install_host def main(env): - from ayon_core.hosts.resolve.utils import setup - import ayon_core.hosts.resolve.api as bmdvr + from ayon_resolve.utils import setup + import ayon_resolve.api as bmdvr # Registers openpype's Global pyblish plugins install_host(bmdvr) setup(env) diff --git a/server_addon/resolve/client/ayon_resolve/utils.py b/server_addon/resolve/client/ayon_resolve/utils.py index 4ef6ea4f40..d256fda18d 100644 --- a/server_addon/resolve/client/ayon_resolve/utils.py +++ b/server_addon/resolve/client/ayon_resolve/utils.py @@ -2,7 +2,7 @@ import os import shutil from ayon_core.lib import Logger, is_running_from_build -RESOLVE_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) +RESOLVE_ADDON_ROOT = os.path.dirname(os.path.abspath(__file__)) def setup(env): @@ -12,7 +12,7 @@ def setup(env): util_scripts_dir = env["RESOLVE_UTILITY_SCRIPTS_DIR"] util_scripts_paths = [os.path.join( - RESOLVE_ROOT_DIR, + RESOLVE_ADDON_ROOT, "utility_scripts" )] diff --git a/server_addon/resolve/client/ayon_resolve/version.py b/server_addon/resolve/client/ayon_resolve/version.py new file mode 100644 index 0000000000..c8f8df554c --- /dev/null +++ b/server_addon/resolve/client/ayon_resolve/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'resolve' version.""" +__version__ = "0.2.0" From 7da9638a2a11f6732d4eee6718d2a754fcc7d10d Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 17:37:28 +0200 Subject: [PATCH 4/4] added resolve milestone --- client/ayon_core/addon/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py index fcd41c5f7d..a5d1db4058 100644 --- a/client/ayon_core/addon/base.py +++ b/client/ayon_core/addon/base.py @@ -59,6 +59,7 @@ MOVED_ADDON_MILESTONE_VERSIONS = { "tvpaint": VersionInfo(0, 2, 0), "maya": VersionInfo(0, 2, 0), "nuke": VersionInfo(0, 2, 0), + "resolve": VersionInfo(0, 2, 0), "substancepainter": VersionInfo(0, 2, 0), }