v0.13.3

README.md

@@ -248,13 +248,15 @@ the browser has the following hotkeys (assumes qwerty, ignores actual layout)
 * when viewing images / playing videos:
   * `J/L, Left/Right` prev/next file
   * `Home/End` first/last file
+  * `S` toggle selection
+  * `R` rotate clockwise (shift=ccw)
   * `Esc` close viewer
   * videos:
     * `U/O` skip 10sec back/forward
     * `P/K/Space` play/pause
     * `F` fullscreen
     * `C` continue playing next video
-    * `R` loop
+    * `V` loop
     * `M` mute
 * when the navpane is open:
   * `A/D` adjust tree width

bin/mtag/res/yt-ipr.user.js

@@ -21,7 +21,6 @@ function main() {
     }
 
     function collect() {
-        setTimeout(collect, interval * 1000);
         try {
             var pd = document.querySelector('ytd-watch-flexy');
             if (!pd)
@@ -39,7 +38,7 @@ function main() {
             console.log("[yt-pdh]", ex);
         }
     }
-    collect();
+    setInterval(collect, interval * 1000);
 }
 
 var scr = document.createElement('script');

bin/prisonparty.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 set -e
 
-# runs copyparty (or any other python script really) in a chroot
+# runs copyparty (or any other program really) in a chroot
 #
 # assumption: these directories, and everything within, are owned by root
-sysdirs=(bin lib lib32 lib64 sbin usr)
+sysdirs=( /bin /lib /lib32 /lib64 /sbin /usr )
 
 
 # error-handler
@@ -14,7 +14,7 @@ usage:
   ./prisonparty.sh <ROOTDIR> <UID> <GID> [VOLDIR [VOLDIR...]] -- copyparty-sfx.py [...]"
 
 example:
-  ./prisonparty.sh /var/jail 1000 1000 /mnt/nas/music -- copyparty-sfx.py -v /mnt/nas/music::rwmd"
+  ./prisonparty.sh /var/lib/copyparty-jail 1000 1000 /mnt/nas/music -- copyparty-sfx.py -v /mnt/nas/music::rwmd"
 
 EOF
 exit 1
@@ -23,7 +23,7 @@ exit 1
 
 # read arguments
 trap help EXIT
-jail="$1"; shift
+jail="$(realpath "$1")"; shift
 uid="$1"; shift
 gid="$1"; shift
 
@@ -32,8 +32,10 @@ while true; do
 	v="$1"; shift
 	[ "$v" = -- ] && break  # end of volumes
 	[ "$#" -eq 0 ] && break  # invalid usage
-	vols+=("$v")
+	vols+=( "$(realpath "$v")" )
 done
+pybin="$1"; shift
+pybin="$(realpath "$pybin")"
 cpp="$1"; shift
 cpp="$(realpath "$cpp")"
 cppdir="$(dirname "$cpp")"
@@ -56,39 +58,42 @@ vols+=("$cppdir" "$PWD")
 echo
 
 
-# resolve and remove trailing slash
-jail="$(realpath "$jail")"
+# remove any trailing slashes
 jail="${jail%/}"
+cppdir="${cppdir%/}"
 
 
 # bind-mount system directories and volumes
 printf '%s\n' "${sysdirs[@]}" "${vols[@]}" | LC_ALL=C sort |
 while IFS= read -r v; do
