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

retain upload time (but not ip) on file reindex

Browse source
This commit is contained in:
ed 2023-02-26 19:09:24 +00:00
parent 7ea183baef
commit 1c2c9db8f0
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
copyparty/up2k.py
View file

@ -1050,7 +1050,7 @@ class Up2k(object):
if fn: # diff-golf if fn: # diff-golf
sql = "select w, mt, sz from up where rd = ? and fn = ?" sql = "select w, mt, sz, at from up where rd = ? and fn = ?"
try: try:
c = db.c.execute(sql, (rd, fn)) c = db.c.execute(sql, (rd, fn))
except: except:
@ -1059,7 +1059,7 @@ class Up2k(object):
in_db = list(c.fetchall()) in_db = list(c.fetchall())
if in_db: if in_db:
self.pp.n -= 1 self.pp.n -= 1
dw, dts, dsz = in_db[0] dw, dts, dsz, at = in_db[0]
if len(in_db) > 1: if len(in_db) > 1:
t = "WARN: multiple entries: [{}] => [{}] |{}|\n{}" t = "WARN: multiple entries: [{}] => [{}] |{}|\n{}"
rep_db = "\n".join([repr(x) for x in in_db]) rep_db = "\n".join([repr(x) for x in in_db])
@ -1080,6 +1080,8 @@ class Up2k(object):
ret += 1 ret += 1
db.n += 1 db.n += 1
in_db = [] in_db = []
else:
at = 0
self.pp.msg = "a{} {}".format(self.pp.n, abspath) self.pp.msg = "a{} {}".format(self.pp.n, abspath)
@ -1103,7 +1105,7 @@ class Up2k(object):
wark = up2k_wark_from_hashlist(self.salt, sz, hashes) wark = up2k_wark_from_hashlist(self.salt, sz, hashes)
# skip upload hooks by not providing vflags # skip upload hooks by not providing vflags
self.db_add(db.c, {}, rd, fn, lmod, sz, "", "", wark, "", "", "", 0) self.db_add(db.c, {}, rd, fn, lmod, sz, "", "", wark, "", "", "", at)
db.n += 1 db.n += 1
ret += 1 ret += 1
td = time.time() - db.t td = time.time() - db.t
@ -2088,6 +2090,17 @@ class Up2k(object):
def _add_xiu_tab(self, cur: "sqlite3.Cursor") -> None: def _add_xiu_tab(self, cur: "sqlite3.Cursor") -> None:
# v5a -> v5b # v5a -> v5b
# store rd+fn rather than warks to support nohash vols # store rd+fn rather than warks to support nohash vols
try:
cur.execute("select ws, rd, fn from iu limit 1").fetchone()
return
except:
pass
try:
cur.execute("drop table iu")
except:
pass
for cmd in [ for cmd in [
r"create table iu (c int, w text, rd text, fn text)", r"create table iu (c int, w text, rd text, fn text)",
r"create index iu_c on iu(c)", r"create index iu_c on iu(c)",