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

correctly ordered folders in initial listing

Browse source
This commit is contained in:
ed 2021-09-19 00:08:29 +02:00
parent ed6c683922
commit 0fcbcdd08c
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
copyparty/httpcli.py
View file

@ -12,6 +12,7 @@ import string
import socket import socket
import ctypes import ctypes
from datetime import datetime from datetime import datetime
from operator import itemgetter
import calendar import calendar
try: try:
@ -1533,8 +1534,9 @@ class HttpCli(object):
def tx_md(self, fs_path): def tx_md(self, fs_path):
logmsg = "{:4} {} ".format("", self.req) logmsg = "{:4} {} ".format("", self.req)
if "edit" in self.uparam or "edit2" in self.uparam and not self.can_write: if not self.can_write:
return self.tx_404() if "edit" in self.uparam or "edit2" in self.uparam:
return self.tx_404()
tpl = "mde" if "edit2" in self.uparam else "md" tpl = "mde" if "edit2" in self.uparam else "md"
html_path = os.path.join(E.mod, "web", "{}.html".format(tpl)) html_path = os.path.join(E.mod, "web", "{}.html".format(tpl))
@ -2149,6 +2151,11 @@ class HttpCli(object):
self.reply(ret.encode("utf-8", "replace"), mime="application/json") self.reply(ret.encode("utf-8", "replace"), mime="application/json")
return True return True
for d in dirs:
d["name"] += "/"
dirs.sort(key=itemgetter('name'))
j2a["files"] = dirs + files j2a["files"] = dirs + files
j2a["logues"] = logues j2a["logues"] = logues
j2a["taglist"] = taglist j2a["taglist"] = taglist