Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

preparation for 'ftrack_resources'

Browse source
This commit is contained in:
Jakub Trllo 2018-12-05 19:00:29 +01:00
parent c5c6927e61
commit 2da8a47442
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pype/ftrack/actions/action_Apps.py
View file

@ -31,11 +31,19 @@ def registerApp(app, session):
label = apptoml['ftrack_label']
icon = None
ftrack_resources = "" # Path to resources here
if 'icon' in apptoml:
icon = apptoml['icon']
if '{ftrack_resources}' in icon:
icon = icon.format(ftrack_resources)
description = None
if 'description' in apptoml:
description = apptoml['description']
# register action
AppAction(session, label, name, executable, variant, icon).register()
AppAction(session, label, name, executable, variant, icon, description).register()
def register(session):

17
pype/ftrack/actions/ftrack_action_handler.py
View file

@ -14,9 +14,6 @@ import acre
from pype import api as pype
log = pype.Logger.getLogger(__name__, "ftrack")
log.debug("pype.Anatomy: {}".format(pype.Anatomy))
class AppAction(object):
@ -231,13 +228,9 @@ class AppAction(object):
entity, id = entities[0]
entity = session.get(entity, id)
silo = "Film"
if entity.entity_type == "AssetBuild":
silo = "Asset"
# set environments for Avalon
os.environ["AVALON_PROJECT"] = entity['project']['full_name']
os.environ["AVALON_SILO"] = silo
os.environ["AVALON_SILO"] = entity['ancestors'][0]['name']
os.environ["AVALON_ASSET"] = entity['parent']['name']
os.environ["AVALON_TASK"] = entity['name']
os.environ["AVALON_APP"] = self.identifier
@ -262,7 +255,7 @@ class AppAction(object):
try:
anatomy = anatomy.format(data)
except Exception as e:
log.error("{0} Error in anatomy.format: {1}".format(__name__, e))
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
@ -328,7 +321,7 @@ class AppAction(object):
try:
fp = open(execfile)
except PermissionError as p:
log.error('Access denied on {0} - {1}'.
self.log.error('Access denied on {0} - {1}'.
format(execfile, p))
return {
'success': False,
@ -338,7 +331,7 @@ class AppAction(object):
fp.close()
# check executable permission
if not os.access(execfile, os.X_OK):
log.error('No executable permission on {}'.
self.log.error('No executable permission on {}'.
format(execfile))
return {
'success': False,
@ -347,7 +340,7 @@ class AppAction(object):
}
pass
else:
log.error('Launcher doesn\'t exist - {}'.
self.log.error('Launcher doesn\'t exist - {}'.
format(execfile))
return {
'success': False,