Vasanko/cista-storage
Vasanko/cista-storage
2
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Image previews improved, all EXIF Orientations handled.

Browse Source
This commit is contained in:
Leo Vasanko 2025-08-17 07:00:52 -06:00
parent ce6d60e588
commit 26addb2f7b
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
cista/preview.py
View File

@ -24,6 +24,17 @@ pillow_heif.register_heif_opener()
bp = Blueprint("preview", url_prefix="/preview") bp = Blueprint("preview", url_prefix="/preview")
# Map EXIF Orientation value to a corresponding PIL transpose
EXIF_ORI = {
2: Image.Transpose.FLIP_LEFT_RIGHT,
3: Image.Transpose.ROTATE_180,
4: Image.Transpose.FLIP_TOP_BOTTOM,
5: Image.Transpose.TRANSPOSE,
6: Image.Transpose.ROTATE_270,
7: Image.Transpose.TRANSVERSE,
8: Image.Transpose.ROTATE_90,
}
@bp.get("/<path:path>") @bp.get("/<path:path>")
async def preview(req, path): async def preview(req, path):
@ -69,34 +80,35 @@ def dispatch(path, quality, maxsize, maxzoom):
def process_image(path, *, maxsize, quality): def process_image(path, *, maxsize, quality):
t_load_start = perf_counter() t_load = perf_counter()
img = Image.open(path) with Image.open(path) as img:
# Force decode to include I/O in load timing # Force decode to include I/O in load timing
img.load() img.load()
t_load_end = perf_counter() t_proc = perf_counter()
# Resize # Resize
orig_w, orig_h = img.size w, h = img.size
t_proc_start = perf_counter() img.thumbnail((min(w, maxsize), min(h, maxsize)))
img.thumbnail((min(orig_w, maxsize), min(orig_h, maxsize))) # Transpose pixels according to EXIF Orientation
t_proc_end = perf_counter() orientation = img.getexif().get(274, 1)
# Save as AVIF if orientation in EXIF_ORI:
imgdata = io.BytesIO() img = img.transpose(EXIF_ORI[orientation])
t_save_start = perf_counter() # Save as AVIF
img.save(imgdata, format="avif", quality=quality, speed=10, max_threads=1) imgdata = io.BytesIO()
t_save_end = perf_counter() t_save = perf_counter()
img.save(imgdata, format="avif", quality=quality, speed=10, max_threads=1)
t_end = perf_counter()
ret = imgdata.getvalue() ret = imgdata.getvalue()
load_ms = (t_load_end - t_load_start) * 1000 load_ms = (t_proc - t_load) * 1000
proc_ms = (t_proc_end - t_proc_start) * 1000 proc_ms = (t_save - t_proc) * 1000
save_ms = (t_save_end - t_save_start) * 1000 save_ms = (t_end - t_save) * 1000
logger.debug( logger.debug(
"Preview image %s: load=%.1fms process=%.1fms save=%.1fms out=%.1fKB", "Preview image %s: load=%.1fms process=%.1fms save=%.1fms",
path.name, path.name,
load_ms, load_ms,
proc_ms, proc_ms,
save_ms, save_ms,
len(ret) / 1024,
) )
return ret return ret