Merge pull request #549 from ynput/feature/AY-4921_Move-TrayPublisher…

…-client-code TrayPublisher: Move client code
ynput · May 24, 2024 · c7723bb · c7723bb
2 parents 55d8f11 + c73e84a
commit c7723bb
Show file tree

Hide file tree

Showing 48 changed files with 27 additions and 21 deletions.
diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py
@@ -52,6 +52,7 @@
 MOVED_ADDON_MILESTONE_VERSIONS = {
  "applications": VersionInfo(0, 2, 0),
  "clockify": VersionInfo(0, 2, 0),
+ "traypublisher": VersionInfo(0, 2, 0),
  "tvpaint": VersionInfo(0, 2, 0),
 }
 

diff --git a/...ayon_core/hosts/traypublisher/__init__.py → ...her/client/ayon_traypublisher/__init__.py b/...ayon_core/hosts/traypublisher/__init__.py → ...her/client/ayon_traypublisher/__init__.py
diff --git a/...nt/ayon_core/hosts/traypublisher/addon.py → ...lisher/client/ayon_traypublisher/addon.py b/...nt/ayon_core/hosts/traypublisher/addon.py → ...lisher/client/ayon_traypublisher/addon.py
@@ -29,8 +29,8 @@ def tray_init(self):
  def on_action_trigger(self):
  self.run_traypublisher()
 
- def connect_with_addons(self, enabled_modules):
- """Collect publish paths from other modules."""
+ def connect_with_addons(self, enabled_addons):
+ """Collect publish paths from other addons."""
  publish_paths = self.manager.collect_plugin_paths()["publish"]
  self.publish_paths.extend(publish_paths)
 
@@ -55,9 +55,9 @@ def cli_main():
 def launch():
  """Launch TrayPublish tool UI."""
 
- from ayon_core.tools import traypublisher
+ from ayon_traypublisher import ui
 
- traypublisher.main()
+ ui.main()
 
 
 @cli_main.command()

diff --git a/..._core/hosts/traypublisher/api/__init__.py → ...client/ayon_traypublisher/api/__init__.py b/..._core/hosts/traypublisher/api/__init__.py → ...client/ayon_traypublisher/api/__init__.py
diff --git a/...core/hosts/traypublisher/api/editorial.py → ...lient/ayon_traypublisher/api/editorial.py b/...core/hosts/traypublisher/api/editorial.py → ...lient/ayon_traypublisher/api/editorial.py
diff --git a/..._core/hosts/traypublisher/api/pipeline.py → ...client/ayon_traypublisher/api/pipeline.py b/..._core/hosts/traypublisher/api/pipeline.py → ...client/ayon_traypublisher/api/pipeline.py
diff --git a/...on_core/hosts/traypublisher/api/plugin.py → ...r/client/ayon_traypublisher/api/plugin.py b/...on_core/hosts/traypublisher/api/plugin.py → ...r/client/ayon_traypublisher/api/plugin.py
@@ -22,7 +22,7 @@
 )
 
 REVIEW_EXTENSIONS = set(IMAGE_EXTENSIONS) | set(VIDEO_EXTENSIONS)
-SHARED_DATA_KEY = "openpype.traypublisher.instances"
+SHARED_DATA_KEY = "ayon.traypublisher.instances"
 
 
 class HiddenTrayPublishCreator(HiddenCreator):

diff --git a/...core/hosts/traypublisher/batch_parsing.py → ...lient/ayon_traypublisher/batch_parsing.py b/...core/hosts/traypublisher/batch_parsing.py → ...lient/ayon_traypublisher/batch_parsing.py
diff --git a/...n_core/hosts/traypublisher/csv_publish.py → .../client/ayon_traypublisher/csv_publish.py b/...n_core/hosts/traypublisher/csv_publish.py → .../client/ayon_traypublisher/csv_publish.py
@@ -6,7 +6,7 @@
 from ayon_core.pipeline import install_host
 from ayon_core.pipeline.create import CreateContext
 
