From 72a96229afff06062b2215b400471eb2830360c0 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Thu, 13 Dec 2018 21:34:23 +0100 Subject: [PATCH 1/4] clean up action handler --- pype/ftrack/actions/ftrack_action_handler.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pype/ftrack/actions/ftrack_action_handler.py b/pype/ftrack/actions/ftrack_action_handler.py index de8b7b2845..5f739e0366 100644 --- a/pype/ftrack/actions/ftrack_action_handler.py +++ b/pype/ftrack/actions/ftrack_action_handler.py @@ -242,7 +242,6 @@ class AppAction(object): 'data']['parents'] io.uninstall() if hierarchy: - # hierarchy = os.path.sep.join(hierarchy) hierarchy = os.path.join(*hierarchy) data = {"project": {"name": entity['project']['full_name'], @@ -256,13 +255,13 @@ class AppAction(object): self.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 - if self.identifier == 'maya': - os.environ['PYTHONPATH'] += os.pathsep + \ - os.path.join(os.getenv("AVALON_CORE"), 'setup', 'maya') - elif self.identifier == 'nuke': - os.environ['NUKE_PATH'] = os.pathsep + \ - os.path.join(os.getenv("AVALON_CORE"), 'setup', 'nuke') + # # TODO Add paths to avalon setup from tomls + # if self.identifier == 'maya': + # os.environ['PYTHONPATH'] += os.pathsep + \ + # os.path.join(os.getenv("AVALON_CORE"), 'setup', 'maya') + # elif self.identifier == 'nuke': + # os.environ['NUKE_PATH'] = os.pathsep + \ + # os.path.join(os.getenv("AVALON_CORE"), 'setup', 'nuke') # config = toml.load(lib.which_app(self.identifier + "_" + self.variant)) env = os.environ From 194606a4e83aac66a0399e4c3daa6c52a08098c2 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 14 Dec 2018 17:49:00 +0100 Subject: [PATCH 2/4] - removed old, unused code --- pype/ftrack/actions/ftrack_action_handler.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pype/ftrack/actions/ftrack_action_handler.py b/pype/ftrack/actions/ftrack_action_handler.py index 5f739e0366..df307c55d8 100644 --- a/pype/ftrack/actions/ftrack_action_handler.py +++ b/pype/ftrack/actions/ftrack_action_handler.py @@ -255,17 +255,6 @@ class AppAction(object): self.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 - # if self.identifier == 'maya': - # os.environ['PYTHONPATH'] += os.pathsep + \ - # os.path.join(os.getenv("AVALON_CORE"), 'setup', 'maya') - # elif self.identifier == 'nuke': - # os.environ['NUKE_PATH'] = os.pathsep + \ - # os.path.join(os.getenv("AVALON_CORE"), 'setup', 'nuke') - # config = toml.load(lib.which_app(self.identifier + "_" + self.variant)) - - env = os.environ - # collect all parents from the task parents = [] for item in entity['link']: From 31bfe15eddde2d1d925844c0152af49e5140aaf3 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 14 Dec 2018 18:03:42 +0100 Subject: [PATCH 3/4] removed reset.session() from event_handler and moved only to sync to avalon event --- pype/ftrack/events/event_sync_to_avalon.py | 12 ++++++++++++ pype/ftrack/events/ftrack_event_handler.py | 3 --- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pype/ftrack/events/event_sync_to_avalon.py b/pype/ftrack/events/event_sync_to_avalon.py index 0ed231c625..77b036880c 100644 --- a/pype/ftrack/events/event_sync_to_avalon.py +++ b/pype/ftrack/events/event_sync_to_avalon.py @@ -199,6 +199,18 @@ class Sync_to_Avalon(BaseEvent): if 'avalon_' not in cust_attr['key']: self.custom_attributes.append(cust_attr) + def _launch(self, event): + self.session.reset() + + args = self._translate_event( + self.session, event + ) + + self.launch( + self.session, *args + ) + return + def _translate_event(self, session, event): exceptions = ['assetversion', 'job', 'user', 'reviewsessionobject', 'timer', 'socialfeed', 'timelog'] _selection = event['data'].get('entities',[]) diff --git a/pype/ftrack/events/ftrack_event_handler.py b/pype/ftrack/events/ftrack_event_handler.py index a440d93fc4..e6d942af06 100644 --- a/pype/ftrack/events/ftrack_event_handler.py +++ b/pype/ftrack/events/ftrack_event_handler.py @@ -88,9 +88,6 @@ class BaseEvent(object): ) def _launch(self, event): - - self.session.reset() - args = self._translate_event( self.session, event ) From c964c439295a408117807a629ec54e0a8838e707 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 18 Dec 2018 17:50:06 +0100 Subject: [PATCH 4/4] changed source of icons for ftrack actions to ['ftrack_icon'] --- pype/ftrack/actions/action_Apps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/ftrack/actions/action_Apps.py b/pype/ftrack/actions/action_Apps.py index ecc3062d83..3225724524 100644 --- a/pype/ftrack/actions/action_Apps.py +++ b/pype/ftrack/actions/action_Apps.py @@ -34,7 +34,7 @@ def registerApp(app, session): ftrack_resources = "" # Path to resources here if 'icon' in apptoml: - icon = apptoml['icon'] + icon = apptoml['ftrack_icon'] if '{ftrack_resources}' in icon: icon = icon.format(ftrack_resources)