diff --git a/pype/hosts/fusion/__init__.py b/pype/hosts/fusion/api/__init__.py similarity index 100% rename from pype/hosts/fusion/__init__.py rename to pype/hosts/fusion/api/__init__.py diff --git a/pype/hosts/fusion/lib.py b/pype/hosts/fusion/api/lib.py similarity index 100% rename from pype/hosts/fusion/lib.py rename to pype/hosts/fusion/api/lib.py diff --git a/pype/hosts/fusion/menu.py b/pype/hosts/fusion/api/menu.py similarity index 100% rename from pype/hosts/fusion/menu.py rename to pype/hosts/fusion/api/menu.py diff --git a/pype/hosts/fusion/menu_style.qss b/pype/hosts/fusion/api/menu_style.qss similarity index 100% rename from pype/hosts/fusion/menu_style.qss rename to pype/hosts/fusion/api/menu_style.qss diff --git a/pype/hosts/fusion/pipeline.py b/pype/hosts/fusion/api/pipeline.py similarity index 89% rename from pype/hosts/fusion/pipeline.py rename to pype/hosts/fusion/api/pipeline.py index b2918675ea..36084dc734 100644 --- a/pype/hosts/fusion/pipeline.py +++ b/pype/hosts/fusion/api/pipeline.py @@ -7,20 +7,20 @@ from avalon.tools import workfiles from avalon import api as avalon from pyblish import api as pyblish from pype.api import Logger -from pype import PLUGINS_DIR +import pype.hosts.fusion log = Logger().get_logger(__name__) -AVALON_CONFIG = os.environ["AVALON_CONFIG"] +AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype") -LOAD_PATH = os.path.join(PLUGINS_DIR, "fusion", "load") -CREATE_PATH = os.path.join(PLUGINS_DIR, "fusion", "create") -INVENTORY_PATH = os.path.join(PLUGINS_DIR, "fusion", "inventory") +HOST_DIR = os.path.dirname(os.path.abspath(pype.hosts.fusion.__file__)) +PLUGINS_DIR = os.path.join(HOST_DIR, "plugins") -PUBLISH_PATH = os.path.join( - PLUGINS_DIR, "fusion", "publish" -).replace("\\", "/") +PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") +LOAD_PATH = os.path.join(PLUGINS_DIR, "load") +CREATE_PATH = os.path.join(PLUGINS_DIR, "create") +INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory") def install(): diff --git a/pype/hosts/fusion/utils.py b/pype/hosts/fusion/api/utils.py similarity index 100% rename from pype/hosts/fusion/utils.py rename to pype/hosts/fusion/api/utils.py diff --git a/pype/plugins/fusion/create/create_exr_saver.py b/pype/hosts/fusion/plugins/create/create_exr_saver.py similarity index 100% rename from pype/plugins/fusion/create/create_exr_saver.py rename to pype/hosts/fusion/plugins/create/create_exr_saver.py diff --git a/pype/plugins/fusion/inventory/select_containers.py b/pype/hosts/fusion/plugins/inventory/select_containers.py similarity index 100% rename from pype/plugins/fusion/inventory/select_containers.py rename to pype/hosts/fusion/plugins/inventory/select_containers.py diff --git a/pype/plugins/fusion/inventory/set_tool_color.py b/pype/hosts/fusion/plugins/inventory/set_tool_color.py similarity index 100% rename from pype/plugins/fusion/inventory/set_tool_color.py rename to pype/hosts/fusion/plugins/inventory/set_tool_color.py diff --git a/pype/plugins/fusion/load/actions.py b/pype/hosts/fusion/plugins/load/actions.py similarity index 95% rename from pype/plugins/fusion/load/actions.py rename to pype/hosts/fusion/plugins/load/actions.py index 0c86fdaad2..51a32ee6e1 100644 --- a/pype/plugins/fusion/load/actions.py +++ b/pype/hosts/fusion/plugins/load/actions.py @@ -22,7 +22,7 @@ class FusionSetFrameRangeLoader(api.Loader): def load(self, context, name, namespace, data): - from pype.hosts.fusion import lib + from pype.hosts.fusion.api import lib version = context['version'] version_data = version.get("data", {}) @@ -55,7 +55,7 @@ class FusionSetFrameRangeWithHandlesLoader(api.Loader): def load(self, context, name, namespace, data): - from pype.hosts.fusion import lib + from pype.hosts.fusion.api import lib version = context['version'] version_data = version.get("data", {}) diff --git a/pype/plugins/fusion/load/load_sequence.py b/pype/hosts/fusion/plugins/load/load_sequence.py similarity index 100% rename from pype/plugins/fusion/load/load_sequence.py rename to pype/hosts/fusion/plugins/load/load_sequence.py diff --git a/pype/plugins/fusion/publish/collect_comp.py b/pype/hosts/fusion/plugins/publish/collect_comp.py similarity index 100% rename from pype/plugins/fusion/publish/collect_comp.py rename to pype/hosts/fusion/plugins/publish/collect_comp.py diff --git a/pype/plugins/fusion/publish/collect_fusion_version.py b/pype/hosts/fusion/plugins/publish/collect_fusion_version.py similarity index 100% rename from pype/plugins/fusion/publish/collect_fusion_version.py rename to pype/hosts/fusion/plugins/publish/collect_fusion_version.py diff --git a/pype/plugins/fusion/publish/collect_instances.py b/pype/hosts/fusion/plugins/publish/collect_instances.py similarity index 100% rename from pype/plugins/fusion/publish/collect_instances.py rename to pype/hosts/fusion/plugins/publish/collect_instances.py diff --git a/pype/plugins/fusion/publish/collect_render_target.py b/pype/hosts/fusion/plugins/publish/collect_render_target.py similarity index 100% rename from pype/plugins/fusion/publish/collect_render_target.py rename to pype/hosts/fusion/plugins/publish/collect_render_target.py diff --git a/pype/plugins/fusion/publish/increment_current_file_deadline.py b/pype/hosts/fusion/plugins/publish/increment_current_file_deadline.py similarity index 100% rename from pype/plugins/fusion/publish/increment_current_file_deadline.py rename to pype/hosts/fusion/plugins/publish/increment_current_file_deadline.py diff --git a/pype/plugins/fusion/publish/render_local.py b/pype/hosts/fusion/plugins/publish/render_local.py similarity index 100% rename from pype/plugins/fusion/publish/render_local.py rename to pype/hosts/fusion/plugins/publish/render_local.py diff --git a/pype/plugins/fusion/publish/save_scene.py b/pype/hosts/fusion/plugins/publish/save_scene.py similarity index 100% rename from pype/plugins/fusion/publish/save_scene.py rename to pype/hosts/fusion/plugins/publish/save_scene.py diff --git a/pype/plugins/fusion/publish/submit_deadline.py b/pype/hosts/fusion/plugins/publish/submit_deadline.py similarity index 100% rename from pype/plugins/fusion/publish/submit_deadline.py rename to pype/hosts/fusion/plugins/publish/submit_deadline.py diff --git a/pype/plugins/fusion/publish/validate_background_depth.py b/pype/hosts/fusion/plugins/publish/validate_background_depth.py similarity index 100% rename from pype/plugins/fusion/publish/validate_background_depth.py rename to pype/hosts/fusion/plugins/publish/validate_background_depth.py diff --git a/pype/plugins/fusion/publish/validate_comp_saved.py b/pype/hosts/fusion/plugins/publish/validate_comp_saved.py similarity index 100% rename from pype/plugins/fusion/publish/validate_comp_saved.py rename to pype/hosts/fusion/plugins/publish/validate_comp_saved.py diff --git a/pype/plugins/fusion/publish/validate_create_folder_checked.py b/pype/hosts/fusion/plugins/publish/validate_create_folder_checked.py similarity index 100% rename from pype/plugins/fusion/publish/validate_create_folder_checked.py rename to pype/hosts/fusion/plugins/publish/validate_create_folder_checked.py diff --git a/pype/plugins/fusion/publish/validate_filename_has_extension.py b/pype/hosts/fusion/plugins/publish/validate_filename_has_extension.py similarity index 100% rename from pype/plugins/fusion/publish/validate_filename_has_extension.py rename to pype/hosts/fusion/plugins/publish/validate_filename_has_extension.py diff --git a/pype/plugins/fusion/publish/validate_saver_has_input.py b/pype/hosts/fusion/plugins/publish/validate_saver_has_input.py similarity index 100% rename from pype/plugins/fusion/publish/validate_saver_has_input.py rename to pype/hosts/fusion/plugins/publish/validate_saver_has_input.py diff --git a/pype/plugins/fusion/publish/validate_saver_passthrough.py b/pype/hosts/fusion/plugins/publish/validate_saver_passthrough.py similarity index 100% rename from pype/plugins/fusion/publish/validate_saver_passthrough.py rename to pype/hosts/fusion/plugins/publish/validate_saver_passthrough.py diff --git a/pype/plugins/fusion/publish/validate_unique_subsets.py b/pype/hosts/fusion/plugins/publish/validate_unique_subsets.py similarity index 100% rename from pype/plugins/fusion/publish/validate_unique_subsets.py rename to pype/hosts/fusion/plugins/publish/validate_unique_subsets.py diff --git a/pype/setup/fusion/scripts/Comp/colorbleed/32bit/backgrounds_selected_to32bit.py b/pype/hosts/fusion/scripts/Comp/colorbleed/32bit/backgrounds_selected_to32bit.py similarity index 100% rename from pype/setup/fusion/scripts/Comp/colorbleed/32bit/backgrounds_selected_to32bit.py rename to pype/hosts/fusion/scripts/Comp/colorbleed/32bit/backgrounds_selected_to32bit.py diff --git a/pype/setup/fusion/scripts/Comp/colorbleed/32bit/backgrounds_to32bit.py b/pype/hosts/fusion/scripts/Comp/colorbleed/32bit/backgrounds_to32bit.py similarity index 100% rename from pype/setup/fusion/scripts/Comp/colorbleed/32bit/backgrounds_to32bit.py rename to pype/hosts/fusion/scripts/Comp/colorbleed/32bit/backgrounds_to32bit.py diff --git a/pype/setup/fusion/scripts/Comp/colorbleed/32bit/loaders_selected_to32bit.py b/pype/hosts/fusion/scripts/Comp/colorbleed/32bit/loaders_selected_to32bit.py similarity index 100% rename from pype/setup/fusion/scripts/Comp/colorbleed/32bit/loaders_selected_to32bit.py rename to pype/hosts/fusion/scripts/Comp/colorbleed/32bit/loaders_selected_to32bit.py diff --git a/pype/setup/fusion/scripts/Comp/colorbleed/32bit/loaders_to32bit.py b/pype/hosts/fusion/scripts/Comp/colorbleed/32bit/loaders_to32bit.py similarity index 100% rename from pype/setup/fusion/scripts/Comp/colorbleed/32bit/loaders_to32bit.py rename to pype/hosts/fusion/scripts/Comp/colorbleed/32bit/loaders_to32bit.py diff --git a/pype/setup/fusion/scripts/Comp/colorbleed/duplicate_with_input_connections.py b/pype/hosts/fusion/scripts/Comp/colorbleed/duplicate_with_input_connections.py similarity index 100% rename from pype/setup/fusion/scripts/Comp/colorbleed/duplicate_with_input_connections.py rename to pype/hosts/fusion/scripts/Comp/colorbleed/duplicate_with_input_connections.py diff --git a/pype/setup/fusion/scripts/Comp/colorbleed/set_rendermode.py b/pype/hosts/fusion/scripts/Comp/colorbleed/set_rendermode.py similarity index 100% rename from pype/setup/fusion/scripts/Comp/colorbleed/set_rendermode.py rename to pype/hosts/fusion/scripts/Comp/colorbleed/set_rendermode.py diff --git a/pype/setup/fusion/scripts/Comp/colorbleed/switch_ui.py b/pype/hosts/fusion/scripts/Comp/colorbleed/switch_ui.py similarity index 100% rename from pype/setup/fusion/scripts/Comp/colorbleed/switch_ui.py rename to pype/hosts/fusion/scripts/Comp/colorbleed/switch_ui.py diff --git a/pype/setup/fusion/scripts/Comp/colorbleed/update_selected_loader_ranges.py b/pype/hosts/fusion/scripts/Comp/colorbleed/update_selected_loader_ranges.py similarity index 100% rename from pype/setup/fusion/scripts/Comp/colorbleed/update_selected_loader_ranges.py rename to pype/hosts/fusion/scripts/Comp/colorbleed/update_selected_loader_ranges.py diff --git a/pype/hosts/fusion/scripts/fusion_switch_shot.py b/pype/hosts/fusion/scripts/fusion_switch_shot.py index ed657cb612..2eea68b007 100644 --- a/pype/hosts/fusion/scripts/fusion_switch_shot.py +++ b/pype/hosts/fusion/scripts/fusion_switch_shot.py @@ -9,7 +9,7 @@ import avalon.fusion # Config imports import pype.lib as pype -import pype.hosts.fusion.lib as fusion_lib +import pype.hosts.fusion.api.lib as fusion_lib log = logging.getLogger("Update Slap Comp") diff --git a/pype/hosts/fusion/utility_scripts/Pype_menu.py b/pype/hosts/fusion/utility_scripts/Pype_menu.py index 6c2324f66d..0cd2b7502e 100644 --- a/pype/hosts/fusion/utility_scripts/Pype_menu.py +++ b/pype/hosts/fusion/utility_scripts/Pype_menu.py @@ -8,7 +8,7 @@ log = Logger().get_logger(__name__) def main(env): - from pype.hosts.fusion import menu + from pype.hosts.fusion.api import menu import avalon.fusion # Registers pype's Global pyblish plugins pype.install() diff --git a/test_localsystem.txt b/test_localsystem.txt new file mode 100644 index 0000000000..dde7986af8 --- /dev/null +++ b/test_localsystem.txt @@ -0,0 +1 @@ +I have run