From aa2377738569032e82eb1ded3c18b57acfaedfc3 Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 23 Mar 2026 03:28:27 +0000 Subject: [PATCH] v1.20.13 --- copyparty/__version__.py | 4 ++-- copyparty/httpsrv.py | 2 +- copyparty/sutil.py | 5 ++++- copyparty/svchub.py | 14 +++++++------- copyparty/up2k.py | 2 +- scripts/deps-docker/Dockerfile | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/copyparty/__version__.py b/copyparty/__version__.py index 42955cb4..a7229506 100644 --- a/copyparty/__version__.py +++ b/copyparty/__version__.py @@ -1,8 +1,8 @@ # coding: utf-8 -VERSION = (1, 20, 12) +VERSION = (1, 20, 13) CODENAME = "sftp is fine too" -BUILD_DT = (2026, 3, 11) +BUILD_DT = (2026, 3, 23) S_VERSION = ".".join(map(str, VERSION)) S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT) diff --git a/copyparty/httpsrv.py b/copyparty/httpsrv.py index 1c0ddfad..f6ec1e56 100644 --- a/copyparty/httpsrv.py +++ b/copyparty/httpsrv.py @@ -700,7 +700,7 @@ class HttpSrv(object): if not fmts: continue log("starting for volume /%s" % (vn.vpath,), 6) - g = vn.walk("x", "/", [], LEELOO_DALLAS, [True], 2, scandir, False, False) + g = vn.walk("x", "/", [], LEELOO_DALLAS, [[True]], 2, scandir, False, False) g = gfilter2(g, self, vn.vpath, fmts.split(",")) for f in g: nfiles += 1 diff --git a/copyparty/sutil.py b/copyparty/sutil.py index f64d2d02..7fc03bab 100644 --- a/copyparty/sutil.py +++ b/copyparty/sutil.py @@ -5,7 +5,7 @@ import os import tempfile from datetime import datetime -from .__init__ import CORES +from .__init__ import CORES, TYPE_CHECKING from .authsrv import LEELOO_DALLAS, VFS, AuthSrv from .bos import bos from .th_cli import ThumbCli @@ -17,6 +17,9 @@ if True: # pylint: disable=using-constant-test from .util import NamedLogger +if TYPE_CHECKING: + from httpsrv import HttpSrv + TAR_NO_OPUS = set("aac|m4a|m4b|m4r|mp3|oga|ogg|opus|wma".split("|")) diff --git a/copyparty/svchub.py b/copyparty/svchub.py index 2e744207..d5a59722 100644 --- a/copyparty/svchub.py +++ b/copyparty/svchub.py @@ -264,6 +264,13 @@ class SvcHub(object): t = "WARNING: --s-rd-sz (%d) is larger than --iobuf (%d); this may lead to reduced performance" self.log("root", t % (args.s_rd_sz, args.iobuf), 3) + if args.vc_url: + zi = max(1, int(args.vc_age)) + if zi < 3 and "api.copyparty.eu" in args.vc_url: + zi = 3 + self.log("root", "vc-age too low for copyparty.eu; will use 3 hours") + args.vc_age = zi + zs = "" if args.th_ram_max < 0.22: zs = "generate thumbnails" @@ -1257,13 +1264,6 @@ class SvcHub(object): except: raise Exception("invalid --mv-retry [%s]" % (self.args.mv_retry,)) - if self.args.vc_url: - zi = max(1, int(self.args.vc_age)) - if zi < 3 and "api.copyparty.eu" in self.args.vc_url: - zi = 3 - self.log("root", "vc-age too low for copyparty.eu; will use 3 hours") - self.args.vc_age = zi - al.js_utc = "false" if al.localtime else "true" al.tcolor = al.tcolor.lstrip("#") diff --git a/copyparty/up2k.py b/copyparty/up2k.py index b6c95798..c3d7901d 100644 --- a/copyparty/up2k.py +++ b/copyparty/up2k.py @@ -337,7 +337,7 @@ class Up2k(object): if not self.stop: self.log("uploads are now possible", 2) - def is_busy(self) -> bool: + def is_busy(self) -> tuple[bool, float]: # returns ( currently-busy , have-finished-at-least-once ) return bool(self.pp), self.gt1 diff --git a/scripts/deps-docker/Dockerfile b/scripts/deps-docker/Dockerfile index 18d8b709..a2330576 100644 --- a/scripts/deps-docker/Dockerfile +++ b/scripts/deps-docker/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.23 WORKDIR /z ENV ver_hashwasm=4.12.0 \ ver_marked=4.3.0 \ - ver_dompf=3.3.1 \ + ver_dompf=3.3.3 \ ver_mde=2.18.0 \ ver_codemirror=5.65.18 \ ver_fontawesome=5.13.0 \