OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

getvalue closes buffer

pull/2538/head
Erik Johnston 2017-10-12 17:52:30 +01:00
parent 1259a76047
commit cc505b4b5e
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,7 +258,7 @@ class MediaRepository(object):
server_name, media_id)
raise SynapseError(502, "Failed to fetch remote media")
# Will close the file after its done
# Will close the file after its done
yield self.copy_to_backup(open(fname), fpath)
media_type = headers["Content-Type"][0]
@ -359,8 +359,6 @@ class MediaRepository(object):
)
if t_byte_source:
t_len = len(t_byte_source.getvalue())
output_path = yield self.write_to_file(
t_byte_source,
self.filepaths.local_media_thumbnail_rel(
@ -369,6 +367,8 @@ class MediaRepository(object):
)
logger.info("Stored thumbnail in file %r", output_path)
t_len = os.path.getsize(output_path)
yield self.store.store_local_thumbnail_rel(
media_id, t_width, t_height, t_type, t_method, t_len
)
@ -388,7 +388,6 @@ class MediaRepository(object):
)
if t_byte_source:
t_len = len(t_byte_source.getvalue())
output_path = yield self.write_to_file(
t_byte_source,
self.filepaths.remote_media_thumbnail_rel(
@ -397,7 +396,9 @@ class MediaRepository(object):
)
logger.info("Stored thumbnail in file %r", output_path)
yield self.store.store_remote_media_thumbnail_rel(
t_len = os.path.getsize(output_path)
yield self.store.store_remote_media_thumbnail(
server_name, media_id, file_id,
t_width, t_height, t_type, t_method, t_len
)
@ -451,9 +452,8 @@ class MediaRepository(object):
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)
output_path = yield self.write_to_file(t_byte_source, file_path)
t_len = os.path.getsize(output_path)
yield self.store.store_local_thumbnail(
media_id, t_width, t_height, t_type, t_method, t_len
@ -503,9 +503,8 @@ class MediaRepository(object):
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)
output_path = yield self.write_to_file(t_byte_source, file_path)
t_len = os.path.getsize(output_path)
yield self.store.store_remote_media_thumbnail(
server_name, media_id, file_id,