-	[ -e "/$v" ] || {
-		# printf '\033[1;31mfolder does not exist:\033[0m %s\n' "$v"
+	[ -e "$v" ] || {
+		# printf '\033[1;31mfolder does not exist:\033[0m %s\n' "/$v"
 		continue
 	}
-	mkdir -p "$jail/$v"
-	mount | grep -qF " on $jail/$v " ||
-		mount --bind /$v "$jail/$v"
+	i1=$(stat -c%D.%i "$v"      2>/dev/null || echo a)
+	i2=$(stat -c%D.%i "$jail$v" 2>/dev/null || echo b)
+	[ $i1 = $i2 ] && continue
+	
+	mkdir -p "$jail$v"
+	mount --bind "$v" "$jail$v"
 done
 
 
 # create a tmp
 mkdir -p "$jail/tmp"
-chown -R "$uid:$gid" "$jail/tmp"
+chmod 777 "$jail/tmp"
 
 
 # run copyparty
-/sbin/chroot --userspec=$uid:$gid "$jail" "$(which python3)" "$cpp" "$@" && rv=0 || rv=$?
+/sbin/chroot --userspec=$uid:$gid "$jail" "$pybin" "$cpp" "$@" && rv=0 || rv=$?
 
 
 # cleanup if not in use
 lsof "$jail" | grep -qF "$jail" &&
 	echo "chroot is in use, will not cleanup" ||
 {
-	mount | grep -F " on $jail" |
+	mount | grep -qF " on $jail" |
 	awk '{sub(/ type .*/,"");sub(/.* on /,"");print}' |
-	LC_ALL=C sort -r  | tr '\n' '\0' | xargs -r0 umount
+	LC_ALL=C sort -r  | tee /dev/stderr | tr '\n' '\0' | xargs -r0 umount
 }
 exit $rv

contrib/openrc/copyparty

@@ -8,11 +8,11 @@
 #
 # you may want to:
 #   change '/usr/bin/python' to another interpreter
-#   change '/mnt::a' to another location or permission-set
+#   change '/mnt::rw' to another location or permission-set
 
 name="$SVCNAME"
 command_background=true
 pidfile="/var/run/$SVCNAME.pid"
 
 command="/usr/bin/python /usr/local/bin/copyparty-sfx.py"
-command_args="-q -v /mnt::a"
+command_args="-q -v /mnt::rw"

contrib/systemd/copyparty.service

@@ -6,7 +6,7 @@
 #
 # you may want to:
 #   change '/usr/bin/python' to another interpreter
-#   change '/mnt::a' to another location or permission-set
+#   change '/mnt::rw' to another location or permission-set
 #
 # with `Type=notify`, copyparty will signal systemd when it is ready to
 #   accept connections; correctly delaying units depending on copyparty.
@@ -27,7 +27,7 @@ Description=copyparty file server
 [Service]
 Type=notify
 SyslogIdentifier=copyparty
-ExecStart=/usr/bin/python3 /usr/local/bin/copyparty-sfx.py -q -v /mnt::a
+ExecStart=/usr/bin/python3 /usr/local/bin/copyparty-sfx.py -q -v /mnt::rw
 ExecStartPre=/bin/bash -c 'mkdir -p /run/tmpfiles.d/ && echo "x /tmp/pe-copyparty*" > /run/tmpfiles.d/copyparty.conf'
 
 [Install]

contrib/systemd/prisonparty.service

@@ -0,0 +1,27 @@
+# this will start `/usr/local/bin/copyparty-sfx.py`
+# in a chroot, preventing accidental access elsewhere
+# and share '/mnt' with anonymous read+write
+#
+# installation:
+#   1) put copyparty-sfx.py and prisonparty.sh in /usr/local/bin
+#   2) cp -pv prisonparty.service /etc/systemd/system && systemctl enable --now prisonparty
+#
+# you may want to:
+#   change '/mnt::rw' to another location or permission-set
+#    (remember to change the '/mnt' chroot arg too)
+#
+# enable line-buffering for realtime logging (slight performance cost):
+#   inside the [Service] block, add the following line:
+#   Environment=PYTHONUNBUFFERED=x
+
+[Unit]
+Description=copyparty file server
+
+[Service]
+SyslogIdentifier=prisonparty
+WorkingDirectory=/usr/local/bin
+ExecStart=/bin/bash /usr/local/bin/prisonparty.sh /var/lib/copyparty-jail 1000 1000 /mnt -- \
+  /usr/bin/python3 /usr/local/bin/copyparty-sfx.py -q -v /mnt::rw
+
+[Install]
+WantedBy=multi-user.target

copyparty/__main__.py

@@ -378,6 +378,7 @@ def run_argparse(argv, formatter):
     ap2.add_argument("--no-thumb", action="store_true", help="disable all thumbnails")
     ap2.add_argument("--no-vthumb", action="store_true", help="disable video thumbnails")
     ap2.add_argument("--th-size", metavar="WxH", default="320x256", help="thumbnail res")
+    ap2.add_argument("--th-mt", metavar="CORES", type=int, default=0, help="max num cpu cores to use, 0=all")
     ap2.add_argument("--th-no-crop", action="store_true", help="dynamic height; show full image")
     ap2.add_argument("--th-no-jpg", action="store_true", help="disable jpg output")
     ap2.add_argument("--th-no-webp", action="store_true", help="disable webp output")

copyparty/__version__.py

@@ -1,8 +1,8 @@
 # coding: utf-8
 
-VERSION = (0, 13, 1)
+VERSION = (0, 13, 3)
 CODENAME = "future-proof"
-BUILD_DT = (2021, 8, 9)
+BUILD_DT = (2021, 8, 14)
 
 S_VERSION = ".".join(map(str, VERSION))
 S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

copyparty/th_srv.py

@@ -21,7 +21,7 @@ HAVE_AVIF = False
 HAVE_WEBP = False
 
 try:
-    from PIL import Image, ImageOps
+    from PIL import Image, ImageOps, ExifTags
 
     HAVE_PIL = True
     try:
@@ -105,7 +105,10 @@ class ThumbSrv(object):
         self.mutex = threading.Lock()
         self.busy = {}
         self.stopping = False
-        self.nthr = os.cpu_count() if hasattr(os, "cpu_count") else 4
+        self.nthr = self.args.th_mt
+        if not self.nthr:
+            self.nthr = os.cpu_count() if hasattr(os, "cpu_count") else 4
+
         self.q = Queue(self.nthr * 4)
         for n in range(self.nthr):
             t = threading.Thread(
@@ -221,21 +224,38 @@ class ThumbSrv(object):
         with self.mutex:
             self.nthr -= 1
 
+    def fancy_pillow(self, im):
+        # exif_transpose is expensive (loads full image + unconditional copy)
+        r = max(*self.res) * 2
+        im.thumbnail((r, r), resample=Image.LANCZOS)
+        try:
+            k = next(k for k, v in ExifTags.TAGS.items() if v == "Orientation")
+            exif = im.getexif()
+            rot = int(exif[k])
+            del exif[k]
+        except:
+            rot = 1
+
+        rots = {8: Image.ROTATE_90, 3: Image.ROTATE_180, 6: Image.ROTATE_270}
+        if rot in rots:
+            im = im.transpose(rots[rot])
+
+        if self.args.th_no_crop:
+            im.thumbnail(self.res, resample=Image.LANCZOS)
+        else:
+            iw, ih = im.size
+            dw, dh = self.res
+            res = (min(iw, dw), min(ih, dh))
+            im = ImageOps.fit(im, res, method=Image.LANCZOS)
+
+        return im
+
     def conv_pil(self, abspath, tpath):
         with Image.open(fsenc(abspath)) as im:
-            crop = not self.args.th_no_crop
-            res2 = self.res
-            if crop:
-                res2 = (res2[0] * 2, res2[1] * 2)
-
             try:
-                im.thumbnail(res2, resample=Image.LANCZOS)
-                if crop:
-                    iw, ih = im.size
-                    dw, dh = self.res
-                    res = (min(iw, dw), min(ih, dh))
-                    im = ImageOps.fit(im, res, method=Image.LANCZOS)
-            except:
+                im = self.fancy_pillow(im)
+            except Exception as ex:
+                self.log("fancy_pillow {}".format(ex), "1;30")
                 im.thumbnail(self.res)
 
             fmts = ["RGB", "L"]
@@ -289,6 +309,7 @@ class ThumbSrv(object):
             b"-map", b"0:v:0",
             b"-vf", scale,
             b"-frames:v", b"1",
+            b"-metadata:s:v:0", b"rotate=0",
         ]
         # fmt: on
 
@@ -306,6 +327,7 @@ class ThumbSrv(object):
             ]
 
         cmd += [fsenc(tpath)]
