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

fix adv and date handling in query lang

Browse source
This commit is contained in:
ed 2021-06-01 02:10:17 +02:00
parent 8efd780a72
commit 271096874a
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
copyparty/u2idx.py
View file

@ -47,7 +47,7 @@ class U2idx(object):
fhash = body["hash"] fhash = body["hash"]
wark = up2k_wark_from_hashlist(self.args.salt, fsize, fhash) wark = up2k_wark_from_hashlist(self.args.salt, fsize, fhash)
uq = "substr(w,1,16) = ? and w = ?" uq = "where substr(w,1,16) = ? and w = ?"
uv = [wark[:16], wark] uv = [wark[:16], wark]
try: try:
@ -156,7 +156,7 @@ class U2idx(object):
v = datetime.strptime(v, fmt).timestamp() v = datetime.strptime(v, fmt).timestamp()
break break
except: except:
v = None pass
elif is_size: elif is_size:
is_size = False is_size = False
@ -171,18 +171,16 @@ class U2idx(object):
tail = "||'%'" tail = "||'%'"
v = v[:-1] v = v[:-1]
q += "{}?{} ".format(head, tail) q += " {}?{} ".format(head, tail)
va.append(v) va.append(v)
is_key = True is_key = True
try: try:
return self.run_query(vols, joins + q, va) return self.run_query(vols, joins + "where " + q, va)
except Exception as ex: except Exception as ex:
raise Pebkac(500, repr(ex)) raise Pebkac(500, repr(ex))
def run_query(self, vols, uq, uv): def run_query(self, vols, uq, uv):
self.log("qs: {} {}".format(uq, repr(uv)))
done_flag = [] done_flag = []
self.active_id = "{:.6f}_{}".format( self.active_id = "{:.6f}_{}".format(
time.time(), threading.current_thread().ident time.time(), threading.current_thread().ident
@ -201,10 +199,10 @@ class U2idx(object):
q = "select * from up" q = "select * from up"
v = () v = ()
else: else:
q = "select * from up where " + uq q = "select up.* from up " + uq
v = tuple(uv) v = tuple(uv)
# self.log("q2: {} {}".format(q, repr(v))) self.log("qs: {!r} {!r}".format(q, v))
ret = [] ret = []
lim = 1000 lim = 1000

5
copyparty/web/browser.js
View file

@ -1076,10 +1076,13 @@ document.onkeydown = function (e) {
for (var c = 0; c < tvs.length; c++) { for (var c = 0; c < tvs.length; c++) {
var tv = tvs[c]; var tv = tvs[c];
if (!tv.length)
break;
q += ' and '; q += ' and ';
if (k == 'adv') { if (k == 'adv') {
q += tv.replace(/ /g, " and "); q += tv.replace(/ /g, " and ").replace(/([=!><]=?)/, " $1 ");
continue; continue;
} }