converted AvalonModule

pype/modules/__init__.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 from .base import PypeModule
+from .avalon_apps import AvalonModule
 from .clockify import ClockifyModule
 
 __all__ = (
     "PypeModule",
+    "AvalonModule",
     "ClockifyModule",
 )

pype/modules/avalon_apps/__init__.py

@@ -1,5 +1,6 @@
-from .avalon_app import AvalonApps
+from .avalon_app import AvalonModule
 
 
-def tray_init(tray_widget, main_widget):
-    return AvalonApps(main_widget, tray_widget)
+__all__ = (
+    "AvalonModule",
+)

pype/modules/avalon_apps/avalon_app.py

@@ -1,61 +1,160 @@
-from pype.api import Logger
+import os
+import pype
+from .. import (
+    PypeModule,
+    ITrayModule,
+    IPluginPaths,
+)
 
 
-class AvalonApps:
-    def __init__(self, main_parent=None, parent=None):
-        self.log = Logger().get_logger(__name__)
+class AvalonModule(PypeModule, ITrayModule, IRestApi):
+    name = "Avalon"
 
-        self.tray_init(main_parent, parent)
+    def initialize(self, modules_settings):
+        # This module is always enabled
+        self.enabled = True
 
-    def tray_init(self, main_parent, parent):
-        from avalon.tools.libraryloader import app
-        from avalon import style
-        from pype.tools.launcher import LauncherWindow, actions
+        avalon_settings = modules_settings[self.name]
 
-        self.parent = parent
-        self.main_parent = main_parent
+        # Check if environment is already set
+        avalon_mongo_url = os.environ.get("AVALON_MONGO")
+        if not avalon_mongo_url:
+            avalon_mongo_url = avalon_settings["AVALON_MONGO"]
+        # Use pype mongo if Avalon's mongo not defined
+        if not avalon_mongo_url:
+            avalon_mongo_url = os.environ["PYPE_MONGO"]
 
-        self.app_launcher = LauncherWindow()
-        self.libraryloader = app.Window(
-            icon=self.parent.icon,
-            show_projects=True,
-            show_libraries=True
+        thumbnail_root = os.environ.get("AVALON_THUMBNAIL_ROOT")
+        if not thumbnail_root:
+            thumbnail_root = avalon_settings["AVALON_THUMBNAIL_ROOT"]
+
+        self.thumbnail_root = thumbnail_root
+        self.avalon_mongo_url = avalon_mongo_url
+        self.avalon_settings = avalon_settings
+        self.schema_path = os.path.join(
+            os.path.dirname(pype.PACKAGE_DIR),
+            "schema"
         )
-        self.libraryloader.setStyleSheet(style.load_stylesheet())
 
-        # actions.register_default_actions()
-        actions.register_config_actions()
-        actions.register_environment_actions()
+        # Tray attributes
+        self.app_launcher = None
+        self.libraryloader = None
+        self.rest_api_obj = None
 
     def process_modules(self, modules):
         if "RestApiServer" in modules:
+    def get_global_environments(self):
+        """Avalon global environments for pype implementation."""
+        mongodb_data_dir = os.environ.get("AVALON_DB_DATA")
+        if not mongodb_data_dir:
+            mongodb_data_dir = os.path.join(
+                os.path.dirname(os.environ["PYPE_ROOT"]),
+                "mongo_db_data"
+            )
+        return {
+            # 100% hardcoded
+            "AVALON_SCHEMA": self.schema_path,
+            "AVALON_CONFIG": "pype",
+            "AVALON_LABEL": "Pype",
+
+            # Modifiable by settings
+            # - mongo ulr for avalon projects
+            "AVALON_MONGO": self.avalon_mongo_url,
+            # TODO thumbnails root should be multiplafrom
+            # - thumbnails root
+            "AVALON_THUMBNAIL_ROOT": self.thumbnail_root,
+
+            # May be modifiable?
+            # - mongo database name where projects are stored
+            "AVALON_DB": "avalon",
+            # - mongo timeout in ms
+            "AVALON_TIMEOUT": "1000",
+
+            # Avalon environments not used in code
+            "AVALON_DEBUG": "1",
+            "AVALON_EARLY_ADOPTER": "1",
+
+            # Not even connected to Avalon
+            # TODO remove - pype's variable for local mongo
+            "AVALON_DB_DATA": mongodb_data_dir
+        }
+
+    def tray_init(self, tray_widget, main_window):
+        # Add library tool
+        try:
+            from avalon.tools.libraryloader import app
+            from avalon import style
+
+            self.libraryloader = app.Window(
+                icon=tray_widget.icon,
+                show_projects=True,
+                show_libraries=True
+            )
+            self.libraryloader.setStyleSheet(style.load_stylesheet())
+        except Exception:
+            self.log.warning(
+                "Couldn't load Library loader tool for tray.",
+                exc_info=True
+            )
+
+        # Add launcher
+        try:
+            from pype.tools.launcher import LauncherWindow
+            self.app_launcher = LauncherWindow()
+        except Exception:
+            self.log.warning(
+                "Couldn't load Launch for tray.",
+                exc_info=True
+            )
+
+    def connect_with_modules(self, enabled_modules):
+        plugin_paths = []
+        for module in enabled_modules:
+            if not isinstance(module, IPluginPaths):
+                continue
+
+            paths = (module.get_plugin_paths() or {}).get("actions")
+            if not paths:
+                continue
+
+            if not isinstance(paths, (list, tuple, set)):
+                paths = [paths]
+            plugin_paths.extend(paths)
+
+        if plugin_paths:
+            env_paths_str = os.environ.get("AVALON_ACTIONS") or ""
+            env_paths = env_paths_str.split(os.pathsep)
+            env_paths.extend(plugin_paths)
+            os.environ["AVALON_ACTIONS"] = os.pathsep.join(env_paths)
+
+        if self.tray_initialized:
+            from pype.tools.launcher import actions
+            # actions.register_default_actions()
+            actions.register_config_actions()
+            actions.register_environment_actions()
             from .rest_api import AvalonRestApi
             self.rest_api_obj = AvalonRestApi()
 
     # Definition of Tray menu
-    def tray_menu(self, parent_menu=None):
+    def tray_menu(self, tray_menu):
         from Qt import QtWidgets
         # Actions
-        if parent_menu is None:
-            if self.parent is None:
-                self.log.warning('Parent menu is not set')
-                return
-            elif self.parent.hasattr('menu'):
-                parent_menu = self.parent.menu
-            else:
-                self.log.warning('Parent menu is not set')
-                return
-
-        action_launcher = QtWidgets.QAction("Launcher", parent_menu)
+        action_launcher = QtWidgets.QAction("Launcher", tray_menu)
         action_library_loader = QtWidgets.QAction(
-            "Library loader", parent_menu
+            "Library loader", tray_menu
         )
 
         action_launcher.triggered.connect(self.show_launcher)
         action_library_loader.triggered.connect(self.show_library_loader)
 
-        parent_menu.addAction(action_launcher)
-        parent_menu.addAction(action_library_loader)
+        tray_menu.addAction(action_launcher)
+        tray_menu.addAction(action_library_loader)
+
+    def tray_start(self, *_a, **_kw):
+        return
+
+    def tray_exit(self, *_a, **_kw):
+        return
 
     def show_launcher(self):
         # if app_launcher don't exist create it/otherwise only show main window