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

Generalised saving/loading of project+manager-specific settings + added one

Browse Source 
Added the `flamenco_exclude_filter` setting to the set, and also made it
easier to add new settings too.
This commit is contained in:
Sybren A. Stüvel 2018-11-16 17:12:30 +01:00
parent 564c2589b1
commit 85f911cb59
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
blender_cloud/flamenco/__init__.py
View File

@ -84,9 +84,10 @@ def manager_updated(self: 'FlamencoManagerGroup', context):
return return
with project_specific.mark_as_loading(): with project_specific.mark_as_loading():
prefs.flamenco_job_file_path = pppm['file_path'] for name in project_specific.FLAMENCO_PER_PROJECT_PER_MANAGER:
prefs.flamenco_job_output_path = pppm['output_path'] if name not in pppm:
prefs.flamenco_job_output_strip_components = pppm['output_strip_components'] continue
setattr(prefs, name, pppm[name])
class FlamencoManagerGroup(PropertyGroup): class FlamencoManagerGroup(PropertyGroup):

14
blender_cloud/project_specific.py
View File

@ -9,6 +9,15 @@ PROJECT_SPECIFIC_SIMPLE_PROPS = (
'cloud_project_local_path', 'cloud_project_local_path',
) )
# Names of BlenderCloudPreferences properties that are project-specific and
# Flamenco Manager-specific, and simple enough to store in a dict.
FLAMENCO_PER_PROJECT_PER_MANAGER = (
'flamenco_exclude_filter',
'flamenco_job_file_path',
'flamenco_job_output_path',
'flamenco_job_output_strip_components',
)
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
project_settings_loading = 0 # counter, if > 0 then we're loading stuff. project_settings_loading = 0 # counter, if > 0 then we're loading stuff.
@ -116,9 +125,8 @@ def store(_=None, _2=None):
# Store per-project, per-manager settings for the current Manager. # Store per-project, per-manager settings for the current Manager.
pppm = ps.get('flamenco_managers_settings', {}) pppm = ps.get('flamenco_managers_settings', {})
pppm[prefs.flamenco_manager.manager] = { pppm[prefs.flamenco_manager.manager] = {
'file_path': prefs.flamenco_job_file_path, name: getattr(prefs, name) for name in FLAMENCO_PER_PROJECT_PER_MANAGER
'output_path': prefs.flamenco_job_output_path, }
'output_strip_components': prefs.flamenco_job_output_strip_components}
ps['flamenco_managers_settings'] = pppm # IDPropertyGroup has no setdefault() method. ps['flamenco_managers_settings'] = pppm # IDPropertyGroup has no setdefault() method.
# Store this project's settings in the preferences. # Store this project's settings in the preferences.