jonny/microblog.pub
1
0
Fork 0
forked from forks/microblog.pub
Code Pull requests Activity

More webp support

Browse source
This commit is contained in:
Thomas Sileo 2022-08-26 09:28:00 +02:00
parent 55d82c5843
commit 84203fc66e
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/main.py
View file

@ -905,6 +905,10 @@ def _filter_proxy_resp_headers(
} }
def _strip_content_type(headers: dict[str, str]) -> dict[str, str]:
return {k: v for k, v in headers.items() if k.lower() != "content-type"}
@app.get("/proxy/media/{encoded_url}") @app.get("/proxy/media/{encoded_url}")
async def serve_proxy_media(request: Request, encoded_url: str) -> StreamingResponse: async def serve_proxy_media(request: Request, encoded_url: str) -> StreamingResponse:
# Decode the base64-encoded URL # Decode the base64-encoded URL
@ -979,28 +983,31 @@ async def serve_proxy_media_resized(
if getattr(i, "is_animated", False): if getattr(i, "is_animated", False):
raise ValueError raise ValueError
i.thumbnail((size, size)) i.thumbnail((size, size))
is_webp = False
try: try:
resized_buf = BytesIO() resized_buf = BytesIO()
i.save(resized_buf, format="webp") i.save(resized_buf, format="webp")
is_webp = True
except Exception: except Exception:
logger.exception("Failed to convert to webp") logger.exception("Failed to convert to webp")
resized_buf = BytesIO() resized_buf = BytesIO()
i.save(resized_buf, format=i.format) i.save(resized_buf, format=i.format)
resized_buf.seek(0) resized_buf.seek(0)
resized_content = resized_buf.read() resized_content = resized_buf.read()
resized_mimetype = i.get_format_mimetype() # type: ignore resized_mimetype = (
"image/webp" if is_webp else i.get_format_mimetype() # type: ignore
)
# Only cache images < 1MB # Only cache images < 1MB
if len(resized_content) < 2**20: if len(resized_content) < 2**20:
_RESIZED_CACHE[(url, size)] = ( _RESIZED_CACHE[(url, size)] = (
resized_content, resized_content,
resized_mimetype, resized_mimetype,
proxy_resp_headers, _strip_content_type(proxy_resp_headers),
) )
return PlainTextResponse( return PlainTextResponse(
resized_content, resized_content,
media_type=resized_mimetype, media_type=resized_mimetype,
headers=proxy_resp_headers, headers=_strip_content_type(proxy_resp_headers),
) )
except ValueError: except ValueError:
return PlainTextResponse( return PlainTextResponse(
@ -1055,7 +1062,7 @@ async def serve_attachment_thumbnail(
return FileResponse( return FileResponse(
UPLOAD_DIR / (content_hash + "_resized"), UPLOAD_DIR / (content_hash + "_resized"),
media_type=upload.content_type, media_type="image/webp",
) )