mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2026-02-27 05:53:11 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

th: deduplicate libvips logic between ThumbSrv.conv_{vips,raw}()

Browse source 
No functional change intended.

This would potentially be useful later if and when libvips gains
additional encoding/decoding options for other formats (like jxl)
and we decide to use them.
This commit is contained in:
Ivan Shapovalov 2026-02-03 18:51:46 +01:00
parent 4dc100ad3f
commit fe4d560e4a
1 changed files with 18 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
copyparty/th_srv.py
View file

@ -36,7 +36,7 @@ from .util import (
) )
if True: # pylint: disable=using-constant-test if True: # pylint: disable=using-constant-test
from typing import Any, Optional, Union from typing import Any, Callable, Optional, Union
if TYPE_CHECKING: if TYPE_CHECKING:
from .svchub import SvcHub from .svchub import SvcHub
@ -670,8 +670,8 @@ class ThumbSrv(object):
with Image.open(fsenc(abspath)) as im: with Image.open(fsenc(abspath)) as im:
self.conv_image_pil(im, tpath, fmt, vn) self.conv_image_pil(im, tpath, fmt, vn)
def conv_vips(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None: def conv_image_vips(self, loader: "Callable[[int, dict], Any]",
self.wait4ram(0.2, tpath) tpath: str, fmt: str, vn: VFS) -> None:
crops = ["centre", "none"] crops = ["centre", "none"]
if "f" in fmt: if "f" in fmt:
crops = ["none"] crops = ["none"]
@ -679,10 +679,11 @@ class ThumbSrv(object):
w, h = self.getres(vn, fmt) w, h = self.getres(vn, fmt)
kw = {"height": h, "size": "down", "intent": "relative"} kw = {"height": h, "size": "down", "intent": "relative"}
img = None
for c in crops: for c in crops:
try: try:
kw["crop"] = c kw["crop"] = c
img = pyvips.Image.thumbnail(abspath, w, **kw) img = loader(w, kw)
break break
except: except:
if c == crops[-1]: if c == crops[-1]:
@ -697,6 +698,12 @@ class ThumbSrv(object):
img.write_to_file(tpath, Q=qv, strip=True, **args) img.write_to_file(tpath, Q=qv, strip=True, **args)
img.invalidate() img.invalidate()
def conv_vips(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None:
self.wait4ram(0.2, tpath)
def _loader(w: int, kw: dict) -> Any:
return pyvips.Image.thumbnail(abspath, w, **kw)
self.conv_image_vips(_loader, tpath, fmt, vn)
def conv_raw(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None: def conv_raw(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None:
self.wait4ram(0.2, tpath) self.wait4ram(0.2, tpath)
with rawpy.imread(abspath) as raw: with rawpy.imread(abspath) as raw:
@ -707,35 +714,13 @@ class ThumbSrv(object):
with open(tpath, "wb") as f: with open(tpath, "wb") as f:
f.write(thumb.data) f.write(thumb.data)
if HAVE_VIPS: if HAVE_VIPS:
crops = ["centre", "none"] def _loader(w: int, kw: dict) -> Any:
if "f" in fmt: if thumb.format == rawpy.ThumbFormat.BITMAP:
crops = ["none"] img = pyvips.Image.new_from_array(thumb.data, interpretation="rgb")
w, h = self.getres(vn, fmt) return img.thumbnail_image(w, **kw)
kw = {"height": h, "size": "down", "intent": "relative"} else:
return pyvips.Image.thumbnail_buffer(thumb.data, w, **kw)
for c in crops: self.conv_image_vips(_loader, tpath, fmt, vn)
try:
kw["crop"] = c
if thumb.format == rawpy.ThumbFormat.BITMAP:
img = pyvips.Image.new_from_array(
thumb.data, interpretation="rgb"
)
img = img.thumbnail_image(w, **kw)
else:
img = pyvips.Image.thumbnail_buffer(thumb.data, w, **kw)
break
except:
if c == crops[-1]:
raise
assert img # type: ignore # !rm
args = {}
qv = vn.flags["th_qv"]
if tpath.endswith("jpg"):
qv = VIPS_JPG_Q[qv // 5]
args["optimize_coding"] = True
img.write_to_file(tpath, Q=qv, strip=True, **args)
img.invalidate()
elif HAVE_PIL: elif HAVE_PIL:
if thumb.format == rawpy.ThumbFormat.BITMAP: if thumb.format == rawpy.ThumbFormat.BITMAP:
im = Image.fromarray(thumb.data, "RGB") im = Image.fromarray(thumb.data, "RGB")