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

Added support for sharing packed images.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-07-07 11:09:30 +02:00
parent 959e83229b
commit 4762f0292d
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
blender_cloud/image_sharing.py
View File

@ -126,7 +126,7 @@ class PILLAR_OT_image_share(pillar.PillarOperatorMixin,
await self.share_image(context) await self.share_image(context)
except Exception as ex: except Exception as ex:
self.log.exception('Unexpected exception caught.') self.log.exception('Unexpected exception caught.')
self.report({'ERROR'}, 'Unexpected error: %s' % ex) self.report({'ERROR'}, 'Unexpected error %s: %s' % (type(ex), ex))
self._state = 'QUIT' self._state = 'QUIT'
@ -139,7 +139,7 @@ class PILLAR_OT_image_share(pillar.PillarOperatorMixin,
else: else:
await self.upload_datablock(context) await self.upload_datablock(context)
async def upload_file(self, filename: str): async def upload_file(self, filename: str, fileobj=None):
"""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)
@ -150,6 +150,7 @@ class PILLAR_OT_image_share(pillar.PillarOperatorMixin,
filename, filename,
extra_where={'user': self.user_id}, extra_where={'user': self.user_id},
always_create_new_node=True, always_create_new_node=True,
fileobj=fileobj,
caching=False) caching=False)
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!')
@ -175,6 +176,10 @@ class PILLAR_OT_image_share(pillar.PillarOperatorMixin,
await self.upload_via_tempdir(datablock, filename) await self.upload_via_tempdir(datablock, filename)
return return
if datablock.packed_file is not None:
await self.upload_packed_file(datablock)
return
if datablock.is_dirty: if datablock.is_dirty:
# We can handle dirty datablocks like this if we want. # We can handle dirty datablocks like this if we want.
# However, I (Sybren) do NOT think it's a good idea to: # However, I (Sybren) do NOT think it's a good idea to:
@ -186,11 +191,6 @@ class PILLAR_OT_image_share(pillar.PillarOperatorMixin,
await self.upload_via_tempdir(datablock, filename) await self.upload_via_tempdir(datablock, filename)
return return
if datablock.packed_file is not None:
# TODO: support packed files.
self.report({'ERROR'}, 'Packed files are not supported yet.')
return
filepath = bpy.path.abspath(datablock.filepath) filepath = bpy.path.abspath(datablock.filepath)
await self.upload_file(filepath) await self.upload_file(filepath)
@ -206,6 +206,16 @@ class PILLAR_OT_image_share(pillar.PillarOperatorMixin,
datablock.save_render(filepath) datablock.save_render(filepath)
await self.upload_file(filepath) await self.upload_file(filepath)
async def upload_packed_file(self, datablock):
import io
filename = '%s.%s' % (datablock.name, datablock.file_format.lower())
fileobj = io.BytesIO(datablock.packed_file.data)
fileobj.seek(0) # ensure PillarSDK reads the file from the beginning.
self.log.info('Uploading packed file directly from memory to %r.', filename)
await self.upload_file(filename, fileobj=fileobj)
def image_editor_menu(self, context): def image_editor_menu(self, context):
image = context.space_data.image image = context.space_data.image