diff options
| author | Erik Johnston <erik@matrix.org> | 2017-07-06 10:36:25 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-07-06 10:36:25 +0100 |
| commit | 42b50483be2b022735f8ae2107314d51e92e8471 (patch) | |
| tree | 6b41c2096b105f04244ce80e840d0f998dbe226f /synapse/rest/media/v1/download_resource.py | |
| parent | Merge pull request #2282 from matrix-org/release-v0.21.1 (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-42b50483be2b022735f8ae2107314d51e92e8471.tar.xz | |
Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse v0.22.0
Diffstat (limited to 'synapse/rest/media/v1/download_resource.py')
| -rw-r--r-- | synapse/rest/media/v1/download_resource.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/download_resource.py b/synapse/rest/media/v1/download_resource.py index 6788375e85..6879249c8a 100644 --- a/synapse/rest/media/v1/download_resource.py +++ b/synapse/rest/media/v1/download_resource.py @@ -66,14 +66,19 @@ class DownloadResource(Resource): @defer.inlineCallbacks def _respond_local_file(self, request, media_id, name): media_info = yield self.store.get_local_media(media_id) - if not media_info: + if not media_info or media_info["quarantined_by"]: respond_404(request) return media_type = media_info["media_type"] media_length = media_info["media_length"] upload_name = name if name else media_info["upload_name"] - file_path = self.filepaths.local_media_filepath(media_id) + if media_info["url_cache"]: + # TODO: Check the file still exists, if it doesn't we can redownload + # it from the url `media_info["url_cache"]` + file_path = self.filepaths.url_cache_filepath(media_id) + else: + file_path = self.filepaths.local_media_filepath(media_id) yield respond_with_file( request, media_type, file_path, media_length, |