mirror of
https://github.com/9001/copyparty.git
synced 2026-04-12 15:22:32 -06:00
misc fixes
This commit is contained in:
parent
1c9f894e14
commit
0d71dde215
|
|
@ -667,7 +667,7 @@ class MTag(object):
|
|||
zb = os.getxattr(abspath, xattr)
|
||||
ret[xattr] = zb.decode("utf-8", "replace")
|
||||
except:
|
||||
self.log("failed to read xattrs from [%s]\n%s", abspath, min_ex(), 3)
|
||||
self.log("failed to read xattrs from [%s]\n%s" % (abspath, min_ex()), 3)
|
||||
elif "db_xattr_yes" in vf:
|
||||
for xattr in vf["db_xattr_yes"]:
|
||||
if "=" in xattr:
|
||||
|
|
|
|||
|
|
@ -1248,7 +1248,7 @@ class SvcHub(object):
|
|||
zi = max(1, int(self.args.vc_age))
|
||||
if zi < 3 and "api.copyparty.eu" in self.args.vc_url:
|
||||
zi = 3
|
||||
self.log("vc-age too low for copyparty.eu; will use 3 hours")
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -871,7 +871,7 @@ class ThumbSrv(object):
|
|||
try:
|
||||
zs = shlex.join([x.decode("utf-8", "replace") for x in cmd])
|
||||
except:
|
||||
zs = "'" + (b"' '".join(cmd2)).decode("utf-8", "replace") + "'"
|
||||
zs = "'" + (b"' '".join(cmd)).decode("utf-8", "replace") + "'"
|
||||
|
||||
self.log("%scmd: %s\n%s" % (t, zs, txt), c=c)
|
||||
raise sp.CalledProcessError(ret, (cmd[0], b"...", cmd[-1]))
|
||||
|
|
|
|||
Loading…
Reference in a new issue