From 41bcf7308d631b89ebbc47aae31895c55f45e98d Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 1 Jun 2021 01:41:36 +0200 Subject: [PATCH] fix search results as thumbnails --- copyparty/u2idx.py | 2 +- copyparty/web/browser.js | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/copyparty/u2idx.py b/copyparty/u2idx.py index cf846a0a..e44a7413 100644 --- a/copyparty/u2idx.py +++ b/copyparty/u2idx.py @@ -227,7 +227,7 @@ class U2idx(object): if rd.startswith("//") or fn.startswith("//"): rd, fn = s3dec(rd, fn) - rp = "/".join([vtop, rd, fn]) + rp = "/".join([x for x in [vtop, rd, fn] if x]) sret.append({"ts": int(ts), "sz": sz, "rp": rp, "w": w[:16]}) for hit in sret: diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js index dcc93916..deeb90af 100644 --- a/copyparty/web/browser.js +++ b/copyparty/web/browser.js @@ -811,6 +811,9 @@ var thegrid = (function () { if (e && e.ctrlKey) return true; + if (QS('#ggrid a[ref="unsearch"]')) + return ebi('unsearch').click(); + ev(e); var oth = ebi(this.getAttribute('ref')), td = oth.parentNode.nextSibling, @@ -836,9 +839,9 @@ var thegrid = (function () { return r.loadsel(); var html = []; - var tr = lfiles.tBodies[0].rows; - for (var a = 0; a < tr.length; a++) { - var ao = tr[a].cells[1].firstChild, + var files = QSA('#files>tbody>tr>td:nth-child(2) a[id]'); + for (var a = 0, aa = files.length; a < aa; a++) { + var ao = files[a], href = esc(ao.getAttribute('href')), ref = ao.getAttribute('id'), isdir = href.split('?')[0].slice(-1)[0] == '/', @@ -1124,7 +1127,7 @@ document.onkeydown = function (e) { xhr.setRequestHeader('Content-Type', 'text/plain'); xhr.onreadystatechange = xhr_search_results; xhr.ts = Date.now(); - xhr.send(JSON.stringify({"q": ebi('q_raw').value})); + xhr.send(JSON.stringify({ "q": ebi('q_raw').value })); } function xhr_search_results() {