+        # self.log((b" ".join(cmd)).decode("utf-8"))
 
         ret, sout, serr = runcmd(cmd)
         if ret != 0:

copyparty/web/baguettebox.js

@@ -22,7 +22,7 @@ window.baguetteBox = (function () {
             afterHide: null,
             onChange: null,
         },
-        overlay, slider, btnPrev, btnNext, btnHelp, btnVmode, btnClose,
+        overlay, slider, btnPrev, btnNext, btnHelp, btnRotL, btnRotR, btnSel, btnVmode, btnClose,
         currentGallery = [],
         currentIndex = 0,
         isOverlayVisible = false,
@@ -49,7 +49,7 @@ window.baguetteBox = (function () {
     };
 
     var touchstartHandler = function (e) {
-        touch.count++;
+        touch.count = e.touches.length;
         if (touch.count > 1)
             touch.multitouch = true;
 
@@ -72,8 +72,11 @@ window.baguetteBox = (function () {
             hideOverlay();
         }
     };
-    var touchendHandler = function () {
+    var touchendHandler = function (e) {
         touch.count--;
+        if (e && e.touches)
+            touch.count = e.touches.length;
+
         if (touch.count <= 0)
             touch.multitouch = false;
 
@@ -175,6 +178,9 @@ window.baguetteBox = (function () {
                 '<button id="bbox-next" class="bbox-btn" type="button" aria-label="Next">&gt;</button>' +
                 '<div id="bbox-btns">' +
                 '<button id="bbox-help" type="button">?</button>' +
+                '<button id="bbox-rotl" type="button">↶</button>' +
+                '<button id="bbox-rotr" type="button">↷</button>' +
+                '<button id="bbox-tsel" type="button">sel</button>' +
                 '<button id="bbox-vmode" type="button" tt="a"></button>' +
                 '<button id="bbox-close" type="button" aria-label="Close">X</button>' +
                 '</div></div>'
@@ -187,6 +193,9 @@ window.baguetteBox = (function () {
         btnPrev = ebi('bbox-prev');
         btnNext = ebi('bbox-next');
         btnHelp = ebi('bbox-help');
+        btnRotL = ebi('bbox-rotl');
+        btnRotR = ebi('bbox-rotr');
+        btnSel = ebi('bbox-tsel');
         btnVmode = ebi('bbox-vmode');
         btnClose = ebi('bbox-close');
         bindEvents();
@@ -203,11 +212,13 @@ window.baguetteBox = (function () {
             ['right, L', 'next file'],
             ['home', 'first file'],
             ['end', 'last file'],
+            ['R', 'rotate (shift=ccw)'],
+            ['S', 'toggle file selection'],
             ['space, P, K', 'video: play / pause'],
             ['U', 'video: seek 10sec back'],
             ['P', 'video: seek 10sec ahead'],
             ['M', 'video: toggle mute'],
-            ['R', 'video: toggle loop'],
+            ['V', 'video: toggle loop'],
             ['C', 'video: toggle auto-next'],
             ['F', 'video: toggle fullscreen'],
         ],
@@ -249,7 +260,7 @@ window.baguetteBox = (function () {
             v.muted = vmute = !vmute;
             mp_ctl();
         }
-        else if (k == "KeyR" && v) {
+        else if (k == "KeyV" && v) {
             vloop = !vloop;
             vnext = vnext && !vloop;
             setVmode();
@@ -267,6 +278,10 @@ window.baguetteBox = (function () {
                     v.requestFullscreen();
             }
             catch (ex) { }
+        else if (k == "KeyS")
+            tglsel();
+        else if (k == "KeyR")
+            rotn(e.shiftKey ? -1 : 1);
     }
 
     function setVmode() {
@@ -279,7 +294,7 @@ window.baguetteBox = (function () {
         if (vloop) {
             lbl = 'Loop';
             msg += 'repeat it';
-            tts = '$NHotkey: R';
+            tts = '$NHotkey: V';
         }
         else if (vnext) {
             lbl = 'Cont';
@@ -314,6 +329,40 @@ window.baguetteBox = (function () {
             tt.show.bind(this)();
     }
 
+    function tglsel() {
+        var thumb = currentGallery[currentIndex].imageElement,
+            name = vsplit(thumb.href)[1],
+            files = msel.getall();
+
+        for (var a = 0; a < files.length; a++)
+            if (vsplit(files[a].vp)[1] == name)
+                clmod(ebi(files[a].id).closest('tr'), 'sel', 't');
+
+        msel.selui();
+        selbg();
+    }
+
+    function selbg() {
+        var img = vidimg(),
+            thumb = currentGallery[currentIndex].imageElement,
+            name = vsplit(thumb.href)[1],
+            files = msel.getsel(),
+            sel = false;
+
+        for (var a = 0; a < files.length; a++)
+            if (vsplit(files[a].vp)[1] == name)
+                sel = true;
+
+        ebi('bbox-overlay').style.background = sel ?
+            'rgba(153,34,85,0.7)' : '';
+
+        img.style.borderRadius = sel ? '1em' : '';
+        btnSel.style.color = sel ? '#fff' : '';
+        btnSel.style.background = sel ? '#d48' : '';
+        btnSel.style.textShadow = sel ? '1px 1px 0 #b38' : '';
+        btnSel.style.boxShadow = sel ? '.15em .15em 0 #502' : '';
+    }
+
     function keyUpHandler(e) {
         if (e.ctrlKey || e.altKey || e.metaKey || e.isComposing)
             return;
@@ -348,6 +397,9 @@ window.baguetteBox = (function () {
         bind(btnClose, 'click', hideOverlay);
         bind(btnVmode, 'click', tglVmode);
         bind(btnHelp, 'click', halp);
+        bind(btnRotL, 'click', rotl);
+        bind(btnRotR, 'click', rotr);
+        bind(btnSel, 'click', tglsel);
         bind(slider, 'contextmenu', contextmenuHandler);
         bind(overlay, 'touchstart', touchstartHandler, nonPassiveEvent);
         bind(overlay, 'touchmove', touchmoveHandler, passiveEvent);
@@ -362,11 +414,15 @@ window.baguetteBox = (function () {
         unbind(btnClose, 'click', hideOverlay);
         unbind(btnVmode, 'click', tglVmode);
         unbind(btnHelp, 'click', halp);
+        unbind(btnRotL, 'click', rotl);
+        unbind(btnRotR, 'click', rotr);
+        unbind(btnSel, 'click', tglsel);
         unbind(slider, 'contextmenu', contextmenuHandler);
         unbind(overlay, 'touchstart', touchstartHandler, nonPassiveEvent);
         unbind(overlay, 'touchmove', touchmoveHandler, passiveEvent);
         unbind(overlay, 'touchend', touchendHandler);
         unbind(document, 'focus', trapFocusInsideOverlay, true);
+        timer.rm(rotn);
     }
 
     function prepareOverlay(gallery, userOptions) {
@@ -617,10 +673,91 @@ window.baguetteBox = (function () {
         return true;
     }
 
+    var prev_cw = 0, prev_ch = 0, unrot_timer = null;
+    function rotn(n) {
+        var el = vidimg(),
+            orot = parseInt(el.getAttribute('rot') || 0),
+            frot = orot + (n || 0) * 90;
+
+        if (!frot && !orot)
+            return;  // reflow noop
+
+        var co = ebi('bbox-overlay'),
+            cw = co.clientWidth,
+            ch = co.clientHeight;
+
+        if (!n && prev_cw === cw && prev_ch === ch)
+            return;  // reflow noop
+
+        prev_cw = cw;
+        prev_ch = ch;
+        var rot = frot,
+            iw = el.naturalWidth || el.videoWidth,
+            ih = el.naturalHeight || el.videoHeight,
+            magic = 4,  // idk, works in enough browsers
+            dl = el.closest('div').querySelector('figcaption a'),
+            vw = cw,
+            vh = ch - dl.offsetHeight + magic,
+            pmag = Math.min(1, Math.min(vw / ih, vh / iw)),
+            wmag = Math.min(1, Math.min(vw / iw, vh / ih));
+
+        while (rot < 0) rot += 360;
+        while (rot >= 360) rot -= 360;
+        var q = rot == 90 || rot == 270 ? 1 : 0,
+            mag = q ? pmag : wmag;
+
+        el.style.cssText = 'max-width:none; max-height:none; position:absolute; display:block; margin:0';
+        if (!orot) {
+            el.style.width = iw * wmag + 'px';
+            el.style.height = ih * wmag + 'px';
+            el.style.left = (vw - iw * wmag) / 2 + 'px';
+            el.style.top = (vh - ih * wmag) / 2 - magic + 'px';
+            q = el.offsetHeight;
+        }
+        el.style.width = iw * mag + 'px';
+        el.style.height = ih * mag + 'px';
+        el.style.left = (vw - iw * mag) / 2 + 'px';
+        el.style.top = (vh - ih * mag) / 2 - magic + 'px';
+        el.style.transform = 'rotate(' + frot + 'deg)';
+        el.setAttribute('rot', frot);
+        timer.add(rotn);
+        if (!rot) {
+            clearTimeout(unrot_timer);
+            unrot_timer = setTimeout(unrot, 300);
+        }
+    }
+    function rotl() {
+        rotn(-1);
+    }
+    function rotr() {
+        rotn(1);
+    }
+    function unrot() {
+        var el = vidimg(),
+            orot = el.getAttribute('rot'),
+            rot = parseInt(orot || 0);
+
+        while (rot < 0) rot += 360;
+        while (rot >= 360) rot -= 360;
+        if (rot || orot === null)
+            return;
+
+        el.classList.add('nt');
+        el.removeAttribute('rot');
+        el.removeAttribute("style");
+        rot = el.offsetHeight;
+        el.classList.remove('nt');
+        timer.rm(rotn);
+    }
+
     function vid() {
         return imagesElements[currentIndex].querySelector('video');
     }
 
+    function vidimg() {
+        return imagesElements[currentIndex].querySelector('img, video');
+    }
+
     function playvid(play) {
         if (vid())
             vid()[play ? 'play' : 'pause']();
@@ -679,8 +816,21 @@ window.baguetteBox = (function () {
             v.muted = vmute;
             v.loop = vloop;
         }
+        selbg();
         mp_ctl();
         setVmode();
+
+        var el = vidimg();
+        if (el.getAttribute('rot'))
+            timer.add(rotn);
+        else
+            timer.rm(rotn);
+
+        var prev = QS('.full-image.vis');
+        if (prev)
+            prev.classList.remove('vis');
+
+        el.closest('div').classList.add('vis');
     }
 
     function preloadNext(index) {

copyparty/web/browser.css

@@ -1294,7 +1294,7 @@ html.light #tree::-webkit-scrollbar {
 	opacity: 0;
 	position: fixed;
 	overflow: hidden;
-	touch-action: none;
+	touch-action: pinch-zoom;
 	top: 0;
 	left: 0;
 	width: 100%;
@@ -1328,6 +1328,14 @@ html.light #tree::-webkit-scrollbar {
 	max-height: calc(100% - 1.4em);
 	margin-bottom: 1.4em;
 	vertical-align: middle;
+	transition: transform .23s, left .23s, top .23s, width .23s, height .23s;
+}
+.full-image img.nt,
+.full-image video.nt {
+	transition: none;
+}
+.full-image.vis img,
+.full-image.vis video {
 	box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
 }
 .full-image video {
@@ -1341,6 +1349,7 @@ html.light #tree::-webkit-scrollbar {
 	text-align: center;
 	white-space: normal;
 	color: #ccc;
+	z-index: 1;
 }
 #bbox-overlay figcaption a {
 	background: rgba(0, 0, 0, 0.6);
@@ -1406,6 +1415,7 @@ html.light #bbox-overlay figcaption a {
 	font-size: 1.4em;
 	line-height: 1.4em;
 	vertical-align: top;
+	font-variant: small-caps;
 }
 #bbox-overlay button:focus,
 #bbox-overlay button:hover {

copyparty/web/browser.js

@@ -921,14 +921,16 @@ function playpause(e) {
 var mpui = (function () {
 	var r = {},
 		nth = 0,
-		timeout = null,
 		preloaded = null;
 
 	r.progress_updater = function () {
-		clearTimeout(timeout);
+		timer.add(updater_impl, true);
+	};
 
+	function updater_impl() {
 		if (!mp.au) {
 			widget.paused(true);
+			timer.rm(updater_impl);
 			return;
 		}
 
@@ -970,9 +972,9 @@ var mpui = (function () {
 			}
 		}
 
-		if (!mp.au.paused)
-			timeout = setTimeout(r.progress_updater, 100);
-	};
+		if (mp.au.paused)
+			timer.rm(updater_impl);
+	}
 	r.progress_updater();
 	return r;
 })();
@@ -1461,6 +1463,83 @@ function play_linked() {
 })();
 
 
+function sortfiles(nodes) {
+	var sopts = jread('fsort', [["href", 1, ""]]);
+
+	try {
+		var is_srch = false;
+		if (nodes[0]['rp']) {
+			is_srch = true;
+			for (var b = 0, bb = nodes.length; b < bb; b++)
+				nodes[b].ext = nodes[b].rp.split('.').pop();
+			for (var b = 0; b < sopts.length; b++)
+				if (sopts[b][0] == 'href')
+					sopts[b][0] = 'rp';
+		}
+		for (var a = sopts.length - 1; a >= 0; a--) {
+			var name = sopts[a][0], rev = sopts[a][1], typ = sopts[a][2];
+			if (!name)
+				continue;
+
+			if (name == 'ts')
+				typ = 'int';
+
+			if (name.indexOf('tags/') === 0) {
+				name = name.slice(5);
+				for (var b = 0, bb = nodes.length; b < bb; b++)
+					nodes[b]._sv = nodes[b].tags[name];
+			}
+			else {
+				for (var b = 0, bb = nodes.length; b < bb; b++) {
+					var v = nodes[b][name];
+
+					if ((v + '').indexOf('<a ') === 0)
+						v = v.split('>')[1];
+					else if (name == "href" && v) {
+						if (v.slice(-1) == '/')
+							v = '\t' + v;
+
+						v = uricom_dec(v)[0]
+					}
+
+					nodes[b]._sv = v;
+				}
+			}
+
+			var onodes = nodes.map(function (x) { return x; });
+			nodes.sort(function (n1, n2) {
+				var v1 = n1._sv,
+					v2 = n2._sv;
+
+				if (v1 === undefined) {
+					if (v2 === undefined) {
+						return onodes.indexOf(n1) - onodes.indexOf(n2);
+					}
+					return -1 * rev;
+				}
+				if (v2 === undefined) return 1 * rev;
+
+				var ret = rev * (typ == 'int' ? (v1 - v2) : (v1.localeCompare(v2)));
+				if (ret === 0)
+					ret = onodes.indexOf(n1) - onodes.indexOf(n2);
+
+				return ret;
+			});
+		}
+		for (var b = 0, bb = nodes.length; b < bb; b++) {
+			delete nodes[b]._sv;
+			if (is_srch)
+				delete nodes[b].ext;
+		}
+	}
+	catch (ex) {
+		console.log("failed to apply sort config: " + ex);
+		console.log("resetting fsort " + sread('fsort'))
+		localStorage.removeItem('fsort');
+	}
+	return nodes;
+}
+
 
 function fmt_ren(re, md, fmt) {
 	var ptr = 0;
@@ -2025,18 +2104,21 @@ var fileman = (function () {
 		}, null);
 	};
 
+	function onmsg(msg) {
+		r.clip = null;
+		r.render();
+		if (msg == get_evpath())
+			treectl.goto(msg);
+	}
+
 	if (r.bus)
 		r.bus.onmessage = function (e) {
-			r.clip = null;
-			r.render();
-			var me = get_evpath();
-			if (e && e.data == me)
-				treectl.goto(e.data);
+			onmsg(e ? e.data : 1)
 		};
 
 	r.tx = function (msg) {
 		if (!r.bus)
-			return;
+			return onmsg(msg);
 
 		r.bus.postMessage(msg);
 		r.bus.onmessage();
@@ -2161,7 +2243,7 @@ var thegrid = (function () {
 		var oth = ebi(this.getAttribute('ref')),
 			href = this.getAttribute('href'),
 			aplay = ebi('a' + oth.getAttribute('id')),
-			is_img = /\.(gif|jpe?g|png|webp)(\?|$)/i.test(href),
+			is_img = /\.(gif|jpe?g|png|webp|webm|mp4)(\?|$)/i.test(href),
 			in_tree = null,
 			have_sel = QS('#files tr.sel'),
 			td = oth.closest('td').nextSibling,
@@ -2822,7 +2904,7 @@ var treectl = (function () {
 	}
 
 	function onscroll() {
-		if (!entreed || treectl.hidden)
+		if (!entreed || treectl.hidden || document.visibilityState == 'hidden')
 			return;
 
 		var tree = ebi('tree'),
@@ -2858,12 +2940,7 @@ var treectl = (function () {
 			tree.style.height = treeh < 10 ? '' : treeh + 'px';
 		}
 	}
-
-	function periodic() {
-		onscroll();
-		setTimeout(periodic, document.visibilityState ? 100 : 5000);
-	}
-	periodic();
+	timer.add(onscroll, true);
 
 	function onresize(e) {
 		if (!entreed || treectl.hidden)

copyparty/web/ui.css

@@ -146,6 +146,7 @@ html.light #tt em {
 	text-align: center;
 }
 #modalc {
+	position: relative;
 	display: inline-block;
 	background: #f7f7f7;
 	color: #333;
@@ -165,8 +166,11 @@ html.light #tt em {
     }
 }
 #modalb {
+	position: sticky;
 	text-align: right;
 	padding-top: 1em;
+	bottom: 0;
+	right: 0;
 }
 #modalb a {
 	color: #000;

copyparty/web/up2k.js

@@ -929,21 +929,17 @@ function up2k_init(subtle) {
     }
 
     var tasker = (function () {
-        var tto = null,
-            running = false,
+        var running = false,
             was_busy = false;
 
         function defer() {
             running = false;
-            clearTimeout(tto);
-            tto = setTimeout(taskerd, 100);
         }
 
         function taskerd() {
             if (running)
                 return;
 
-            clearTimeout(tto);
             if (crashed)
                 return defer();
 
@@ -1034,7 +1030,7 @@ function up2k_init(subtle) {
                     return defer();
             }
         }
-        taskerd();
+        timer.add(taskerd, true);
         return taskerd;
     })();
 

copyparty/web/util.js

@@ -179,84 +179,6 @@ function clmod(obj, cls, add) {
 }
 
 
-function sortfiles(nodes) {
-    var sopts = jread('fsort', [["href", 1, ""]]);
-
-    try {
-        var is_srch = false;
-        if (nodes[0]['rp']) {
-            is_srch = true;
-            for (var b = 0, bb = nodes.length; b < bb; b++)
-                nodes[b].ext = nodes[b].rp.split('.').pop();
-            for (var b = 0; b < sopts.length; b++)
-                if (sopts[b][0] == 'href')
-                    sopts[b][0] = 'rp';
-        }
-        for (var a = sopts.length - 1; a >= 0; a--) {
-            var name = sopts[a][0], rev = sopts[a][1], typ = sopts[a][2];
-            if (!name)
-                continue;
-
-            if (name == 'ts')
-                typ = 'int';
-
-            if (name.indexOf('tags/') === 0) {
-                name = name.slice(5);
-                for (var b = 0, bb = nodes.length; b < bb; b++)
-                    nodes[b]._sv = nodes[b].tags[name];
-            }
-            else {
-                for (var b = 0, bb = nodes.length; b < bb; b++) {
-                    var v = nodes[b][name];
-
-                    if ((v + '').indexOf('<a ') === 0)
-                        v = v.split('>')[1];
-                    else if (name == "href" && v) {
-                        if (v.slice(-1) == '/')
-                            v = '\t' + v;
-
-                        v = uricom_dec(v)[0]
-                    }
-
-                    nodes[b]._sv = v;
-                }
-            }
-
-            var onodes = nodes.map(function (x) { return x; });
-            nodes.sort(function (n1, n2) {
-                var v1 = n1._sv,
-                    v2 = n2._sv;
-
-                if (v1 === undefined) {
-                    if (v2 === undefined) {
-                        return onodes.indexOf(n1) - onodes.indexOf(n2);
-                    }
-                    return -1 * rev;
-                }
-                if (v2 === undefined) return 1 * rev;
-
-                var ret = rev * (typ == 'int' ? (v1 - v2) : (v1.localeCompare(v2)));
-                if (ret === 0)
-                    ret = onodes.indexOf(n1) - onodes.indexOf(n2);
-
-                return ret;
-            });
-        }
-        for (var b = 0, bb = nodes.length; b < bb; b++) {
-            delete nodes[b]._sv;
-            if (is_srch)
-                delete nodes[b].ext;
-        }
-    }
-    catch (ex) {
-        console.log("failed to apply sort config: " + ex);
-        console.log("resetting fsort " + sread('fsort'))
-        localStorage.removeItem('fsort');
-    }
-    return nodes;
-}
-
-
 function sortTable(table, col, cb) {
     var tb = table.tBodies[0],
         th = table.tHead.rows[0].cells,
@@ -555,6 +477,39 @@ function hist_replace(url) {
 }
 
 
+var timer = (function () {
+    var r = {};
+    r.q = [];
+    r.last = 0;
+
+    r.add = function (fun, run) {
+        r.rm(fun);
+        r.q.push(fun);
+
+        if (run)
+            fun();
+    };
+
+    r.rm = function (fun) {
+        apop(r.q, fun);
+    };
+
+    function doevents() {
+        if (Date.now() - r.last < 69)
+            return;
+
+        var q = r.q.slice(0);
+        for (var a = 0; a < q.length; a++)
+            q[a]();
+
+        r.last = Date.now();
+    }
+    setInterval(doevents, 100);
+
+    return r;
+})();
+
+
 var tt = (function () {
     var r = {
         "tt": mknod("div"),
@@ -820,3 +775,14 @@ var modal = (function () {
 
     return r;
 })();
+
+
+function winpopup(txt) {
+    fetch(get_evpath(), {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+        },
+        body: 'msg=' + uricom_enc(Date.now() + ', ' + txt)
+    });
+}

docs/notes.sh

@@ -173,7 +173,7 @@ about:config >> devtools.debugger.prefs-schema-version = -1
 git pull; git reset --hard origin/HEAD && git log --format=format:"%H %ai %d" --decorate=full > ../revs && cat ../{util,browser,up2k}.js >../vr && cat ../revs | while read -r rev extra; do (git reset --hard $rev >/dev/null 2>/dev/null && dsz=$(cat copyparty/web/{util,browser,up2k}.js >../vg 2>/dev/null && diff -wNarU0 ../{vg,vr} | wc -c) && printf '%s %6s %s\n' "$rev" $dsz "$extra") </dev/null; done                
 
 # download all sfx versions
-curl https://api.github.com/repos/9001/copyparty/releases?per_page=100 | jq -r '.[] | .tag_name + " " + .name' | while read v t; do fn="copyparty $v $t.py"; [ -e $fn ] || curl https://github.com/9001/copyparty/releases/download/$v/copyparty-sfx.py -Lo "$fn"; done
+curl https://api.github.com/repos/9001/copyparty/releases?per_page=100 | jq -r '.[] | .tag_name + " " + .name' | tr -d '\r' | while read v t; do fn="copyparty $v $t.py"; [ -e "$fn" ] || curl https://github.com/9001/copyparty/releases/download/$v/copyparty-sfx.py -Lo "$fn"; done
 
 
 ##

scripts/test/smoketest.py

@@ -108,6 +108,7 @@ def tc1():
     pdirs = [x.replace("\\", "/") for x in pdirs]
     udirs = [x.split("/", 2)[2] for x in pdirs]
     perms = [x.rstrip("j/")[-1] for x in pdirs]
+    perms = ["rw" if x == "a" else x for x in perms]
     for pd, ud, p in zip(pdirs, udirs, perms):
         if ud[-1] == "j":
             continue
@@ -147,14 +148,14 @@ def tc1():
         u = "{}{}/a.h264".format(ub, d)
         r = requests.get(u)
         ok = bool(r)
-        if ok != (p in ["a"]):
+        if ok != (p in ["rw"]):
             raise Exception("get {} with perm {} at {}".format(ok, p, u))
 
     # stat filesystem
     for d, p in zip(pdirs, perms):
         u = "{}/a.h264".format(d)
         ok = os.path.exists(u)
-        if ok != (p in ["a", "w"]):
+        if ok != (p in ["rw", "w"]):
             raise Exception("stat {} with perm {} at {}".format(ok, p, u))
 
     # GET thumbnail, vreify contents
@@ -162,7 +163,7 @@ def tc1():
         u = "{}{}/a.h264?th=j".format(ub, d)
         r = requests.get(u)
         ok = bool(r and r.content[:3] == b"\xff\xd8\xff")
-        if ok != (p in ["a"]):
+        if ok != (p in ["rw"]):
             raise Exception("thumb {} with perm {} at {}".format(ok, p, u))
 
     # check tags
@@ -179,10 +180,10 @@ def tc1():
         r_ok = bool(j)
         w_ok = bool(r_ok and j.get("files"))
 
-        if not r_ok or w_ok != (p in ["a"]):
+        if not r_ok or w_ok != (p in ["rw"]):
             raise Exception("ls {} with perm {} at {}".format(ok, p, u))
 
-        if (tag and p != "a") or (not tag and p == "a"):
+        if (tag and p != "rw") or (not tag and p == "rw"):
             raise Exception("tag {} with perm {} at {}".format(tag, p, u))
 
         if tag is not None and tag != "48x32":