From 0eaf09101ec02eb7d5b906c0f849c62c43d0208c Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 6 Oct 2020 17:38:19 +0200 Subject: [PATCH 1/4] feat(hiero): renaming host name references --- pype/hosts/{nukestudio => hiero}/__init__.py | 24 +++++++++--------- pype/hosts/{nukestudio => hiero}/events.py | 2 +- pype/hosts/{nukestudio => hiero}/lib.py | 10 ++++---- pype/hosts/{nukestudio => hiero}/menu.py | 4 +-- pype/hosts/{nukestudio => hiero}/tags.json | 0 pype/hosts/{nukestudio => hiero}/tags.py | 4 +-- pype/hosts/{nukestudio => hiero}/workio.py | 4 +-- .../_unused/collect_metadata.py | 2 +- .../_unused/collect_submission.py | 0 .../_unused/collect_timecodes.py | 2 +- .../_unused/collect_workfile_version.py | 0 .../_unused/extract_plates_waiting.py | 2 +- .../_unused/extract_tasks.py | 2 +- .../_unused/subset-representations_logic.txt | 0 .../_unused/validate_projectroot.py | 2 +- .../_unused/validate_resolved_paths.py | 2 +- .../_unused/validate_task.py | 4 +-- .../_unused/validate_track_item.py | 2 +- .../_unused/validate_viewer_lut.py | 10 ++++---- ...load_sequences_to_timeline_asset_origin.py | 2 +- .../publish/collect_active_project.py | 0 .../publish/collect_assetbuilds.py | 2 +- .../publish/collect_audio.py | 2 +- .../publish/collect_calculate_retime.py | 2 +- .../publish/collect_clip_resolution.py | 2 +- .../publish/collect_clips.py | 2 +- .../publish/collect_colorspace.py | 0 .../publish/collect_current_file.py | 0 .../publish/collect_effects.py | 0 .../publish/collect_frame_ranges.py | 2 +- .../publish/collect_framerate.py | 2 +- .../publish/collect_handles.py | 2 +- .../publish/collect_hierarchy_context.py | 2 +- .../publish/collect_host.py | 0 .../publish/collect_host_version.py | 0 .../publish/collect_instance_version.py | 0 .../publish/collect_leader_clip.py | 2 +- .../publish/collect_plates.py | 4 +-- .../publish/collect_remove_clip_instances.py | 2 +- .../publish/collect_reviews.py | 2 +- .../publish/collect_selection.py | 0 .../publish/collect_sequence.py | 2 +- .../publish/collect_shots.py | 2 +- .../publish/collect_tag_comments.py | 2 +- .../publish/collect_tag_framestart.py | 2 +- .../publish/collect_tag_handles.py | 2 +- .../publish/collect_tag_resolution.py | 2 +- .../publish/collect_tag_retime.py | 2 +- .../publish/collect_tag_subsets.py | 2 +- .../publish/collect_tag_tasks.py | 2 +- .../publish/collect_tags.py | 2 +- .../publish/extract_audio.py | 2 +- .../publish/extract_effects.py | 0 .../publish/extract_review_cutup_video.py | 2 +- .../publish/validate_hierarchy.py | 2 +- .../publish/validate_names.py | 2 +- .../publish/version_up_workfile.py | 2 +- .../HieroPlayer/PlayerPresets.hrox | 0 .../Icons/1_add_handles_end.png | Bin .../hiero_plugin_path/Icons/2_add_handles.png | Bin .../hiero_plugin_path/Icons/3D.png | Bin .../Icons/3_add_handles_start.png | Bin .../hiero_plugin_path/Icons/4_2D.png | Bin .../hiero_plugin_path/Icons/edit.png | Bin .../hiero_plugin_path/Icons/fusion.png | Bin .../hiero_plugin_path/Icons/hierarchy.png | Bin .../hiero_plugin_path/Icons/houdini.png | Bin .../hiero_plugin_path/Icons/layers.psd | Bin .../hiero_plugin_path/Icons/lense.png | Bin .../hiero_plugin_path/Icons/lense1.png | Bin .../hiero_plugin_path/Icons/maya.png | Bin .../hiero_plugin_path/Icons/nuke.png | Bin .../hiero_plugin_path/Icons/resolution.png | Bin .../hiero_plugin_path/Icons/resolution.psd | Bin .../hiero_plugin_path/Icons/retiming.png | Bin .../hiero_plugin_path/Icons/retiming.psd | Bin .../hiero_plugin_path/Icons/review.png | Bin .../hiero_plugin_path/Icons/review.psd | Bin .../hiero_plugin_path/Icons/volume.png | Bin .../hiero_plugin_path/Icons/z_layer_bg.png | Bin .../hiero_plugin_path/Icons/z_layer_fg.png | Bin .../hiero_plugin_path/Icons/z_layer_main.png | Bin .../Python/Startup/SpreadsheetExport.py | 0 .../Python/Startup/Startup.py | 19 ++++++++++++++ .../Startup/otioexporter/OTIOExportTask.py | 0 .../Startup/otioexporter/OTIOExportUI.py | 0 .../Python/Startup/otioexporter/__init__.py | 0 .../Python/Startup/project_helpers.py | 0 .../Python/Startup/selection_tracker.py | 0 .../Python/Startup/setFrameRate.py | 0 .../Python/Startup/version_everywhere.py | 0 .../Python/StartupUI/PimpMySpreadsheet.py | 0 .../Python/StartupUI/Purge.py | 0 .../StartupUI/nukeStyleKeyboardShortcuts.py | 0 .../StartupUI/otioimporter/OTIOImport.py | 0 .../Python/StartupUI/otioimporter/__init__.py | 0 .../Python/StartupUI/setPosterFrame.py | 0 .../pipeline.xml | 2 +- .../pipeline.xml | 2 +- .../pipeline.xml | 2 +- .../Python/Startup/Startup.py | 19 -------------- 101 files changed, 90 insertions(+), 90 deletions(-) rename pype/hosts/{nukestudio => hiero}/__init__.py (79%) rename pype/hosts/{nukestudio => hiero}/events.py (98%) rename pype/hosts/{nukestudio => hiero}/lib.py (98%) rename pype/hosts/{nukestudio => hiero}/menu.py (97%) rename pype/hosts/{nukestudio => hiero}/tags.json (100%) rename pype/hosts/{nukestudio => hiero}/tags.py (98%) rename pype/hosts/{nukestudio => hiero}/workio.py (95%) rename pype/plugins/{nukestudio => hiero}/_unused/collect_metadata.py (97%) rename pype/plugins/{nukestudio => hiero}/_unused/collect_submission.py (100%) rename pype/plugins/{nukestudio => hiero}/_unused/collect_timecodes.py (99%) rename pype/plugins/{nukestudio => hiero}/_unused/collect_workfile_version.py (100%) rename pype/plugins/{nukestudio => hiero}/_unused/extract_plates_waiting.py (96%) rename pype/plugins/{nukestudio => hiero}/_unused/extract_tasks.py (99%) rename pype/plugins/{nukestudio => hiero}/_unused/subset-representations_logic.txt (100%) rename pype/plugins/{nukestudio => hiero}/_unused/validate_projectroot.py (97%) rename pype/plugins/{nukestudio => hiero}/_unused/validate_resolved_paths.py (96%) rename pype/plugins/{nukestudio => hiero}/_unused/validate_task.py (97%) rename pype/plugins/{nukestudio => hiero}/_unused/validate_track_item.py (98%) rename pype/plugins/{nukestudio => hiero}/_unused/validate_viewer_lut.py (53%) rename pype/plugins/{nukestudio => hiero}/load/load_sequences_to_timeline_asset_origin.py (97%) rename pype/plugins/{nukestudio => hiero}/publish/collect_active_project.py (100%) rename pype/plugins/{nukestudio => hiero}/publish/collect_assetbuilds.py (98%) rename pype/plugins/{nukestudio => hiero}/publish/collect_audio.py (98%) rename pype/plugins/{nukestudio => hiero}/publish/collect_calculate_retime.py (99%) rename pype/plugins/{nukestudio => hiero}/publish/collect_clip_resolution.py (96%) rename pype/plugins/{nukestudio => hiero}/publish/collect_clips.py (99%) rename pype/plugins/{nukestudio => hiero}/publish/collect_colorspace.py (100%) rename pype/plugins/{nukestudio => hiero}/publish/collect_current_file.py (100%) rename pype/plugins/{nukestudio => hiero}/publish/collect_effects.py (100%) rename pype/plugins/{nukestudio => hiero}/publish/collect_frame_ranges.py (98%) rename pype/plugins/{nukestudio => hiero}/publish/collect_framerate.py (95%) rename pype/plugins/{nukestudio => hiero}/publish/collect_handles.py (98%) rename pype/plugins/{nukestudio => hiero}/publish/collect_hierarchy_context.py (99%) rename pype/plugins/{nukestudio => hiero}/publish/collect_host.py (100%) rename pype/plugins/{nukestudio => hiero}/publish/collect_host_version.py (100%) rename pype/plugins/{nukestudio => hiero}/publish/collect_instance_version.py (100%) rename pype/plugins/{nukestudio => hiero}/publish/collect_leader_clip.py (97%) rename pype/plugins/{nukestudio => hiero}/publish/collect_plates.py (99%) rename pype/plugins/{nukestudio => hiero}/publish/collect_remove_clip_instances.py (94%) rename pype/plugins/{nukestudio => hiero}/publish/collect_reviews.py (99%) rename pype/plugins/{nukestudio => hiero}/publish/collect_selection.py (100%) rename pype/plugins/{nukestudio => hiero}/publish/collect_sequence.py (91%) rename pype/plugins/{nukestudio => hiero}/publish/collect_shots.py (98%) rename pype/plugins/{nukestudio => hiero}/publish/collect_tag_comments.py (97%) rename pype/plugins/{nukestudio => hiero}/publish/collect_tag_framestart.py (98%) rename pype/plugins/{nukestudio => hiero}/publish/collect_tag_handles.py (98%) rename pype/plugins/{nukestudio => hiero}/publish/collect_tag_resolution.py (95%) rename pype/plugins/{nukestudio => hiero}/publish/collect_tag_retime.py (97%) rename pype/plugins/{nukestudio => hiero}/publish/collect_tag_subsets.py (97%) rename pype/plugins/{nukestudio => hiero}/publish/collect_tag_tasks.py (96%) rename pype/plugins/{nukestudio => hiero}/publish/collect_tags.py (96%) rename pype/plugins/{nukestudio => hiero}/publish/extract_audio.py (98%) rename pype/plugins/{nukestudio => hiero}/publish/extract_effects.py (100%) rename pype/plugins/{nukestudio => hiero}/publish/extract_review_cutup_video.py (99%) rename pype/plugins/{nukestudio => hiero}/publish/validate_hierarchy.py (96%) rename pype/plugins/{nukestudio => hiero}/publish/validate_names.py (97%) rename pype/plugins/{nukestudio => hiero}/publish/version_up_workfile.py (95%) rename setup/{nukestudio => hiero}/hiero_plugin_path/HieroPlayer/PlayerPresets.hrox (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/1_add_handles_end.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/2_add_handles.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/3D.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/3_add_handles_start.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/4_2D.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/edit.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/fusion.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/hierarchy.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/houdini.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/layers.psd (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/lense.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/lense1.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/maya.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/nuke.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/resolution.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/resolution.psd (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/retiming.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/retiming.psd (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/review.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/review.psd (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/volume.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/z_layer_bg.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/z_layer_fg.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Icons/z_layer_main.png (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/Startup/SpreadsheetExport.py (100%) create mode 100644 setup/hiero/hiero_plugin_path/Python/Startup/Startup.py rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/Startup/otioexporter/OTIOExportTask.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/Startup/otioexporter/OTIOExportUI.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/Startup/otioexporter/__init__.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/Startup/project_helpers.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/Startup/selection_tracker.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/Startup/setFrameRate.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/Startup/version_everywhere.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/StartupUI/PimpMySpreadsheet.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/StartupUI/Purge.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/StartupUI/nukeStyleKeyboardShortcuts.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/StartupUI/otioimporter/OTIOImport.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/StartupUI/otioimporter/__init__.py (100%) rename setup/{nukestudio => hiero}/hiero_plugin_path/Python/StartupUI/setPosterFrame.py (100%) rename setup/{nukestudio/hiero_plugin_path/TaskPresets/11.2 => hiero/hiero_plugin_path/TaskPresets/10.5/Processors}/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml (99%) rename setup/{nukestudio/hiero_plugin_path/TaskPresets/10.5 => hiero/hiero_plugin_path/TaskPresets/11.1}/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml (99%) rename setup/{nukestudio/hiero_plugin_path/TaskPresets/11.1/Processors => hiero/hiero_plugin_path/TaskPresets/11.2}/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml (99%) delete mode 100644 setup/nukestudio/hiero_plugin_path/Python/Startup/Startup.py diff --git a/pype/hosts/nukestudio/__init__.py b/pype/hosts/hiero/__init__.py similarity index 79% rename from pype/hosts/nukestudio/__init__.py rename to pype/hosts/hiero/__init__.py index c84b288f4ac..50fd39440b7 100644 --- a/pype/hosts/nukestudio/__init__.py +++ b/pype/hosts/hiero/__init__.py @@ -31,17 +31,17 @@ ] # get logger -log = Logger().get_logger(__name__, "nukestudio") +log = Logger().get_logger(__name__, "hiero") ''' Creating all important host related variables ''' AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype") # plugin root path -PUBLISH_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "publish") -LOAD_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "load") -CREATE_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "create") -INVENTORY_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "inventory") +PUBLISH_PATH = os.path.join(PLUGINS_DIR, "hiero", "publish") +LOAD_PATH = os.path.join(PLUGINS_DIR, "hiero", "load") +CREATE_PATH = os.path.join(PLUGINS_DIR, "hiero", "create") +INVENTORY_PATH = os.path.join(PLUGINS_DIR, "hiero", "inventory") # registering particular pyblish gui but `lite` is recomended!! if os.getenv("PYBLISH_GUI", None): @@ -50,7 +50,7 @@ def install(): """ - Installing Nukestudio integration for avalon + Installing Hiero integration for avalon Args: config (obj): avalon config module `pype` in our case, it is not @@ -61,8 +61,8 @@ def install(): # adding all events _register_events() - log.info("Registering NukeStudio plug-ins..") - pyblish.register_host("nukestudio") + log.info("Registering Hiero plug-ins..") + pyblish.register_host("hiero") pyblish.register_plugin_path(PUBLISH_PATH) avalon.register_plugin_path(avalon.Loader, LOAD_PATH) avalon.register_plugin_path(avalon.Creator, CREATE_PATH) @@ -87,11 +87,11 @@ def install(): def uninstall(): """ - Uninstalling Nukestudio integration for avalon + Uninstalling Hiero integration for avalon """ - log.info("Deregistering NukeStudio plug-ins..") - pyblish.deregister_host("nukestudio") + log.info("Deregistering Hiero plug-ins..") + pyblish.deregister_host("hiero") pyblish.deregister_plugin_path(PUBLISH_PATH) avalon.deregister_plugin_path(avalon.Loader, LOAD_PATH) avalon.deregister_plugin_path(avalon.Creator, CREATE_PATH) @@ -102,7 +102,7 @@ def _register_events(): Adding all callbacks. """ - # if task changed then change notext of nukestudio + # if task changed then change notext of hiero avalon.on("taskChanged", _update_menu_task_label) log.info("Installed event callback for 'taskChanged'..") diff --git a/pype/hosts/nukestudio/events.py b/pype/hosts/hiero/events.py similarity index 98% rename from pype/hosts/nukestudio/events.py rename to pype/hosts/hiero/events.py index 509319f717a..d78f8d54d49 100644 --- a/pype/hosts/nukestudio/events.py +++ b/pype/hosts/hiero/events.py @@ -4,7 +4,7 @@ from .lib import sync_avalon_data_to_workfile, launch_workfiles_app from .tags import add_tags_from_presets -log = Logger().get_logger(__name__, "nukestudio") +log = Logger().get_logger(__name__, "hiero") def startupCompleted(event): diff --git a/pype/hosts/nukestudio/lib.py b/pype/hosts/hiero/lib.py similarity index 98% rename from pype/hosts/nukestudio/lib.py rename to pype/hosts/hiero/lib.py index 6f2d9ad357d..db7199a190e 100644 --- a/pype/hosts/nukestudio/lib.py +++ b/pype/hosts/hiero/lib.py @@ -8,7 +8,7 @@ import pype.api as pype from pype.api import Logger, Anatomy -log = Logger().get_logger(__name__, "nukestudio") +log = Logger().get_logger(__name__, "hiero") cached_process = None @@ -82,7 +82,7 @@ def sync_avalon_data_to_workfile(): def launch_workfiles_app(event): """ - Event for launching workfiles after nukestudio start + Event for launching workfiles after hiero start Args: event (obj): required but unused @@ -109,9 +109,9 @@ def reload_config(): "pypeapp", "{}.api".format(AVALON_CONFIG), "{}.templates".format(AVALON_CONFIG), - "{}.hosts.nukestudio.lib".format(AVALON_CONFIG), - "{}.hosts.nukestudio.menu".format(AVALON_CONFIG), - "{}.hosts.nukestudio.tags".format(AVALON_CONFIG) + "{}.hosts.hiero.lib".format(AVALON_CONFIG), + "{}.hosts.hiero.menu".format(AVALON_CONFIG), + "{}.hosts.hiero.tags".format(AVALON_CONFIG) ): log.info("Reloading module: {}...".format(module)) try: diff --git a/pype/hosts/nukestudio/menu.py b/pype/hosts/hiero/menu.py similarity index 97% rename from pype/hosts/nukestudio/menu.py rename to pype/hosts/hiero/menu.py index 35adcfc16c3..697381f3cb2 100644 --- a/pype/hosts/nukestudio/menu.py +++ b/pype/hosts/hiero/menu.py @@ -12,7 +12,7 @@ set_workfiles ) -log = Logger().get_logger(__name__, "nukestudio") +log = Logger().get_logger(__name__, "hiero") self = sys.modules[__name__] self._change_context_menu = None @@ -38,7 +38,7 @@ def _update_menu_task_label(*args): def install(): """ - Installing menu into Nukestudio + Installing menu into Hiero """ diff --git a/pype/hosts/nukestudio/tags.json b/pype/hosts/hiero/tags.json similarity index 100% rename from pype/hosts/nukestudio/tags.json rename to pype/hosts/hiero/tags.json diff --git a/pype/hosts/nukestudio/tags.py b/pype/hosts/hiero/tags.py similarity index 98% rename from pype/hosts/nukestudio/tags.py rename to pype/hosts/hiero/tags.py index c8af0cabc1b..152d054a8a9 100644 --- a/pype/hosts/nukestudio/tags.py +++ b/pype/hosts/hiero/tags.py @@ -6,7 +6,7 @@ from pype.api import Logger from avalon import io -log = Logger().get_logger(__name__, "nukestudio") +log = Logger().get_logger(__name__, "hiero") def tag_data(): @@ -65,7 +65,7 @@ def add_tags_from_presets(): log.debug("Setting default tags on project: {}".format(project.name())) - # get nukestudio tags.json + # get hiero tags.json nks_pres_tags = tag_data() # Get project task types. diff --git a/pype/hosts/nukestudio/workio.py b/pype/hosts/hiero/workio.py similarity index 95% rename from pype/hosts/nukestudio/workio.py rename to pype/hosts/hiero/workio.py index 2cf898aa337..f11a34c9a8b 100644 --- a/pype/hosts/nukestudio/workio.py +++ b/pype/hosts/hiero/workio.py @@ -4,11 +4,11 @@ from pype.api import Logger -log = Logger().get_logger(__name__, "nukestudio") +log = Logger().get_logger(__name__, "hiero") def file_extensions(): - return api.HOST_WORKFILE_EXTENSIONS["nukestudio"] + return api.HOST_WORKFILE_EXTENSIONS["hiero"] def has_unsaved_changes(): diff --git a/pype/plugins/nukestudio/_unused/collect_metadata.py b/pype/plugins/hiero/_unused/collect_metadata.py similarity index 97% rename from pype/plugins/nukestudio/_unused/collect_metadata.py rename to pype/plugins/hiero/_unused/collect_metadata.py index 23d36ba4a26..c85cb4e898b 100644 --- a/pype/plugins/nukestudio/_unused/collect_metadata.py +++ b/pype/plugins/hiero/_unused/collect_metadata.py @@ -6,7 +6,7 @@ class CollectClipMetadata(api.InstancePlugin): order = api.CollectorOrder + 0.01 label = "Collect Metadata" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, instance): item = instance.data["item"] diff --git a/pype/plugins/nukestudio/_unused/collect_submission.py b/pype/plugins/hiero/_unused/collect_submission.py similarity index 100% rename from pype/plugins/nukestudio/_unused/collect_submission.py rename to pype/plugins/hiero/_unused/collect_submission.py diff --git a/pype/plugins/nukestudio/_unused/collect_timecodes.py b/pype/plugins/hiero/_unused/collect_timecodes.py similarity index 99% rename from pype/plugins/nukestudio/_unused/collect_timecodes.py rename to pype/plugins/hiero/_unused/collect_timecodes.py index 5ac07314a49..e79ee27a156 100644 --- a/pype/plugins/nukestudio/_unused/collect_timecodes.py +++ b/pype/plugins/hiero/_unused/collect_timecodes.py @@ -10,7 +10,7 @@ class CollectClipTimecodes(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.101 label = "Collect Timecodes" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, instance): diff --git a/pype/plugins/nukestudio/_unused/collect_workfile_version.py b/pype/plugins/hiero/_unused/collect_workfile_version.py similarity index 100% rename from pype/plugins/nukestudio/_unused/collect_workfile_version.py rename to pype/plugins/hiero/_unused/collect_workfile_version.py diff --git a/pype/plugins/nukestudio/_unused/extract_plates_waiting.py b/pype/plugins/hiero/_unused/extract_plates_waiting.py similarity index 96% rename from pype/plugins/nukestudio/_unused/extract_plates_waiting.py rename to pype/plugins/hiero/_unused/extract_plates_waiting.py index 9a4d8839178..f385f74a3e6 100644 --- a/pype/plugins/nukestudio/_unused/extract_plates_waiting.py +++ b/pype/plugins/hiero/_unused/extract_plates_waiting.py @@ -8,7 +8,7 @@ class ExtractPlateCheck(api.ContextPlugin): order = api.ExtractorOrder + 0.01 label = "Plates Export Waiting" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ["encode"] def process(self, context): diff --git a/pype/plugins/nukestudio/_unused/extract_tasks.py b/pype/plugins/hiero/_unused/extract_tasks.py similarity index 99% rename from pype/plugins/nukestudio/_unused/extract_tasks.py rename to pype/plugins/hiero/_unused/extract_tasks.py index 3e6ef9b71c8..4f75728468e 100644 --- a/pype/plugins/nukestudio/_unused/extract_tasks.py +++ b/pype/plugins/hiero/_unused/extract_tasks.py @@ -6,7 +6,7 @@ class ExtractTasks(api.InstancePlugin): order = api.ExtractorOrder label = "Tasks" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ["clip"] optional = True diff --git a/pype/plugins/nukestudio/_unused/subset-representations_logic.txt b/pype/plugins/hiero/_unused/subset-representations_logic.txt similarity index 100% rename from pype/plugins/nukestudio/_unused/subset-representations_logic.txt rename to pype/plugins/hiero/_unused/subset-representations_logic.txt diff --git a/pype/plugins/nukestudio/_unused/validate_projectroot.py b/pype/plugins/hiero/_unused/validate_projectroot.py similarity index 97% rename from pype/plugins/nukestudio/_unused/validate_projectroot.py rename to pype/plugins/hiero/_unused/validate_projectroot.py index 94315014c60..51e5082250f 100644 --- a/pype/plugins/nukestudio/_unused/validate_projectroot.py +++ b/pype/plugins/hiero/_unused/validate_projectroot.py @@ -22,7 +22,7 @@ class ValidateProjectRoot(api.ContextPlugin): order = api.ValidatorOrder label = "Project Root" - hosts = ["nukestudio"] + hosts = ["hiero"] actions = [RepairProjectRoot] def process(self, context): diff --git a/pype/plugins/nukestudio/_unused/validate_resolved_paths.py b/pype/plugins/hiero/_unused/validate_resolved_paths.py similarity index 96% rename from pype/plugins/nukestudio/_unused/validate_resolved_paths.py rename to pype/plugins/hiero/_unused/validate_resolved_paths.py index f1f0b7bbc8b..21883aa1d36 100644 --- a/pype/plugins/nukestudio/_unused/validate_resolved_paths.py +++ b/pype/plugins/hiero/_unused/validate_resolved_paths.py @@ -5,7 +5,7 @@ class ValidateResolvedPaths(api.ContextPlugin): order = api.ValidatorOrder label = "Resolved Paths" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, context): import os diff --git a/pype/plugins/nukestudio/_unused/validate_task.py b/pype/plugins/hiero/_unused/validate_task.py similarity index 97% rename from pype/plugins/nukestudio/_unused/validate_task.py rename to pype/plugins/hiero/_unused/validate_task.py index ff8fa6b6e10..3af94273bb0 100644 --- a/pype/plugins/nukestudio/_unused/validate_task.py +++ b/pype/plugins/hiero/_unused/validate_task.py @@ -13,7 +13,7 @@ class ValidateOutputRange(api.InstancePlugin): order = api.ValidatorOrder families = ["trackItem.task"] label = "Output Range" - hosts = ["nukestudio"] + hosts = ["hiero"] optional = True def process(self, instance): @@ -43,7 +43,7 @@ class ValidateImageSequence(api.InstancePlugin): families = ["trackItem.task", "img"] match = api.Subset label = "Image Sequence" - hosts = ["nukestudio"] + hosts = ["hiero"] optional = True def process(self, instance): diff --git a/pype/plugins/nukestudio/_unused/validate_track_item.py b/pype/plugins/hiero/_unused/validate_track_item.py similarity index 98% rename from pype/plugins/nukestudio/_unused/validate_track_item.py rename to pype/plugins/hiero/_unused/validate_track_item.py index 48f63b56085..f29e1d5d755 100644 --- a/pype/plugins/nukestudio/_unused/validate_track_item.py +++ b/pype/plugins/hiero/_unused/validate_track_item.py @@ -10,7 +10,7 @@ class ValidateClip(api.InstancePlugin): families = ["clip"] # match = api.Exact label = "Validate Track Item" - hosts = ["nukestudio"] + hosts = ["hiero"] optional = True def process(self, instance): diff --git a/pype/plugins/nukestudio/_unused/validate_viewer_lut.py b/pype/plugins/hiero/_unused/validate_viewer_lut.py similarity index 53% rename from pype/plugins/nukestudio/_unused/validate_viewer_lut.py rename to pype/plugins/hiero/_unused/validate_viewer_lut.py index 08c084880dc..4d307b5a71a 100644 --- a/pype/plugins/nukestudio/_unused/validate_viewer_lut.py +++ b/pype/plugins/hiero/_unused/validate_viewer_lut.py @@ -2,11 +2,11 @@ class ValidateViewerLut(api.ContextPlugin): - """Validate viewer lut in NukeStudio is the same as in Nuke.""" + """Validate viewer lut in Hiero is the same as in Nuke.""" order = api.ValidatorOrder label = "Viewer LUT" - hosts = ["nukestudio"] + hosts = ["hiero"] optional = True def process(self, context): @@ -14,8 +14,8 @@ def process(self, context): import hiero # nuke_lut = nuke.ViewerProcess.node()["current"].value() - nukestudio_lut = context.data["activeProject"].lutSettingViewer() - self.log.info("__ nukestudio_lut: {}".format(nukestudio_lut)) + hiero_lut = context.data["activeProject"].lutSettingViewer() + self.log.info("__ hiero_lut: {}".format(hiero_lut)) msg = "Viewer LUT can only be RGB" - assert "RGB" in nukestudio_lut, msg + assert "RGB" in hiero_lut, msg diff --git a/pype/plugins/nukestudio/load/load_sequences_to_timeline_asset_origin.py b/pype/plugins/hiero/load/load_sequences_to_timeline_asset_origin.py similarity index 97% rename from pype/plugins/nukestudio/load/load_sequences_to_timeline_asset_origin.py rename to pype/plugins/hiero/load/load_sequences_to_timeline_asset_origin.py index c56dcbcaaac..3c58a0a90d2 100644 --- a/pype/plugins/nukestudio/load/load_sequences_to_timeline_asset_origin.py +++ b/pype/plugins/hiero/load/load_sequences_to_timeline_asset_origin.py @@ -1,6 +1,6 @@ from avalon import api import hiero -from pype.hosts.nukestudio import lib +from pype.hosts.hiero import lib reload(lib) diff --git a/pype/plugins/nukestudio/publish/collect_active_project.py b/pype/plugins/hiero/publish/collect_active_project.py similarity index 100% rename from pype/plugins/nukestudio/publish/collect_active_project.py rename to pype/plugins/hiero/publish/collect_active_project.py diff --git a/pype/plugins/nukestudio/publish/collect_assetbuilds.py b/pype/plugins/hiero/publish/collect_assetbuilds.py similarity index 98% rename from pype/plugins/nukestudio/publish/collect_assetbuilds.py rename to pype/plugins/hiero/publish/collect_assetbuilds.py index 76326c320ba..f20acaf3da8 100644 --- a/pype/plugins/nukestudio/publish/collect_assetbuilds.py +++ b/pype/plugins/hiero/publish/collect_assetbuilds.py @@ -14,7 +14,7 @@ class CollectAssetBuilds(api.ContextPlugin): # Run just after CollectClip order = api.CollectorOrder + 0.02 label = "Collect AssetBuilds" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, context): asset_builds = {} diff --git a/pype/plugins/nukestudio/publish/collect_audio.py b/pype/plugins/hiero/publish/collect_audio.py similarity index 98% rename from pype/plugins/nukestudio/publish/collect_audio.py rename to pype/plugins/hiero/publish/collect_audio.py index 727d7da795f..a63a18be05f 100644 --- a/pype/plugins/nukestudio/publish/collect_audio.py +++ b/pype/plugins/hiero/publish/collect_audio.py @@ -14,7 +14,7 @@ class CollectAudio(api.InstancePlugin): # Run just before CollectSubsets order = api.CollectorOrder + 0.1021 label = "Collect Audio" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ["clip"] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_calculate_retime.py b/pype/plugins/hiero/publish/collect_calculate_retime.py similarity index 99% rename from pype/plugins/nukestudio/publish/collect_calculate_retime.py rename to pype/plugins/hiero/publish/collect_calculate_retime.py index a97b43a4ce0..1b2f047da24 100644 --- a/pype/plugins/nukestudio/publish/collect_calculate_retime.py +++ b/pype/plugins/hiero/publish/collect_calculate_retime.py @@ -8,7 +8,7 @@ class CollectCalculateRetime(api.InstancePlugin): order = api.CollectorOrder + 0.02 label = "Collect Calculate Retiming" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ['retime'] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_clip_resolution.py b/pype/plugins/hiero/publish/collect_clip_resolution.py similarity index 96% rename from pype/plugins/nukestudio/publish/collect_clip_resolution.py rename to pype/plugins/hiero/publish/collect_clip_resolution.py index b70f8f2f958..8d441959ba8 100644 --- a/pype/plugins/nukestudio/publish/collect_clip_resolution.py +++ b/pype/plugins/hiero/publish/collect_clip_resolution.py @@ -6,7 +6,7 @@ class CollectClipResolution(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.101 label = "Collect Clip Resoluton" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, instance): sequence = instance.context.data['activeSequence'] diff --git a/pype/plugins/nukestudio/publish/collect_clips.py b/pype/plugins/hiero/publish/collect_clips.py similarity index 99% rename from pype/plugins/nukestudio/publish/collect_clips.py rename to pype/plugins/hiero/publish/collect_clips.py index d39e25bfc6d..e11ad938839 100644 --- a/pype/plugins/nukestudio/publish/collect_clips.py +++ b/pype/plugins/hiero/publish/collect_clips.py @@ -9,7 +9,7 @@ class CollectClips(api.ContextPlugin): order = api.CollectorOrder + 0.01 label = "Collect Clips" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, context): # create asset_names conversion table diff --git a/pype/plugins/nukestudio/publish/collect_colorspace.py b/pype/plugins/hiero/publish/collect_colorspace.py similarity index 100% rename from pype/plugins/nukestudio/publish/collect_colorspace.py rename to pype/plugins/hiero/publish/collect_colorspace.py diff --git a/pype/plugins/nukestudio/publish/collect_current_file.py b/pype/plugins/hiero/publish/collect_current_file.py similarity index 100% rename from pype/plugins/nukestudio/publish/collect_current_file.py rename to pype/plugins/hiero/publish/collect_current_file.py diff --git a/pype/plugins/nukestudio/publish/collect_effects.py b/pype/plugins/hiero/publish/collect_effects.py similarity index 100% rename from pype/plugins/nukestudio/publish/collect_effects.py rename to pype/plugins/hiero/publish/collect_effects.py diff --git a/pype/plugins/nukestudio/publish/collect_frame_ranges.py b/pype/plugins/hiero/publish/collect_frame_ranges.py similarity index 98% rename from pype/plugins/nukestudio/publish/collect_frame_ranges.py rename to pype/plugins/hiero/publish/collect_frame_ranges.py index 1cb5e5dd1eb..19a46d80b15 100644 --- a/pype/plugins/nukestudio/publish/collect_frame_ranges.py +++ b/pype/plugins/hiero/publish/collect_frame_ranges.py @@ -6,7 +6,7 @@ class CollectClipFrameRanges(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.101 label = "Collect Frame Ranges" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_framerate.py b/pype/plugins/hiero/publish/collect_framerate.py similarity index 95% rename from pype/plugins/nukestudio/publish/collect_framerate.py rename to pype/plugins/hiero/publish/collect_framerate.py index 694052f8027..6d2d2eef2bf 100644 --- a/pype/plugins/nukestudio/publish/collect_framerate.py +++ b/pype/plugins/hiero/publish/collect_framerate.py @@ -6,7 +6,7 @@ class CollectFramerate(api.ContextPlugin): order = api.CollectorOrder + 0.01 label = "Collect Framerate" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, context): sequence = context.data["activeSequence"] diff --git a/pype/plugins/nukestudio/publish/collect_handles.py b/pype/plugins/hiero/publish/collect_handles.py similarity index 98% rename from pype/plugins/nukestudio/publish/collect_handles.py rename to pype/plugins/hiero/publish/collect_handles.py index c16f1a58035..1f278a6b4cc 100644 --- a/pype/plugins/nukestudio/publish/collect_handles.py +++ b/pype/plugins/hiero/publish/collect_handles.py @@ -6,7 +6,7 @@ class CollectClipHandles(api.ContextPlugin): order = api.CollectorOrder + 0.0121 label = "Collect Handles" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, context): assets_shared = context.data.get("assetsShared") diff --git a/pype/plugins/nukestudio/publish/collect_hierarchy_context.py b/pype/plugins/hiero/publish/collect_hierarchy_context.py similarity index 99% rename from pype/plugins/nukestudio/publish/collect_hierarchy_context.py rename to pype/plugins/hiero/publish/collect_hierarchy_context.py index 930efd618e8..249194003b9 100644 --- a/pype/plugins/nukestudio/publish/collect_hierarchy_context.py +++ b/pype/plugins/hiero/publish/collect_hierarchy_context.py @@ -46,7 +46,7 @@ def process(self, context): clip_out = instance.data["clipOut"] fps = context.data["fps"] - # build data for inner nukestudio project property + # build data for inner hiero project property data = { "sequence": ( context.data['activeSequence'].name().replace(' ', '_') diff --git a/pype/plugins/nukestudio/publish/collect_host.py b/pype/plugins/hiero/publish/collect_host.py similarity index 100% rename from pype/plugins/nukestudio/publish/collect_host.py rename to pype/plugins/hiero/publish/collect_host.py diff --git a/pype/plugins/nukestudio/publish/collect_host_version.py b/pype/plugins/hiero/publish/collect_host_version.py similarity index 100% rename from pype/plugins/nukestudio/publish/collect_host_version.py rename to pype/plugins/hiero/publish/collect_host_version.py diff --git a/pype/plugins/nukestudio/publish/collect_instance_version.py b/pype/plugins/hiero/publish/collect_instance_version.py similarity index 100% rename from pype/plugins/nukestudio/publish/collect_instance_version.py rename to pype/plugins/hiero/publish/collect_instance_version.py diff --git a/pype/plugins/nukestudio/publish/collect_leader_clip.py b/pype/plugins/hiero/publish/collect_leader_clip.py similarity index 97% rename from pype/plugins/nukestudio/publish/collect_leader_clip.py rename to pype/plugins/hiero/publish/collect_leader_clip.py index 62ef4203169..bba85cf411c 100644 --- a/pype/plugins/nukestudio/publish/collect_leader_clip.py +++ b/pype/plugins/hiero/publish/collect_leader_clip.py @@ -6,7 +6,7 @@ class CollectLeaderClip(api.InstancePlugin): order = api.CollectorOrder + 0.0111 label = "Collect Leader Clip" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ['clip'] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_plates.py b/pype/plugins/hiero/publish/collect_plates.py similarity index 99% rename from pype/plugins/nukestudio/publish/collect_plates.py rename to pype/plugins/hiero/publish/collect_plates.py index 770cef7e3f3..0c08b94148c 100644 --- a/pype/plugins/nukestudio/publish/collect_plates.py +++ b/pype/plugins/hiero/publish/collect_plates.py @@ -16,7 +16,7 @@ class CollectPlates(api.InstancePlugin): # Run just before CollectSubsets order = api.CollectorOrder + 0.1021 label = "Collect Plates" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ["clip"] def process(self, instance): @@ -85,7 +85,7 @@ class CollectPlatesData(api.InstancePlugin): order = api.CollectorOrder + 0.48 label = "Collect Plates Data" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ["plate"] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_remove_clip_instances.py b/pype/plugins/hiero/publish/collect_remove_clip_instances.py similarity index 94% rename from pype/plugins/nukestudio/publish/collect_remove_clip_instances.py rename to pype/plugins/hiero/publish/collect_remove_clip_instances.py index d41dc50ab1e..c42bd1345b7 100644 --- a/pype/plugins/nukestudio/publish/collect_remove_clip_instances.py +++ b/pype/plugins/hiero/publish/collect_remove_clip_instances.py @@ -5,7 +5,7 @@ class CollectClipSubsets(api.InstancePlugin): order = api.CollectorOrder + 0.103 label = "Collect Remove Clip Instaces" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ['clip'] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_reviews.py b/pype/plugins/hiero/publish/collect_reviews.py similarity index 99% rename from pype/plugins/nukestudio/publish/collect_reviews.py rename to pype/plugins/hiero/publish/collect_reviews.py index 3167c66170b..0ef0842e82c 100644 --- a/pype/plugins/nukestudio/publish/collect_reviews.py +++ b/pype/plugins/hiero/publish/collect_reviews.py @@ -15,7 +15,7 @@ class CollectReviews(api.InstancePlugin): # Run just before CollectSubsets order = api.CollectorOrder + 0.1022 label = "Collect Reviews" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ["plate"] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_selection.py b/pype/plugins/hiero/publish/collect_selection.py similarity index 100% rename from pype/plugins/nukestudio/publish/collect_selection.py rename to pype/plugins/hiero/publish/collect_selection.py diff --git a/pype/plugins/nukestudio/publish/collect_sequence.py b/pype/plugins/hiero/publish/collect_sequence.py similarity index 91% rename from pype/plugins/nukestudio/publish/collect_sequence.py rename to pype/plugins/hiero/publish/collect_sequence.py index 162d1ebdfe4..4247c7c4cbe 100644 --- a/pype/plugins/nukestudio/publish/collect_sequence.py +++ b/pype/plugins/hiero/publish/collect_sequence.py @@ -7,7 +7,7 @@ class CollectSequence(api.ContextPlugin): order = api.CollectorOrder - 0.01 label = "Collect Sequence" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, context): context.data['activeSequence'] = hiero.ui.activeSequence() diff --git a/pype/plugins/nukestudio/publish/collect_shots.py b/pype/plugins/hiero/publish/collect_shots.py similarity index 98% rename from pype/plugins/nukestudio/publish/collect_shots.py rename to pype/plugins/hiero/publish/collect_shots.py index 03fc7ab282f..22f23e57422 100644 --- a/pype/plugins/nukestudio/publish/collect_shots.py +++ b/pype/plugins/hiero/publish/collect_shots.py @@ -7,7 +7,7 @@ class CollectShots(api.InstancePlugin): # Run just before CollectClipSubsets order = api.CollectorOrder + 0.1021 label = "Collect Shots" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ["clip"] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_tag_comments.py b/pype/plugins/hiero/publish/collect_tag_comments.py similarity index 97% rename from pype/plugins/nukestudio/publish/collect_tag_comments.py rename to pype/plugins/hiero/publish/collect_tag_comments.py index e14e53d4393..76d7b6a67c6 100644 --- a/pype/plugins/nukestudio/publish/collect_tag_comments.py +++ b/pype/plugins/hiero/publish/collect_tag_comments.py @@ -6,7 +6,7 @@ class CollectClipTagComments(api.InstancePlugin): order = api.CollectorOrder + 0.013 label = "Collect Comments" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ["clip"] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_tag_framestart.py b/pype/plugins/hiero/publish/collect_tag_framestart.py similarity index 98% rename from pype/plugins/nukestudio/publish/collect_tag_framestart.py rename to pype/plugins/hiero/publish/collect_tag_framestart.py index 993aa99a3e4..0d14271aa5a 100644 --- a/pype/plugins/nukestudio/publish/collect_tag_framestart.py +++ b/pype/plugins/hiero/publish/collect_tag_framestart.py @@ -6,7 +6,7 @@ class CollectClipTagFrameStart(api.InstancePlugin): order = api.CollectorOrder + 0.013 label = "Collect Frame Start" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ['clip'] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_tag_handles.py b/pype/plugins/hiero/publish/collect_tag_handles.py similarity index 98% rename from pype/plugins/nukestudio/publish/collect_tag_handles.py rename to pype/plugins/hiero/publish/collect_tag_handles.py index a6a63faea9e..7e51efd8e1e 100644 --- a/pype/plugins/nukestudio/publish/collect_tag_handles.py +++ b/pype/plugins/hiero/publish/collect_tag_handles.py @@ -7,7 +7,7 @@ class CollectClipTagHandles(api.ContextPlugin): order = api.CollectorOrder + 0.012 label = "Collect Tag Handles" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ['clip'] def process(self, context): diff --git a/pype/plugins/nukestudio/publish/collect_tag_resolution.py b/pype/plugins/hiero/publish/collect_tag_resolution.py similarity index 95% rename from pype/plugins/nukestudio/publish/collect_tag_resolution.py rename to pype/plugins/hiero/publish/collect_tag_resolution.py index 24c13d2b4a3..ef46d9d5947 100644 --- a/pype/plugins/nukestudio/publish/collect_tag_resolution.py +++ b/pype/plugins/hiero/publish/collect_tag_resolution.py @@ -6,7 +6,7 @@ class CollectClipTagResolution(api.InstancePlugin): order = api.CollectorOrder + 0.013 label = "Collect Source Resolution" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ['clip'] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_tag_retime.py b/pype/plugins/hiero/publish/collect_tag_retime.py similarity index 97% rename from pype/plugins/nukestudio/publish/collect_tag_retime.py rename to pype/plugins/hiero/publish/collect_tag_retime.py index 32e49e1b2af..06341309760 100644 --- a/pype/plugins/nukestudio/publish/collect_tag_retime.py +++ b/pype/plugins/hiero/publish/collect_tag_retime.py @@ -6,7 +6,7 @@ class CollectTagRetime(api.InstancePlugin): order = api.CollectorOrder + 0.014 label = "Collect Retiming Tag" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ['clip'] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_tag_subsets.py b/pype/plugins/hiero/publish/collect_tag_subsets.py similarity index 97% rename from pype/plugins/nukestudio/publish/collect_tag_subsets.py rename to pype/plugins/hiero/publish/collect_tag_subsets.py index 0d420008964..d3d247727ba 100644 --- a/pype/plugins/nukestudio/publish/collect_tag_subsets.py +++ b/pype/plugins/hiero/publish/collect_tag_subsets.py @@ -6,7 +6,7 @@ class CollectClipSubsetsTags(api.InstancePlugin): order = api.CollectorOrder + 0.012 label = "Collect Tags Subsets" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ['clip'] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_tag_tasks.py b/pype/plugins/hiero/publish/collect_tag_tasks.py similarity index 96% rename from pype/plugins/nukestudio/publish/collect_tag_tasks.py rename to pype/plugins/hiero/publish/collect_tag_tasks.py index ed2f3009d3a..b83e208b584 100644 --- a/pype/plugins/nukestudio/publish/collect_tag_tasks.py +++ b/pype/plugins/hiero/publish/collect_tag_tasks.py @@ -6,7 +6,7 @@ class CollectClipTagTasks(api.InstancePlugin): order = api.CollectorOrder + 0.012 label = "Collect Tag Tasks" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ['clip'] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/collect_tags.py b/pype/plugins/hiero/publish/collect_tags.py similarity index 96% rename from pype/plugins/nukestudio/publish/collect_tags.py rename to pype/plugins/hiero/publish/collect_tags.py index 49005f4b223..fde6f7a26b8 100644 --- a/pype/plugins/nukestudio/publish/collect_tags.py +++ b/pype/plugins/hiero/publish/collect_tags.py @@ -6,7 +6,7 @@ class CollectClipTags(api.InstancePlugin): order = api.CollectorOrder + 0.011 label = "Collect Tags" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ['clip'] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/extract_audio.py b/pype/plugins/hiero/publish/extract_audio.py similarity index 98% rename from pype/plugins/nukestudio/publish/extract_audio.py rename to pype/plugins/hiero/publish/extract_audio.py index 2c4afc84124..34fdcdfe9d3 100644 --- a/pype/plugins/nukestudio/publish/extract_audio.py +++ b/pype/plugins/hiero/publish/extract_audio.py @@ -7,7 +7,7 @@ class ExtractAudioFile(pype.api.Extractor): order = api.ExtractorOrder label = "Extract Subset Audio" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ["clip", "audio"] match = api.Intersection diff --git a/pype/plugins/nukestudio/publish/extract_effects.py b/pype/plugins/hiero/publish/extract_effects.py similarity index 100% rename from pype/plugins/nukestudio/publish/extract_effects.py rename to pype/plugins/hiero/publish/extract_effects.py diff --git a/pype/plugins/nukestudio/publish/extract_review_cutup_video.py b/pype/plugins/hiero/publish/extract_review_cutup_video.py similarity index 99% rename from pype/plugins/nukestudio/publish/extract_review_cutup_video.py rename to pype/plugins/hiero/publish/extract_review_cutup_video.py index d1ce3675b1b..d1953b5aa2a 100644 --- a/pype/plugins/nukestudio/publish/extract_review_cutup_video.py +++ b/pype/plugins/hiero/publish/extract_review_cutup_video.py @@ -9,7 +9,7 @@ class ExtractReviewCutUpVideo(pype.api.Extractor): order = api.ExtractorOrder # order = api.CollectorOrder + 0.1023 label = "Extract Review CutUp Video" - hosts = ["nukestudio"] + hosts = ["hiero"] families = ["review"] # presets diff --git a/pype/plugins/nukestudio/publish/validate_hierarchy.py b/pype/plugins/hiero/publish/validate_hierarchy.py similarity index 96% rename from pype/plugins/nukestudio/publish/validate_hierarchy.py rename to pype/plugins/hiero/publish/validate_hierarchy.py index 8013a98efdf..d43f7fd562b 100644 --- a/pype/plugins/nukestudio/publish/validate_hierarchy.py +++ b/pype/plugins/hiero/publish/validate_hierarchy.py @@ -9,7 +9,7 @@ class ValidateHierarchy(api.InstancePlugin): order = api.ValidatorOrder families = ["clip", "shot"] label = "Validate Hierarchy" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, instance): asset_name = instance.data.get("asset", None) diff --git a/pype/plugins/nukestudio/publish/validate_names.py b/pype/plugins/hiero/publish/validate_names.py similarity index 97% rename from pype/plugins/nukestudio/publish/validate_names.py rename to pype/plugins/hiero/publish/validate_names.py index 8f7436cca06..52e4bf8ecc2 100644 --- a/pype/plugins/nukestudio/publish/validate_names.py +++ b/pype/plugins/hiero/publish/validate_names.py @@ -13,7 +13,7 @@ class ValidateNames(api.InstancePlugin): families = ["clip"] match = api.Exact label = "Names" - hosts = ["nukestudio"] + hosts = ["hiero"] def process(self, instance): diff --git a/pype/plugins/nukestudio/publish/version_up_workfile.py b/pype/plugins/hiero/publish/version_up_workfile.py similarity index 95% rename from pype/plugins/nukestudio/publish/version_up_workfile.py rename to pype/plugins/hiero/publish/version_up_workfile.py index 195099dd098..893d3789ebf 100644 --- a/pype/plugins/nukestudio/publish/version_up_workfile.py +++ b/pype/plugins/hiero/publish/version_up_workfile.py @@ -7,7 +7,7 @@ class VersionUpWorkfile(api.ContextPlugin): order = api.IntegratorOrder + 10.1 label = "Version-up Workfile" - hosts = ["nukestudio"] + hosts = ["hiero"] optional = True active = True diff --git a/setup/nukestudio/hiero_plugin_path/HieroPlayer/PlayerPresets.hrox b/setup/hiero/hiero_plugin_path/HieroPlayer/PlayerPresets.hrox similarity index 100% rename from setup/nukestudio/hiero_plugin_path/HieroPlayer/PlayerPresets.hrox rename to setup/hiero/hiero_plugin_path/HieroPlayer/PlayerPresets.hrox diff --git a/setup/nukestudio/hiero_plugin_path/Icons/1_add_handles_end.png b/setup/hiero/hiero_plugin_path/Icons/1_add_handles_end.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/1_add_handles_end.png rename to setup/hiero/hiero_plugin_path/Icons/1_add_handles_end.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/2_add_handles.png b/setup/hiero/hiero_plugin_path/Icons/2_add_handles.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/2_add_handles.png rename to setup/hiero/hiero_plugin_path/Icons/2_add_handles.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/3D.png b/setup/hiero/hiero_plugin_path/Icons/3D.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/3D.png rename to setup/hiero/hiero_plugin_path/Icons/3D.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/3_add_handles_start.png b/setup/hiero/hiero_plugin_path/Icons/3_add_handles_start.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/3_add_handles_start.png rename to setup/hiero/hiero_plugin_path/Icons/3_add_handles_start.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/4_2D.png b/setup/hiero/hiero_plugin_path/Icons/4_2D.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/4_2D.png rename to setup/hiero/hiero_plugin_path/Icons/4_2D.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/edit.png b/setup/hiero/hiero_plugin_path/Icons/edit.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/edit.png rename to setup/hiero/hiero_plugin_path/Icons/edit.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/fusion.png b/setup/hiero/hiero_plugin_path/Icons/fusion.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/fusion.png rename to setup/hiero/hiero_plugin_path/Icons/fusion.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/hierarchy.png b/setup/hiero/hiero_plugin_path/Icons/hierarchy.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/hierarchy.png rename to setup/hiero/hiero_plugin_path/Icons/hierarchy.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/houdini.png b/setup/hiero/hiero_plugin_path/Icons/houdini.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/houdini.png rename to setup/hiero/hiero_plugin_path/Icons/houdini.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/layers.psd b/setup/hiero/hiero_plugin_path/Icons/layers.psd similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/layers.psd rename to setup/hiero/hiero_plugin_path/Icons/layers.psd diff --git a/setup/nukestudio/hiero_plugin_path/Icons/lense.png b/setup/hiero/hiero_plugin_path/Icons/lense.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/lense.png rename to setup/hiero/hiero_plugin_path/Icons/lense.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/lense1.png b/setup/hiero/hiero_plugin_path/Icons/lense1.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/lense1.png rename to setup/hiero/hiero_plugin_path/Icons/lense1.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/maya.png b/setup/hiero/hiero_plugin_path/Icons/maya.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/maya.png rename to setup/hiero/hiero_plugin_path/Icons/maya.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/nuke.png b/setup/hiero/hiero_plugin_path/Icons/nuke.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/nuke.png rename to setup/hiero/hiero_plugin_path/Icons/nuke.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/resolution.png b/setup/hiero/hiero_plugin_path/Icons/resolution.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/resolution.png rename to setup/hiero/hiero_plugin_path/Icons/resolution.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/resolution.psd b/setup/hiero/hiero_plugin_path/Icons/resolution.psd similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/resolution.psd rename to setup/hiero/hiero_plugin_path/Icons/resolution.psd diff --git a/setup/nukestudio/hiero_plugin_path/Icons/retiming.png b/setup/hiero/hiero_plugin_path/Icons/retiming.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/retiming.png rename to setup/hiero/hiero_plugin_path/Icons/retiming.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/retiming.psd b/setup/hiero/hiero_plugin_path/Icons/retiming.psd similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/retiming.psd rename to setup/hiero/hiero_plugin_path/Icons/retiming.psd diff --git a/setup/nukestudio/hiero_plugin_path/Icons/review.png b/setup/hiero/hiero_plugin_path/Icons/review.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/review.png rename to setup/hiero/hiero_plugin_path/Icons/review.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/review.psd b/setup/hiero/hiero_plugin_path/Icons/review.psd similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/review.psd rename to setup/hiero/hiero_plugin_path/Icons/review.psd diff --git a/setup/nukestudio/hiero_plugin_path/Icons/volume.png b/setup/hiero/hiero_plugin_path/Icons/volume.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/volume.png rename to setup/hiero/hiero_plugin_path/Icons/volume.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/z_layer_bg.png b/setup/hiero/hiero_plugin_path/Icons/z_layer_bg.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/z_layer_bg.png rename to setup/hiero/hiero_plugin_path/Icons/z_layer_bg.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/z_layer_fg.png b/setup/hiero/hiero_plugin_path/Icons/z_layer_fg.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/z_layer_fg.png rename to setup/hiero/hiero_plugin_path/Icons/z_layer_fg.png diff --git a/setup/nukestudio/hiero_plugin_path/Icons/z_layer_main.png b/setup/hiero/hiero_plugin_path/Icons/z_layer_main.png similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Icons/z_layer_main.png rename to setup/hiero/hiero_plugin_path/Icons/z_layer_main.png diff --git a/setup/nukestudio/hiero_plugin_path/Python/Startup/SpreadsheetExport.py b/setup/hiero/hiero_plugin_path/Python/Startup/SpreadsheetExport.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/Startup/SpreadsheetExport.py rename to setup/hiero/hiero_plugin_path/Python/Startup/SpreadsheetExport.py diff --git a/setup/hiero/hiero_plugin_path/Python/Startup/Startup.py b/setup/hiero/hiero_plugin_path/Python/Startup/Startup.py new file mode 100644 index 00000000000..003d7959c5d --- /dev/null +++ b/setup/hiero/hiero_plugin_path/Python/Startup/Startup.py @@ -0,0 +1,19 @@ +import traceback + +# activate hiero from pype +import avalon.api +import pype.hosts.hiero +avalon.api.install(pype.hosts.hiero) + +try: + __import__("pype.hosts.hiero") + __import__("pyblish") + +except ImportError as e: + print traceback.format_exc() + print("pyblish: Could not load integration: %s " % e) + +else: + # Setup integration + import pype.hosts.hiero.lib + pype.hosts.hiero.lib.setup() diff --git a/setup/nukestudio/hiero_plugin_path/Python/Startup/otioexporter/OTIOExportTask.py b/setup/hiero/hiero_plugin_path/Python/Startup/otioexporter/OTIOExportTask.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/Startup/otioexporter/OTIOExportTask.py rename to setup/hiero/hiero_plugin_path/Python/Startup/otioexporter/OTIOExportTask.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/Startup/otioexporter/OTIOExportUI.py b/setup/hiero/hiero_plugin_path/Python/Startup/otioexporter/OTIOExportUI.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/Startup/otioexporter/OTIOExportUI.py rename to setup/hiero/hiero_plugin_path/Python/Startup/otioexporter/OTIOExportUI.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/Startup/otioexporter/__init__.py b/setup/hiero/hiero_plugin_path/Python/Startup/otioexporter/__init__.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/Startup/otioexporter/__init__.py rename to setup/hiero/hiero_plugin_path/Python/Startup/otioexporter/__init__.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/Startup/project_helpers.py b/setup/hiero/hiero_plugin_path/Python/Startup/project_helpers.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/Startup/project_helpers.py rename to setup/hiero/hiero_plugin_path/Python/Startup/project_helpers.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/Startup/selection_tracker.py b/setup/hiero/hiero_plugin_path/Python/Startup/selection_tracker.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/Startup/selection_tracker.py rename to setup/hiero/hiero_plugin_path/Python/Startup/selection_tracker.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/Startup/setFrameRate.py b/setup/hiero/hiero_plugin_path/Python/Startup/setFrameRate.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/Startup/setFrameRate.py rename to setup/hiero/hiero_plugin_path/Python/Startup/setFrameRate.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/Startup/version_everywhere.py b/setup/hiero/hiero_plugin_path/Python/Startup/version_everywhere.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/Startup/version_everywhere.py rename to setup/hiero/hiero_plugin_path/Python/Startup/version_everywhere.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/StartupUI/PimpMySpreadsheet.py b/setup/hiero/hiero_plugin_path/Python/StartupUI/PimpMySpreadsheet.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/StartupUI/PimpMySpreadsheet.py rename to setup/hiero/hiero_plugin_path/Python/StartupUI/PimpMySpreadsheet.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/StartupUI/Purge.py b/setup/hiero/hiero_plugin_path/Python/StartupUI/Purge.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/StartupUI/Purge.py rename to setup/hiero/hiero_plugin_path/Python/StartupUI/Purge.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/StartupUI/nukeStyleKeyboardShortcuts.py b/setup/hiero/hiero_plugin_path/Python/StartupUI/nukeStyleKeyboardShortcuts.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/StartupUI/nukeStyleKeyboardShortcuts.py rename to setup/hiero/hiero_plugin_path/Python/StartupUI/nukeStyleKeyboardShortcuts.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/StartupUI/otioimporter/OTIOImport.py b/setup/hiero/hiero_plugin_path/Python/StartupUI/otioimporter/OTIOImport.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/StartupUI/otioimporter/OTIOImport.py rename to setup/hiero/hiero_plugin_path/Python/StartupUI/otioimporter/OTIOImport.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/StartupUI/otioimporter/__init__.py b/setup/hiero/hiero_plugin_path/Python/StartupUI/otioimporter/__init__.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/StartupUI/otioimporter/__init__.py rename to setup/hiero/hiero_plugin_path/Python/StartupUI/otioimporter/__init__.py diff --git a/setup/nukestudio/hiero_plugin_path/Python/StartupUI/setPosterFrame.py b/setup/hiero/hiero_plugin_path/Python/StartupUI/setPosterFrame.py similarity index 100% rename from setup/nukestudio/hiero_plugin_path/Python/StartupUI/setPosterFrame.py rename to setup/hiero/hiero_plugin_path/Python/StartupUI/setPosterFrame.py diff --git a/setup/nukestudio/hiero_plugin_path/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml b/setup/hiero/hiero_plugin_path/TaskPresets/10.5/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml similarity index 99% rename from setup/nukestudio/hiero_plugin_path/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml rename to setup/hiero/hiero_plugin_path/TaskPresets/10.5/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml index e24a4dbe4e2..690820c7882 100644 --- a/setup/nukestudio/hiero_plugin_path/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml +++ b/setup/hiero/hiero_plugin_path/TaskPresets/10.5/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml @@ -1,6 +1,6 @@ 991 - //10.11.0.184/171001_ftrack/tgbvfx/editorial/nukestudio/workspace/ + //10.11.0.184/171001_ftrack/tgbvfx/editorial/hiero/workspace/ 1 True 3 diff --git a/setup/nukestudio/hiero_plugin_path/TaskPresets/10.5/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml b/setup/hiero/hiero_plugin_path/TaskPresets/11.1/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml similarity index 99% rename from setup/nukestudio/hiero_plugin_path/TaskPresets/10.5/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml rename to setup/hiero/hiero_plugin_path/TaskPresets/11.1/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml index e24a4dbe4e2..690820c7882 100644 --- a/setup/nukestudio/hiero_plugin_path/TaskPresets/10.5/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml +++ b/setup/hiero/hiero_plugin_path/TaskPresets/11.1/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml @@ -1,6 +1,6 @@ 991 - //10.11.0.184/171001_ftrack/tgbvfx/editorial/nukestudio/workspace/ + //10.11.0.184/171001_ftrack/tgbvfx/editorial/hiero/workspace/ 1 True 3 diff --git a/setup/nukestudio/hiero_plugin_path/TaskPresets/11.1/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml b/setup/hiero/hiero_plugin_path/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml similarity index 99% rename from setup/nukestudio/hiero_plugin_path/TaskPresets/11.1/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml rename to setup/hiero/hiero_plugin_path/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml index e24a4dbe4e2..690820c7882 100644 --- a/setup/nukestudio/hiero_plugin_path/TaskPresets/11.1/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml +++ b/setup/hiero/hiero_plugin_path/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml @@ -1,6 +1,6 @@ 991 - //10.11.0.184/171001_ftrack/tgbvfx/editorial/nukestudio/workspace/ + //10.11.0.184/171001_ftrack/tgbvfx/editorial/hiero/workspace/ 1 True 3 diff --git a/setup/nukestudio/hiero_plugin_path/Python/Startup/Startup.py b/setup/nukestudio/hiero_plugin_path/Python/Startup/Startup.py deleted file mode 100644 index e5c5729e2c2..00000000000 --- a/setup/nukestudio/hiero_plugin_path/Python/Startup/Startup.py +++ /dev/null @@ -1,19 +0,0 @@ -import traceback - -# activate nukestudio from pype -import avalon.api -import pype.hosts.nukestudio -avalon.api.install(pype.hosts.nukestudio) - -try: - __import__("pype.hosts.nukestudio") - __import__("pyblish") - -except ImportError as e: - print traceback.format_exc() - print("pyblish: Could not load integration: %s " % e) - -else: - # Setup integration - import pype.hosts.nukestudio.lib - pype.hosts.nukestudio.lib.setup() From dc77711d510910240fdb3404aae5f1352e0bd9e1 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 7 Oct 2020 17:02:05 +0200 Subject: [PATCH 2/4] fix(hiero): loading Tasks correctly --- pype/hosts/hiero/tags.py | 8 ++++++-- .../ftrack/publish/integrate_hierarchy_ftrack.py | 12 +++++++----- pype/plugins/global/publish/extract_burnin.py | 2 +- .../global/publish/extract_hierarchy_avalon.py | 13 +++++++------ pype/plugins/global/publish/extract_review.py | 2 +- pype/plugins/global/publish/integrate_new.py | 9 ++++----- .../publish/validate_custom_ftrack_attributes.py | 2 +- .../hiero/publish/collect_hierarchy_context.py | 2 +- pype/plugins/hiero/publish/collect_shots.py | 2 +- pype/plugins/hiero/publish/collect_tag_tasks.py | 5 +++-- .../hiero/publish/extract_review_cutup_video.py | 2 +- 11 files changed, 33 insertions(+), 26 deletions(-) diff --git a/pype/hosts/hiero/tags.py b/pype/hosts/hiero/tags.py index 152d054a8a9..551dc1698d6 100644 --- a/pype/hosts/hiero/tags.py +++ b/pype/hosts/hiero/tags.py @@ -3,6 +3,8 @@ import json import hiero +from pprint import pformat + from pype.api import Logger from avalon import io @@ -71,15 +73,17 @@ def add_tags_from_presets(): # Get project task types. tasks = io.find_one({"type": "project"})["config"]["tasks"] nks_pres_tags["[Tasks]"] = {} + log.debug("__ tasks: {}".format(pformat(tasks))) for task_type in tasks.keys(): - nks_pres_tags["[Tasks]"][task_type] = { + nks_pres_tags["[Tasks]"][task_type.lower()] = { "editable": "1", "note": "", "icon": { "path": "icons:TagGood.png" }, "metadata": { - "family": "task" + "family": "task", + "type": task_type } } diff --git a/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py b/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py index 7d4e0333d6c..2ee08987119 100644 --- a/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py +++ b/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py @@ -143,15 +143,17 @@ def import_to_ftrack(self, input_data, parent=None): # existing_tasks.append(child['type']['name']) for task in tasks: - if task.lower() in existing_tasks: + task_name = next(iter(task)) + task_type = task[task_name]["type"] + if task_name.lower() in existing_tasks: print("Task {} already exists".format(task)) continue - tasks_to_create.append(task) + tasks_to_create.append((task_name, task_type)) - for task in tasks_to_create: + for task_name, task_type in tasks_to_create: self.create_task( - name=task, - task_type=task, + name=task_name, + task_type=task_type, parent=entity ) try: diff --git a/pype/plugins/global/publish/extract_burnin.py b/pype/plugins/global/publish/extract_burnin.py index a613e39113e..353f2f27f0f 100644 --- a/pype/plugins/global/publish/extract_burnin.py +++ b/pype/plugins/global/publish/extract_burnin.py @@ -23,7 +23,7 @@ class ExtractBurnin(pype.api.Extractor): "nuke", "maya", "shell", - "nukestudio", + "hiero", "premiere", "standalonepublisher", "harmony" diff --git a/pype/plugins/global/publish/extract_hierarchy_avalon.py b/pype/plugins/global/publish/extract_hierarchy_avalon.py index 2d82eca6b24..64df6727096 100644 --- a/pype/plugins/global/publish/extract_hierarchy_avalon.py +++ b/pype/plugins/global/publish/extract_hierarchy_avalon.py @@ -100,12 +100,13 @@ def import_to_avalon(self, input_data, parent=None): # Do not override data, only update cur_entity_data = entity.get("data") or {} new_tasks = data.pop("tasks", {}) - if "tasks" in cur_entity_data and new_tasks: - for task_name in new_tasks.keys(): - if task_name \ - not in cur_entity_data["tasks"].keys(): - cur_entity_data["tasks"][task_name] = \ - new_tasks[task_name] + if "tasks" not in cur_entity_data and not new_tasks: + continue + for task in new_tasks: + task_name = next(iter(task)) + if task_name in cur_entity_data["tasks"].keys(): + continue + cur_entity_data["tasks"][task_name] = task[task_name] cur_entity_data.update(data) data = cur_entity_data else: diff --git a/pype/plugins/global/publish/extract_review.py b/pype/plugins/global/publish/extract_review.py index 0b1c0f07450..f4a39a7c31a 100644 --- a/pype/plugins/global/publish/extract_review.py +++ b/pype/plugins/global/publish/extract_review.py @@ -26,7 +26,7 @@ class ExtractReview(pyblish.api.InstancePlugin): "nuke", "maya", "shell", - "nukestudio", + "hiero", "premiere", "harmony", "standalonepublisher", diff --git a/pype/plugins/global/publish/integrate_new.py b/pype/plugins/global/publish/integrate_new.py index 68549e91860..4dc60060761 100644 --- a/pype/plugins/global/publish/integrate_new.py +++ b/pype/plugins/global/publish/integrate_new.py @@ -521,8 +521,8 @@ def register(self, instance): # get 'files' info for representation and all attached resources self.log.debug("Preparing files information ...") representation["files"] = self.get_files_info( - instance, - self.integrated_file_sizes) + instance, + self.integrated_file_sizes) self.log.debug("__ representation: {}".format(representation)) destination_list.append(dst) @@ -543,10 +543,9 @@ def register(self, instance): repre_ids_to_remove.append(repre["_id"]) io.delete_many({"_id": {"$in": repre_ids_to_remove}}) - self.log.debug("__ representations: {}".format(representations)) for rep in instance.data["representations"]: - self.log.debug("__ represNAME: {}".format(rep['name'])) - self.log.debug("__ represPATH: {}".format(rep['published_path'])) + self.log.debug("__ rep: {}".format(rep)) + io.insert_many(representations) instance.data["published_representations"] = ( published_representations diff --git a/pype/plugins/global/publish/validate_custom_ftrack_attributes.py b/pype/plugins/global/publish/validate_custom_ftrack_attributes.py index 633deaa6d1d..4bddcd2e03e 100644 --- a/pype/plugins/global/publish/validate_custom_ftrack_attributes.py +++ b/pype/plugins/global/publish/validate_custom_ftrack_attributes.py @@ -46,7 +46,7 @@ class ValidateFtrackAttributes(pyblish.api.InstancePlugin): "houdini", "maya", "nuke", - "nukestudio", + "hiero", "photoshop", "premiere", "resolve", diff --git a/pype/plugins/hiero/publish/collect_hierarchy_context.py b/pype/plugins/hiero/publish/collect_hierarchy_context.py index 249194003b9..f18783cd375 100644 --- a/pype/plugins/hiero/publish/collect_hierarchy_context.py +++ b/pype/plugins/hiero/publish/collect_hierarchy_context.py @@ -13,7 +13,7 @@ class CollectHierarchyInstance(pyblish.api.ContextPlugin): """ label = "Collect Hierarchy Clip" - order = pyblish.api.CollectorOrder + 0.101 + order = pyblish.api.CollectorOrder + 0.102 families = ["clip"] def convert_to_entity(self, key, value): diff --git a/pype/plugins/hiero/publish/collect_shots.py b/pype/plugins/hiero/publish/collect_shots.py index 22f23e57422..6f83e08fbe9 100644 --- a/pype/plugins/hiero/publish/collect_shots.py +++ b/pype/plugins/hiero/publish/collect_shots.py @@ -43,7 +43,7 @@ def process(self, instance): "{} - {} - tasks:{} - assetbuilds:{} - comments:{}".format( data["asset"], data["subset"], - data["tasks"].keys(), + [task.keys()[0] for task in data["tasks"]], [x["name"] for x in data.get("assetbuilds", [])], len(data.get("comments", [])) ) diff --git a/pype/plugins/hiero/publish/collect_tag_tasks.py b/pype/plugins/hiero/publish/collect_tag_tasks.py index b83e208b584..dbcf5e52607 100644 --- a/pype/plugins/hiero/publish/collect_tag_tasks.py +++ b/pype/plugins/hiero/publish/collect_tag_tasks.py @@ -20,8 +20,9 @@ def process(self, instance): # gets only task family tags and collect labels if "task" in t_family: - t_task = t_metadata.get("tag.label", "") - tasks.append(t_task) + t_task_name = t_metadata.get("tag.label", "") + t_task_type = t_metadata.get("tag.type", "") + tasks.append({t_task_name: {"type": t_task_type}}) instance.data["tasks"] = tasks diff --git a/pype/plugins/hiero/publish/extract_review_cutup_video.py b/pype/plugins/hiero/publish/extract_review_cutup_video.py index d1953b5aa2a..868d450fd68 100644 --- a/pype/plugins/hiero/publish/extract_review_cutup_video.py +++ b/pype/plugins/hiero/publish/extract_review_cutup_video.py @@ -227,7 +227,7 @@ def process(self, instance): "step": 1, "fps": fps, "name": "cut_up_preview", - "tags": ["review", "delete"] + self.tags_addition, + "tags": ["review"] + self.tags_addition, "ext": ext, "anatomy_template": "publish" } From 79275d9ff5f43d14aefa070300bd53b49f5904dd Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 7 Oct 2020 17:26:23 +0200 Subject: [PATCH 3/4] fix(hiero): thumbnail was rewriting in cycle --- pype/plugins/hiero/publish/collect_plates.py | 9 +++++---- pype/plugins/hiero/publish/collect_reviews.py | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pype/plugins/hiero/publish/collect_plates.py b/pype/plugins/hiero/publish/collect_plates.py index 0c08b94148c..4d1cc36a920 100644 --- a/pype/plugins/hiero/publish/collect_plates.py +++ b/pype/plugins/hiero/publish/collect_plates.py @@ -192,16 +192,17 @@ def process(self, instance): instance.data["representations"].append( plates_mov_representation) - thumb_file = head + ".png" + thumb_frame = instance.data["clipInH"] + ( + (instance.data["clipOutH"] - instance.data["clipInH"]) / 2) + thumb_file = "{}_{}{}".format(head, thumb_frame, ".png") thumb_path = os.path.join(staging_dir, thumb_file) - thumb_frame = instance.data["sourceIn"] + ((instance.data["sourceOut"] - instance.data["sourceIn"])/2) thumbnail = item.thumbnail(thumb_frame).save( thumb_path, format='png' ) - self.log.debug("__ sourceIn: `{}`".format(instance.data["sourceIn"])) - self.log.debug("__ thumbnail: `{}`, frame: `{}`".format(thumbnail, thumb_frame)) + self.log.debug("__ thumbnail: `{}`, frame: `{}`".format( + thumbnail, thumb_frame)) thumb_representation = { 'files': thumb_file, diff --git a/pype/plugins/hiero/publish/collect_reviews.py b/pype/plugins/hiero/publish/collect_reviews.py index 0ef0842e82c..edb81aed8a3 100644 --- a/pype/plugins/hiero/publish/collect_reviews.py +++ b/pype/plugins/hiero/publish/collect_reviews.py @@ -142,12 +142,12 @@ def create_thumbnail(self, instance): staging_dir = os.path.dirname( source_path) - thumb_file = head + ".png" + thumb_frame = instance.data["clipInH"] + ( + (instance.data["clipOutH"] - instance.data["clipInH"]) / 2) + thumb_file = "{}_{}{}".format(head, thumb_frame, ".png") thumb_path = os.path.join(staging_dir, thumb_file) self.log.debug("__ thumb_path: {}".format(thumb_path)) - thumb_frame = instance.data["sourceIn"] + ( - (instance.data["sourceOut"] - instance.data["sourceIn"]) / 2) self.log.debug("__ thumb_frame: {}".format(thumb_frame)) thumbnail = item.thumbnail(thumb_frame).save( thumb_path, From 333c764c12b79958e2bab222b11a6655a6309634 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 7 Oct 2020 17:28:15 +0200 Subject: [PATCH 4/4] clean(hiero): hound suggestion --- setup/hiero/hiero_plugin_path/Python/Startup/Startup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/hiero/hiero_plugin_path/Python/Startup/Startup.py b/setup/hiero/hiero_plugin_path/Python/Startup/Startup.py index 003d7959c5d..cdf85c524f9 100644 --- a/setup/hiero/hiero_plugin_path/Python/Startup/Startup.py +++ b/setup/hiero/hiero_plugin_path/Python/Startup/Startup.py @@ -10,7 +10,7 @@ __import__("pyblish") except ImportError as e: - print traceback.format_exc() + print(traceback.format_exc()) print("pyblish: Could not load integration: %s " % e) else: