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

Don't write to artist's blend file, but to temporary file.

Browse Source 
This file is saved to '{blendfile}.flamenco.blend', which is used to BAM-
pack and create the Flamenco job. After that, the file is removed from
the local filesystem again.
This commit is contained in:
Sybren A. Stüvel 2017-01-24 14:39:49 +01:00
parent 9272e22129
commit 5f73837d3c
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
blender_cloud/flamenco/__init__.py
View File

@ -134,16 +134,23 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
from pillarsdk import exceptions as sdk_exceptions from pillarsdk import exceptions as sdk_exceptions
from ..blender import preferences from ..blender import preferences
filepath = Path(context.blend_data.filepath)
scene = context.scene scene = context.scene
# The file extension should be determined by the render settings, not necessarily # The file extension should be determined by the render settings, not necessarily
# by the setttings in the output panel. # by the setttings in the output panel.
scene.render.use_file_extension = True scene.render.use_file_extension = True
bpy.ops.wm.save_mainfile()
# Save to a different file, specifically for Flamenco. We shouldn't overwrite
# the artist's file. We can compress, since this file won't be managed by SVN
# and doesn't need diffability.
filepath = Path(context.blend_data.filepath).with_suffix('.flamenco.blend')
self.log.info('Saving copy to temporary file %s', filepath)
bpy.ops.wm.save_as_mainfile(filepath=str(filepath),
compress=True,
copy=True)
# Determine where the render output will be stored. # Determine where the render output will be stored.
render_output = render_output_path(context) render_output = render_output_path(context, filepath)
if render_output is None: if render_output is None:
self.report({'ERROR'}, 'Current file is outside of project path.') self.report({'ERROR'}, 'Current file is outside of project path.')
self.quit() self.quit()
@ -186,6 +193,17 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
job_info['missing_files'] = [str(mf) for mf in missing_sources] job_info['missing_files'] = [str(mf) for mf in missing_sources]
json.dump(job_info, outfile, sort_keys=True, indent=4) json.dump(job_info, outfile, sort_keys=True, indent=4)
# We can now remove the local copy we made with bpy.ops.wm.save_as_mainfile().
# Strictly speaking we can already remove it after the BAM-pack, but it may come in
# handy in case of failures.
try:
self.log.info('Removing temporary file %s', filepath)
filepath.unlink()
except Exception as ex:
self.report({'ERROR'}, 'Unable to remove file: %s' % ex)
self.quit()
return
# Do a final report. # Do a final report.
if missing_sources: if missing_sources:
names = (ms.name for ms in missing_sources) names = (ms.name for ms in missing_sources)
@ -353,7 +371,7 @@ def is_image_type(render_output_type: str) -> bool:
@functools.lru_cache(1) @functools.lru_cache(1)
def _render_output_path( def _render_output_path(
local_project_path: str, local_project_path: str,
blend_filepath: str, blend_filepath: Path,
flamenco_job_output_strip_components: int, flamenco_job_output_strip_components: int,
flamenco_job_output_path: str, flamenco_job_output_path: str,
render_image_format: str, render_image_format: str,
@ -366,16 +384,15 @@ def _render_output_path(
""" """
project_path = Path(bpy.path.abspath(local_project_path)).resolve() project_path = Path(bpy.path.abspath(local_project_path)).resolve()
blendfile = Path(blend_filepath)
try: try:
proj_rel = blendfile.parent.relative_to(project_path) proj_rel = blend_filepath.parent.relative_to(project_path)
except ValueError: except ValueError:
return None return None
rel_parts = proj_rel.parts[flamenco_job_output_strip_components:] rel_parts = proj_rel.parts[flamenco_job_output_strip_components:]
output_top = Path(flamenco_job_output_path) output_top = Path(flamenco_job_output_path)
dir_components = output_top.joinpath(*rel_parts) / blendfile.stem dir_components = output_top.joinpath(*rel_parts) / blend_filepath.stem
# Blender will have to append the file extensions by itself. # Blender will have to append the file extensions by itself.
if is_image_type(render_image_format): if is_image_type(render_image_format):
@ -383,9 +400,12 @@ def _render_output_path(
return dir_components / flamenco_render_frame_range return dir_components / flamenco_render_frame_range
def render_output_path(context) -> typing.Optional[PurePath]: def render_output_path(context, filepath: Path=None) -> typing.Optional[PurePath]:
"""Returns the render output path to be sent to Flamenco. """Returns the render output path to be sent to Flamenco.
:param context: the Blender context (used to find Flamenco preferences etc.)
:param filepath: the Path of the blend file to render, or None for the current file.
Returns None when the current blend file is outside the project path. Returns None when the current blend file is outside the project path.
""" """
@ -394,9 +414,12 @@ def render_output_path(context) -> typing.Optional[PurePath]:
scene = context.scene scene = context.scene
prefs = preferences() prefs = preferences()
if filepath is None:
filepath = Path(context.blend_data.filepath)
return _render_output_path( return _render_output_path(
prefs.attract_project_local_path, prefs.attract_project_local_path,
context.blend_data.filepath, filepath,
prefs.flamenco_job_output_strip_components, prefs.flamenco_job_output_strip_components,
prefs.flamenco_job_output_path, prefs.flamenco_job_output_path,
scene.render.image_settings.file_format, scene.render.image_settings.file_format,