diff --git a/pype/tools/standalonepublish/__init__.py b/pype/standalonepublish/__init__.py similarity index 60% rename from pype/tools/standalonepublish/__init__.py rename to pype/standalonepublish/__init__.py index 29a4e52904..41bc69b9a2 100644 --- a/pype/tools/standalonepublish/__init__.py +++ b/pype/standalonepublish/__init__.py @@ -1,3 +1,4 @@ +from .asapublish_module import ASAPublishModule from .app import ( show, cli diff --git a/pype/tools/standalonepublish/app.py b/pype/standalonepublish/app.py similarity index 95% rename from pype/tools/standalonepublish/app.py rename to pype/standalonepublish/app.py index f45c8bd0cd..1a875505d7 100644 --- a/pype/tools/standalonepublish/app.py +++ b/pype/standalonepublish/app.py @@ -10,6 +10,8 @@ from .widgets import * # Move this to pype lib? from avalon.tools.libraryloader.io_nonsingleton import DbConnector +module = sys.modules[__name__] +module.window = None class Window(QtWidgets.QDialog): _db = DbConnector() @@ -22,7 +24,7 @@ class Window(QtWidgets.QDialog): NOT_SELECTED = '< Nothing is selected >' def __init__(self, parent=None): - super(Window, self).__init__(parent) + super(Window, self).__init__() self._db.install() self.setWindowTitle("Standalone Publish") @@ -172,18 +174,10 @@ class Window(QtWidgets.QDialog): data.update(self.widget_assets.collect_data()) data.update(self.widget_family.collect_data()) data.update(self.widget_components.collect_data()) - + return data -def show(parent=None, debug=False, context=None): - """Display Loader GUI - - Arguments: - debug (bool, optional): Run loader in debug-mode, - defaults to False - - """ - +def show(parent=None, debug=False): try: module.window.close() del module.window @@ -191,7 +185,7 @@ def show(parent=None, debug=False, context=None): pass with parentlib.application(): - window = Window(parent, context) + window = Window(parent) window.show() module.window = window diff --git a/pype/tools/standalonepublish/publish.py b/pype/standalonepublish/publish.py similarity index 95% rename from pype/tools/standalonepublish/publish.py rename to pype/standalonepublish/publish.py index bb6c7215b4..215281bfaf 100644 --- a/pype/tools/standalonepublish/publish.py +++ b/pype/standalonepublish/publish.py @@ -23,7 +23,9 @@ pyblish.api.register_plugin_path(PUBLISH_PATH) def set_context(project, asset, app): os.environ["AVALON_PROJECT"] = project + io.Session["AVALON_PROJECT"] = project os.environ["AVALON_ASSET"] = asset + io.Session["AVALON_ASSET"] = asset io.install() diff --git a/pype/tools/standalonepublish/resources/__init__.py b/pype/standalonepublish/resources/__init__.py similarity index 100% rename from pype/tools/standalonepublish/resources/__init__.py rename to pype/standalonepublish/resources/__init__.py diff --git a/pype/tools/standalonepublish/resources/edit.svg b/pype/standalonepublish/resources/edit.svg similarity index 100% rename from pype/tools/standalonepublish/resources/edit.svg rename to pype/standalonepublish/resources/edit.svg diff --git a/pype/tools/standalonepublish/resources/file.png b/pype/standalonepublish/resources/file.png similarity index 100% rename from pype/tools/standalonepublish/resources/file.png rename to pype/standalonepublish/resources/file.png diff --git a/pype/tools/standalonepublish/resources/files.png b/pype/standalonepublish/resources/files.png similarity index 100% rename from pype/tools/standalonepublish/resources/files.png rename to pype/standalonepublish/resources/files.png diff --git a/pype/tools/standalonepublish/resources/houdini.png b/pype/standalonepublish/resources/houdini.png similarity index 100% rename from pype/tools/standalonepublish/resources/houdini.png rename to pype/standalonepublish/resources/houdini.png diff --git a/pype/tools/standalonepublish/resources/image_file.png b/pype/standalonepublish/resources/image_file.png similarity index 100% rename from pype/tools/standalonepublish/resources/image_file.png rename to pype/standalonepublish/resources/image_file.png diff --git a/pype/tools/standalonepublish/resources/image_files.png b/pype/standalonepublish/resources/image_files.png similarity index 100% rename from pype/tools/standalonepublish/resources/image_files.png rename to pype/standalonepublish/resources/image_files.png diff --git a/pype/tools/standalonepublish/resources/information.svg b/pype/standalonepublish/resources/information.svg similarity index 100% rename from pype/tools/standalonepublish/resources/information.svg rename to pype/standalonepublish/resources/information.svg diff --git a/pype/tools/standalonepublish/resources/maya.png b/pype/standalonepublish/resources/maya.png similarity index 100% rename from pype/tools/standalonepublish/resources/maya.png rename to pype/standalonepublish/resources/maya.png diff --git a/pype/tools/standalonepublish/resources/menu.svg b/pype/standalonepublish/resources/menu.svg similarity index 100% rename from pype/tools/standalonepublish/resources/menu.svg rename to pype/standalonepublish/resources/menu.svg diff --git a/pype/tools/standalonepublish/resources/nuke.png b/pype/standalonepublish/resources/nuke.png similarity index 100% rename from pype/tools/standalonepublish/resources/nuke.png rename to pype/standalonepublish/resources/nuke.png diff --git a/pype/tools/standalonepublish/resources/premiere.png b/pype/standalonepublish/resources/premiere.png similarity index 100% rename from pype/tools/standalonepublish/resources/premiere.png rename to pype/standalonepublish/resources/premiere.png diff --git a/pype/tools/standalonepublish/resources/preview.svg b/pype/standalonepublish/resources/preview.svg similarity index 100% rename from pype/tools/standalonepublish/resources/preview.svg rename to pype/standalonepublish/resources/preview.svg diff --git a/pype/tools/standalonepublish/resources/thumbnail.svg b/pype/standalonepublish/resources/thumbnail.svg similarity index 100% rename from pype/tools/standalonepublish/resources/thumbnail.svg rename to pype/standalonepublish/resources/thumbnail.svg diff --git a/pype/tools/standalonepublish/resources/trash.svg b/pype/standalonepublish/resources/trash.svg similarity index 100% rename from pype/tools/standalonepublish/resources/trash.svg rename to pype/standalonepublish/resources/trash.svg diff --git a/pype/tools/standalonepublish/resources/video_file.png b/pype/standalonepublish/resources/video_file.png similarity index 100% rename from pype/tools/standalonepublish/resources/video_file.png rename to pype/standalonepublish/resources/video_file.png diff --git a/pype/tools/standalonepublish/widgets/__init__.py b/pype/standalonepublish/widgets/__init__.py similarity index 100% rename from pype/tools/standalonepublish/widgets/__init__.py rename to pype/standalonepublish/widgets/__init__.py diff --git a/pype/tools/standalonepublish/widgets/button_from_svgs.py b/pype/standalonepublish/widgets/button_from_svgs.py similarity index 100% rename from pype/tools/standalonepublish/widgets/button_from_svgs.py rename to pype/standalonepublish/widgets/button_from_svgs.py diff --git a/pype/tools/standalonepublish/widgets/model_asset.py b/pype/standalonepublish/widgets/model_asset.py similarity index 100% rename from pype/tools/standalonepublish/widgets/model_asset.py rename to pype/standalonepublish/widgets/model_asset.py diff --git a/pype/tools/standalonepublish/widgets/model_filter_proxy_exact_match.py b/pype/standalonepublish/widgets/model_filter_proxy_exact_match.py similarity index 100% rename from pype/tools/standalonepublish/widgets/model_filter_proxy_exact_match.py rename to pype/standalonepublish/widgets/model_filter_proxy_exact_match.py diff --git a/pype/tools/standalonepublish/widgets/model_filter_proxy_recursive_sort.py b/pype/standalonepublish/widgets/model_filter_proxy_recursive_sort.py similarity index 100% rename from pype/tools/standalonepublish/widgets/model_filter_proxy_recursive_sort.py rename to pype/standalonepublish/widgets/model_filter_proxy_recursive_sort.py diff --git a/pype/tools/standalonepublish/widgets/model_node.py b/pype/standalonepublish/widgets/model_node.py similarity index 100% rename from pype/tools/standalonepublish/widgets/model_node.py rename to pype/standalonepublish/widgets/model_node.py diff --git a/pype/tools/standalonepublish/widgets/model_tasks_template.py b/pype/standalonepublish/widgets/model_tasks_template.py similarity index 100% rename from pype/tools/standalonepublish/widgets/model_tasks_template.py rename to pype/standalonepublish/widgets/model_tasks_template.py diff --git a/pype/tools/standalonepublish/widgets/model_tree.py b/pype/standalonepublish/widgets/model_tree.py similarity index 100% rename from pype/tools/standalonepublish/widgets/model_tree.py rename to pype/standalonepublish/widgets/model_tree.py diff --git a/pype/tools/standalonepublish/widgets/model_tree_view_deselectable.py b/pype/standalonepublish/widgets/model_tree_view_deselectable.py similarity index 100% rename from pype/tools/standalonepublish/widgets/model_tree_view_deselectable.py rename to pype/standalonepublish/widgets/model_tree_view_deselectable.py diff --git a/pype/tools/standalonepublish/widgets/widget_asset.py b/pype/standalonepublish/widgets/widget_asset.py similarity index 100% rename from pype/tools/standalonepublish/widgets/widget_asset.py rename to pype/standalonepublish/widgets/widget_asset.py diff --git a/pype/tools/standalonepublish/widgets/widget_asset_view.py b/pype/standalonepublish/widgets/widget_asset_view.py similarity index 100% rename from pype/tools/standalonepublish/widgets/widget_asset_view.py rename to pype/standalonepublish/widgets/widget_asset_view.py diff --git a/pype/tools/standalonepublish/widgets/widget_component_item.py b/pype/standalonepublish/widgets/widget_component_item.py similarity index 100% rename from pype/tools/standalonepublish/widgets/widget_component_item.py rename to pype/standalonepublish/widgets/widget_component_item.py diff --git a/pype/tools/standalonepublish/widgets/widget_components.py b/pype/standalonepublish/widgets/widget_components.py similarity index 100% rename from pype/tools/standalonepublish/widgets/widget_components.py rename to pype/standalonepublish/widgets/widget_components.py diff --git a/pype/tools/standalonepublish/widgets/widget_components_list.py b/pype/standalonepublish/widgets/widget_components_list.py similarity index 100% rename from pype/tools/standalonepublish/widgets/widget_components_list.py rename to pype/standalonepublish/widgets/widget_components_list.py diff --git a/pype/tools/standalonepublish/widgets/widget_drop_empty.py b/pype/standalonepublish/widgets/widget_drop_empty.py similarity index 100% rename from pype/tools/standalonepublish/widgets/widget_drop_empty.py rename to pype/standalonepublish/widgets/widget_drop_empty.py diff --git a/pype/tools/standalonepublish/widgets/widget_drop_frame.py b/pype/standalonepublish/widgets/widget_drop_frame.py similarity index 98% rename from pype/tools/standalonepublish/widgets/widget_drop_frame.py rename to pype/standalonepublish/widgets/widget_drop_frame.py index 1c9c9ea359..90434e75f4 100644 --- a/pype/tools/standalonepublish/widgets/widget_drop_frame.py +++ b/pype/standalonepublish/widgets/widget_drop_frame.py @@ -11,7 +11,7 @@ class DropDataFrame(QtWidgets.QFrame): super().__init__() self.parent_widget = parent self.items = [] - self.presets = config.get_presets()['tools']['standalone_publish'] + self.presets = config.get_presets()['standalone_publish'] self.setAcceptDrops(True) layout = QtWidgets.QVBoxLayout(self) @@ -267,7 +267,7 @@ class DropDataFrame(QtWidgets.QFrame): icon += 's' data['icon'] = icon data['thumb'] = ( - ext in self.presets['thumbnailable'] and + ext in self.presets['extensions']['thumbnailable'] and data['is_sequence'] is False ) data['prev'] = ext in self.presets['extensions']['video_file'] diff --git a/pype/tools/standalonepublish/widgets/widget_family.py b/pype/standalonepublish/widgets/widget_family.py similarity index 98% rename from pype/tools/standalonepublish/widgets/widget_family.py rename to pype/standalonepublish/widgets/widget_family.py index 26dab9bc19..7259ecdb64 100644 --- a/pype/tools/standalonepublish/widgets/widget_family.py +++ b/pype/standalonepublish/widgets/widget_family.py @@ -247,9 +247,7 @@ class FamilyWidget(QtWidgets.QWidget): def refresh(self): has_families = False - presets = config.get_presets().get('tools', {}).get( - 'standalone_publish', {} - ) + presets = config.get_presets().get('standalone_publish', {}) for creator in presets.get('families', {}).values(): creator = namedtuple("Creator", creator.keys())(*creator.values()) diff --git a/pype/tools/standalonepublish/widgets/widget_family_desc.py b/pype/standalonepublish/widgets/widget_family_desc.py similarity index 100% rename from pype/tools/standalonepublish/widgets/widget_family_desc.py rename to pype/standalonepublish/widgets/widget_family_desc.py diff --git a/pype/tools/standalonepublish/widgets/widget_shadow.py b/pype/standalonepublish/widgets/widget_shadow.py similarity index 100% rename from pype/tools/standalonepublish/widgets/widget_shadow.py rename to pype/standalonepublish/widgets/widget_shadow.py diff --git a/pype/tools/standalonepublish/__main__.py b/pype/tools/standalonepublish/__main__.py deleted file mode 100644 index d77bc585c5..0000000000 --- a/pype/tools/standalonepublish/__main__.py +++ /dev/null @@ -1,5 +0,0 @@ -from . import cli - -if __name__ == '__main__': - import sys - sys.exit(cli(sys.argv[1:]))