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

add nsort option/volflag

Browse source
This commit is contained in:
ed 2024-11-19 18:39:40 +00:00
parent 9c8507a0fd
commit 8f7ffcf350
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
copyparty/__main__.py
View file

@ -1457,6 +1457,7 @@ def add_ui(ap, retry):
ap2.add_argument("--themes", metavar="NUM", type=int, default=8, help="number of themes installed") ap2.add_argument("--themes", metavar="NUM", type=int, default=8, help="number of themes installed")
ap2.add_argument("--au-vol", metavar="0-100", type=int, default=50, choices=range(0, 101), help="default audio/video volume percent") ap2.add_argument("--au-vol", metavar="0-100", type=int, default=50, choices=range(0, 101), help="default audio/video volume percent")
ap2.add_argument("--sort", metavar="C,C,C", type=u, default="href", help="default sort order, comma-separated column IDs (see header tooltips), prefix with '-' for descending. Examples: \033[32mhref -href ext sz ts tags/Album tags/.tn\033[0m (volflag=sort)") ap2.add_argument("--sort", metavar="C,C,C", type=u, default="href", help="default sort order, comma-separated column IDs (see header tooltips), prefix with '-' for descending. Examples: \033[32mhref -href ext sz ts tags/Album tags/.tn\033[0m (volflag=sort)")
ap2.add_argument("--nsort", action="store_true", help="default-enable natural sort of filenames with leading numbers (volflag=nsort)")
ap2.add_argument("--unlist", metavar="REGEX", type=u, default="", help="don't show files matching \033[33mREGEX\033[0m in file list. Purely cosmetic! Does not affect API calls, just the browser. Example: [\033[32m\\.(js|css)$\033[0m] (volflag=unlist)") ap2.add_argument("--unlist", metavar="REGEX", type=u, default="", help="don't show files matching \033[33mREGEX\033[0m in file list. Purely cosmetic! Does not affect API calls, just the browser. Example: [\033[32m\\.(js|css)$\033[0m] (volflag=unlist)")
ap2.add_argument("--favico", metavar="TXT", type=u, default="c 000 none" if retry else "🎉 000 none", help="\033[33mfavicon-text\033[0m [ \033[33mforeground\033[0m [ \033[33mbackground\033[0m ] ], set blank to disable") ap2.add_argument("--favico", metavar="TXT", type=u, default="c 000 none" if retry else "🎉 000 none", help="\033[33mfavicon-text\033[0m [ \033[33mforeground\033[0m [ \033[33mbackground\033[0m ] ], set blank to disable")
ap2.add_argument("--mpmc", metavar="URL", type=u, default="", help="change the mediaplayer-toggle mouse cursor; URL to a folder with {2..5}.png inside (or disable with [\033[32m.\033[0m])") ap2.add_argument("--mpmc", metavar="URL", type=u, default="", help="change the mediaplayer-toggle mouse cursor; URL to a folder with {2..5}.png inside (or disable with [\033[32m.\033[0m])")

1
copyparty/cfg.py
View file

@ -42,6 +42,7 @@ def vf_bmap() -> dict[str, str]:
"magic", "magic",
"no_sb_md", "no_sb_md",
"no_sb_lg", "no_sb_lg",
"nsort",
"og", "og",
"og_no_head", "og_no_head",
"og_s_title", "og_s_title",

2
copyparty/httpcli.py
View file

@ -5505,6 +5505,7 @@ class HttpCli(object):
"acct": self.uname, "acct": self.uname,
"idx": e2d, "idx": e2d,
"itag": e2t, "itag": e2t,
"dnsort": "nsort" in vf,
"dsort": vf["sort"], "dsort": vf["sort"],
"dcrop": vf["crop"], "dcrop": vf["crop"],
"dth3x": vf["th3x"], "dth3x": vf["th3x"],
@ -5533,6 +5534,7 @@ class HttpCli(object):
"sb_md": "" if "no_sb_md" in vf else (vf.get("md_sbf") or "y"), "sb_md": "" if "no_sb_md" in vf else (vf.get("md_sbf") or "y"),
"dgrid": "grid" in vf, "dgrid": "grid" in vf,
"dgsel": "gsel" in vf, "dgsel": "gsel" in vf,
"dnsort": "nsort" in vf,
"dsort": vf["sort"], "dsort": vf["sort"],
"dcrop": vf["crop"], "dcrop": vf["crop"],
"dth3x": vf["th3x"], "dth3x": vf["th3x"],

7
copyparty/web/browser.js
View file

@ -4214,6 +4214,8 @@ function eval_hash() {
function read_dsort(txt) { function read_dsort(txt) {
dnsort = dnsort ? 1 : 0;
clmod(ebi('nsort'), 'on', (sread('nsort') || dnsort) == 1);
try { try {
var zt = (('' + txt).trim() || 'href').split(/,+/g); var zt = (('' + txt).trim() || 'href').split(/,+/g);
dsort = []; dsort = [];
@ -4244,7 +4246,7 @@ function sortfiles(nodes) {
var sopts = jread('fsort', jcp(dsort)), var sopts = jread('fsort', jcp(dsort)),
dir1st = sread('dir1st') !== '0'; dir1st = sread('dir1st') !== '0';
var collator = sread('nsort') != 1 ? null : var collator = !clgot(ebi('nsort'), 'on') ? null :
new Intl.Collator([], {numeric: true}); new Intl.Collator([], {numeric: true});
try { try {
@ -7032,7 +7034,7 @@ var treectl = (function () {
xhr.open('GET', SR + '/?setck=dots=' + (v ? 'y' : ''), true); xhr.open('GET', SR + '/?setck=dots=' + (v ? 'y' : ''), true);
xhr.send(); xhr.send();
}); });
bcfg_bind(r, 'nsort', 'nsort', false, resort); bcfg_bind(r, 'nsort', 'nsort', dnsort, resort);
bcfg_bind(r, 'dir1st', 'dir1st', true, resort); bcfg_bind(r, 'dir1st', 'dir1st', true, resort);
setwrap(bcfg_bind(r, 'wtree', 'wraptree', true, setwrap)); setwrap(bcfg_bind(r, 'wtree', 'wraptree', true, setwrap));
setwrap(bcfg_bind(r, 'parpane', 'parpane', true, onscroll)); setwrap(bcfg_bind(r, 'parpane', 'parpane', true, onscroll));
@ -7538,6 +7540,7 @@ var treectl = (function () {
if (res.files[a].tags === undefined) if (res.files[a].tags === undefined)
res.files[a].tags = {}; res.files[a].tags = {};
dnsort = res.dnsort;
read_dsort(res.dsort); read_dsort(res.dsort);
dcrop = res.dcrop; dcrop = res.dcrop;
dth3x = res.dth3x; dth3x = res.dth3x;