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

fix remote thumbnails?

pull/8675/head
Richard van der Hoff 2020-10-01 15:53:02 +01:00
parent 8a8d01d732
commit b0a463f758
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
synapse/rest/media/v1/media_storage.py
View File

@ -143,12 +143,9 @@ class MediaStorage:
""" """
path = self._file_info_to_path(file_info) path = self._file_info_to_path(file_info)
local_path = os.path.join(self.local_media_directory, path)
if os.path.exists(local_path):
return FileResponder(open(local_path, "rb"))
# Fallback for paths without method names # fallback for remote thumbnails with no method in the filename
# Should be removed in the future legacy_path = None
if file_info.thumbnail and file_info.server_name: if file_info.thumbnail and file_info.server_name:
legacy_path = self.filepaths.remote_media_thumbnail_rel_legacy( legacy_path = self.filepaths.remote_media_thumbnail_rel_legacy(
server_name=file_info.server_name, server_name=file_info.server_name,
@ -157,8 +154,19 @@ class MediaStorage:
height=file_info.thumbnail_height, height=file_info.thumbnail_height,
content_type=file_info.thumbnail_type, content_type=file_info.thumbnail_type,
) )
local_path = os.path.join(self.local_media_directory, path)
if os.path.exists(local_path):
logger.debug("responding with local file %s", local_path)
return FileResponder(open(local_path, "rb"))
if legacy_path:
logger.debug(
"local file %s did not exist; checking legacy name", local_path
)
legacy_local_path = os.path.join(self.local_media_directory, legacy_path) legacy_local_path = os.path.join(self.local_media_directory, legacy_path)
if os.path.exists(legacy_local_path): if os.path.exists(legacy_local_path):
logger.debug("responding with local file %s", legacy_local_path)
return FileResponder(open(legacy_local_path, "rb")) return FileResponder(open(legacy_local_path, "rb"))
for provider in self.storage_providers: for provider in self.storage_providers:
@ -166,6 +174,14 @@ class MediaStorage:
if res: if res:
logger.debug("Streaming %s from %s", path, provider) logger.debug("Streaming %s from %s", path, provider)
return res return res
if legacy_path:
logger.debug(
"Provider %s did not find %s; checking legacy name", provider, path
)
res = await provider.fetch(legacy_path, file_info)
if res:
logger.debug("Streaming %s from %s", legacy_path, provider)
return res
return None return None