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

Simplified some code

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

26
blender_cloud/project_specific.py
View File

@ -93,28 +93,24 @@ def store(_=None, _2=None):
prefs = preferences() prefs = preferences()
project_id = prefs.project.project project_id = prefs.project.project
all_settings = prefs.get('project_settings', {}) all_settings = prefs.get('project_settings', {})
ps = all_settings.get(project_id, {}) ps = all_settings.get(project_id, {}) # either a dict or bpy.types.IDPropertyGroup
for name in PROJECT_SPECIFIC_SIMPLE_PROPS: for name in PROJECT_SPECIFIC_SIMPLE_PROPS:
ps[name] = getattr(prefs, name) ps[name] = getattr(prefs, name)
if ps.get('flamenco_manager') != prefs.flamenco_manager.manager: if ps.get('flamenco_manager') != prefs.flamenco_manager.manager:
# In this case we want to load the manager settings, not save them # In this case we want to load the manager settings, not save them.
# This is done in update_manager (connected to the FlamencoManagerGroup.manager update handle) # This is done in update_manager (connected to the FlamencoManagerGroup.manager
# update handle).
ps['flamenco_manager'] = prefs.flamenco_manager.manager ps['flamenco_manager'] = prefs.flamenco_manager.manager
else: else:
# If the manager did not change, update its settings # If the manager did not change, update its settings.
if 'flamenco_managers_settings' not in ps: per_manager_settings = ps.get('flamenco_managers_settings', {})
ps['flamenco_managers_settings'] = {} per_manager_settings[prefs.flamenco_manager.manager] = {
if prefs.flamenco_manager.manager not in ps['flamenco_managers_settings']: 'file_path': prefs.flamenco_job_file_path,
ps['flamenco_managers_settings'][prefs.flamenco_manager.manager] = {} 'output_path': prefs.flamenco_job_output_path,
'output_strip_components': prefs.flamenco_job_output_strip_components}
ps['flamenco_managers_settings'][prefs.flamenco_manager.manager]['file_path'] = getattr( log.debug('project-specific settings type: %s', type(ps))
prefs, 'flamenco_job_file_path')
ps['flamenco_managers_settings'][prefs.flamenco_manager.manager]['output_path'] = getattr(
prefs, 'flamenco_job_output_path')
ps['flamenco_managers_settings'][prefs.flamenco_manager.manager]['output_strip_components'] = getattr(
prefs, 'flamenco_job_output_strip_components')
if log.isEnabledFor(logging.DEBUG): if log.isEnabledFor(logging.DEBUG):
from pprint import pformat from pprint import pformat