mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2026-06-21 13:42:29 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix folder search and quotes in all search boxes, use date pickers for dates

Browse source
This commit is contained in:
Til Schmitter 2026-04-16 21:25:30 +02:00
parent 4fe8b20ae7
commit 3c3baa0572
2 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
copyparty/web/browser.css
View file

@ -1536,7 +1536,8 @@ html.y #ops svg circle {
} }
#pathBar input[type=text], #pathBar input[type=text],
.opview select, .opview select,
.opview input[type=text] { .opview input[type=text],
.opview input[type=date] {
color: var(--fg); color: var(--fg);
background: var(--txt-bg); background: var(--txt-bg);
border: none; border: none;

43
copyparty/web/browser.js
View file

@ -6637,8 +6637,8 @@ var search_ui = (function () {
], ],
[ [
L.s_dt, L.s_dt,
["dtl", "dt_min", L.s_d1, "14", "1997-08-15, 01:00"], ["dtl", "dt_min", L.s_d1, "14", "1997-08-15, 01:00", "date"],
["dtu", "dt_max", L.s_d2, "14", "2020"] ["dtu", "dt_max", L.s_d2, "14", "2020", "date"]
], ],
[ [
L.s_ta, L.s_ta,
@ -6650,8 +6650,8 @@ var search_ui = (function () {
], ],
[ [
L.s_ua, L.s_ua,
["utl", "ut_min", L.s_u1, "14", "2007-04-08"], ["utl", "ut_min", L.s_u1, "14", "2007-04-08", "date"],
["utu", "ut_max", L.s_u2, "14", "2038-01-19"] ["utu", "ut_max", L.s_u2, "14", "2038-01-19", "date"]
] ]
]; ];
@ -6665,12 +6665,13 @@ var search_ui = (function () {
var html = ['<tr id="tsrch_' + sconf[a][1][0] + '"><td><br />' + sconf[a][0] + '</td>']; var html = ['<tr id="tsrch_' + sconf[a][1][0] + '"><td><br />' + sconf[a][0] + '</td>'];
for (var b = 1; b < 3; b++) { for (var b = 1; b < 3; b++) {
var hn = "srch_" + sconf[a][b][0], var hn = "srch_" + sconf[a][b][0],
csp = (sconf[a].length == 2) ? 2 : 1; csp = (sconf[a].length == 2) ? 2 : 1,
type = sconf[a][b].length >= 6 ? sconf[a][b][5] : "text";
html.push( html.push(
'<td colspan="' + csp + '"><input id="' + hn + 'c" type="checkbox">\n' + '<td colspan="' + csp + '"><input id="' + hn + 'c" type="checkbox">\n' +
'<label for="' + hn + 'c">' + sconf[a][b][2] + '</label>\n' + '<label for="' + hn + 'c">' + sconf[a][b][2] + '</label>\n' +
'<br /><input id="' + hn + 'v" type="text" style="width:' + sconf[a][b][3] + '<br /><input id="' + hn + 'v" type="' + type + '" style="width:' + sconf[a][b][3] +
'em" name="' + sconf[a][b][1] + '" placeholder="' + sconf[a][b][4] + '" /></td>'); 'em" name="' + sconf[a][b][1] + '" placeholder="' + sconf[a][b][4] + '" /></td>');
if (csp == 2) if (csp == 2)
break; break;
@ -6695,8 +6696,8 @@ var search_ui = (function () {
folderSearch.placeholder = '🔎 ' + L.s_dir; folderSearch.placeholder = '🔎 ' + L.s_dir;
folderSearch.onfocus = function(){ folderSearch.onfocus = function(){
ebi('srch_pathc').checked = true; ebi('srch_pathc').checked = true;
var path = get_evpath(); var path = decodeURI(get_evpath());
ebi('srch_pathv').value = path.slice(1, -1); ebi('srch_pathv').value = path.slice(1);
} }
folderSearch.oninput = function(){ folderSearch.oninput = function(){
var v = unsmart(this.value) var v = unsmart(this.value)
@ -6779,8 +6780,21 @@ var search_ui = (function () {
vs = unsmart(ebi('srch_' + k + 'v').value), vs = unsmart(ebi('srch_' + k + 'v').value),
tvs = []; tvs = [];
if (a == 1) if(k == 'path' && vs?.endsWith('/') && !vs?.includes('"')){
vs = vs.trim().replace(/ +/, 'T'); vs = vs.slice(0, -1);
vs = `"${vs}${(recursive ? '*' : '')}"`;
}
function onlyUnique(value, index, array) {
return array.indexOf(value) === index && value?.length > 0;
}
var immune = vs.match(/(([^\s]*|)"[^"]*"([^\s]*|))/)?.filter(onlyUnique)
for(var i=0; i<immune?.length;i++){
if(immune[i].length > 0){
tvs.push(immune[i]);
vs = vs.replace(immune[i], '')
}
}
while (vs) { while (vs) {
vs = vs.trim(); vs = vs.trim();
@ -6799,7 +6813,8 @@ var search_ui = (function () {
} }
} }
else { else {
var vp = vs.split(/ +(.*)/); // split at spaces
var vp = vs.split(/\s+(.*)/);
v = vp[0].replace(/\\"/g, '"'); v = vp[0].replace(/\\"/g, '"');
vs = vp[1] || ''; vs = vp[1] || '';
} }
@ -6836,18 +6851,18 @@ var search_ui = (function () {
if (tv.slice(0, 1) == '^') { if (tv.slice(0, 1) == '^') {
tv = tv.slice(1); tv = tv.slice(1);
} }
else if(!(k == 'path' && !recursive)) { else if (!(tv.includes(' ') || tv.startsWith('"'))){
tv = '*' + tv; tv = '*' + tv;
} }
if (tv.slice(-1) == '$') { if (tv.slice(-1) == '$') {
tv = tv.slice(0, -1); tv = tv.slice(0, -1);
} }
else if(!(k == 'path' && !recursive)) { else if(!(tv.includes(' ') || tv.endsWith('"'))){
tv += '*'; tv += '*';
} }
if (tv.indexOf(' ') + 1) { if (tv.includes(' ') && !tv.includes('"')) {
tv = '"' + tv + '"'; tv = '"' + tv + '"';
} }