alex/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2026-02-22 10:23:30 +10:00
Code Issues Packages Projects Releases Wiki Activity

black

Browse Source
This commit is contained in:
ed
2026-02-09 18:26:35 +00:00
parent 31e7d2d622
commit fef34b5465
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
copyparty/sutil.py
View File

@@ -95,7 +95,9 @@ def enthumb(
if not thp:
raise Exception()
ext = "jpg" if fmt == "j" else "webp" if fmt == "w" else "jxl" if fmt == "x" else fmt
ext = (
"jpg" if fmt == "j" else "webp" if fmt == "w" else "jxl" if fmt == "x" else fmt
)
sz = bos.path.getsize(thp)
st: os.stat_result = f["st"]
ts = st.st_mtime

2
copyparty/th_cli.py
View File

@@ -8,7 +8,7 @@ import stat
from .__init__ import TYPE_CHECKING
from .authsrv import VFS
from .bos import bos
from .th_srv import EXTS_AC, HAVE_WEBP, HAVE_JXL, thumb_path
from .th_srv import EXTS_AC, HAVE_JXL, HAVE_WEBP, thumb_path
from .util import Cooldown, Pebkac
if True: # pylint: disable=using-constant-test

14
copyparty/th_srv.py
View File

@@ -51,6 +51,8 @@ HAVE_AVIF = False
HAVE_WEBP = False
HAVE_JXL = False
TH_CH = {"j": "jpg", "p": "png", "w": "webp", "x": "jxl"}
EXTS_TH = set(["jpg", "webp", "jxl", "png"])
EXTS_AC = set(["opus", "owa", "caf", "mp3", "flac", "wav"])
EXTS_SPEC_SAFE = set("aif aiff flac mp3 opus wav".split())
@@ -240,8 +242,7 @@ def thumb_path(histpath: str, rem: str, mtime: float, fmt: str, ffa: set[str]) -
if fmt in EXTS_AC:
cat = "ac"
else:
fc = fmt[:1]
fmt = "webp" if fc == "w" else "png" if fc == "p" else "jxl" if fc == "x" else "jpg"
fmt = TH_CH[fmt[:1]]
cat = "th"
return "%s/%s/%s/%s.%x.%s" % (histpath, cat, rd, fn, int(mtime), fmt)
@@ -670,8 +671,9 @@ class ThumbSrv(object):
with Image.open(fsenc(abspath)) as im:
self.conv_image_pil(im, tpath, fmt, vn)
def conv_image_vips(self, loader: "Callable[[int, dict], Any]",
tpath: str, fmt: str, vn: VFS) -> None:
def conv_image_vips(
self, loader: "Callable[[int, dict], Any]", tpath: str, fmt: str, vn: VFS
) -> None:
crops = ["centre", "none"]
if "f" in fmt:
crops = ["none"]
@@ -700,8 +702,10 @@ class ThumbSrv(object):
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:
@@ -714,12 +718,14 @@ class ThumbSrv(object):
with open(tpath, "wb") as f:
f.write(thumb.data)
if HAVE_VIPS:
def _loader(w: int, kw: dict) -> Any:
if thumb.format == rawpy.ThumbFormat.BITMAP:
img = pyvips.Image.new_from_array(thumb.data, interpretation="rgb")
return img.thumbnail_image(w, **kw)
else:
return pyvips.Image.thumbnail_buffer(thumb.data, w, **kw)
self.conv_image_vips(_loader, tpath, fmt, vn)
elif HAVE_PIL:
if thumb.format == rawpy.ThumbFormat.BITMAP: