Merge pull request #2791 from matrix-org/erikj/media_storage_refactor

Ensure media is in local cache before thumbnailing
This commit is contained in:
Erik Johnston 2018-02-05 11:28:52 +00:00 committed by GitHub
commit 1f881e0746
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 156 additions and 12 deletions

View file

@ -164,7 +164,8 @@ class ThumbnailResource(Resource):
# Okay, so we generate one.
file_path = yield self.media_repo.generate_local_exact_thumbnail(
media_id, desired_width, desired_height, desired_method, desired_type
media_id, desired_width, desired_height, desired_method, desired_type,
url_cache=media_info["url_cache"],
)
if file_path: