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

abandon listing tags in browser when db busy

Browse source
This commit is contained in:
ed 2021-06-20 21:19:47 +02:00
parent 357347ce3a
commit 2fcd0e7e72
1 changed files with 35 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
copyparty/httpcli.py
View file

@ -1765,7 +1765,9 @@ class HttpCli(object):
fn = f["name"] fn = f["name"]
rd = f["rd"] rd = f["rd"]
del f["rd"] del f["rd"]
if icur: if not icur:
break
if vn != dbv: if vn != dbv:
_, rd = vn.get_dbv(rd) _, rd = vn.get_dbv(rd)
@ -1774,12 +1776,16 @@ class HttpCli(object):
try: try:
r = icur.execute(q, (rd, fn)).fetchone() r = icur.execute(q, (rd, fn)).fetchone()
except Exception as ex: except Exception as ex:
if "database is locked" not in str(ex): if "database is locked" in str(ex):
break
try: try:
args = s3enc(idx.mem_cur, rd, fn) args = s3enc(idx.mem_cur, rd, fn)
r = icur.execute(q, args).fetchone() r = icur.execute(q, args).fetchone()
except: except:
self.log("tag list error:\n" + min_ex()) m = "tag list error, {}/{}\n{}"
self.log(m.format(rd, fn, min_ex()))
break
tags = {} tags = {}
f["tags"] = tags f["tags"] = tags
@ -1794,7 +1800,9 @@ class HttpCli(object):
taglist[k] = True taglist[k] = True
tags[k] = v tags[k] = v
except: except:
self.log("tag read error:\n" + min_ex()) m = "tag read error, {}/{} [{}]:\n{}"
self.log(m.format(rd, fn, w, min_ex()))
break
if icur: if icur:
taglist = [k for k in vn.flags.get("mte", "").split(",") if k in taglist] taglist = [k for k in vn.flags.get("mte", "").split(",") if k in taglist]