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

include pro/epilogues in ?ls

Browse source
This commit is contained in:
ed 2021-02-22 21:09:57 +01:00
parent c3b59f7bcf
commit 5148c4f2e9
3 changed files with 22 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
copyparty/httpcli.py
View file

@ -1275,13 +1275,6 @@ class HttpCli(object):
if self.writable: if self.writable:
perms.append("write") perms.append("write")
if is_ls:
[x.pop(k) for k in ["name", "dt"] for y in [dirs, files] for x in y]
ret = {"dirs": dirs, "files": files, "srvinf": srv_info, "perms": perms}
ret = json.dumps(ret)
self.reply(ret.encode("utf-8", "replace"), mime="application/json")
return True
logues = [None, None] logues = [None, None]
for n, fn in enumerate([".prologue.html", ".epilogue.html"]): for n, fn in enumerate([".prologue.html", ".epilogue.html"]):
fn = os.path.join(abspath, fn) fn = os.path.join(abspath, fn)
@ -1289,6 +1282,19 @@ class HttpCli(object):
with open(fsenc(fn), "rb") as f: with open(fsenc(fn), "rb") as f:
logues[n] = f.read().decode("utf-8") logues[n] = f.read().decode("utf-8")
if is_ls:
[x.pop(k) for k in ["name", "dt"] for y in [dirs, files] for x in y]
ret = {
"dirs": dirs,
"files": files,
"srvinf": srv_info,
"perms": perms,
"logues": logues,
}
ret = json.dumps(ret)
self.reply(ret.encode("utf-8", "replace"), mime="application/json")
return True
ts = "" ts = ""
# ts = "?{}".format(time.time()) # ts = "?{}".format(time.time())
@ -1301,8 +1307,7 @@ class HttpCli(object):
ts=ts, ts=ts,
perms=json.dumps(perms), perms=json.dumps(perms),
have_up2k_idx=self.args.e2d, have_up2k_idx=self.args.e2d,
prologue=logues[0], logues=logues,
epilogue=logues[1],
title=html_escape(self.vpath), title=html_escape(self.vpath),
srv_info=srv_info, srv_info=srv_info,
) )

8
copyparty/web/browser.html
View file

@ -38,9 +38,7 @@
{%- endfor %} {%- endfor %}
</h1> </h1>
{%- if prologue %} <div id="pro" class="logue">{{ logues[0] }}</div>
<div id="pro" class="logue">{{ prologue }}</div>
{%- endif %}
<table id="treetab"> <table id="treetab">
<tr> <tr>
@ -71,9 +69,7 @@
</tbody> </tbody>
</table> </table>
{%- if epilogue %} <div id="epi" class="logue">{{ logues[1] }}</div>
<div id="epi" class="logue">{{ epilogue }}</div>
{%- endif %}
<h2><a href="?h">control-panel</a></h2> <h2><a href="?h">control-panel</a></h2>

27
copyparty/web/browser.js
View file

@ -712,15 +712,9 @@ function autoplay_blocked() {
treetab.style.display = 'table'; treetab.style.display = 'table';
var pro = ebi('pro'); treefiles.appendChild(ebi('pro'));
if (pro)
treefiles.appendChild(pro);
treefiles.appendChild(ebi('files')); treefiles.appendChild(ebi('files'));
treefiles.appendChild(ebi('epi'));
var epi = ebi('epi');
if (epi)
treefiles.appendChild(epi);
localStorage.setItem('entreed', 'tree'); localStorage.setItem('entreed', 'tree');
get_tree("", get_vpath()); get_tree("", get_vpath());
@ -872,11 +866,8 @@ function autoplay_blocked() {
apply_perms(res.perms); apply_perms(res.perms);
despin('#files'); despin('#files');
var o = ebi('pro'); ebi('pro').innerHTML = res.logues ? res.logues[0] || "" : "";
if (o) o.parentNode.removeChild(o); ebi('epi').innerHTML = res.logues ? res.logues[1] || "" : "";
o = ebi('epi');
if (o) o.parentNode.removeChild(o);
reload_tree(); reload_tree();
reload_browser(); reload_browser();
@ -915,15 +906,9 @@ function autoplay_blocked() {
ev(e); ev(e);
var treetab = ebi('treetab'); var treetab = ebi('treetab');
var pro = ebi('pro'); treetab.parentNode.insertBefore(ebi('pro'), treetab);
if (pro)
treetab.parentNode.insertBefore(pro, treetab);
treetab.parentNode.insertBefore(ebi('files'), treetab.nextSibling); treetab.parentNode.insertBefore(ebi('files'), treetab.nextSibling);
treetab.parentNode.insertBefore(ebi('epi'), ebi('files').nextSibling);
var epi = ebi('epi');
if (epi)
treetab.parentNode.insertBefore(epi, ebi('files').nextSibling);
ebi('path').style.display = 'inline-block'; ebi('path').style.display = 'inline-block';
treetab.style.display = 'none'; treetab.style.display = 'none';