-from ayon_core.hosts.traypublisher.api import TrayPublisherHost
+from ayon_traypublisher.api import TrayPublisherHost
 
 
 def csvpublish(

diff --git a/.../plugins/create/create_colorspace_look.py → .../plugins/create/create_colorspace_look.py b/.../plugins/create/create_colorspace_look.py → .../plugins/create/create_colorspace_look.py
@@ -15,13 +15,13 @@
  CreatorError
 )
 from ayon_core.pipeline import colorspace
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.api.plugin import TrayPublishCreator
 
 
 class CreateColorspaceLook(TrayPublishCreator):
  """Creates colorspace look files."""
 
- identifier = "io.openpype.creators.traypublisher.colorspace_look"
+ identifier = "io.ayon.creators.traypublisher.colorspace_look"
  label = "Colorspace Look"
  product_type = "ociolook"
  description = "Publishes color space look file."

diff --git a/...isher/plugins/create/create_csv_ingest.py → ...isher/plugins/create/create_csv_ingest.py b/...isher/plugins/create/create_csv_ingest.py → ...isher/plugins/create/create_csv_ingest.py
@@ -13,9 +13,7 @@
  VIDEO_EXTENSIONS, IMAGE_EXTENSIONS
 )
 from ayon_core.pipeline.create import CreatorError
-from ayon_core.hosts.traypublisher.api.plugin import (
- TrayPublishCreator
-)
+from ayon_traypublisher.api.plugin import TrayPublishCreator
 
 
 class IngestCSV(TrayPublishCreator):

diff --git a/...lisher/plugins/create/create_editorial.py → ...lisher/plugins/create/create_editorial.py b/...lisher/plugins/create/create_editorial.py → ...lisher/plugins/create/create_editorial.py
@@ -4,11 +4,11 @@
 import ayon_api
 import opentimelineio as otio
 
-from ayon_core.hosts.traypublisher.api.plugin import (
+from ayon_traypublisher.api.plugin import (
  TrayPublishCreator,
  HiddenTrayPublishCreator
 )
-from ayon_core.hosts.traypublisher.api.editorial import (
+from ayon_traypublisher.api.editorial import (
  ShotMetadataSolver
 )
 from ayon_core.pipeline import CreatedInstance

diff --git a/...lugins/create/create_editorial_package.py → ...lugins/create/create_editorial_package.py b/...lugins/create/create_editorial_package.py → ...lugins/create/create_editorial_package.py
@@ -9,7 +9,7 @@
  BoolDef,
  TextDef,
 )
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.api.plugin import TrayPublishCreator
 
 
 class EditorialPackageCreator(TrayPublishCreator):

diff --git a/...er/plugins/create/create_from_settings.py → ...er/plugins/create/create_from_settings.py b/...er/plugins/create/create_from_settings.py → ...er/plugins/create/create_from_settings.py
@@ -6,7 +6,7 @@
 
 
 def initialize():
- from ayon_core.hosts.traypublisher.api.plugin import SettingsCreator
+ from ayon_traypublisher.api.plugin import SettingsCreator
 
  project_name = os.environ["AYON_PROJECT_NAME"]
  project_settings = get_project_settings(project_name)

diff --git a/...sher/plugins/create/create_movie_batch.py → ...sher/plugins/create/create_movie_batch.py b/...sher/plugins/create/create_movie_batch.py → ...sher/plugins/create/create_movie_batch.py
@@ -17,8 +17,8 @@
  TaskNotSetError,
 )
 
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
-from ayon_core.hosts.traypublisher.batch_parsing import (
+from ayon_traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.batch_parsing import (
  get_folder_entity_from_filename
 )
 

diff --git a/...publisher/plugins/create/create_online.py → ...publisher/plugins/create/create_online.py b/...publisher/plugins/create/create_online.py → ...publisher/plugins/create/create_online.py
@@ -14,13 +14,13 @@
  CreatedInstance,
  CreatorError
 )
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.api.plugin import TrayPublishCreator
 
 
 class OnlineCreator(TrayPublishCreator):
  """Creates instance from file and retains its original name."""
 
