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

let http thread handle upload verification plugins

Browse source
This commit is contained in:
ed 2023-02-26 19:07:49 +00:00
parent ab87fac6d8
commit 7ea183baef
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copyparty/httpcli.py
View file

@ -1515,6 +1515,7 @@ class HttpCli(object):
self.ip, self.ip,
at, at,
self.uname, self.uname,
True,
) )
vsuf = "" vsuf = ""
@ -2189,6 +2190,7 @@ class HttpCli(object):
self.ip, self.ip,
at, at,
self.uname, self.uname,
True,
) )
self.conn.nbyte += sz self.conn.nbyte += sz

27
copyparty/up2k.py
View file

@ -133,7 +133,7 @@ class Up2k(object):
self.entags: dict[str, set[str]] = {} self.entags: dict[str, set[str]] = {}
self.mtp_parsers: dict[str, dict[str, MParser]] = {} self.mtp_parsers: dict[str, dict[str, MParser]] = {}
self.pending_tags: list[tuple[set[str], str, str, dict[str, Any]]] = [] self.pending_tags: list[tuple[set[str], str, str, dict[str, Any]]] = []
self.hashq: Queue[tuple[str, str, str, str, str, float, str]] = Queue() self.hashq: Queue[tuple[str, str, str, str, str, float, str, bool]] = Queue()
self.tagq: Queue[tuple[str, str, str, str, str, float]] = Queue() self.tagq: Queue[tuple[str, str, str, str, str, float]] = Queue()
self.tag_event = threading.Condition() self.tag_event = threading.Condition()
self.n_hashq = 0 self.n_hashq = 0
@ -2685,6 +2685,7 @@ class Up2k(object):
usr: str, usr: str,
ip: str, ip: str,
at: float, at: float,
skip_xau: bool = False,
) -> bool: ) -> bool:
cur = self.cur.get(ptop) cur = self.cur.get(ptop)
if not cur: if not cur:
@ -2694,7 +2695,20 @@ class Up2k(object):
try: try:
self.db_rm(cur, rd, fn) self.db_rm(cur, rd, fn)
self.db_add( self.db_add(
cur, vflags, rd, fn, lmod, sz, ptop, vtop, wark, host, usr, ip, at cur,
vflags,
rd,
fn,
lmod,
sz,
ptop,
vtop,
wark,
host,
usr,
ip,
at,
skip_xau,
) )
cur.connection.commit() cur.connection.commit()
except Exception as ex: except Exception as ex:
@ -2732,6 +2746,7 @@ class Up2k(object):
usr: str, usr: str,
ip: str, ip: str,
at: float, at: float,
skip_xau: bool = False,
) -> None: ) -> None:
sql = "insert into up values (?,?,?,?,?,?,?)" sql = "insert into up values (?,?,?,?,?,?,?)"
v = (wark, int(ts), sz, rd, fn, ip or "", int(at or 0)) v = (wark, int(ts), sz, rd, fn, ip or "", int(at or 0))
@ -2743,7 +2758,7 @@ class Up2k(object):
v = (wark, int(ts), sz, rd, fn, ip or "", int(at or 0)) v = (wark, int(ts), sz, rd, fn, ip or "", int(at or 0))
db.execute(sql, v) db.execute(sql, v)
xau = vflags.get("xau") xau = False if skip_xau else vflags.get("xau")
dst = djoin(ptop, rd, fn) dst = djoin(ptop, rd, fn)
if xau and not runhook( if xau and not runhook(
self.log, self.log,
@ -3571,7 +3586,7 @@ class Up2k(object):
self.n_hashq -= 1 self.n_hashq -= 1
# self.log("hashq {}".format(self.n_hashq)) # self.log("hashq {}".format(self.n_hashq))
ptop, vtop, rd, fn, ip, at, usr = self.hashq.get() ptop, vtop, rd, fn, ip, at, usr, skip_xau = self.hashq.get()
# self.log("hashq {} pop {}/{}/{}".format(self.n_hashq, ptop, rd, fn)) # self.log("hashq {} pop {}/{}/{}".format(self.n_hashq, ptop, rd, fn))
if "e2d" not in self.flags[ptop]: if "e2d" not in self.flags[ptop]:
continue continue
@ -3604,6 +3619,7 @@ class Up2k(object):
usr, usr,
ip, ip,
at, at,
skip_xau,
) )
if at and time.time() - at > 30: if at and time.time() - at > 30:
@ -3620,10 +3636,11 @@ class Up2k(object):
ip: str, ip: str,
at: float, at: float,
usr: str, usr: str,
skip_xau: bool = False,
) -> None: ) -> None:
with self.mutex: with self.mutex:
self.register_vpath(ptop, flags) self.register_vpath(ptop, flags)
self.hashq.put((ptop, vtop, rd, fn, ip, at, usr)) self.hashq.put((ptop, vtop, rd, fn, ip, at, usr, skip_xau))
self.n_hashq += 1 self.n_hashq += 1
# self.log("hashq {} push {}/{}/{}".format(self.n_hashq, ptop, rd, fn)) # self.log("hashq {} push {}/{}/{}".format(self.n_hashq, ptop, rd, fn))