Loader & Library loader: Use tools from OpenPype

openpype/hosts/fusion/api/menu.py

@@ -10,8 +10,10 @@
 
 from avalon.tools import (
  creator,
- loader,
  sceneinventory,
+)
+from openpype.tools import (
+ loader,
  libraryloader
 )
 

openpype/hosts/fusion/api/pipeline.py

@@ -3,7 +3,7 @@
 """
 import os
 
-from avalon.tools import workfiles
+from openpype.tools import workfiles
 from avalon import api as avalon
 from pyblish import api as pyblish
 from openpype.api import Logger

openpype/hosts/hiero/api/menu.py

@@ -41,7 +41,8 @@ def menu_install():
  apply_colorspace_project, apply_colorspace_clips
  )
  # here is the best place to add menu
- from avalon.tools import cbloader, creator, sceneinventory
+ from avalon.tools import creator, sceneinventory
+ from openpype.tools import loader
  from avalon.vendor.Qt import QtGui
 
  menu_name = os.environ['AVALON_LABEL']
@@ -90,7 +91,7 @@ def menu_install():
 
  loader_action = menu.addAction("Load ...")
  loader_action.setIcon(QtGui.QIcon("icons:CopyRectangle.png"))
- loader_action.triggered.connect(cbloader.show)
+ loader_action.triggered.connect(loader.show)
 
  sceneinventory_action = menu.addAction("Manage ...")
  sceneinventory_action.setIcon(QtGui.QIcon("icons:CopyRectangle.png"))

openpype/hosts/hiero/api/pipeline.py

@@ -4,10 +4,8 @@
 import os
 import contextlib
 from collections import OrderedDict
-from avalon.tools import (
- workfiles,
- publish as _publish
-)
+from avalon.tools import publish as _publish
+from openpype.tools import workfiles
 from avalon.pipeline import AVALON_CONTAINER_ID
 from avalon import api as avalon
 from avalon import schema

openpype/hosts/houdini/startup/MainMenuCommon.xml

@@ -15,8 +15,8 @@ creator.show()
  <scriptItem id="avalon_load">
  <label>Load ...</label>
  <scriptCode><![CDATA[
-from avalon.tools import cbloader
-cbloader.show(use_context=True)
+from openpype.tools import loader
+loader.show(use_context=True)
 ]]></scriptCode>
  </scriptItem>
 

openpype/hosts/maya/api/__init__.py

@@ -8,7 +8,7 @@
 from avalon import pipeline
 from avalon.maya import suspended_refresh
 from avalon.maya.pipeline import IS_HEADLESS
-from avalon.tools import workfiles
+from openpype.tools import workfiles
 from pyblish import api as pyblish
 from openpype.lib import any_outdated
 import openpype.hosts.maya

openpype/hosts/maya/api/customize.py

@@ -79,7 +79,7 @@ def override_toolbox_ui():
  log.warning("Could not import SceneInventory tool")
 
  try:
- import avalon.tools.loader as loader
+ import openpype.tools.loader as loader
  except Exception:
  log.warning("Could not import Loader tool")
 

openpype/hosts/nuke/api/lib.py

@@ -7,7 +7,7 @@
 
 
 from avalon import api, io, lib
-from avalon.tools import workfiles
+from openpype.tools import workfiles
 import avalon.nuke
 from avalon.nuke import lib as anlib
 from avalon.nuke import (

openpype/hosts/resolve/api/menu.py

@@ -10,11 +10,13 @@
 
 from avalon.tools import (
  creator,
- loader,
  sceneinventory,
- libraryloader,
  subsetmanager
 )
+from openpype.tools import (
+ loader,
+ libraryloader,
+)
 
 
 def load_stylesheet():

openpype/hosts/resolve/api/pipeline.py

@@ -4,7 +4,7 @@
 import os
 import contextlib
 from collections import OrderedDict
-from avalon.tools import workfiles
+from openpype.tools import workfiles
 from avalon import api as avalon
 from avalon import schema
 from avalon.pipeline import AVALON_CONTAINER_ID

openpype/modules/default_modules/avalon_apps/avalon_app.py

@@ -55,11 +55,11 @@ def get_global_environments(self):
  def tray_init(self):
  # Add library tool
  try:
- from avalon.tools.libraryloader import app
- from avalon import style
  from Qt import QtGui
+ from avalon import style
+ from openpype.tools.libraryloader import LibraryLoaderWindow
 
- self.libraryloader = app.Window(
+ self.libraryloader = LibraryLoaderWindow(
  icon=QtGui.QIcon(resources.get_openpype_icon_filepath()),
  show_projects=True,
  show_libraries=True

openpype/modules/default_modules/sync_server/tray/models.py

@@ -5,7 +5,7 @@
 from Qt import QtCore
 from Qt.QtCore import Qt
 
-from avalon.tools.delegates import pretty_timestamp
+from openpype.tools.utils.delegates import pretty_timestamp
 from avalon.vendor import qtawesome
 
 from openpype.lib import PypeLogger

openpype/modules/default_modules/sync_server/tray/widgets.py

@@ -14,7 +14,7 @@
 from openpype.api import get_local_site_id
 from openpype.lib import PypeLogger
 
-from avalon.tools.delegates import pretty_timestamp
+from openpype.tools.utils.delegates import pretty_timestamp
 from avalon.vendor import qtawesome
 
 from .models import (

openpype/tools/libraryloader/__init__.py

@@ -0,0 +1,11 @@
+from .app import (
+ LibraryLoaderWindow,
+ show,
+ cli
+)
+
+__all__ = [
+ "LibraryLoaderWindow",
+ "show",
+ "cli",
+]

openpype/tools/libraryloader/__main__.py

@@ -0,0 +1,5 @@
+from . import cli
+
+if __name__ == '__main__':
+ import sys
+ sys.exit(cli(sys.argv[1:]))