This commit is contained in:
ed 2026-03-23 03:28:27 +00:00
parent abdbd69a68
commit aa23777385
6 changed files with 16 additions and 13 deletions

View file

@ -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)

View file

@ -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

View file

@ -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("|"))

View file

@ -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("#")

View file

@ -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

View file

@ -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 \