mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-18 09:22:31 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc mojibake filename support

Browse source
This commit is contained in:
ed 2024-09-16 00:12:49 +00:00
parent 58835b2b42
commit 4493a0a804
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
copyparty/httpcli.py
View file

@ -5229,9 +5229,11 @@ class HttpCli(object):
vdir = "%s/" % (rd,) if rd else "" vdir = "%s/" % (rd,) if rd else ""
q = "select sz, nf from ds where rd=? limit 1" q = "select sz, nf from ds where rd=? limit 1"
for fe in dirs: for fe in dirs:
try:
hit = icur.execute(q, (vdir + fe["name"],)).fetchone() hit = icur.execute(q, (vdir + fe["name"],)).fetchone()
if hit:
(fe["sz"], fe["tags"][".files"]) = hit (fe["sz"], fe["tags"][".files"]) = hit
except:
pass # 404 or mojibake
taglist = [k for k in lmte if k in tagset] taglist = [k for k in lmte if k in tagset]
else: else:

3
copyparty/up2k.py
View file

@ -1424,11 +1424,14 @@ class Up2k(object):
if not self.args.no_dirsz: if not self.args.no_dirsz:
tnf += len(files) tnf += len(files)
q = "select sz, nf from ds where rd=? limit 1" q = "select sz, nf from ds where rd=? limit 1"
try:
db_sz, db_nf = db.c.execute(q, (rd,)).fetchone() or (-1, -1) db_sz, db_nf = db.c.execute(q, (rd,)).fetchone() or (-1, -1)
if rsz != db_sz or tnf != db_nf: if rsz != db_sz or tnf != db_nf:
db.c.execute("delete from ds where rd=?", (rd,)) db.c.execute("delete from ds where rd=?", (rd,))
db.c.execute("insert into ds values (?,?,?)", (rd, rsz, tnf)) db.c.execute("insert into ds values (?,?,?)", (rd, rsz, tnf))
db.n += 1 db.n += 1
except:
pass # mojibake rd
# folder of 1000 files = ~1 MiB RAM best-case (tiny filenames); # folder of 1000 files = ~1 MiB RAM best-case (tiny filenames);
# free up stuff we're done with before dhashing # free up stuff we're done with before dhashing