archive/blender-cloud-addon
Archived
1
3
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

More code simplification

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-09-04 14:34:14 +02:00
parent 21d2257be0
commit 4de8122920
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
blender_cloud/project_specific.py
View File

@ -63,15 +63,18 @@ def handle_project_update(_=None, _2=None):
log.debug('setting flamenco manager to %s', manager_id) log.debug('setting flamenco manager to %s', manager_id)
try: try:
prefs.flamenco_manager.manager = manager_id prefs.flamenco_manager.manager = manager_id
if 'flamenco_managers_settings' in ps and \
prefs.flamenco_manager.manager in ps['flamenco_managers_settings']:
mps = ps['flamenco_managers_settings'][prefs.flamenco_manager.manager]
setattr(prefs, 'flamenco_job_file_path', mps['file_path'])
setattr(prefs, 'flamenco_job_output_path', mps['output_path'])
setattr(prefs, 'flamenco_job_output_strip_components', mps['output_strip_components'])
except TypeError: except TypeError:
log.warning('manager %s for this project could not be found', manager_id) log.warning('manager %s for this project could not be found', manager_id)
else:
try:
mps = ps['flamenco_managers_settings'][prefs.flamenco_manager.manager]
except KeyError:
# No settings for this manager, so nothing to do.
pass
else:
prefs.flamenco_job_file_path = mps['file_path']
prefs.flamenco_job_output_path = mps['output_path']
prefs.flamenco_job_output_strip_components = mps['output_strip_components']
finally: finally:
project_settings_loading = False project_settings_loading = False