diff --git a/pype/ftrack/actions/ftrack_action_handler.py b/pype/ftrack/actions/ftrack_action_handler.py index fa108ec78b..d6bf0a2863 100644 --- a/pype/ftrack/actions/ftrack_action_handler.py +++ b/pype/ftrack/actions/ftrack_action_handler.py @@ -10,14 +10,12 @@ from avalon import io, lib, pipeline from avalon import session as sess import acre -from app.api import ( - Templates, - Logger -) -t = Templates( - type=["anatomy"] -) +from pype import api as pype + +log = pype.Logger.getLogger(__name__, "ftrack") + +log.debug("pype.Anatomy: {}".format(pype.Anatomy)) class AppAction(object): @@ -34,7 +32,7 @@ class AppAction(object): def __init__(self, session, label, name, executable, variant=None, icon=None, description=None): '''Expects a ftrack_api.Session instance''' - self.log = Logger.getLogger(self.__class__.__name__) + self.log = pype.Logger.getLogger(self.__class__.__name__) # self.logger = Logger.getLogger(__name__) @@ -241,7 +239,7 @@ class AppAction(object): os.environ["AVALON_APP"] = self.identifier os.environ["AVALON_APP_NAME"] = self.identifier + "_" + self.variant - anatomy = t.anatomy + anatomy = pype.Anatomy io.install() hierarchy = io.find_one({"type": 'asset', "name": entity['parent']['name']})[ 'data']['parents'] @@ -255,9 +253,10 @@ class AppAction(object): "task": entity['name'], "asset": entity['parent']['name'], "hierarchy": hierarchy} - - anatomy = anatomy.format(data) - + try: + anatomy = anatomy.format(data) + except Exception as e: + log.error("{0} Error in anatomy.format: {1}".format(__name__, e)) os.environ["AVALON_WORKDIR"] = os.path.join(anatomy.work.root, anatomy.work.folder) # TODO Add paths to avalon setup from tomls @@ -398,7 +397,7 @@ class BaseAction(object): def __init__(self, session): '''Expects a ftrack_api.Session instance''' - self.log = Logger.getLogger(self.__class__.__name__) + self.log = pype.Logger.getLogger(self.__class__.__name__) if self.label is None: raise ValueError( @@ -435,7 +434,8 @@ class BaseAction(object): ), self._launch ) - self.log.info("----- action - <" + self.__class__.__name__ + "> - Has been registered -----") + self.log.info("----- action - <" + self.__class__.__name__ + + "> - Has been registered -----") def _discover(self, event): args = self._translate_event( diff --git a/pype/ftrack/ftrackRun.py b/pype/ftrack/ftrackRun.py index e90530b3b2..7fddf171da 100644 --- a/pype/ftrack/ftrackRun.py +++ b/pype/ftrack/ftrackRun.py @@ -7,11 +7,19 @@ import time from app import style from app.vendor.Qt import QtCore, QtGui, QtWidgets from pype.ftrack import credentials, login_dialog as login_dialog -from app.api import Logger + from FtrackServer import FtrackServer -log = Logger.getLogger(__name__) +from pype import api as pype + + +# load data from templates +pype.load_data_from_templates() + +log = pype.Logger.getLogger(__name__, "ftrack") # Validation if alredy logged into Ftrack + + class FtrackRunner: def __init__(self, main_parent=None, parent=None): @@ -76,7 +84,7 @@ class FtrackRunner: def runActionServer(self): if self.actionThread is None: self.actionThread = threading.Thread(target=self.setActionServer) - self.actionThread.daemon=True + self.actionThread.daemon = True self.actionThread.start() log.info("Ftrack action server launched") @@ -107,7 +115,7 @@ class FtrackRunner: def runEventServer(self): if self.eventThread is None: self.eventThread = threading.Thread(target=self.setEventServer) - self.eventThread.daemon=True + self.eventThread.daemon = True self.eventThread.start() log.info("Ftrack event server launched") @@ -168,9 +176,9 @@ class FtrackRunner: self.smEventS.addAction(self.aStopEventS) # Actions - basic - self.aLogin = QtWidgets.QAction("Login",self.menu) + self.aLogin = QtWidgets.QAction("Login", self.menu) self.aLogin.triggered.connect(self.validate) - self.aLogout = QtWidgets.QAction("Logout",self.menu) + self.aLogout = QtWidgets.QAction("Logout", self.menu) self.aLogout.triggered.connect(self.logout) self.menu.addAction(self.aLogin) diff --git a/pype/templates.py b/pype/templates.py index f62488caee..38e120bec3 100644 --- a/pype/templates.py +++ b/pype/templates.py @@ -13,7 +13,8 @@ def load_data_from_templates(): api.Dataflow, api.Anatomy, api.Colorspace, - api.Metadata] + api.Metadata + ] ): # base = Templates() t = Templates(type=["anatomy", "metadata", "dataflow", "colorspace"])