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

fix a bunch of dirkey stuff:

Browse source 
* breadcrumb navigation
* tree generation in `recvls`
* dirkeys in initial tree
This commit is contained in:
ed 2024-03-27 16:05:05 +00:00
parent 20870fda79
commit 32c912bb16
2 changed files with 59 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
copyparty/httpcli.py
View file

@ -2875,7 +2875,7 @@ class HttpCli(object):
return file_lastmod, True
def _use_dirkey(self, ap: str = "") -> bool:
def _use_dirkey(self, ap: str = "", throw: bool = False) -> bool:
if self.can_read or not self.can_get:
return False
@ -2894,6 +2894,9 @@ class HttpCli(object):
t = "wrong dirkey, want %s, got %s\n vp: %s\n ap: %s"
self.log(t % (zs, req, self.req, ap), 6)
if throw:
raise Pebkac(403)
return False
def _expand(self, txt: str, phs: list[str]) -> str:
@ -3605,7 +3608,8 @@ class HttpCli(object):
dk_sz = False
if dk:
vn, rem = vfs.get(top, self.uname, False, False)
if vn.flags.get("dks") and self._use_dirkey(vn.canonical(rem)):
if vn.flags.get("dks"):
self._use_dirkey(vn.canonical(rem), True)
dk_sz = vn.flags.get("dk")
dots = False

58
copyparty/web/browser.js
View file

@ -1400,6 +1400,8 @@ var ACtx = !IPHONE && (window.AudioContext || window.webkitAudioContext),
ACB = sread('au_cbv') || 1,
noih = /[?&]v\b/.exec('' + location),
hash0 = location.hash,
ldks = [],
dks = {},
dk, mp;
@ -5723,6 +5725,14 @@ var treectl = (function () {
};
r.nvis = r.lim;
ldks = jread('dks', []);
for (var a = ldks.length - 1; a >= 0; a--) {
var s = ldks[a],
o = s.lastIndexOf('?');
dks[s.slice(0, o)] = s.slice(o + 1);
}
function setwrap(v) {
clmod(ebi('tree'), 'nowrap', !v);
reload_tree();
@ -5972,7 +5982,7 @@ var treectl = (function () {
}
ebi('treeul').setAttribute('ts', ts);
var top = top0 == '.' ? dst : top0,
var top = (top0 == '.' ? dst : top0).split('?')[0],
name = uricom_dec(top.split('/').slice(-2)[0]),
rtop = top.replace(/^\/+/, ""),
html = parsetree(res, rtop);
@ -5989,7 +5999,7 @@ var treectl = (function () {
var links = QSA('#treeul a+a');
for (var a = 0, aa = links.length; a < aa; a++) {
if (links[a].getAttribute('href') == top) {
if (links[a].getAttribute('href').split('?')[0] == top) {
var o = links[a].parentNode;
if (!o.getElementsByTagName('li').length)
o.innerHTML = html;
@ -6218,8 +6228,16 @@ var treectl = (function () {
if (!this.back) {
var dirs = [];
for (var a = 0; a < res.dirs.length; a++)
dirs.push(res.dirs[a].href.split('/')[0].split('?')[0]);
for (var a = 0; a < res.dirs.length; a++) {
var dh = res.dirs[a].href,
dn = dh.split('/')[0].split('?')[0],
m = /[?&](k=[^&]+)/.exec(dh);
if (m)
dn += '?' + m[1];
dirs.push(dn);
}
rendertree({ "a": dirs }, this.ts, ".", get_evpath() + (dk ? '?k=' + dk : ''));
}
@ -6281,6 +6299,10 @@ var treectl = (function () {
if (ae = ae.querySelector('a[id]'))
cid = ae.getAttribute('id');
var m = /[?&]k=([^&]+)/.exec(location.search);
if (m)
memo_dk(top, m[1]);
r.lsc = res;
if (res.unlist) {
var ptn = new RegExp(res.unlist);
@ -6430,6 +6452,30 @@ var treectl = (function () {
setTimeout(eval_hash, 1);
};
function memo_dk(vp, k) {
dks[vp] = k;
var lv = vp + "?" + k;
if (has(ldks, lv))
return;
ldks.unshift(lv);
if (ldks.length > 32) {
var keep = [], evp = get_evpath();
for (var a = 0; a < ldks.length; a++) {
var s = ldks[a];
if (evp.startsWith(s.replace(/\?[^?]+$/, '')))
keep.push(s);
}
var lim = 32 - keep.length;
for (var a = 0; a < lim; a++) {
if (!has(keep, ldks[a]))
keep.push(ldks[a])
}
ldks = keep;
}
jwrite('dks', ldks);
}
r.setlazy = function (plain) {
var html = ['<div id="plazy">', esc(plain.join(' ')), '</div>'],
all = r.lsc.files.length + r.lsc.dirs.length,
@ -8207,8 +8253,10 @@ function reload_browser() {
for (var a = 0; a < parts.length - 1; a++) {
link += parts[a] + '/';
var link2 = dks[link] ? addq(link, 'k=') + dks[link] : link;
o = mknod('a');
o.setAttribute('href', link);
o.setAttribute('href', link2);
o.textContent = uricom_dec(parts[a]) || '/';
ebi('path').appendChild(mknod('i'));
ebi('path').appendChild(o);