Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve absolute filename check to be explicit

Browse source 
- Also move asset assertion up (micro-optimization)
This commit is contained in:
Roy Nieterau 2018-07-21 14:52:38 +02:00
parent 40640eb598
commit 2dfbbeb093
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
colorbleed/scripts/fusion_switch_shot.py
View file

@ -157,19 +157,22 @@ def switch(asset_name, filepath=None, new=True):
"""
# Ensure filename is absolute
if not os.path.isabs(filepath):
filepath = os.path.abspath(filepath)
# If filepath provided, ensure it is valid absolute path
if filepath is not None:
if not os.path.isabs(filepath):
filepath = os.path.abspath(filepath)
# Get current project
self._project = io.find_one({"type": "project",
"name": api.Session["AVALON_PROJECT"]})
assert os.path.exists(filepath), "%s must exist " % filepath
# Assert asset name exists
# It is better to do this here then to wait till switch_shot does it
asset = io.find_one({"type": "asset", "name": asset_name})
assert asset, "Could not find '%s' in the database" % asset_name
# Get current project
self._project = io.find_one({"type": "project",
"name": api.Session["AVALON_PROJECT"]})
# Go to comp
if not filepath:
current_comp = avalon.fusion.get_current_comp()
@ -189,7 +192,6 @@ def switch(asset_name, filepath=None, new=True):
representation = colorbleed.switch_item(container,
asset_name=asset_name)
representations.append(representation)
current_comp.Print(str(representation["_id"]) + "\n")
except Exception as e:
current_comp.Print("Error in switching! %s\n" % e.message)