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

Store available managers per project, and store chosen manager too

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-09-04 17:38:21 +02:00
parent f6d797512a
commit fb9ffbbc23
2 changed files with 36 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blender_cloud/flamenco/__init__.py
View File

@ -71,7 +71,7 @@ class FlamencoManagerGroup(PropertyGroup):
items=available_managers, items=available_managers,
name='Flamenco Manager', name='Flamenco Manager',
description='Which Flamenco Manager to use for jobs', description='Which Flamenco Manager to use for jobs',
update=project_specific.updated_manager, update=project_specific.store,
) )
status = EnumProperty( status = EnumProperty(
@ -92,7 +92,7 @@ class FlamencoManagerGroup(PropertyGroup):
@available_managers.setter @available_managers.setter
def available_managers(self, new_managers): def available_managers(self, new_managers):
self['available_managers'] = new_managers self['available_managers'] = new_managers
project_specific.updated_manager() project_specific.store()
class FlamencoPollMixin: class FlamencoPollMixin:

81
blender_cloud/project_specific.py
View File

@ -7,10 +7,6 @@ import logging
# and simple enough to store directly in a dict. # and simple enough to store directly in a dict.
PROJECT_SPECIFIC_SIMPLE_PROPS = ( PROJECT_SPECIFIC_SIMPLE_PROPS = (
'cloud_project_local_path', 'cloud_project_local_path',
'flamenco_exclude_filter',
'flamenco_job_file_path',
'flamenco_job_output_path',
'flamenco_job_output_strip_components'
) )
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -58,33 +54,45 @@ def handle_project_update(_=None, _2=None):
# Load project-specific settings from the last time we visited this project. # Load project-specific settings from the last time we visited this project.
ps = prefs.get('project_settings', {}).get(project_id, {}) ps = prefs.get('project_settings', {}).get(project_id, {})
if not ps: if not ps:
log.debug('no project-specific settings are available, not touching options') log.debug('no project-specific settings are available, '
'only resetting available Flamenco Managers')
# The Flamenco Manager should really be chosen explicitly out of the available
# Managers.
prefs.flamenco_manager.available_managers = []
return return
if log.isEnabledFor(logging.DEBUG): if log.isEnabledFor(logging.DEBUG):
from pprint import pformat from pprint import pformat
log.debug('loading project-specific settings:\n%s', pformat(ps.to_dict())) log.debug('loading project-specific settings:\n%s', pformat(ps.to_dict()))
# Restore simple properties.
for name in PROJECT_SPECIFIC_SIMPLE_PROPS: for name in PROJECT_SPECIFIC_SIMPLE_PROPS:
if name in ps and hasattr(prefs, name): if name in ps and hasattr(prefs, name):
setattr(prefs, name, ps[name]) setattr(prefs, name, ps[name])
if ps.get('flamenco_manager'):
manager_id = ps['flamenco_manager'] # Restore Flamenco settings.
log.debug('setting flamenco manager to %s', manager_id) prefs.flamenco_manager.available_managers = ps.get('flamenco_available_managers', [])
flamenco_manager_id = ps.get('flamenco_manager_id')
if flamenco_manager_id:
log.debug('setting flamenco manager to %s', flamenco_manager_id)
try: try:
prefs.flamenco_manager.manager = manager_id prefs.flamenco_manager.manager = flamenco_manager_id
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', flamenco_manager_id)
else: else:
# Load per-project, per-manager settings for the current Manager.
try: try:
mps = ps['flamenco_managers_settings'][prefs.flamenco_manager.manager] pppm = ps['flamenco_managers_settings'][flamenco_manager_id]
except KeyError: except KeyError:
# No settings for this manager, so nothing to do. # No settings for this manager, so nothing to do.
pass pass
else: else:
prefs.flamenco_job_file_path = mps['file_path'] prefs.flamenco_job_file_path = pppm['file_path']
prefs.flamenco_job_output_path = mps['output_path'] prefs.flamenco_job_output_path = pppm['output_path']
prefs.flamenco_job_output_strip_components = mps['output_strip_components'] prefs.flamenco_job_output_strip_components = pppm['output_strip_components']
else:
log.debug('Resetting Flamenco Manager to None')
prefs.flamenco_manager.manager = None
def store(_=None, _2=None): def store(_=None, _2=None):
@ -109,40 +117,19 @@ def store(_=None, _2=None):
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: # Store project-specific Flamenco settings
# In this case we want to load the manager settings, not save them. ps['flamenco_manager_id'] = prefs.flamenco_manager.manager
# This is done in update_manager (connected to the FlamencoManagerGroup.manager ps['flamenco_available_managers'] = prefs.flamenco_manager.available_managers
# update handle).
ps['flamenco_manager'] = prefs.flamenco_manager.manager
else:
# If the manager did not change, update its settings.
per_manager_settings = ps.get('flamenco_managers_settings', {})
per_manager_settings[prefs.flamenco_manager.manager] = {
'file_path': prefs.flamenco_job_file_path,
'output_path': prefs.flamenco_job_output_path,
'output_strip_components': prefs.flamenco_job_output_strip_components}
log.debug('project-specific settings type: %s', type(ps))
if log.isEnabledFor(logging.DEBUG): # Store per-project, per-manager settings for the current Manager.
from pprint import pformat pppm = ps.get('flamenco_managers_settings', {})
if hasattr(ps, 'to_dict'): pppm[prefs.flamenco_manager.manager] = {
ps_to_log = ps.to_dict() 'file_path': prefs.flamenco_job_file_path,
else: 'output_path': prefs.flamenco_job_output_path,
ps_to_log = ps 'output_strip_components': prefs.flamenco_job_output_strip_components}
log.debug('saving project-specific settings:\n%s', pformat(ps_to_log)) ps['flamenco_managers_settings'] = pppm # IDPropertyGroup has no setdefault() method.
# Store this project's settings in the preferences.
all_settings[project_id] = ps all_settings[project_id] = ps
prefs['project_settings'] = all_settings prefs['project_settings'] = all_settings
def updated_manager(_=None, _2=None):
"""When the manager selector in FlamencoManagerGroup is updated.
If a new manager is selected:
- store the manager id in the flamenco_manager key
- load the configuration of such manager in the settings fields
"""
global project_settings_loading
if project_settings_loading:
return
store()
handle_project_update()