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

show multiple filesearch hits

Browse source
This commit is contained in:
ed 2021-10-04 21:53:28 +02:00
parent 19d86b44d9
commit b2ae14695a
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
copyparty/u2idx.py
View file

@ -6,6 +6,7 @@ import os
import time import time
import threading import threading
from datetime import datetime from datetime import datetime
from operator import itemgetter
from .__init__ import ANYWIN, unicode from .__init__ import ANYWIN, unicode
from .util import absreal, s3dec, Pebkac, min_ex, gen_filekey, quotep from .util import absreal, s3dec, Pebkac, min_ex, gen_filekey, quotep
@ -292,9 +293,13 @@ class U2idx(object):
# undupe hits from multiple metadata keys # undupe hits from multiple metadata keys
if len(ret) > 1: if len(ret) > 1:
ret = [ret[0]] + [ ret = [ret[0]] + [
y for x, y in zip(ret[:-1], ret[1:]) if x["rp"] != y["rp"] y
for x, y in zip(ret[:-1], ret[1:])
if x["rp"].split("?")[0] != y["rp"].split("?")[0]
] ]
ret.sort(key=itemgetter("rp"))
return ret, list(taglist.keys()) return ret, list(taglist.keys())
def terminator(self, identifier, done_flag): def terminator(self, identifier, done_flag):

19
copyparty/web/up2k.js
View file

@ -1560,15 +1560,18 @@ function up2k_init(subtle) {
} }
else { else {
smsg = 'found'; smsg = 'found';
var hit = response.hits[0], var msg = [];
msg = linksplit(hit.rp).join(''), for (var a = 0, aa = Math.min(20, response.hits.length); a < aa; a++) {
tr = unix2iso(hit.ts), var hit = response.hits[a],
tu = unix2iso(t.lmod), tr = unix2iso(hit.ts),
diff = parseInt(t.lmod) - parseInt(hit.ts), tu = unix2iso(t.lmod),
cdiff = (Math.abs(diff) <= 2) ? '3c0' : 'f0b', diff = parseInt(t.lmod) - parseInt(hit.ts),
sdiff = '<span style="color:#' + cdiff + '">diff ' + diff; cdiff = (Math.abs(diff) <= 2) ? '3c0' : 'f0b',
sdiff = '<span style="color:#' + cdiff + '">diff ' + diff;
msg += '<br /><small>' + tr + ' (srv), ' + tu + ' (You), ' + sdiff + '</span></span>'; msg.push(linksplit(hit.rp).join('') + '<br /><small>' + tr + ' (srv), ' + tu + ' (You), ' + sdiff + '</small></span>');
}
msg = msg.join('<br />\n');
} }
pvis.seth(t.n, 2, msg); pvis.seth(t.n, 2, msg);
pvis.seth(t.n, 1, smsg); pvis.seth(t.n, 1, smsg);