From 1570ab0bca987e59ada820e70545164d58c22e97 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakub@orbi.tools>
Date: Tue, 2 Jun 2020 14:58:44 +0200
Subject: [PATCH] feat(resolve): new hosts structure

---
 pype/{ => hosts}/resolve/README.markdown                      | 0
 pype/{ => hosts}/resolve/RESOLVE_API_README.txt               | 0
 pype/{ => hosts}/resolve/__init__.py                          | 0
 pype/{ => hosts}/resolve/action.py                            | 4 ++--
 pype/{ => hosts}/resolve/lib.py                               | 0
 pype/{ => hosts}/resolve/menu.py                              | 0
 pype/{ => hosts}/resolve/menu_style.qss                       | 0
 pype/{ => hosts}/resolve/pipeline.py                          | 2 +-
 pype/{ => hosts}/resolve/plugin.py                            | 2 +-
 pype/{ => hosts}/resolve/preload_console.py                   | 2 +-
 pype/{ => hosts}/resolve/utility_scripts/Pype_menu.py         | 2 +-
 pype/{ => hosts}/resolve/utility_scripts/README.markdown      | 0
 .../resolve/utility_scripts/__dev_compound_clip.py            | 0
 pype/{ => hosts}/resolve/utility_scripts/__test_pyblish.py    | 0
 pype/{ => hosts}/resolve/utility_scripts/__test_subprocess.py | 2 +-
 pype/{ => hosts}/resolve/utils.py                             | 0
 pype/{ => hosts}/resolve/workio.py                            | 0
 pype/plugins/resolve/publish/collect_host.py                  | 2 +-
 18 files changed, 8 insertions(+), 8 deletions(-)
 rename pype/{ => hosts}/resolve/README.markdown (100%)
 rename pype/{ => hosts}/resolve/RESOLVE_API_README.txt (100%)
 rename pype/{ => hosts}/resolve/__init__.py (100%)
 rename pype/{ => hosts}/resolve/action.py (93%)
 rename pype/{ => hosts}/resolve/lib.py (100%)
 rename pype/{ => hosts}/resolve/menu.py (100%)
 rename pype/{ => hosts}/resolve/menu_style.qss (100%)
 rename pype/{ => hosts}/resolve/pipeline.py (98%)
 rename pype/{ => hosts}/resolve/plugin.py (97%)
 rename pype/{ => hosts}/resolve/preload_console.py (93%)
 rename pype/{ => hosts}/resolve/utility_scripts/Pype_menu.py (92%)
 rename pype/{ => hosts}/resolve/utility_scripts/README.markdown (100%)
 rename pype/{ => hosts}/resolve/utility_scripts/__dev_compound_clip.py (100%)
 rename pype/{ => hosts}/resolve/utility_scripts/__test_pyblish.py (100%)
 rename pype/{ => hosts}/resolve/utility_scripts/__test_subprocess.py (93%)
 rename pype/{ => hosts}/resolve/utils.py (100%)
 rename pype/{ => hosts}/resolve/workio.py (100%)

diff --git a/pype/resolve/README.markdown b/pype/hosts/resolve/README.markdown
similarity index 100%
rename from pype/resolve/README.markdown
rename to pype/hosts/resolve/README.markdown
diff --git a/pype/resolve/RESOLVE_API_README.txt b/pype/hosts/resolve/RESOLVE_API_README.txt
similarity index 100%
rename from pype/resolve/RESOLVE_API_README.txt
rename to pype/hosts/resolve/RESOLVE_API_README.txt
diff --git a/pype/resolve/__init__.py b/pype/hosts/resolve/__init__.py
similarity index 100%
rename from pype/resolve/__init__.py
rename to pype/hosts/resolve/__init__.py
diff --git a/pype/resolve/action.py b/pype/hosts/resolve/action.py
similarity index 93%
rename from pype/resolve/action.py
rename to pype/hosts/resolve/action.py
index dfbe23087c..31830937c1 100644
--- a/pype/resolve/action.py
+++ b/pype/hosts/resolve/action.py
@@ -4,7 +4,7 @@ from __future__ import absolute_import
 import pyblish.api
 
 
-from ..action import get_errored_instances_from_context
+from ...action import get_errored_instances_from_context
 
 
 class SelectInvalidAction(pyblish.api.Action):
@@ -21,7 +21,7 @@ class SelectInvalidAction(pyblish.api.Action):
     def process(self, context, plugin):
 
         try:
-            from pype.resolve.utils import get_resolve_module
+            from pype.hosts.resolve.utils import get_resolve_module
             resolve = get_resolve_module()
             self.log.debug(resolve)
         except ImportError:
diff --git a/pype/resolve/lib.py b/pype/hosts/resolve/lib.py
similarity index 100%
rename from pype/resolve/lib.py
rename to pype/hosts/resolve/lib.py
diff --git a/pype/resolve/menu.py b/pype/hosts/resolve/menu.py
similarity index 100%
rename from pype/resolve/menu.py
rename to pype/hosts/resolve/menu.py
diff --git a/pype/resolve/menu_style.qss b/pype/hosts/resolve/menu_style.qss
similarity index 100%
rename from pype/resolve/menu_style.qss
rename to pype/hosts/resolve/menu_style.qss
diff --git a/pype/resolve/pipeline.py b/pype/hosts/resolve/pipeline.py
similarity index 98%
rename from pype/resolve/pipeline.py
rename to pype/hosts/resolve/pipeline.py
index 7b7829a8a8..967aed1436 100644
--- a/pype/resolve/pipeline.py
+++ b/pype/hosts/resolve/pipeline.py
@@ -49,7 +49,7 @@ def install():
     avalon.data["familiesStateDefault"] = False
     avalon.data["familiesStateToggled"] = family_states
 
