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

Flamenco: allow jobs to be created in 'paused' state.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-07-12 11:54:13 +02:00
parent 99f0764986
commit b0a03c81f5
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@
- Don't crash the texture browser when an invalid texture is seen. - Don't crash the texture browser when an invalid texture is seen.
- Support colour strips as Attract shots. - Support colour strips as Attract shots.
- Blender 2.8 support (work in progress). - Blender 2.8 support (work in progress).
- Flamenco: allow jobs to be created in 'paused' state.
## Version 1.8 (2018-01-03) ## Version 1.8 (2018-01-03)

17
blender_cloud/flamenco/__init__.py
View File

@ -231,7 +231,8 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
scene.flamenco_render_job_type, scene.flamenco_render_job_type,
settings, settings,
'Render %s' % filepath.name, 'Render %s' % filepath.name,
priority=scene.flamenco_render_job_priority) priority=scene.flamenco_render_job_priority,
start_paused=scene.flamenco_start_paused)
except Exception as ex: except Exception as ex:
self.report({'ERROR'}, 'Error creating Flamenco job: %s' % ex) self.report({'ERROR'}, 'Error creating Flamenco job: %s' % ex)
self.quit() self.quit()
@ -530,7 +531,8 @@ async def create_job(user_id: str,
job_name: str = None, job_name: str = None,
*, *,
priority: int = 50, priority: int = 50,
job_description: str = None) -> dict: job_description: str = None,
start_paused=False) -> dict:
"""Creates a render job at Flamenco Server, returning the job object as dictionary.""" """Creates a render job at Flamenco Server, returning the job object as dictionary."""
import json import json
@ -549,6 +551,8 @@ async def create_job(user_id: str,
} }
if job_description: if job_description:
job_attrs['description'] = job_description job_attrs['description'] = job_description
if start_paused:
job_attrs['start_paused'] = True
log.info('Going to create Flamenco job:\n%s', log.info('Going to create Flamenco job:\n%s',
json.dumps(job_attrs, indent=4, sort_keys=True)) json.dumps(job_attrs, indent=4, sort_keys=True))
@ -680,6 +684,7 @@ class FLAMENCO_PT_render(bpy.types.Panel, FlamencoPollMixin):
layout.prop(context.scene, 'flamenco_render_job_priority') layout.prop(context.scene, 'flamenco_render_job_priority')
layout.prop(context.scene, 'flamenco_render_fchunk_size') layout.prop(context.scene, 'flamenco_render_fchunk_size')
layout.prop(context.scene, 'flamenco_start_paused')
if getattr(context.scene, 'flamenco_render_job_type', None) == 'blender-render-progressive': if getattr(context.scene, 'flamenco_render_job_type', None) == 'blender-render-progressive':
layout.prop(context.scene, 'flamenco_render_schunk_count') layout.prop(context.scene, 'flamenco_render_schunk_count')
@ -824,6 +829,13 @@ def register():
] ]
) )
scene.flamenco_start_paused = BoolProperty(
name='Start Paused',
description="When enabled, the job will be created in 'paused' state, rather than"
" 'queued'. The job will need manual queueing before it will start",
default=False,
)
scene.flamenco_render_job_priority = IntProperty( scene.flamenco_render_job_priority = IntProperty(
name='Job Priority', name='Job Priority',
min=0, min=0,
@ -885,6 +897,7 @@ def unregister():
'flamenco_render_schunk_count', 'flamenco_render_schunk_count',
'flamenco_render_frame_range', 'flamenco_render_frame_range',
'flamenco_render_job_type', 'flamenco_render_job_type',
'flamenco_start_paused',
'flamenco_render_job_priority', 'flamenco_render_job_priority',
'flamenco_do_override_output_path', 'flamenco_do_override_output_path',
'flamenco_override_output_path'): 'flamenco_override_output_path'):