blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add-on: refactor FLAMENCO_OT_submit_job.poll()

Browse Source 
Refactor the `FLAMENCO_OT_submit_job.poll()` function to actually use the
`job_types.active_job_type()` function instead of reimplementing similar
logic.

No functional changes.
This commit is contained in:
Sybren A. Stüvel 2022-07-29 10:10:44 +02:00
parent be1ddaa4eb
commit ca8a909e41
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addon/flamenco/operators.py
View File

@ -156,11 +156,9 @@ class FLAMENCO_OT_submit_job(FlamencoOpMixin, bpy.types.Operator):
@classmethod @classmethod
def poll(cls, context: bpy.types.Context) -> bool: def poll(cls, context: bpy.types.Context) -> bool:
# Only allow the # Only allow submission when there is a job type selected.
propgroup = getattr(context.scene, "flamenco_job_settings", None) job_type = job_types.active_job_type(context.scene)
if propgroup is None: return job_type is not None
return False
return getattr(propgroup, 'job_type', None) is not None
def invoke(self, context: bpy.types.Context, event: bpy.types.Event) -> set[str]: def invoke(self, context: bpy.types.Context, event: bpy.types.Event) -> set[str]:
filepath = self._save_blendfile(context) filepath = self._save_blendfile(context)
@ -243,10 +241,14 @@ class FLAMENCO_OT_submit_job(FlamencoOpMixin, bpy.types.Operator):
self.blendfile_on_farm = None self.blendfile_on_farm = None
self._bat_pack_shaman(context, blendfile) self._bat_pack_shaman(context, blendfile)
elif job_submission.is_file_inside_job_storage(context, blendfile): elif job_submission.is_file_inside_job_storage(context, blendfile):
self.log.info("File is already in job storage location, submitting it as-is") self.log.info(
"File is already in job storage location, submitting it as-is"
)
self._use_blendfile_directly(context, blendfile) self._use_blendfile_directly(context, blendfile)
else: else:
self.log.info("File is not already in job storage location, copying it there") self.log.info(
"File is not already in job storage location, copying it there"
)
self.blendfile_on_farm = self._bat_pack_filesystem(context, blendfile) self.blendfile_on_farm = self._bat_pack_filesystem(context, blendfile)
context.window_manager.modal_handler_add(self) context.window_manager.modal_handler_add(self)
@ -295,9 +297,7 @@ class FLAMENCO_OT_submit_job(FlamencoOpMixin, bpy.types.Operator):
return PurePosixPath(pack_target_file.as_posix()) return PurePosixPath(pack_target_file.as_posix())
def _bat_pack_shaman( def _bat_pack_shaman(self, context: bpy.types.Context, blendfile: Path) -> None:
self, context: bpy.types.Context, blendfile: Path
) -> None:
"""Use the Manager's Shaman API to submit the BAT pack. """Use the Manager's Shaman API to submit the BAT pack.
:return: the filesystem path of the blend file, for in the render job definition. :return: the filesystem path of the blend file, for in the render job definition.
@ -359,7 +359,9 @@ class FLAMENCO_OT_submit_job(FlamencoOpMixin, bpy.types.Operator):
return {"RUNNING_MODAL"} return {"RUNNING_MODAL"}
def _use_blendfile_directly(self, context: bpy.types.Context, blendfile: Path) -> None: def _use_blendfile_directly(
self, context: bpy.types.Context, blendfile: Path
) -> None:
# The temporary '.flamenco.blend' file should not be deleted, as it # The temporary '.flamenco.blend' file should not be deleted, as it
# will be used directly by the render job. # will be used directly by the render job.
self.temp_blendfile = None self.temp_blendfile = None