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

improve tagscan-resume for dupes;

Browse source 
* ignore t:mtp (the todo-flag) when spooling the resume-list
* only add a single t:mtp for each unique file
This commit is contained in:
ed 2025-05-14 12:32:30 +02:00
parent f425ff51ae
commit 41fa6b2552
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
copyparty/up2k.py
View file

@ -2120,11 +2120,12 @@ class Up2k(object):
return -1 return -1
w = bw[:-1].decode("ascii") w = bw[:-1].decode("ascii")
w16 = w[:16]
with self.mutex: with self.mutex:
try: try:
q = "select rd, fn, ip, at from up where substr(w,1,16)=? and +w=?" q = "select rd, fn, ip, at from up where substr(w,1,16)=? and +w=?"
rd, fn, ip, at = cur.execute(q, (w[:16], w)).fetchone() rd, fn, ip, at = cur.execute(q, (w16, w)).fetchone()
except: except:
# file modified/deleted since spooling # file modified/deleted since spooling
continue continue
@ -2133,8 +2134,12 @@ class Up2k(object):
rd, fn = s3dec(rd, fn) rd, fn = s3dec(rd, fn)
if "mtp" in flags: if "mtp" in flags:
q = "select 1 from mt where w=? and +k='t:mtp' limit 1"
if cur.execute(q, (w16,)).fetchone():
continue
q = "insert into mt values (?,'t:mtp','a')" q = "insert into mt values (?,'t:mtp','a')"
cur.execute(q, (w[:16],)) cur.execute(q, (w16,))
abspath = djoin(ptop, rd, fn) abspath = djoin(ptop, rd, fn)
self.pp.msg = "c%d %s" % (nq, abspath) self.pp.msg = "c%d %s" % (nq, abspath)
@ -2190,7 +2195,7 @@ class Up2k(object):
return tf, -1 return tf, -1
if flt == 1: if flt == 1:
q = "select w from mt where w = ?" q = "select 1 from mt where w=? and +k != 't:mtp'"
if c2.execute(q, (row[0][:16],)).fetchone(): if c2.execute(q, (row[0][:16],)).fetchone():
continue continue