- identifier = "io.openpype.creators.traypublisher.online"
+ identifier = "io.ayon.creators.traypublisher.online"
  label = "Online"
  product_type = "online"
  description = "Publish file retaining its original file name"

diff --git a/...isher/plugins/publish/collect_app_name.py → ...isher/plugins/publish/collect_app_name.py b/...isher/plugins/publish/collect_app_name.py → ...isher/plugins/publish/collect_app_name.py
diff --git a/...plugins/publish/collect_clip_instances.py → ...plugins/publish/collect_clip_instances.py b/...plugins/publish/collect_clip_instances.py → ...plugins/publish/collect_clip_instances.py
diff --git a/...lugins/publish/collect_colorspace_look.py → ...lugins/publish/collect_colorspace_look.py b/...lugins/publish/collect_colorspace_look.py → ...lugins/publish/collect_colorspace_look.py
diff --git a/...blish/collect_csv_ingest_instance_data.py → ...blish/collect_csv_ingest_instance_data.py b/...blish/collect_csv_ingest_instance_data.py → ...blish/collect_csv_ingest_instance_data.py
diff --git a/...ns/publish/collect_editorial_instances.py → ...ns/publish/collect_editorial_instances.py b/...ns/publish/collect_editorial_instances.py → ...ns/publish/collect_editorial_instances.py
diff --git a/...gins/publish/collect_editorial_package.py → ...gins/publish/collect_editorial_package.py b/...gins/publish/collect_editorial_package.py → ...gins/publish/collect_editorial_package.py
diff --git a/...s/publish/collect_editorial_reviewable.py → ...s/publish/collect_editorial_reviewable.py b/...s/publish/collect_editorial_reviewable.py → ...s/publish/collect_editorial_reviewable.py
diff --git a/...ns/publish/collect_explicit_colorspace.py → ...ns/publish/collect_explicit_colorspace.py b/...ns/publish/collect_explicit_colorspace.py → ...ns/publish/collect_explicit_colorspace.py
diff --git a/.../collect_frame_data_from_folder_entity.py → .../collect_frame_data_from_folder_entity.py b/.../collect_frame_data_from_folder_entity.py → .../collect_frame_data_from_folder_entity.py
diff --git a/...er/plugins/publish/collect_movie_batch.py → ...er/plugins/publish/collect_movie_batch.py b/...er/plugins/publish/collect_movie_batch.py → ...er/plugins/publish/collect_movie_batch.py
diff --git a/...er/plugins/publish/collect_online_file.py → ...er/plugins/publish/collect_online_file.py b/...er/plugins/publish/collect_online_file.py → ...er/plugins/publish/collect_online_file.py
diff --git a/.../plugins/publish/collect_review_frames.py → .../plugins/publish/collect_review_frames.py b/.../plugins/publish/collect_review_frames.py → .../plugins/publish/collect_review_frames.py
diff --git a/...ns/publish/collect_sequence_frame_data.py → ...ns/publish/collect_sequence_frame_data.py b/...ns/publish/collect_sequence_frame_data.py → ...ns/publish/collect_sequence_frame_data.py
diff --git a/...plugins/publish/collect_shot_instances.py → ...plugins/publish/collect_shot_instances.py b/...plugins/publish/collect_shot_instances.py → ...plugins/publish/collect_shot_instances.py
diff --git a/...ugins/publish/collect_simple_instances.py → ...ugins/publish/collect_simple_instances.py b/...ugins/publish/collect_simple_instances.py → ...ugins/publish/collect_simple_instances.py
diff --git a/...blisher/plugins/publish/collect_source.py → ...blisher/plugins/publish/collect_source.py b/...blisher/plugins/publish/collect_source.py → ...blisher/plugins/publish/collect_source.py
diff --git a/...lugins/publish/extract_colorspace_look.py → ...lugins/publish/extract_colorspace_look.py b/...lugins/publish/extract_colorspace_look.py → ...lugins/publish/extract_colorspace_look.py
diff --git a/...isher/plugins/publish/extract_csv_file.py → ...isher/plugins/publish/extract_csv_file.py b/...isher/plugins/publish/extract_csv_file.py → ...isher/plugins/publish/extract_csv_file.py
diff --git a/...plugins/publish/extract_editorial_pckg.py → ...plugins/publish/extract_editorial_pckg.py b/...plugins/publish/extract_editorial_pckg.py → ...plugins/publish/extract_editorial_pckg.py
diff --git a/...ugins/publish/extract_trim_video_audio.py → ...ugins/publish/extract_trim_video_audio.py b/...ugins/publish/extract_trim_video_audio.py → ...ugins/publish/extract_trim_video_audio.py
diff --git a/...ublish/help/validate_existing_version.xml → ...ublish/help/validate_existing_version.xml b/...ublish/help/validate_existing_version.xml → ...ublish/help/validate_existing_version.xml
diff --git a/...ns/publish/help/validate_frame_ranges.xml → ...ns/publish/help/validate_frame_ranges.xml b/...ns/publish/help/validate_frame_ranges.xml → ...ns/publish/help/validate_frame_ranges.xml
diff --git a/...er/plugins/publish/validate_colorspace.py → ...er/plugins/publish/validate_colorspace.py b/...er/plugins/publish/validate_colorspace.py → ...er/plugins/publish/validate_colorspace.py
diff --git a/...ugins/publish/validate_colorspace_look.py → ...ugins/publish/validate_colorspace_look.py b/...ugins/publish/validate_colorspace_look.py → ...ugins/publish/validate_colorspace_look.py
diff --git a/...ins/publish/validate_editorial_package.py → ...ins/publish/validate_editorial_package.py b/...ins/publish/validate_editorial_package.py → ...ins/publish/validate_editorial_package.py
diff --git a/...gins/publish/validate_existing_version.py → ...gins/publish/validate_existing_version.py b/...gins/publish/validate_existing_version.py → ...gins/publish/validate_existing_version.py
diff --git a/...her/plugins/publish/validate_filepaths.py → ...her/plugins/publish/validate_filepaths.py b/...her/plugins/publish/validate_filepaths.py → ...her/plugins/publish/validate_filepaths.py
diff --git a/.../plugins/publish/validate_frame_ranges.py → .../plugins/publish/validate_frame_ranges.py b/.../plugins/publish/validate_frame_ranges.py → .../plugins/publish/validate_frame_ranges.py
diff --git a/...r/plugins/publish/validate_online_file.py → ...r/plugins/publish/validate_online_file.py b/...r/plugins/publish/validate_online_file.py → ...r/plugins/publish/validate_online_file.py
diff --git a/...ayon_core/tools/traypublisher/__init__.py → .../client/ayon_traypublisher/ui/__init__.py b/...ayon_core/tools/traypublisher/__init__.py → .../client/ayon_traypublisher/ui/__init__.py
diff --git a/...t/ayon_core/tools/traypublisher/window.py → ...er/client/ayon_traypublisher/ui/window.py b/...t/ayon_core/tools/traypublisher/window.py → ...er/client/ayon_traypublisher/ui/window.py
@@ -13,7 +13,6 @@
 
 from ayon_core.lib import AYONSettingsRegistry, is_running_from_build
 from ayon_core.pipeline import install_host
-from ayon_core.hosts.traypublisher.api import TrayPublisherHost
 from ayon_core.tools.publisher.control_qt import QtPublisherController
 from ayon_core.tools.publisher.window import PublisherWindow
 from ayon_core.tools.common_models import ProjectsModel
@@ -24,6 +23,7 @@
  ProjectSortFilterProxy,
  PROJECT_NAME_ROLE,
 )
+from ayon_traypublisher.api import TrayPublisherHost
 
 
 class TrayPublisherRegistry(AYONSettingsRegistry):

diff --git a/server_addon/traypublisher/package.py b/server_addon/traypublisher/package.py
@@ -1,3 +1,10 @@
 name = "traypublisher"
 title = "TrayPublisher"
-version = "0.1.5"
+version = "0.2.0"
+
+client_dir = "ayon_traypublisher"
+
+ayon_required_addons = {
+ "core": ">0.3.2",
+}
+ayon_compatible_addons = {}