Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2024-12-22 22:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix thumbnails having incorrect mimetypes

Browse Source 
Fixes #555
This commit is contained in:
rubenwardy 2024-07-27 22:17:04 +01:00
parent e5de270e65
commit 06979345c7
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/blueprints/thumbnails/__init__.py
View File

@ -25,7 +25,11 @@ bp = Blueprint("thumbnails", __name__)
ALLOWED_RESOLUTIONS = [(100, 67), (270, 180), (350, 233), (1100, 520)] ALLOWED_RESOLUTIONS = [(100, 67), (270, 180), (350, 233), (1100, 520)]
ALLOWED_EXTENSIONS = {"png", "webp", "jpg"} ALLOWED_MIMETYPES = {
"png": "image/png",
"webp": "image/webp",
"jpg": "image/jpeg",
}
def mkdir(path): def mkdir(path):
@ -76,10 +80,10 @@ def find_source_file(img):
period = source_filepath.rfind(".") period = source_filepath.rfind(".")
start = source_filepath[:period] start = source_filepath[:period]
ext = source_filepath[period + 1:] ext = source_filepath[period + 1:]
if ext not in ALLOWED_EXTENSIONS: if ext not in ALLOWED_MIMETYPES:
abort(404) abort(404)
for other_ext in ALLOWED_EXTENSIONS: for other_ext in ALLOWED_MIMETYPES.keys():
other_path = f"{start}.{other_ext}" other_path = f"{start}.{other_ext}"
if ext != other_ext and os.path.isfile(other_path): if ext != other_ext and os.path.isfile(other_path):
return other_path return other_path
@ -87,6 +91,15 @@ def find_source_file(img):
abort(404) abort(404)
def get_mimetype(cache_filepath: str) -> str:
period = cache_filepath.rfind(".")
ext = cache_filepath[period + 1:]
mimetype = ALLOWED_MIMETYPES.get(ext)
if mimetype is None:
abort(404)
return mimetype
@bp.route("/thumbnails/<int:level>/<img>") @bp.route("/thumbnails/<int:level>/<img>")
def make_thumbnail(img, level): def make_thumbnail(img, level):
if level > len(ALLOWED_RESOLUTIONS) or level <= 0: if level > len(ALLOWED_RESOLUTIONS) or level <= 0:
@ -104,7 +117,7 @@ def make_thumbnail(img, level):
source_filepath = find_source_file(img) source_filepath = find_source_file(img)
resize_and_crop(source_filepath, cache_filepath, (w, h)) resize_and_crop(source_filepath, cache_filepath, (w, h))
res = send_file(cache_filepath) res = send_file(cache_filepath, mimetype=get_mimetype(cache_filepath))
res.headers["Cache-Control"] = "max-age=604800" # 1 week res.headers["Cache-Control"] = "max-age=604800" # 1 week
return res return res