diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-19 12:05:26 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-19 12:05:38 +0000 |
| commit | 390e48a8b03784d7cdb49d792c7798b194471ed0 (patch) | |
| tree | 981c1306d264389213b7b229f2347e750d91e462 /synapse/media | |
| parent | s/user_id/sender/ (diff) | |
| download | synapse-390e48a8b03784d7cdb49d792c7798b194471ed0.tar.xz | |
SYN-203: Handle requests for thunbnails for images that are small
Diffstat (limited to 'synapse/media')
| -rw-r--r-- | synapse/media/v1/thumbnail_resource.py | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/synapse/media/v1/thumbnail_resource.py b/synapse/media/v1/thumbnail_resource.py index e19620d456..5ddcf54b9f 100644 --- a/synapse/media/v1/thumbnail_resource.py +++ b/synapse/media/v1/thumbnail_resource.py @@ -165,18 +165,27 @@ class ThumbnailResource(BaseMediaResource): aspect_quality, size_quality, type_quality, length_quality, info )) - return min(info_list)[-1] + if info_list: + return min(info_list)[-1] else: info_list = [] + info_list2 = [] for info in thumbnail_infos: t_w = info["thumbnail_width"] t_h = info["thumbnail_height"] t_method = info["thumbnail_method"] + size_quality = abs((d_w - t_w) * (d_h - t_h)) + type_quality = desired_type != info["thumbnail_type"] + length_quality = info["thumbnail_length"] if t_method == "scale" and (t_w >= d_w or t_h >= d_h): - size_quality = abs((d_w - t_w) * (d_h - t_h)) - type_quality = desired_type != info["thumbnail_type"] - length_quality = info["thumbnail_length"] info_list.append(( size_quality, type_quality, length_quality, info )) - return min(info_list)[-1] + elif t_method == "scale": + info_list2.append(( + size_quality, type_quality, length_quality, info + )) + if info_list: + return min(info_list)[-1] + else: + return min(info_list2)[-1] |