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

windows: fix upload-abort

Browse source
This commit is contained in:
ed 2024-04-18 23:08:05 +00:00
parent bf5850785f
commit 8c552f1ad1
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
copyparty/up2k.py
View file

@ -342,6 +342,9 @@ class Up2k(object):
finally: finally:
self.reg_mutex.release() self.reg_mutex.release()
if ANYWIN:
ret = [(x[0], x[1].replace("\\", "/"), x[2], x[3], x[4]) for x in ret]
ret.sort(reverse=True) ret.sort(reverse=True)
ret2 = [ ret2 = [
{"at": at, "vp": "/" + vp, "pd": 100 - ((nn * 100) // (nh or 1)), "sz": sz} {"at": at, "vp": "/" + vp, "pd": 100 - ((nn * 100) // (nh or 1)), "sz": sz}
@ -2508,6 +2511,7 @@ class Up2k(object):
cur.connection.commit() cur.connection.commit()
def handle_json(self, cj: dict[str, Any], busy_aps: set[str]) -> dict[str, Any]: def handle_json(self, cj: dict[str, Any], busy_aps: set[str]) -> dict[str, Any]:
# busy_aps is u2fh (always undefined if -j0) so this is safe
self.busy_aps = busy_aps self.busy_aps = busy_aps
got_lock = False got_lock = False
try: try:
@ -3365,7 +3369,10 @@ class Up2k(object):
for wark, job in reg.items(): for wark, job in reg.items():
if (user and user != job["user"]) or (addr and addr != job["addr"]): if (user and user != job["user"]) or (addr and addr != job["addr"]):
continue continue
if djoin(job["prel"], job["name"]) == rem: jrem = djoin(job["prel"], job["name"])
if ANYWIN:
jrem = jrem.replace("\\", "/")
if jrem == rem:
if job["ptop"] != ptop: if job["ptop"] != ptop:
t = "job.ptop [%s] != vol.ptop [%s] ??" t = "job.ptop [%s] != vol.ptop [%s] ??"
raise Exception(t % (job["ptop"] != ptop)) raise Exception(t % (job["ptop"] != ptop))