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

Support for uploading render results.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-07-06 15:48:55 +02:00
parent c9a92dd5d1
commit 0a1f1972da
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
blender_cloud/image_sharing.py
View File

@ -1,5 +1,5 @@
import logging import logging
import pathlib import os.path
import tempfile import tempfile
import bpy import bpy
@ -123,11 +123,11 @@ class PILLAR_OT_image_share(pillar.PillarOperatorMixin,
self.report({'INFO'}, 'Uploading %s %s' % (self.target.lower(), self.name)) self.report({'INFO'}, 'Uploading %s %s' % (self.target.lower(), self.name))
if self.target == 'FILE': if self.target == 'FILE':
await self.upload_file(pathlib.Path(self.name)) await self.upload_file(self.name)
else: else:
await self.upload_datablock() await self.upload_datablock(context)
async def upload_file(self, filename: pathlib.Path): async def upload_file(self, filename: str):
"""Uploads a file to the cloud, attached to the image sharing node.""" """Uploads a file to the cloud, attached to the image sharing node."""
self.log.info('Uploading file %s', filename) self.log.info('Uploading file %s', filename)
@ -135,7 +135,7 @@ class PILLAR_OT_image_share(pillar.PillarOperatorMixin,
self.home_project_id, self.home_project_id,
self.share_group_id, self.share_group_id,
'image', 'image',
str(filename), filename,
extra_where={'user': self.user_id}) extra_where={'user': self.user_id})
self.log.info('Created node %s', node['_id']) self.log.info('Created node %s', node['_id'])
self.report({'INFO'}, 'File succesfully uploaded to the cloud!') self.report({'INFO'}, 'File succesfully uploaded to the cloud!')
@ -146,12 +146,25 @@ class PILLAR_OT_image_share(pillar.PillarOperatorMixin,
self.log.info('Opening browser at %s', url) self.log.info('Opening browser at %s', url)
webbrowser.open_new_tab(url) webbrowser.open_new_tab(url)
async def upload_datablock(self): async def upload_datablock(self, context):
"""Saves a datablock to file if necessary, then upload.""" """Saves a datablock to file if necessary, then upload."""
self.log.info('Uploading datablock %s' % self.name) self.log.info('Uploading datablock %s' % self.name)
datablock = bpy.data.images[self.name] datablock = bpy.data.images[self.name]
if datablock.type == 'RENDER_RESULT':
render_fname_suffix = context.scene.render.file_extension
with tempfile.TemporaryDirectory() as tmpdir:
filename = '%s-%s-render%s' % (
os.path.splitext(os.path.basename(context.blend_data.filepath))[0],
context.scene.name,
render_fname_suffix)
filepath = os.path.join(tmpdir, filename)
self.log.debug('Saving render to %s', filepath)
datablock.save_render(filepath)
await self.upload_file(filepath)
return
if datablock.is_dirty: if datablock.is_dirty:
# TODO: support dirty datablocks. # TODO: support dirty datablocks.
self.report({'ERROR'}, 'Datablock is dirty, save it first.') self.report({'ERROR'}, 'Datablock is dirty, save it first.')
@ -162,7 +175,7 @@ class PILLAR_OT_image_share(pillar.PillarOperatorMixin,
self.report({'ERROR'}, 'Packed files are not supported yet.') self.report({'ERROR'}, 'Packed files are not supported yet.')
return return
filepath = pathlib.Path(bpy.path.abspath(datablock.filepath)) filepath = bpy.path.abspath(datablock.filepath)
await self.upload_file(filepath) await self.upload_file(filepath)