-    log.info("pype.resolve installed")
+    log.info("pype.hosts.resolve installed")
 
     pyblish.register_host("resolve")
     pyblish.register_plugin_path(PUBLISH_PATH)
diff --git a/pype/resolve/plugin.py b/pype/hosts/resolve/plugin.py
similarity index 97%
rename from pype/resolve/plugin.py
rename to pype/hosts/resolve/plugin.py
index 610fc6bcfe..628d4bdb26 100644
--- a/pype/resolve/plugin.py
+++ b/pype/hosts/resolve/plugin.py
@@ -1,5 +1,5 @@
 from avalon import api
-# from pype.resolve import lib as drlib
+# from pype.hosts.resolve import lib as drlib
 from avalon.vendor import qargparse
 
 
diff --git a/pype/resolve/preload_console.py b/pype/hosts/resolve/preload_console.py
similarity index 93%
rename from pype/resolve/preload_console.py
rename to pype/hosts/resolve/preload_console.py
index 4f783fffbe..ea1bd4f180 100644
--- a/pype/resolve/preload_console.py
+++ b/pype/hosts/resolve/preload_console.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import time
-from pype.resolve.utils import get_resolve_module
+from pype.hosts.resolve.utils import get_resolve_module
 from pypeapp import Logger
 
 log = Logger().get_logger(__name__, "resolve")
diff --git a/pype/resolve/utility_scripts/Pype_menu.py b/pype/hosts/resolve/utility_scripts/Pype_menu.py
similarity index 92%
rename from pype/resolve/utility_scripts/Pype_menu.py
rename to pype/hosts/resolve/utility_scripts/Pype_menu.py
index 5c68fb431b..1f5cd36277 100644
--- a/pype/resolve/utility_scripts/Pype_menu.py
+++ b/pype/hosts/resolve/utility_scripts/Pype_menu.py
@@ -9,7 +9,7 @@ log = Logger().get_logger(__name__)
 
 
 def main(env):
-    import pype.resolve as bmdvr
+    import pype.hosts.resolve as bmdvr
     # Registers pype's Global pyblish plugins
     pype.install()
 
diff --git a/pype/resolve/utility_scripts/README.markdown b/pype/hosts/resolve/utility_scripts/README.markdown
similarity index 100%
rename from pype/resolve/utility_scripts/README.markdown
rename to pype/hosts/resolve/utility_scripts/README.markdown
diff --git a/pype/resolve/utility_scripts/__dev_compound_clip.py b/pype/hosts/resolve/utility_scripts/__dev_compound_clip.py
similarity index 100%
rename from pype/resolve/utility_scripts/__dev_compound_clip.py
rename to pype/hosts/resolve/utility_scripts/__dev_compound_clip.py
diff --git a/pype/resolve/utility_scripts/__test_pyblish.py b/pype/hosts/resolve/utility_scripts/__test_pyblish.py
similarity index 100%
rename from pype/resolve/utility_scripts/__test_pyblish.py
rename to pype/hosts/resolve/utility_scripts/__test_pyblish.py
diff --git a/pype/resolve/utility_scripts/__test_subprocess.py b/pype/hosts/resolve/utility_scripts/__test_subprocess.py
similarity index 93%
rename from pype/resolve/utility_scripts/__test_subprocess.py
rename to pype/hosts/resolve/utility_scripts/__test_subprocess.py
index 30613feb22..bdc57bbf00 100644
--- a/pype/resolve/utility_scripts/__test_subprocess.py
+++ b/pype/hosts/resolve/utility_scripts/__test_subprocess.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import os
 from pypeapp import execute, Logger
-from pype.resolve.utils import get_resolve_module
+from pype.hosts.resolve.utils import get_resolve_module
 
 log = Logger().get_logger("Resolve")
 
diff --git a/pype/resolve/utils.py b/pype/hosts/resolve/utils.py
similarity index 100%
rename from pype/resolve/utils.py
rename to pype/hosts/resolve/utils.py
diff --git a/pype/resolve/workio.py b/pype/hosts/resolve/workio.py
similarity index 100%
rename from pype/resolve/workio.py
rename to pype/hosts/resolve/workio.py
diff --git a/pype/plugins/resolve/publish/collect_host.py b/pype/plugins/resolve/publish/collect_host.py
index 7579be487c..a5c4b0936c 100644
--- a/pype/plugins/resolve/publish/collect_host.py
+++ b/pype/plugins/resolve/publish/collect_host.py
@@ -1,5 +1,5 @@
 import pyblish.api
-from pype.resolve.utils import get_resolve_module
+from pype.hosts.resolve.utils import get_resolve_module
 
 
 class CollectProject(pyblish.api.ContextPlugin):