Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get len before close

This commit is contained in:
Erik Johnston 2017-10-12 17:39:23 +01:00
parent 802ca12d05
commit 1259a76047
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
synapse/rest/media/v1/media_repository.py
View File

@ -359,6 +359,8 @@ class MediaRepository(object):
) )
if t_byte_source: if t_byte_source:
t_len = len(t_byte_source.getvalue())
output_path = yield self.write_to_file( output_path = yield self.write_to_file(
t_byte_source, t_byte_source,
self.filepaths.local_media_thumbnail_rel( self.filepaths.local_media_thumbnail_rel(
@ -368,8 +370,7 @@ class MediaRepository(object):
logger.info("Stored thumbnail in file %r", output_path) logger.info("Stored thumbnail in file %r", output_path)
yield self.store.store_local_thumbnail_rel( yield self.store.store_local_thumbnail_rel(
media_id, t_width, t_height, t_type, t_method, media_id, t_width, t_height, t_type, t_method, t_len
len(t_byte_source.getvalue())
) )
defer.returnValue(output_path) defer.returnValue(output_path)
@ -387,6 +388,7 @@ class MediaRepository(object):
) )
if t_byte_source: if t_byte_source:
t_len = len(t_byte_source.getvalue())
output_path = yield self.write_to_file( output_path = yield self.write_to_file(
t_byte_source, t_byte_source,
self.filepaths.remote_media_thumbnail_rel( self.filepaths.remote_media_thumbnail_rel(
@ -397,7 +399,7 @@ class MediaRepository(object):
yield self.store.store_remote_media_thumbnail_rel( yield self.store.store_remote_media_thumbnail_rel(
server_name, media_id, file_id, server_name, media_id, file_id,
t_width, t_height, t_type, t_method, len(t_byte_source.getvalue()) t_width, t_height, t_type, t_method, t_len
) )
defer.returnValue(output_path) defer.returnValue(output_path)
@ -449,11 +451,12 @@ class MediaRepository(object):
media_id, t_width, t_height, t_type, t_method media_id, t_width, t_height, t_type, t_method
) )
t_len = len(t_byte_source.getvalue())
yield self.write_to_file(t_byte_source, file_path) yield self.write_to_file(t_byte_source, file_path)
yield self.store.store_local_thumbnail( yield self.store.store_local_thumbnail(
media_id, t_width, t_height, t_type, t_method, media_id, t_width, t_height, t_type, t_method, t_len
len(t_byte_source.getvalue())
) )
defer.returnValue({ defer.returnValue({
@ -500,11 +503,13 @@ class MediaRepository(object):
server_name, file_id, t_width, t_height, t_type, t_method server_name, file_id, t_width, t_height, t_type, t_method
) )
t_len = len(t_byte_source.getvalue())
yield self.write_to_file(t_byte_source, file_path) yield self.write_to_file(t_byte_source, file_path)
yield self.store.store_remote_media_thumbnail( yield self.store.store_remote_media_thumbnail(
server_name, media_id, file_id, server_name, media_id, file_id,
t_width, t_height, t_type, t_method, len(t_byte_source.getvalue()) t_width, t_height, t_type, t_method, t_len
) )
defer.returnValue({ defer.returnValue({