diff --git a/README.md b/README.md index e5a714e0..c45eb7fe 100644 --- a/README.md +++ b/README.md @@ -583,12 +583,12 @@ through arguments: * `-e2tsr` also deletes all existing tags, doing a full reindex the same arguments can be set as volume flags, in addition to `d2d` and `d2t` for disabling: -* `-v ~/music::r:c,e2dsa:c,e2tsr` does a full reindex of everything on startup +* `-v ~/music::r:c,e2dsa,e2tsr` does a full reindex of everything on startup * `-v ~/music::r:c,d2d` disables **all** indexing, even if any `-e2*` are on * `-v ~/music::r:c,d2t` disables all `-e2t*` (tags), does not affect `-e2d*` note: -* the parser currently can't handle `c,e2dsa,e2tsr` so you have to `c,e2dsa:c,e2tsr` +* the parser can finally handle `c,e2dsa,e2tsr` so you no longer have to `c,e2dsa:c,e2tsr` * `e2tsr` is probably always overkill, since `e2ds`/`e2dsa` would pick up any file modifications and `e2ts` would then reindex those, unless there is a new copyparty version with new parsers and the release note says otherwise * the rescan button in the admin panel has no effect unless the volume has `-e2ds` or higher @@ -746,7 +746,7 @@ quick summary of more eccentric web-browsers trying to view a directory index: | **w3m** (0.5.3/macports) | can browse, login, upload at 100kB/s, mkdir/msg | | **netsurf** (3.10/arch) | is basically ie6 with much better css (javascript has almost no effect) | | **opera** (11.60/winxp) | OK: thumbnails, image-viewer, zip-selection, rename/cut/paste. NG: up2k, navpane, markdown, audio | -| **ie4** and **netscape** 4.0 | can browse (text is yellow on white), upload with `?b=u` | +| **ie4** and **netscape** 4.0 | can browse, upload with `?b=u` | | **SerenityOS** (7e98457) | hits a page fault, works with `?b=u`, file upload not-impl | diff --git a/bin/mtag/wget.py b/bin/mtag/wget.py index 11a006d1..ef13b256 100644 --- a/bin/mtag/wget.py +++ b/bin/mtag/wget.py @@ -6,7 +6,7 @@ application/x-www-form-urlencoded (for example using the message/pager function on the website) example copyparty config to use this: - --urlform save,get -vsrv/wget:wget:rwmd,ed:c,e2ts:c,mtp=title=ebin,t300,ad,bin/mtag/wget.py + --urlform save,get -vsrv/wget:wget:rwmd,ed:c,e2ts,mtp=title=ebin,t300,ad,bin/mtag/wget.py explained: for realpath srv/wget (served at /wget) with read-write-modify-delete for ed, diff --git a/bin/mtag/yt-ipr.py b/bin/mtag/yt-ipr.py index f1b93f4a..99e870cf 100644 --- a/bin/mtag/yt-ipr.py +++ b/bin/mtag/yt-ipr.py @@ -17,7 +17,7 @@ it's probably best to use this through a config file; see res/yt-ipr.conf but if you want to use plain arguments instead then: -v srv/ytm:ytm:w:rw,ed - :c,e2ts:c,e2dsa + :c,e2ts,e2dsa :c,sz=16k-1m:c,maxn=10,300:c,rotf=%Y-%m/%d-%H :c,mtp=yt-id,yt-title,yt-author,yt-channel,yt-views,yt-private,yt-manifest,yt-expires=bin/mtag/yt-ipr.py :c,mte=yt-id,yt-title,yt-author,yt-channel,yt-views,yt-private,yt-manifest,yt-expires diff --git a/copyparty/authsrv.py b/copyparty/authsrv.py index d6a905ed..943b8b3d 100644 --- a/copyparty/authsrv.py +++ b/copyparty/authsrv.py @@ -579,9 +579,17 @@ class AuthSrv(object): raise Exception("invalid volume flag: {},{}".format(lvl, uname)) if lvl == "c": - cval = True - if "=" in uname: + try: + # volume flag with arguments, possibly with a preceding list of bools uname, cval = uname.split("=", 1) + except: + # just one or more bools + cval = True + + while "," in uname: + # one or more bools before the final flag; eat them + n1, uname = uname.split(",", 1) + self._read_volflag(flags, n1, True, False) self._read_volflag(flags, uname, cval, False) return diff --git a/docs/example.conf b/docs/example.conf index 858770dd..2b3b9e0f 100644 --- a/docs/example.conf +++ b/docs/example.conf @@ -47,5 +47,5 @@ c e2d c nodupe # this entire config file can be replaced with these arguments: -# -u ed:123 -u k:k -v .::r:a,ed -v priv:priv:r,k:rw,ed -v /home/ed/Music:music:r -v /home/ed/inc:dump:w:c,e2d:c,nodupe +# -u ed:123 -u k:k -v .::r:a,ed -v priv:priv:r,k:rw,ed -v /home/ed/Music:music:r -v /home/ed/inc:dump:w:c,e2d,nodupe # but note that the config file always wins in case of conflicts