v0.13.11

README.md

@@ -6,7 +6,7 @@
 
 ## summary
 
-turn your phone or raspi into a portable file server with resumable uploads/downloads using IE6 or any other browser
+turn your phone or raspi into a portable file server with resumable uploads/downloads using *any* web browser
 
 * server runs on anything with `py2.7` or `py3.3+`
 * browse/upload with IE4 / netscape4.0 on win3.11 (heh)
@@ -19,49 +19,53 @@ turn your phone or raspi into a portable file server with resumable uploads/down
 ## readme toc
 
 * top
-    * [quickstart](#quickstart)
-        * [on debian](#on-debian)
-    * [notes](#notes)
-    * [status](#status)
-    * [testimonials](#testimonials)
+    * [quickstart](#quickstart) - download [copyparty-sfx.py](https://github.com/9001/copyparty/releases/latest/download/copyparty-sfx.py) and you're all set!
+        * [on debian](#on-debian) - recommended additional steps on debian
+    * [notes](#notes) - general notes
+    * [status](#status) - summary: all planned features work! now please enjoy the bloatening
+    * [testimonials](#testimonials) - small collection of user feedback
 * [bugs](#bugs)
     * [general bugs](#general-bugs)
     * [not my bugs](#not-my-bugs)
-* [the browser](#the-browser)
-    * [tabs](#tabs)
-    * [hotkeys](#hotkeys)
-    * [navpane](#navpane)
-    * [thumbnails](#thumbnails)
-    * [zip downloads](#zip-downloads)
-    * [uploading](#uploading)
-        * [file-search](#file-search)
-    * [file manager](#file-manager)
-    * [batch rename](#batch-rename)
-    * [markdown viewer](#markdown-viewer)
+* [accounts and volumes](#accounts-and-volumes) - per-folder, per-user permissions
+* [the browser](#the-browser) - accessing a copyparty server using a web-browser
+    * [tabs](#tabs) - the main tabs in the ui
+    * [hotkeys](#hotkeys) - the browser has the following hotkeys (always qwerty)
+    * [navpane](#navpane) - switching between breadcrumbs or navpane
+    * [thumbnails](#thumbnails) - press `g` to toggle image/video thumbnails instead of the file listing
+    * [zip downloads](#zip-downloads) - download folders (or file selections) as `zip` or `tar` files
+    * [uploading](#uploading) - web-browsers can upload using `bup` and `up2k`
+        * [file-search](#file-search) - drop files/folders into up2k to see if they exist on the server
+        * [unpost](#unpost) - undo/delete accidental uploads
+    * [file manager](#file-manager) - cut/paste, rename, and delete files/folders (if you have permission)
+    * [batch rename](#batch-rename) - select some files and press F2 to bring up the rename UI
+    * [markdown viewer](#markdown-viewer) - and there are *two* editors
     * [other tricks](#other-tricks)
-    * [searching](#searching)
+    * [searching](#searching) - search by size, date, path/name, mp3-tags, ...
 * [server config](#server-config)
-    * [upload rules](#upload-rules)
-    * [database location](#database-location)upload rules
-    * [metadata from audio files](#metadata-from-audio-files)
-    * [file parser plugins](#file-parser-plugins)
+    * [file indexing](#file-indexing)
+    * [upload rules](#upload-rules) - set upload rules using volume flags, some examples
+    * [compress uploads](#compress-uploads) - files can be autocompressed on upload
+    * [database location](#database-location) - can be stored in-volume (default) or elsewhere
+    * [metadata from audio files](#metadata-from-audio-files) - set `-e2t` to index tags on upload
+    * [file parser plugins](#file-parser-plugins) - provide custom parsers to index additional tags
     * [complete examples](#complete-examples)
-* [browser support](#browser-support)
-* [client examples](#client-examples)
-* [up2k](#up2k)
-* [performance](#performance)
-* [dependencies](#dependencies)
-    * [optional dependencies](#optional-dependencies)
+* [browser support](#browser-support) - TLDR: yes
+* [client examples](#client-examples) - interact with copyparty using non-browser clients
+* [up2k](#up2k) - quick outline of the up2k protocol, see [uploading](#uploading) for the web-client
+* [performance](#performance) - defaults are good for most cases
+* [dependencies](#dependencies) - mandatory deps
+    * [optional dependencies](#optional-dependencies) - install these to enable bonus features
     * [install recommended deps](#install-recommended-deps)
     * [optional gpl stuff](#optional-gpl-stuff)
-* [sfx](#sfx)
-    * [sfx repack](#sfx-repack)
+* [sfx](#sfx) - there are two self-contained "binaries"
+    * [sfx repack](#sfx-repack) - reduce the size of an sfx by removing features
 * [install on android](#install-on-android)
 * [building](#building)
     * [dev env setup](#dev-env-setup)
     * [just the sfx](#just-the-sfx)
     * [complete release](#complete-release)
-* [todo](#todo)
+* [todo](#todo) - roughly sorted by priority
     * [discarded ideas](#discarded-ideas)
 
 
@@ -86,7 +90,9 @@ you may also want these, especially on servers:
 
 ### on debian
 
-recommended steps to enable audio metadata and thumbnails (from images and videos):
+recommended additional steps on debian
+
+enable audio metadata and thumbnails (from images and videos):
 
 * as root, run the following:  
   `apt install python3 python3-pip python3-dev ffmpeg`
@@ -99,7 +105,7 @@ recommended steps to enable audio metadata and thumbnails (from images and video
 
 ## notes
 
-general:
+general notes:
 * paper-printing is affected by dark/light-mode! use lightmode for color, darkmode for grayscale
   * because no browsers currently implement the media-query to do this properly orz
 
@@ -124,7 +130,7 @@ summary: all planned features work! now please enjoy the bloatening
   * ☑ basic: plain multipart, ie6 support
   * ☑ [up2k](#uploading): js, resumable, multithreaded
   * ☑ stash: simple PUT filedropper
-  * ☑ unpost: undo/delete accidental uploads
+  * ☑ [unpost](#unpost): undo/delete accidental uploads
   * ☑ symlink/discard existing files (content-matching)
 * download
   * ☑ single files in browser
@@ -184,6 +190,7 @@ small collection of user feedback
 
 # accounts and volumes
 
+per-folder, per-user permissions
 * `-a usr:pwd` adds account `usr` with password `pwd`
 * `-v .::r` adds current-folder `.` as the webroot, `r`eadable by anyone
   * the syntax is `-v src:dst:perm:perm:...` so local-path, url-path, and one or more permissions to set
@@ -208,14 +215,17 @@ example:
 
 # the browser
 
-![copyparty-browser-fs8](https://user-images.githubusercontent.com/241032/115978054-65106380-a57d-11eb-98f8-59e3dee73557.png)
+accessing a copyparty server using a web-browser
+
+![copyparty-browser-fs8](https://user-images.githubusercontent.com/241032/129635359-d6dd9b07-8079-4020-ad77-2bfdb9ebd8d5.png)
 
 
 ## tabs
 
-* `[🔎]` search by size, date, path/name, mp3-tags ... see [searching](#searching)
-* `[🧯]` unpost: undo/delete accidental uploads
-* `[🚀]` and `[🎈]` are the uploaders, see [uploading](#uploading)
+the main tabs in the ui
+* `[🔎]` [search](#searching) by size, date, path/name, mp3-tags ...
+* `[🧯]` [unpost](#unpost): undo/delete accidental uploads
+* `[🚀]` and `[🎈]` are the [uploaders](#uploading)
 * `[📂]` mkdir: create directories
 * `[📝]` new-md: create a new markdown document
 * `[📟]` send-msg: either to server-log or into textfiles if `--urlform save`
@@ -225,7 +235,7 @@ example:
 
 ## hotkeys
 
-the browser has the following hotkeys (assumes qwerty, ignores actual layout)
+the browser has the following hotkeys (always qwerty)
 * `B` toggle breadcrumbs / navpane
 * `I/K` prev/next folder
 * `M` parent folder (or unexpand current)
@@ -248,13 +258,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
@@ -272,14 +284,18 @@ the browser has the following hotkeys (assumes qwerty, ignores actual layout)
 
 ## navpane
 
-by default there's a breadcrumbs path; you can replace this with a navpane (tree-browser sidebar thing) by clicking the `🌲` or pressing the `B` hotkey
+switching between breadcrumbs or navpane
+
+click the `🌲` or pressing the `B` hotkey to toggle between breadcrumbs path (default), or a navpane (tree-browser sidebar thing)
 
 click `[-]` and `[+]` (or hotkeys `A`/`D`) to adjust the size, and the `[a]` toggles if the tree should widen dynamically as you go deeper or stay fixed-size
 
 
 ## thumbnails
 
-![copyparty-thumbs-fs8](https://user-images.githubusercontent.com/241032/120070302-10836b00-c08a-11eb-8eb4-82004a34c342.png)
+press `g` to toggle image/video thumbnails instead of the file listing
+
+![copyparty-thumbs-fs8](https://user-images.githubusercontent.com/241032/129636211-abd20fa2-a953-4366-9423-1c88ebb96ba9.png)
 
 it does static images with Pillow and uses FFmpeg for video files, so you may want to `--no-thumb` or maybe just `--no-vthumb` depending on how dangerous your users are
 
@@ -290,7 +306,9 @@ in the grid/thumbnail view, if the audio player panel is open, songs will start
 
 ## zip downloads
 
-the `zip` link next to folders can produce various types of zip/tar files using these alternatives in the browser settings tab:
+download folders (or file selections) as `zip` or `tar` files
+
+select which type of archive you want in the browser settings tab:
 
 | name | url-suffix | description |
 |--|--|--|
@@ -307,15 +325,16 @@ the `zip` link next to folders can produce various types of zip/tar files using
 
 you can also zip a selection of files or folders by clicking them in the browser, that brings up a selection editor and zip button in the bottom right
 
-![copyparty-zipsel-fs8](https://user-images.githubusercontent.com/241032/116008321-372a2e00-a614-11eb-9a4a-4a1fd9074224.png)
+![copyparty-zipsel-fs8](https://user-images.githubusercontent.com/241032/129635374-e5136e01-470a-49b1-a762-848e8a4c9cdc.png)
+
 
 ## uploading
 
-two upload methods are available in the html client:
+web-browsers can upload using `bup` and `up2k`:
 * `[🎈] bup`, the basic uploader, supports almost every browser since netscape 4.0
 * `[🚀] up2k`, the fancy one
 
-you can undo/delete uploads using `[🧯] unpost` if the server is running with `-e2d`
+you can undo/delete uploads using `[🧯]` [unpost](#unpost)
 
 up2k has several advantages:
 * you can drop folders into the browser (files are added recursively)
@@ -329,7 +348,7 @@ up2k has several advantages:
 
 see [up2k](#up2k) for details on how it works
 
-![copyparty-upload-fs8](https://user-images.githubusercontent.com/241032/115978061-680b5400-a57d-11eb-9ef6-cbb5f60aeccc.png)
+![copyparty-upload-fs8](https://user-images.githubusercontent.com/241032/129635371-48fc54ca-fa91-48e3-9b1d-ba413e4b68cb.png)
 
 **protip:** you can avoid scaring away users with [docs/minimal-up2k.html](docs/minimal-up2k.html) which makes it look [much simpler](https://user-images.githubusercontent.com/241032/118311195-dd6ca380-b4ef-11eb-86f3-75a3ff2e1332.png)
 
@@ -337,7 +356,7 @@ the up2k UI is the epitome of polished inutitive experiences:
 * "parallel uploads" specifies how many chunks to upload at the same time
 * `[🏃]` analysis of other files should continue while one is uploading
 * `[💭]` ask for confirmation before files are added to the list
-* `[💤]` sync uploading between other copyparty tabs so only one is active
+* `[💤]` sync uploading between other copyparty browser-tabs so only one is active
 * `[🔎]` switch between upload and file-search mode
 
 and then theres the tabs below it,
@@ -348,11 +367,14 @@ and then theres the tabs below it,
   * plus up to 3 entries each from `[done]` and `[que]` for context
 * `[que]` is all the files that are still queued
 
+
 ### file-search
 
-![copyparty-fsearch-fs8](https://user-images.githubusercontent.com/241032/116008320-36919780-a614-11eb-803f-04162326a700.png)
+drop files/folders into up2k to see if they exist on the server
 
-in the `[🚀 up2k]` tab, after toggling the `[🔎]` switch green, any files/folders you drop onto the dropzone will be hashed on the client-side. Each hash is sent to the server which checks if that file exists somewhere already
+![copyparty-fsearch-fs8](https://user-images.githubusercontent.com/241032/129635361-c79286f0-b8f1-440e-aaf4-6e929428fac9.png)
+
+in the `[🚀 up2k]` tab, after toggling the `[🔎]` switch green, any files/folders you drop onto the dropzone will be hashed on the client-side. Each hash is sent to the server which checks if that file exists somewhere
 
 files go into `[ok]` if they exist (and you get a link to where it is), otherwise they land in `[ng]`
 * the main reason filesearch is combined with the uploader is cause the code was too spaghetti to separate it out somewhere else, this is no longer the case but now i've warmed up to the idea too much
@@ -364,19 +386,28 @@ note that since up2k has to read the file twice, `[🎈 bup]` can be up to 2x fa
 up2k has saved a few uploads from becoming corrupted in-transfer already; caught an android phone on wifi redhanded in wireshark with a bitflip, however bup with https would *probably* have noticed as well (thanks to tls also functioning as an integrity check)
 
 
+### unpost
+
+undo/delete accidental uploads
+
+![copyparty-unpost-fs8](https://user-images.githubusercontent.com/241032/129635368-3afa6634-c20f-418c-90dc-ec411f3b3897.png)
+
+you can unpost even if you don't have regular move/delete access, however only for files uploaded within the past `--unpost` seconds (default 12 hours) and the server must be running with `-e2d`
+
+
 ## file manager
 
-if you have the required permissions, you can cut/paste, rename, and delete files/folders
+cut/paste, rename, and delete files/folders (if you have permission)
 
 you can move files across browser tabs (cut in one tab, paste in another)
 
 
 ## batch rename
 
-![batch-rename-fs8](https://user-images.githubusercontent.com/241032/128434204-eb136680-3c07-4ec7-92e0-ae86af20c241.png)
-
 select some files and press F2 to bring up the rename UI
 
+![batch-rename-fs8](https://user-images.githubusercontent.com/241032/128434204-eb136680-3c07-4ec7-92e0-ae86af20c241.png)
+
 quick explanation of the buttons,  
 * `[✅ apply rename]` confirms and begins renaming
 * `[❌ cancel]` aborts and closes the rename window
@@ -420,6 +451,8 @@ the metadata keys you can use in the format field are the ones in the file-brows
 
 ## markdown viewer
 
+and there are *two* editors
+
 ![copyparty-md-read-fs8](https://user-images.githubusercontent.com/241032/115978057-66419080-a57d-11eb-8539-d2be843991aa.png)
 
 * the document preview has a max-width which is the same as an A4 paper when printed
@@ -434,7 +467,9 @@ the metadata keys you can use in the format field are the ones in the file-brows
 
 ## searching
 
-![copyparty-search-fs8](https://user-images.githubusercontent.com/241032/115978060-6772bd80-a57d-11eb-81d3-174e869b72c3.png)
+search by size, date, path/name, mp3-tags, ...
+
+![copyparty-search-fs8](https://user-images.githubusercontent.com/241032/129635365-c0ff2a9f-0ee5-4fc3-8bb6-006033cf67b8.png)
 
 when started with `-e2dsa` copyparty will scan/index all your files. This avoids duplicates on upload, and also makes the volumes searchable through the web-ui:
 * make search queries by `size`/`date`/`directory-path`/`filename`, or...
@@ -449,6 +484,8 @@ add the argument `-e2ts` to also scan/index tags from music files, which brings
 
 # server config
 
+## file indexing
+
 file indexing relies on two databases, the up2k filetree (`-e2d`) and the metadata tags (`-e2t`). Configuration can be done through arguments, volume flags, or a mix of both.
 
 through arguments:
@@ -478,7 +515,7 @@ if you set `--no-hash`, you can enable hashing for specific volumes using flag `
 
 ## upload rules
 
-you can set upload rules using volume flags, some examples:
+set upload rules using volume flags, some examples:
 
 * `:c,sz=1k-3m` sets allowed filesize between 1 KiB and 3 MiB inclusive (suffixes: b, k, m, g)
 * `:c,nosub` disallow uploading into subdirectories; goes well with `rotn` and `rotf`:
@@ -487,6 +524,7 @@ you can set upload rules using volume flags, some examples:
   * if someone uploads to `/foo/bar` the path would be rewritten to `/foo/bar/2021/08/06/23` for example
   * but the actual value is not verified, just the structure, so the uploader can choose any values which conform to the format string
     * just to avoid additional complexity in up2k which is enough of a mess already
+* `:c,lifetime=300` delete uploaded files when they become 5 minutes old
 
 you can also set transaction limits which apply per-IP and per-volume, but these assume `-j 1` (default) otherwise the limits will be off, for example `-j 4` would allow anywhere between 1x and 4x the limits you set depending on which processing node the client gets routed to
 
@@ -496,7 +534,9 @@ you can also set transaction limits which apply per-IP and per-volume, but these
 
 ## compress uploads
 
-files can be autocompressed on upload, either on user-request (if config allows) or forced by server-config
+files can be autocompressed on upload
+
+compression is either on user-request (if config allows) or forced by server-config
 
 * volume flag `gz` allows gz compression
 * volume flag `xz` allows lzma compression
@@ -517,6 +557,8 @@ some examples,
 
 ## database location
 
+can be stored in-volume (default) or elsewhere
+
 copyparty creates a subfolder named `.hist` inside each volume where it stores the database, thumbnails, and some other stuff
 
 this can instead be kept in a single place using the `--hist` argument, or the `hist=` volume flag, or a mix of both:
@@ -530,6 +572,8 @@ note:
 
 ## metadata from audio files
 
+set `-e2t` to index tags on upload
+
 `-mte` decides which tags to index and display in the browser (and also the display order), this can be changed per-volume:
 * `-v ~/music::r:c,mte=title,artist` indexes and displays *title* followed by *artist*
 
@@ -553,6 +597,8 @@ see the beautiful mess of a dictionary in [mtag.py](https://github.com/9001/copy
 
 ## file parser plugins
 
+provide custom parsers to index additional tags
+
 copyparty can invoke external programs to collect additional metadata for files using `mtp` (either as argument or volume flag), there is a default timeout of 30sec
 
 * `-mtp .bpm=~/bin/audio-bpm.py` will execute `~/bin/audio-bpm.py` with the audio file as argument 1 to provide the `.bpm` tag, if that does not exist in the audio metadata
@@ -573,32 +619,38 @@ copyparty can invoke external programs to collect additional metadata for files
 
 # browser support
 
+TLDR: yes
+
 ![copyparty-ie4-fs8](https://user-images.githubusercontent.com/241032/118192791-fb31fe00-b446-11eb-9647-898ea8efc1f7.png)
 
 `ie` = internet-explorer, `ff` = firefox, `c` = chrome, `iOS` = iPhone/iPad, `Andr` = Android
 
-| feature         | ie6 | ie9 | ie10 | ie11 | ff 52 | c 49 | iOS | Andr |
-| --------------- | --- | --- | ---- | ---- | ----- | ---- | --- | ---- |
-| browse files    | yep | yep | yep  | yep  | yep   | yep  | yep | yep  |
-| basic uploader  | yep | yep | yep  | yep  | yep   | yep  | yep | yep  |
-| make directory  | yep | yep | yep  | yep  | yep   | yep  | yep | yep  |
-| send message    | yep | yep | yep  | yep  | yep   | yep  | yep | yep  |
-| set sort order  |  -  | yep | yep  | yep  | yep   | yep  | yep | yep  |
-| zip selection   |  -  | yep | yep  | yep  | yep   | yep  | yep | yep  |
-| navpane         |  -  |  -  | `*1` | yep  | yep   | yep  | yep | yep  |
-| up2k            |  -  |  -  | yep  | yep  | yep   | yep  | yep | yep  |
-| markdown editor |  -  |  -  | yep  | yep  | yep   | yep  | yep | yep  |
-| markdown viewer |  -  |  -  | yep  | yep  | yep   | yep  | yep | yep  |
-| play mp3/m4a    |  -  | yep | yep  | yep  | yep   | yep  | yep | yep  |
-| play ogg/opus   |  -  |  -  |  -   |  -   | yep   | yep  | `*2` | yep |
-| thumbnail view  |  -  |  -  | -    | -    | yep   | yep  | yep | yep  |
-| image viewer    |  -  |  -  | -    | -    | yep   | yep  | yep | yep  |
-| **= feature =** | ie6 | ie9 | ie10 | ie11 | ff 52 | c 49 | iOS | Andr |
+| feature         | ie6 | ie9  | ie10 | ie11 | ff 52 | c 49 | iOS | Andr |
+| --------------- | --- | ---- | ---- | ---- | ----- | ---- | --- | ---- |
+| browse files    | yep | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| thumbnail view  |  -  | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| basic uploader  | yep | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| up2k            |  -  |  -   | `*1` | `*1` |  yep  | yep  | yep | yep  |
+| make directory  | yep | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| send message    | yep | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| set sort order  |  -  | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| zip selection   |  -  | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| file rename     |  -  | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| file cut/paste  |  -  | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| navpane         |  -  | `*2` | yep  | yep  |  yep  | yep  | yep | yep  |
+| image viewer    |  -  | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| video player    |  -  | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| markdown editor |  -  |  -   | yep  | yep  |  yep  | yep  | yep | yep  |
+| markdown viewer |  -  |  -   | yep  | yep  |  yep  | yep  | yep | yep  |
+| play mp3/m4a    |  -  | yep  | yep  | yep  |  yep  | yep  | yep | yep  |
+| play ogg/opus   |  -  |  -   |  -   |  -   |  yep  | yep  | `*3` | yep |
+| **= feature =** | ie6 | ie9  | ie10 | ie11 | ff 52 | c 49 | iOS | Andr |
 
 * internet explorer 6 to 8 behave the same
 * firefox 52 and chrome 49 are the last winxp versions
-* `*1` only public folders (login session is dropped) and no history / back-button
-* `*2` using a wasm decoder which can sometimes get stuck and consumes a bit more power
+* `*1` yes, but extremely slow (ie10: 1 MiB/s, ie11: 270 KiB/s)
+* `*2` causes a full-page refresh on each navigation
+* `*3` using a wasm decoder which can sometimes get stuck and consumes a bit more power
 
 quick summary of more eccentric web-browsers trying to view a directory index:
 
@@ -610,12 +662,15 @@ quick summary of more eccentric web-browsers trying to view a directory index:
 | **lynx** (2.8.9/macports) | can browse, login, upload/mkdir/msg |
 | **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` |
 | **SerenityOS** (7e98457)  | hits a page fault, works with `?b=u`, file upload not-impl |
 
 
 # client examples
 
+interact with copyparty using non-browser clients
+
 * javascript: dump some state into a file (two separate examples)
   * `await fetch('https://127.0.0.1:3923/', {method:"PUT", body: JSON.stringify(foo)});`
   * `var xhr = new XMLHttpRequest(); xhr.open('POST', 'https://127.0.0.1:3923/msgs?raw'); xhr.send('foo');`
@@ -658,7 +713,9 @@ quick outline of the up2k protocol, see [uploading](#uploading) for the web-clie
 
 # performance
 
-defaults are good for most cases, don't mind the `cannot efficiently use multiple CPU cores` message, it's very unlikely to be a problem
+defaults are good for most cases
+
+you can ignore the `cannot efficiently use multiple CPU cores` message, it's very unlikely to be a problem
 
 below are some tweaks roughly ordered by usefulness:
 
@@ -675,11 +732,14 @@ below are some tweaks roughly ordered by usefulness:
 
 # dependencies
 
+mandatory deps:
 * `jinja2` (is built into the SFX)
 
 
 ## optional dependencies
 
+install these to enable bonus features
+
 enable music tags:
 * either `mutagen` (fast, pure-python, skips a few tags, makes copyparty GPL? idk)
 * or `ffprobe` (20x slower, more accurate, possibly dangerous depending on your distro and users)
@@ -712,7 +772,7 @@ these are standalone programs and will never be imported / evaluated by copypart
 
 # sfx
 
-currently there are two self-contained "binaries":
+there are two self-contained "binaries":
 * [copyparty-sfx.py](https://github.com/9001/copyparty/releases/latest/download/copyparty-sfx.py) -- pure python, works everywhere, **recommended**
 * [copyparty-sfx.sh](https://github.com/9001/copyparty/releases/latest/download/copyparty-sfx.sh) -- smaller, but only for linux and macos, kinda deprecated
 
@@ -723,6 +783,8 @@ pls note that `copyparty-sfx.sh` will fail if you rename `copyparty-sfx.py` to `
 
 ## sfx repack
 
+reduce the size of an sfx by removing features
+
 if you don't need all the features, you can repack the sfx and save a bunch of space; all you need is an sfx and a copy of this repo (nothing else to download or build, except if you're on windows then you need msys2 or WSL)
 * `525k` size of original sfx.py as of v0.11.30
 * `315k` after `./scripts/make-sfx.sh re no-ogv`
@@ -766,7 +828,7 @@ pip install black bandit pylint flake8  # vscode tooling
 
 ## just the sfx
 
-unless you need to modify something in the web-dependencies, it's faster to grab those from a previous release:
+grab the web-dependencies from a previous sfx (unless you need to modify something in those):
 
 ```sh
 rm -rf copyparty/web/deps
@@ -786,7 +848,7 @@ then build the sfx using any of the following examples:
 
 ## complete release
 
-also builds the sfx so disregard the sfx section above
+also builds the sfx so skip the sfx section above
 
 in the `scripts` folder:
 

bin/README.md

@@ -61,3 +61,8 @@ cd /mnt/nas/music/.hist
 ~/src/copyparty/bin/dbtool.py -src up2k.*.v3 up2k.db -rm-mtp-flag -copy key
 ~/src/copyparty/bin/dbtool.py -src up2k.*.v3 up2k.db -rm-mtp-flag -copy .bpm -vac
 ```
+
+
+# [`prisonparty.sh`](prisonparty.sh)
+* run copyparty in a chroot, preventing any accidental file access
+* creates bindmounts for /bin, /lib, and so on, see `sysdirs=`

bin/mtag/res/yt-ipr.conf

@@ -0,0 +1,39 @@
+# example config file to use copyparty as a youtube manifest collector,
+# use with copyparty like:  python copyparty.py -c yt-ipr.conf
+#
+# see docs/example.conf for a better explanation of the syntax, but
+# newlines are block separators, so adding blank lines inside a volume definition is bad
+# (use comments as separators instead)
+
+
+# create user ed, password wark
+u ed:wark
+
+
+# create a volume at /ytm which stores files at ./srv/ytm
+./srv/ytm
+/ytm
+# write-only, but read-write for user ed
+w
+rw ed
+# rescan the volume on startup
+c e2dsa
+# collect tags from all new files since last scan
+c e2ts
+# optionally enable compression to make the files 50% smaller
+c pk
+# only allow uploads which are between 16k and 1m large
+c sz=16k-1m
+# allow up to 10 uploads over 5 minutes from each ip
+c maxn=10,300
+# move uploads into subfolders: YEAR-MONTH / DAY-HOUR / <upload>
+c rotf=%Y-%m/%d-%H
+# delete uploads when they are 24 hours old
+c lifetime=86400
+# add the parser and tell copyparty what tags it can expect from it
+c mtp=yt-id,yt-title,yt-author,yt-channel,yt-views,yt-private,yt-manifest,yt-expires=bin/mtag/yt-ipr.py
+# decide which tags we want to index and in what order
+c mte=yt-id,yt-title,yt-author,yt-channel,yt-views,yt-private,yt-manifest,yt-expires
+
+
+# create any other volumes you'd like down here, or merge this with an existing config file

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

@@ -7,26 +7,41 @@
 // ==/UserScript==
 
 function main() {
+    var server = 'https://127.0.0.1:3923/ytm?pw=wark',
+        interval = 60; // sec
+
     var sent = {};
-    function send(txt) {
-        if (sent[txt])
+    function send(txt, mf_url, desc) {
+        if (sent[mf_url])
             return;
 
-        fetch('https://127.0.0.1:3923/playerdata?_=' + Date.now(), { method: "PUT", body: txt });
-        console.log('[yt-ipr] yeet %d bytes', txt.length);
-        sent[txt] = 1;
+        fetch(server + '&_=' + Date.now(), { method: "PUT", body: txt });
+        console.log('[yt-pdh] yeet %d bytes, %s', txt.length, desc);
+        sent[mf_url] = 1;
     }
 
     function collect() {
-        setTimeout(collect, 60 * 1000);
-        var pd = document.querySelector('ytd-watch-flexy');
-        if (pd)
-            send(JSON.stringify(pd.playerData));
+        try {
+            var pd = document.querySelector('ytd-watch-flexy');
+            if (!pd)
+                return console.log('[yt-pdh] no video found');
+
+            pd = pd.playerData;
+            var mu = pd.streamingData.dashManifestUrl || pd.streamingData.hlsManifestUrl;
+            if (!mu || !mu.length)
+                return console.log('[yt-pdh] no manifest found');
+
+            var desc = pd.videoDetails.videoId + ', ' + pd.videoDetails.title;
+            send(JSON.stringify(pd), mu, desc);
+        }
+        catch (ex) {
+            console.log("[yt-pdh]", ex);
+        }
     }
-    setTimeout(collect, 5000);
+    setInterval(collect, interval * 1000);
 }
 
 var scr = document.createElement('script');
 scr.textContent = '(' + main.toString() + ')();';
 (document.head || document.getElementsByTagName('head')[0]).appendChild(scr);
-console.log('[yt-ipr] a');
+console.log('[yt-pdh] a');

bin/mtag/yt-ipr.py

@@ -1,19 +1,26 @@
 #!/usr/bin/env python
 
 import re
+import os
 import sys
 import gzip
 import json
+import base64
+import string
+import urllib.request
 from datetime import datetime
 
 """
 youtube initial player response
 
-example usage:
-  -v srv/playerdata:playerdata:w
-       :c,e2tsr:c,e2dsa
-       :c,mtp=yt-id,yt-title,yt-author,yt-channel,yt-views,yt-private,yt-expires=bin/mtag/yt-ipr.py
-       :c,mte=yt-id,yt-title,yt-author,yt-channel,yt-views,yt-private,yt-expires
+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,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
 
 see res/yt-ipr.user.js for the example userscript to go with this
 """
@@ -30,19 +37,36 @@ def main():
     txt = "{" + txt.split("{", 1)[1]
 
     try:
-        obj = json.loads(txt)
+        pd = json.loads(txt)
     except json.decoder.JSONDecodeError as ex:
-        obj = json.loads(txt[: ex.pos])
+        pd = json.loads(txt[: ex.pos])
 
-    # print(json.dumps(obj, indent=2))
+    # print(json.dumps(pd, indent=2))
 
-    vd = obj["videoDetails"]
-    sd = obj["streamingData"]
+    if "videoDetails" in pd:
+        parse_youtube(pd)
+    else:
+        parse_freg(pd)
+
+
+def get_expiration(url):
+    et = re.search(r"[?&]expire=([0-9]+)", url).group(1)
+    et = datetime.utcfromtimestamp(int(et))
+    return et.strftime("%Y-%m-%d, %H:%M")
+
+
+def parse_youtube(pd):
+    vd = pd["videoDetails"]
+    sd = pd["streamingData"]
 
     et = sd["adaptiveFormats"][0]["url"]
-    et = re.search(r"[?&]expire=([0-9]+)", et).group(1)
-    et = datetime.utcfromtimestamp(int(et))
-    et = et.strftime("%Y-%m-%d, %H:%M")
+    et = get_expiration(et)
+
+    mf = []
+    if "dashManifestUrl" in sd:
+        mf.append("dash")
+    if "hlsManifestUrl" in sd:
+        mf.append("hls")
 
     r = {
         "yt-id": vd["videoId"],
@@ -52,10 +76,123 @@ def main():
         "yt-views": vd["viewCount"],
         "yt-private": vd["isPrivate"],
         # "yt-expires": sd["expiresInSeconds"],
+        "yt-manifest": ",".join(mf),
         "yt-expires": et,
     }
     print(json.dumps(r))
 
+    freg_conv(pd)
+
+
+def parse_freg(pd):
+    md = pd["metadata"]
+    r = {
+        "yt-id": md["id"],
+        "yt-title": md["title"],
+        "yt-author": md["channelName"],
+        "yt-channel": md["channelURL"].strip("/").split("/")[-1],
+        "yt-expires": get_expiration(list(pd["video"].values())[0]),
+    }
+    print(json.dumps(r))
+
+
+def freg_conv(pd):
+    # based on getURLs.js v1.5 (2021-08-07)
+    # fmt: off
+    priority = {
+        "video": [
+            337, 315, 266, 138,  # 2160p60
+            313, 336,  # 2160p
+            308,  # 1440p60
+            271, 264,  # 1440p
+            335, 303, 299,  # 1080p60
+            248, 169, 137,  # 1080p
+            334, 302, 298,  # 720p60
+            247, 136  # 720p
+        ],
+        "audio": [
+            251, 141, 171, 140, 250, 249, 139
+        ]
+    }
+
+    vid_id = pd["videoDetails"]["videoId"]
+    chan_id = pd["videoDetails"]["channelId"]
+
+    try:
+        thumb_url = pd["microformat"]["playerMicroformatRenderer"]["thumbnail"]["thumbnails"][0]["url"]
+        start_ts = pd["microformat"]["playerMicroformatRenderer"]["liveBroadcastDetails"]["startTimestamp"]
+    except:
+        thumb_url = f"https://img.youtube.com/vi/{vid_id}/maxresdefault.jpg"
+        start_ts = ""
+
+    # fmt: on
+
+    metadata = {
+        "title": pd["videoDetails"]["title"],
+        "id": vid_id,
+        "channelName": pd["videoDetails"]["author"],
+        "channelURL": "https://www.youtube.com/channel/" + chan_id,
+        "description": pd["videoDetails"]["shortDescription"],
+        "thumbnailUrl": thumb_url,
+        "startTimestamp": start_ts,
+    }
+
+    if [x for x in vid_id if x not in string.ascii_letters + string.digits + "_-"]:
+        print(f"malicious json", file=sys.stderr)
+        return
+
+    basepath = os.path.dirname(sys.argv[1])
+
+    thumb_fn = f"{basepath}/{vid_id}.jpg"
+    tmp_fn = f"{thumb_fn}.{os.getpid()}"
+    if not os.path.exists(thumb_fn) and (
+        thumb_url.startswith("https://img.youtube.com/vi/")
+        or thumb_url.startswith("https://i.ytimg.com/vi/")
+    ):
+        try:
+            with urllib.request.urlopen(thumb_url) as fi:
+                with open(tmp_fn, "wb") as fo:
+                    fo.write(fi.read())
+
+            os.rename(tmp_fn, thumb_fn)
+        except:
+            if os.path.exists(tmp_fn):
+                os.unlink(tmp_fn)
+
+    try:
+        with open(thumb_fn, "rb") as f:
+            thumb = base64.b64encode(f.read()).decode("ascii")
+    except:
+        thumb = "/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k="
+
+    metadata["thumbnail"] = "data:image/jpeg;base64," + thumb
+
+    ret = {
+        "metadata": metadata,
+        "version": "1.5",
+        "createTime": datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ"),
+    }
+
+    for stream, itags in priority.items():
+        for itag in itags:
+            url = None
+            for afmt in pd["streamingData"]["adaptiveFormats"]:
+                if itag == afmt["itag"]:
+                    url = afmt["url"]
+                    break
+
+            if url:
+                ret[stream] = {itag: url}
+                break
+
+    fn = f"{basepath}/{vid_id}.urls.json"
+    with open(fn, "w", encoding="utf-8", errors="replace") as f:
+        f.write(json.dumps(ret, indent=4))
+
 
 if __name__ == "__main__":
-    main()
+    try:
+        main()
+    except:
+        # raise
+        pass

bin/prisonparty.sh

@@ -0,0 +1,99 @@
+#!/bin/bash
+set -e
+
+# 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 )
+
+
+# error-handler
+help() { cat <<'EOF'
+
+usage:
+  ./prisonparty.sh <ROOTDIR> <UID> <GID> [VOLDIR [VOLDIR...]] -- copyparty-sfx.py [...]"
+
+example:
+  ./prisonparty.sh /var/lib/copyparty-jail 1000 1000 /mnt/nas/music -- copyparty-sfx.py -v /mnt/nas/music::rwmd"
+
+EOF
+exit 1
+}
+
+
+# read arguments
+trap help EXIT
+jail="$(realpath "$1")"; shift
+uid="$1"; shift
+gid="$1"; shift
+
+vols=()
+while true; do
+	v="$1"; shift
+	[ "$v" = -- ] && break  # end of volumes
+	[ "$#" -eq 0 ] && break  # invalid usage
+	vols+=( "$(realpath "$v")" )
+done
+pybin="$1"; shift
+pybin="$(realpath "$pybin")"
+cpp="$1"; shift
+cpp="$(realpath "$cpp")"
+cppdir="$(dirname "$cpp")"
+trap - EXIT
+
+
+# debug/vis
+echo
+echo "chroot-dir = $jail"
+echo "user:group = $uid:$gid"
+echo " copyparty = $cpp"
+echo
+printf '\033[33m%s\033[0m\n' "copyparty can access these folders and all their subdirectories:"
+for v in "${vols[@]}"; do
+	printf '\033[36m ├─\033[0m %s \033[36m ── added by (You)\033[0m\n' "$v"
+done
+printf '\033[36m ├─\033[0m %s \033[36m ── where the copyparty binary is\033[0m\n' "$cppdir"
+printf '\033[36m ╰─\033[0m %s \033[36m ── the folder you are currently in\033[0m\n' "$PWD"
+vols+=("$cppdir" "$PWD")
+echo
+
+
+# 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"
+		continue
+	}
+	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"
+chmod 777 "$jail/tmp"
+
+
+# run copyparty
+/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 -qF " on $jail" |
+	awk '{sub(/ type .*/,"");sub(/.* on /,"");print}' |
+	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/__init__.py

@@ -25,6 +25,28 @@ ANYWIN = WINDOWS or sys.platform in ["msys"]
 MACOS = platform.system() == "Darwin"
 
 
+def get_unix_home():
+    try:
+        v = os.environ["XDG_CONFIG_HOME"]
+        if not v:
+            raise Exception()
+        ret = os.path.normpath(v)
+        os.listdir(ret)
+        return ret
+    except:
+        pass
+
+    try:
+        v = os.path.expanduser("~/.config")
+        if v.startswith("~"):
+            raise Exception()
+        ret = os.path.normpath(v)
+        os.listdir(ret)
+        return ret
+    except:
+        return "/tmp"
+
+
 class EnvParams(object):
     def __init__(self):
         self.t0 = time.time()
@@ -37,10 +59,7 @@ class EnvParams(object):
         elif sys.platform == "darwin":
             self.cfg = os.path.expanduser("~/Library/Preferences/copyparty")
         else:
-            self.cfg = os.path.normpath(
-                os.getenv("XDG_CONFIG_HOME", os.path.expanduser("~/.config"))
-                + "/copyparty"
-            )
+            self.cfg = get_unix_home() + "/copyparty"
 
         self.cfg = self.cfg.replace("\\", "/")
         try:

copyparty/__main__.py

@@ -210,9 +210,9 @@ def run_argparse(argv, formatter):
             dedent(
                 """
             -a takes username:password,
-            -v takes src:dst:perm1:perm2:permN:cflag1:cflag2:cflagN:...
+            -v takes src:dst:perm1:perm2:permN:volflag1:volflag2:volflagN:...
                where "perm" is "accesslevels,username1,username2,..."
-               and "cflag" is config flags to set on this volume
+               and "volflag" is config flags to set on this volume
             
             list of accesslevels:
               "r" (read):   list folder contents, download files
@@ -220,7 +220,7 @@ def run_argparse(argv, formatter):
               "m" (move):   move files and folders; need "w" at destination
               "d" (delete): permanently delete files and folders
 
-            too many cflags to list here, see the other sections
+            too many volflags to list here, see the other sections
 
             example:\033[35m
               -a ed:hunter2 -v .::r:rw,ed -v ../inc:dump:w:rw,ed:c,nodupe  \033[36m
@@ -241,11 +241,11 @@ def run_argparse(argv, formatter):
             ),
         ],
         [
-            "cflags",
-            "list of cflags",
+            "flags",
+            "list of volflags",
             dedent(
                 """
-            cflags are appended to volume definitions, for example,
+            volflags are appended to volume definitions, for example,
             to create a write-only volume with the \033[33mnodupe\033[0m and \033[32mnosub\033[0m flags:
               \033[35m-v /mnt/inc:/inc:w\033[33m:c,nodupe\033[32m:c,nosub
 
@@ -264,13 +264,15 @@ def run_argparse(argv, formatter):
             (moves all uploads into the specified folder structure)
               \033[36mrotn=100,3\033[35m 3 levels of subfolders with 100 entries in each
               \033[36mrotf=%Y-%m/%d-%H\033[35m date-formatted organizing
+              \033[36mlifetime=3600\033[35m uploads are deleted after 1 hour
             
             \033[0mdatabase, general:
-              \033[36me2d\033[35m sets -e2d (all -e2* args can be set using ce2* cflags)
+              \033[36me2d\033[35m sets -e2d (all -e2* args can be set using ce2* volflags)
               \033[36md2t\033[35m disables metadata collection, overrides -e2t*
               \033[36md2d\033[35m disables all database stuff, overrides -e2*
               \033[36mdhash\033[35m disables file hashing on initial scans, also ehash
               \033[36mhist=/tmp/cdb\033[35m puts thumbnails and indexes at that location
+              \033[36mscan=60\033[35m scan for new files every 60sec, same as --re-maxage
             
             \033[0mdatabase, audio tags:
             "mte", "mth", "mtp", "mtm" all work the same as -mte, -mth, ...
@@ -353,6 +355,7 @@ def run_argparse(argv, formatter):
     ap2.add_argument("-nih", action="store_true", help="no info hostname")
     ap2.add_argument("-nid", action="store_true", help="no info disk-usage")
     ap2.add_argument("--no-zip", action="store_true", help="disable download as zip/tar")
+    ap2.add_argument("--no-lifetime", action="store_true", help="disable automatic deletion of uploads after a certain time (lifetime volflag)")
 
     ap2 = ap.add_argument_group('safety options')
     ap2.add_argument("--ls", metavar="U[,V[,F]]", type=u, help="scan all volumes; arguments USER,VOL,FLAGS; example [**,*,ln,p,r]")
@@ -375,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")
@@ -391,7 +395,7 @@ def run_argparse(argv, formatter):
     ap2.add_argument("--hist", metavar="PATH", type=u, help="where to store volume data (db, thumbs)")
     ap2.add_argument("--no-hash", action="store_true", help="disable hashing during e2ds folder scans")
     ap2.add_argument("--re-int", metavar="SEC", type=int, default=30, help="disk rescan check interval")
-    ap2.add_argument("--re-maxage", metavar="SEC", type=int, default=0, help="disk rescan volume interval (0=off)")
+    ap2.add_argument("--re-maxage", metavar="SEC", type=int, default=0, help="disk rescan volume interval, 0=off, can be set per-volume with the 'scan' volflag")
     ap2.add_argument("--srch-time", metavar="SEC", type=int, default=30, help="search deadline")
     
     ap2 = ap.add_argument_group('metadata db options')

copyparty/__version__.py

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

copyparty/authsrv.py

@@ -25,6 +25,9 @@ from .util import (
 from .bos import bos
 
 
+LEELOO_DALLAS = "leeloo_dallas"
+
+
 class AXS(object):
     def __init__(self, uread=None, uwrite=None, umove=None, udel=None):
         self.uread = {} if uread is None else {k: 1 for k in uread}
@@ -327,7 +330,7 @@ class VFS(object):
             [will_move, c.umove, "move"],
             [will_del, c.udel, "delete"],
         ]:
-            if req and (uname not in d and "*" not in d):
+            if req and (uname not in d and "*" not in d) and uname != LEELOO_DALLAS:
                 m = "you don't have {}-access for this location"
                 raise Pebkac(403, m.format(msg))
 
@@ -554,6 +557,9 @@ class AuthSrv(object):
 
     def _read_vol_str(self, lvl, uname, axs, flags):
         # type: (str, str, AXS, any) -> None
+        if lvl.strip("crwmd"):
+            raise Exception("invalid volume flag: {},{}".format(lvl, uname))
+
         if lvl == "c":
             cval = True
             if "=" in uname:
@@ -709,6 +715,9 @@ class AuthSrv(object):
             )
             raise Exception("invalid config")
 
+        if LEELOO_DALLAS in all_users:
+            raise Exception("sorry, reserved username: " + LEELOO_DALLAS)
+
         promote = []
         demote = []
         for vol in vfs.all_vols.values():
@@ -807,6 +816,11 @@ class AuthSrv(object):
             if "pk" in vol.flags and "gz" not in vol.flags and "xz" not in vol.flags:
                 vol.flags["gz"] = False  # def.pk
 
+            if "scan" in vol.flags:
+                vol.flags["scan"] = int(vol.flags["scan"])
+            elif self.args.re_maxage:
+                vol.flags["scan"] = self.args.re_maxage
+
         all_mte = {}
         errors = False
         for vol in vfs.all_vols.values():

copyparty/httpcli.py

@@ -112,7 +112,7 @@ class HttpCli(object):
             self.http_ver = "HTTP/1.1"
             # self.log("pebkac at httpcli.run #1: " + repr(ex))
             self.keepalive = False
-            self.loud_reply(unicode(ex), status=ex.code)
+            self.loud_reply(unicode(ex), status=ex.code, volsan=True)
             return self.keepalive
 
         # time.sleep(0.4)
@@ -224,19 +224,24 @@ class HttpCli(object):
             else:
                 raise Pebkac(400, 'invalid HTTP mode "{0}"'.format(self.mode))
 
-        except Pebkac as ex:
+        except Exception as ex:
+            pex = ex
+            if not hasattr(ex, "code"):
+                pex = Pebkac(500)
+
             try:
-                # self.log("pebkac at httpcli.run #2: " + repr(ex))
                 post = self.mode in ["POST", "PUT"] or "content-length" in self.headers
-                if not self._check_nonfatal(ex, post):
+                if not self._check_nonfatal(pex, post):
                     self.keepalive = False
 
-                self.log("{}\033[0m, {}".format(str(ex), self.vpath), 3)
+                msg = str(ex) if pex == ex else min_ex()
+                self.log("{}\033[0m, {}".format(msg, self.vpath), 3)
+
                 msg = "<pre>{}\r\nURL: {}\r\n".format(str(ex), self.vpath)
                 if self.hint:
                     msg += "hint: {}\r\n".format(self.hint)
 
-                self.reply(msg.encode("utf-8", "replace"), status=ex.code)
+                self.reply(msg.encode("utf-8", "replace"), status=pex.code, volsan=True)
                 return self.keepalive
             except Pebkac:
                 return False
@@ -269,8 +274,12 @@ class HttpCli(object):
         except:
             raise Pebkac(400, "client d/c while replying headers")
 
-    def reply(self, body, status=200, mime=None, headers=None):
+    def reply(self, body, status=200, mime=None, headers=None, volsan=False):
         # TODO something to reply with user-supplied values safely
+
+        if volsan:
+            body = vol_san(self.asrv.vfs.all_vols.values(), body)
+
         self.send_headers(len(body), status, mime, headers)
 
         try:
@@ -864,7 +873,7 @@ class HttpCli(object):
         self.parser.drop()
 
         ck, msg = self.get_pwd_cookie(pwd)
-        html = self.j2("msg", h1=msg, h2='<a href="/">ack</a>', redir="/")
+        html = self.j2("msg", h1=msg, h2='<a href="/?h">ack</a>', redir="/?h")
         self.reply(html.encode("utf-8"), headers={"Set-Cookie": ck})
         return True
 
@@ -947,10 +956,14 @@ class HttpCli(object):
         vfs, rem = self.asrv.vfs.get(self.vpath, self.uname, False, True)
         self._assert_safe_rem(rem)
 
+        upload_vpath = self.vpath
         lim = vfs.get_dbv(rem)[0].lim
         fdir_base = os.path.join(vfs.realpath, rem)
         if lim:
             fdir_base, rem = lim.all(self.ip, rem, -1, fdir_base)
+            upload_vpath = "{}/{}".format(vfs.vpath, rem).strip("/")
+            if not nullwrite:
+                bos.makedirs(fdir_base)
 
         files = []
         errmsg = ""
@@ -977,8 +990,6 @@ class HttpCli(object):
                 if lim:
                     lim.chk_bup(self.ip)
                     lim.chk_nup(self.ip)
-                    if not nullwrite:
-                        bos.makedirs(fdir)
 
                 try:
                     with ren_open(fname, "wb", 512 * 1024, **open_args) as f:
@@ -1029,7 +1040,9 @@ class HttpCli(object):
                     raise
 
         except Pebkac as ex:
-            errmsg = unicode(ex)
+            errmsg = vol_san(
+                self.asrv.vfs.all_vols.values(), unicode(ex).encode("utf-8")
+            ).decode("utf-8")
 
         td = max(0.1, time.time() - t0)
         sz_total = sum(x[0] for x in files)
@@ -1049,7 +1062,7 @@ class HttpCli(object):
             errmsg = "ERROR: " + errmsg
 
         for sz, sha512, ofn, lfn in files:
-            vpath = (self.vpath + "/" if self.vpath else "") + lfn
+            vpath = "{}/{}".format(upload_vpath, lfn).strip("/")
             msg += 'sha512: {} // {} bytes // <a href="/{}">{}</a>\n'.format(
                 sha512[:56], sz, quotep(vpath), html_escape(ofn, crlf=True)
             )
@@ -1686,7 +1699,7 @@ class HttpCli(object):
 
             q = "select sz, rd, fn, at from up where ip=? and at>?"
             for sz, rd, fn, at in cur.execute(q, (self.ip, lim)):
-                vp = "/" + "/".join([rd, fn]).strip("/")
+                vp = "/" + "/".join(x for x in [vol.vpath, rd, fn] if x)
                 if filt and filt not in vp:
                     continue
 
@@ -1769,7 +1782,7 @@ class HttpCli(object):
                     for fn in self.args.th_covers.split(","):
                         fp = os.path.join(abspath, fn)
                         if bos.path.exists(fp):
-                            vrem = "{}/{}".format(vrem.rstrip("/"), fn)
+                            vrem = "{}/{}".format(vrem.rstrip("/"), fn).strip("/")
                             is_dir = False
                             break
 

copyparty/tcpsrv.py

@@ -177,7 +177,7 @@ class TcpSrv(object):
             eps = self.ips_linux()
 
         if "0.0.0.0" not in listen_ips:
-            eps = {k: v for k, v in eps if k in listen_ips}
+            eps = {k: v for k, v in eps.items() if k in listen_ips}
 
         default_route = None
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)

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/up2k.py

@@ -36,7 +36,7 @@ from .util import (
     min_ex,
 )
 from .bos import bos
-from .authsrv import AuthSrv
+from .authsrv import AuthSrv, LEELOO_DALLAS
 from .mtag import MTag, MParser
 
 try:
@@ -176,36 +176,71 @@ class Up2k(object):
         return None
 
     def _sched_rescan(self):
-        maxage = self.args.re_maxage
         volage = {}
         while True:
             time.sleep(self.args.re_int)
             now = time.time()
-            vpaths = list(sorted(self.asrv.vfs.all_vols.keys()))
             with self.mutex:
-                if maxage:
-                    for vp in vpaths:
-                        if vp not in volage:
-                            volage[vp] = now
+                for vp, vol in sorted(self.asrv.vfs.all_vols.items()):
+                    maxage = vol.flags.get("scan")
+                    if not maxage:
+                        continue
 
-                        if now - volage[vp] >= maxage:
-                            self.need_rescan[vp] = 1
+                    if vp not in volage:
+                        volage[vp] = now
 
-                if not self.need_rescan:
-                    continue
+                    if now - volage[vp] >= maxage:
+                        self.need_rescan[vp] = 1
 
                 vols = list(sorted(self.need_rescan.keys()))
                 self.need_rescan = {}
 
-            err = self.rescan(self.asrv.vfs.all_vols, vols)
-            if err:
-                for v in vols:
-                    self.need_rescan[v] = True
+            if vols:
+                err = self.rescan(self.asrv.vfs.all_vols, vols)
+                if err:
+                    for v in vols:
+                        self.need_rescan[v] = True
 
+                    continue
+
+                for v in vols:
+                    volage[v] = now
+
+            if self.args.no_lifetime:
                 continue
 
-            for v in vols:
-                volage[v] = now
+            for vp, vol in sorted(self.asrv.vfs.all_vols.items()):
+                lifetime = vol.flags.get("lifetime")
+                if not lifetime:
+                    continue
+
+                cur = self.cur.get(vol.realpath)
+                if not cur:
+                    continue
+
+                nrm = 0
+                deadline = time.time() - int(lifetime)
+                q = "select rd, fn from up where at > 0 and at < ? limit 100"
+                while True:
+                    with self.mutex:
+                        hits = cur.execute(q, (deadline,)).fetchall()
+
+                    if not hits:
+                        break
+
+                    for rd, fn in hits:
+                        if rd.startswith("//") or fn.startswith("//"):
+                            rd, fn = s3dec(rd, fn)
+
+                        fvp = "{}/{}".format(rd, fn).strip("/")
+                        if vp:
+                            fvp = "{}/{}".format(vp, fvp)
+
+                        self._handle_rm(LEELOO_DALLAS, None, fvp)
+                        nrm += 1
+
+                if nrm:
+                    self.log("{} files graduated in {}".format(nrm, vp))
 
     def _vis_job_progress(self, job):
         perc = 100 - (len(job["need"]) * 100.0 / len(job["hash"]))
@@ -1188,7 +1223,8 @@ class Up2k(object):
 
                 self._new_upload(job)
 
-            purl = "/{}/".format("{}/{}".format(job["vtop"], job["prel"]).strip("/"))
+            purl = "{}/{}".format(job["vtop"], job["prel"]).strip("/")
+            purl = "/{}/".format(purl) if purl else "/"
 
             return {
                 "name": job["name"],
@@ -1392,7 +1428,11 @@ class Up2k(object):
         ptop = vn.realpath
         atop = vn.canonical(rem, False)
         adir, fn = os.path.split(atop)
-        st = bos.lstat(atop)
+        try:
+            st = bos.lstat(atop)
+        except:
+            raise Pebkac(400, "file not found on disk (already deleted?)")
+
         scandir = not self.args.no_scandir
         if stat.S_ISLNK(st.st_mode) or stat.S_ISREG(st.st_mode):
             dbv, vrem = self.asrv.vfs.get(vpath, uname, *permsets[0])

copyparty/util.py

@@ -19,7 +19,7 @@ import subprocess as sp  # nosec
 from datetime import datetime
 from collections import Counter
 
-from .__init__ import PY2, WINDOWS, ANYWIN
+from .__init__ import PY2, WINDOWS, ANYWIN, VT100
 from .stolen import surrogateescape
 
 FAKE_MP = False
@@ -58,7 +58,7 @@ except:
         return struct.unpack(f.decode("ascii"), *a, **ka)
 
 
-ansi_re = re.compile("\033\\[[^m]*m")
+ansi_re = re.compile("\033\\[[^mK]*[mK]")
 
 
 surrogateescape.register_surrogateescape()
@@ -207,17 +207,22 @@ class ProgressPrinter(threading.Thread):
 
     def run(self):
         msg = None
+        fmt = " {}\033[K\r" if VT100 else " {} $\r"
         while not self.end:
             time.sleep(0.1)
             if msg == self.msg or self.end:
                 continue
 
             msg = self.msg
-            uprint(" {}\033[K\r".format(msg))
+            uprint(fmt.format(msg))
             if PY2:
                 sys.stdout.flush()
 
-        print("\033[K", end="")
+        if VT100:
+            print("\033[K", end="")
+        elif msg:
+            print("------------------------")
+
         sys.stdout.flush()  # necessary on win10 even w/ stderr btw
 
 
@@ -344,6 +349,13 @@ def log_thrs(log, ival, name):
         log(name, "\033[0m \033[33m".join(tv), 3)
 
 
+def vol_san(vols, txt):
+    for vol in vols:
+        txt = txt.replace(vol.realpath.encode("utf-8"), vol.vpath.encode("utf-8"))
+
+    return txt
+
+
 def min_ex():
     et, ev, tb = sys.exc_info()
     tb = traceback.extract_tb(tb)

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;
+
+        clmod(el, 'nt', 1);
+        el.removeAttribute('rot');
+        el.removeAttribute("style");
+        rot = el.offsetHeight;
+        clmod(el, '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']();
@@ -662,15 +799,21 @@ window.baguetteBox = (function () {
     }
 
     function updateOffset() {
-        var offset = -currentIndex * 100 + '%';
+        var offset = -currentIndex * 100 + '%',
+            xform = slider.style.perspective !== undefined;
+
         if (options.animation === 'fadeIn') {
             slider.style.opacity = 0;
             setTimeout(function () {
-                slider.style.transform = 'translate3d(' + offset + ',0,0)';
+                xform ?
+                    slider.style.transform = 'translate3d(' + offset + ',0,0)' :
+                    slider.style.left = offset;
                 slider.style.opacity = 1;
             }, 400);
         } else {
-            slider.style.transform = 'translate3d(' + offset + ',0,0)';
+            xform ?
+                slider.style.transform = 'translate3d(' + offset + ',0,0)' :
+                slider.style.left = offset;
         }
         playvid(false);
         var v = vid();
@@ -679,8 +822,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)
+            clmod(prev, 'vis');
+
+        clmod(el.closest('div'), 'vis', 1);
     }
 
     function preloadNext(index) {

copyparty/web/browser.css

@@ -1,5 +1,10 @@
 :root {
 	--grid-sz: 10em;
+	--grid-ln: 3;
+}
+@font-face {
+	font-family: 'scp';
+	src: local('Source Code Pro Regular'), local('SourceCodePro-Regular'), url(/.cpr/deps/scp.woff2) format('woff2');
 }
 * {
 	line-height: 1.2em;
@@ -23,7 +28,7 @@ html, body {
 	padding: 0;
 }
 pre, code, tt {
-	font-family: monospace, monospace;
+	font-family: 'scp', monospace, monospace;
 }
 #path,
 #path * {
@@ -113,7 +118,7 @@ a, #files tbody div a:last-child {
 	border-top: 1px solid #383838;
 }
 #files tbody td:nth-child(3) {
-	font-family: monospace, monospace;
+	font-family: 'scp', monospace, monospace;
 	text-align: right;
 	padding-right: 1em;
 	white-space: nowrap;
@@ -199,6 +204,9 @@ a, #files tbody div a:last-child {
 	color: #f4c;
 	border-bottom: 1px solid rgba(255,68,204,0.6);
 }
+#repl {
+	padding: .33em;
+}
 #files tbody a.play {
 	color: #e70;
 	padding: .2em;
@@ -208,8 +216,8 @@ a, #files tbody div a:last-child {
 	color: #720;
 	text-shadow: 0 0 .3em #b80;
 }
-#ggrid a.play,
-html.light #ggrid a.play {
+#ggrid>a.play,
+html.light #ggrid>a.play {
 	color: #fff;
 	background: #750;
 	border-color: #c90;
@@ -217,36 +225,38 @@ html.light #ggrid a.play {
 	box-shadow: 0 .1em 1.2em #b83;
 }
 #files tbody tr.sel td,
-#ggrid a.sel,
-html.light #ggrid a.sel {
+#ggrid>a.sel,
+#ggrid>a[tt].sel,
+html.light #ggrid>a.sel,
+html.light #ggrid>a[tt].sel {
 	color: #fff;
 	background: #925;
 	border-color: #c37;
 }
 #files tbody tr.sel:hover td,
 #files tbody tr.sel:focus td,
-#ggrid a.sel:hover,
-html.light #ggrid a.sel:hover {
+#ggrid>a.sel:hover,
+html.light #ggrid>a.sel:hover {
 	color: #fff;
 	background: #d39;
 	border-color: #d48;
 	text-shadow: 1px 1px 0 #804;
 }
-#ggrid a.sel,
-html.light #ggrid a.sel {
+#ggrid>a.sel,
+html.light #ggrid>a.sel {
 	border-top: 1px solid #d48;
 	box-shadow: 0 .1em 1.2em #b36;
 	transition: all 0.2s cubic-bezier(.2, 2.2, .5, 1); /* https://cubic-bezier.com/#.4,2,.7,1 */
 }
-#ggrid a.sel img,
-#ggrid a.play img {
+#ggrid>a.sel img,
+#ggrid>a.play img {
 	opacity: .7;
 	filter: contrast(130%) brightness(107%);
 }
-#ggrid a.sel img {
+#ggrid>a.sel img {
 	box-shadow: 0 0 1em #b36;
 }
-#ggrid a.play img {
+#ggrid>a.play img {
 	box-shadow: 0 0 1em #b83;
 }
 #files tr.sel a {
@@ -310,7 +320,7 @@ html.light #ggrid a.sel {
 }
 #widget {
 	position: fixed;
-	font-size: 1.5em;
+	font-size: 1.4em;
 	left: 0;
 	right: 0;
 	bottom: -6em;
@@ -333,16 +343,19 @@ html.light #ggrid a.sel {
 }
 #wtgrid,
 #wtico {
-	cursor: url(/.cpr/dd/4.png), pointer;
-	animation: cursor 500ms;
 	position: relative;
-	top: -.06em;
+	font-size: .9em;
+	top: -.04em;
 }
 #wtgrid {
-	font-size: .8em;
+	font-size: .75em;
+	padding: .1em;
 	top: -.12em;
 }
-#wtgrid:hover,
+#wtico {
+	cursor: url(/.cpr/dd/4.png), pointer;
+	animation: cursor 500ms;
+}
 #wtico:hover {
 	animation: cursor 500ms infinite;
 }
@@ -359,7 +372,8 @@ html.light #ggrid a.sel {
 #wtoggle {
 	position: absolute;
 	white-space: nowrap;
-	top: -1.2em;
+	font-size: .8em;
+	top: -1em;
 	right: 0;
 	height: 1em;
 	font-size: 2em;
@@ -369,23 +383,25 @@ html.light #ggrid a.sel {
 	background: #3c3c3c;
 	box-shadow: 0 0 .5em #222;
 	border-radius: .3em 0 0 0;
-	padding: .2em .2em;
+	padding: 0 0 0 .1em;
 	color: #fff;
 }
-#wzip, #wnp {
+#wfm, #wzip, #wnp {
 	display: none;
-	margin-right: .3em;
-	padding-right: .3em;
+}
+#wzip, #wnp {
+	margin-right: .2em;
+	padding-right: .2em;
 	border-right: .1em solid #555;
 }
-#wnp a {
-	position: relative;
-	font-size: .47em;
-	margin: 0 .1em;
-	top: -.4em;
+#wfm.act+#wzip,
+#wfm.act+#wzip+#wnp {
+	margin-left: .2em;
+	padding-left: .2em;
+	border-left: .1em solid #555;
 }
-#wnp a+a {
-	margin-left: .33em;
+#wfm.act {
+	display: inline-block;
 }
 #wtoggle,
 #wtoggle * {
@@ -399,17 +415,22 @@ html.light #ggrid a.sel {
 	display: none;
 }
 #wfm a,
+#wnp a,
 #wzip a {
 	font-size: .5em;
 	padding: 0 .3em;
-	margin: -.3em .2em;
+	margin: -.3em .1em;
 	position: relative;
 	display: inline-block;
 }
-#wfm span {
+#wfm span,
+#wnp span {
 	font-size: .6em;
 	display: block;
 }
+#wnp span {
+	font-size: .7em;
+}
 #wfm a:not(.en) {
 	opacity: .3;
 	color: #f6c;
@@ -417,23 +438,16 @@ html.light #ggrid a.sel {
 html.light #wfm a:not(.en) {
 	color: #c4a;
 }
-#files tbody tr.c1 td {
-	animation: fcut1 .5s ease-out;
+#files tbody tr.fcut td {
+	animation: fcut .5s ease-out;
 }
-#files tbody tr.c2 td {
-	animation: fcut2 .5s ease-out;
-}
-@keyframes fcut1 {
-	0% {opacity:0}
-	100% {opacity:1}
-}
-@keyframes fcut2 {
+@keyframes fcut {
 	0% {opacity:0}
 	100% {opacity:1}
 }
 #wzip a {
 	font-size: .4em;
-	margin: -.3em .3em;
+	margin: -.3em .1em;
 }
 #wtoggle.sel #wzip #selzip {
 	top: -.6em;
@@ -533,24 +547,9 @@ html.light #wfm a:not(.en) {
 	box-shadow: 0 -.15em .2em #000 inset;
 	padding-bottom: .3em;
 }
-#ops i {
-	font-size: 1.5em;
-}
-#ops i:before {
-	content: 'x';
-	color: #282828;
-	text-shadow: 0 0 .08em #01a7e1;
-	position: relative;
-}
-#ops i:after {
-	content: 'x';
-	color: #282828;
-	text-shadow: 0 0 .08em #ff3f1a;
-	margin-left: -.35em;
-	font-size: 1.05em;
-}
 #ops,
-.opbox {
+.opbox,
+#u2etas {
 	border: 1px solid #3a3a3a;
 	box-shadow: 0 0 1em #222 inset;
 }
@@ -699,6 +698,7 @@ input.eq_gain {
 	left: 0;
 	bottom: 0;
 	top: 7em;
+	overflow-x: hidden;
 	overflow-y: auto;
 	-ms-scroll-chaining: none;
 	overscroll-behavior-y: none;
@@ -709,6 +709,10 @@ input.eq_gain {
 	position: sticky;
 	z-index: 1;
 	top: 0;
+	height: 2.2em;
+	line-height: 2.2em;
+	border-bottom: 1px solid #555;
+	overflow: hidden;
 }
 #thx_ff {
 	padding: 5em 0;
@@ -726,8 +730,8 @@ input.eq_gain {
 }
 #treeul {
 	position: relative;
-	left: -1.7em;
-	width: calc(100% + 1.3em);
+	left: -2em;
+	width: calc(100% + 2em);
 }
 .btn {
 	padding: .2em .4em;
@@ -788,7 +792,9 @@ input.eq_gain {
 	color: #fff;
 }
 #treeul a:first-child {
-	font-family: monospace, monospace;
+	font-family: 'scp', monospace, monospace;
+	font-size: 1.2em;
+	line-height: 0;
 }
 .dumb_loader_thing {
 	display: inline-block;
@@ -878,10 +884,12 @@ input.eq_gain {
 	background: #3c3c3c;
 	border: 1px solid #444;
 	border-radius: .3em;
-	padding: .5em;
+	padding: .2em .5em;
+	line-height: 2.3em;
 	margin: 0 1.5em 1em .4em;
 	position: sticky;
 	top: -.3em;
+	z-index: 1;
 }
 html.light #ghead {
 	background: #f7f7f7;
@@ -891,11 +899,24 @@ html.light #ghead {
 	position: relative;
 	top: 0;
 }
+#ghead>span {
+	white-space: pre;
+	padding-left: .3em;
+}
 #ggrid {
 	padding-top: .5em;
 }
-#ggrid a {
+#ggrid>a>span {
+	overflow: hidden;
+	display: block;
+	display: -webkit-box;
+	-webkit-line-clamp: var(--grid-ln);
+	-webkit-box-orient: vertical;
+	padding-top: .3em;
+}
+#ggrid>a {
 	display: inline-block;
+	width: 10em;
 	width: var(--grid-sz);
 	vertical-align: top;
 	overflow-wrap: break-word;
@@ -907,34 +928,45 @@ html.light #ghead {
 	padding: .3em;
 	margin: .5em;
 }
-#ggrid a img {
+#ggrid>a[tt] {
+	background: linear-gradient(135deg, #383838 95%, #555 95%);
+}
+#ggrid>a img {
 	border-radius: .2em;
+	max-width: 10em;
 	max-width: var(--grid-sz);
+	max-height: 8em;
 	max-height: calc(var(--grid-sz)/1.25);
 	margin: 0 auto;
 	display: block;
 }
-#ggrid a span {
-	padding: .2em .3em;
-	display: block;
-}
-#ggrid span.dir:before {
+#ggrid>a.dir:before {
 	content: '📂';
-	line-height: 0;
-	font-size: 2em;
-	margin: -.7em .1em -.5em -.3em;
 }
-#ggrid a:hover {
+#ggrid>a:before {
+	display: block;
+	position: absolute;
+	padding: .3em 0;
+	margin: -.4em;
+	text-shadow: 0 0 .1em #000;
+	background: linear-gradient(135deg,rgba(255,255,255,0) 50%,rgba(255,255,255,0.2));
+	border-radius: .3em;
+	font-size: 2em;
+}
+#ggrid>a:hover {
 	background: #444;
 	border-color: #555;
 	color: #fd9;
 }
-html.light #ggrid a {
+html.light #ggrid>a {
 	background: #f7f7f7;
 	border-color: #ddd;
 	box-shadow: 0 .1em .2em #ddd;
 }
-html.light #ggrid a:hover {
+html.light #ggrid>a[tt] {
+	background: linear-gradient(135deg, #f7f7f7 95%, #ccc 95%);
+}
+html.light #ggrid>a:hover {
 	background: #fff;
 	border-color: #ccc;
 	color: #015;
@@ -978,7 +1010,7 @@ html.light #rui {
 	padding: .2em 0 .2em .5em;
 }
 #rn_vadv input {
-	font-family: monospace, monospace;
+	font-family: 'scp', monospace, monospace;
 }
 #rui td+td,
 #rui td input[type="text"] {
@@ -1011,8 +1043,12 @@ html.light #rui {
 #pvol,
 #barbuf,
 #barpos,
+a.btn,
+#u2btn,
 #u2conf label,
 #rui label,
+#modal-ok,
+#modal-ng,
 #ops {
 	-webkit-user-select: none;
 	-moz-user-select: none;
@@ -1051,7 +1087,8 @@ html.light {
 }
 html.light #ops,
 html.light .opbox,
-html.light #srch_form {
+html.light #srch_form,
+html.light #u2etas {
 	background: #f7f7f7;
 	box-shadow: 0 0 .3em #ddd;
 	border-color: #f7f7f7;
@@ -1251,6 +1288,7 @@ html.light #files tr.sel a:hover {
 }
 html.light #treeh {
 	background: #eee;
+	border-color: #ddd;
 }
 html.light #tree {
 	scrollbar-color: #a70 #ddd;
@@ -1294,7 +1332,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%;
@@ -1307,11 +1345,11 @@ html.light #tree::-webkit-scrollbar {
 	opacity: 1;
 }
 .full-image {
-    display: inline-block;
-    position: relative;
-    width: 100%;
-    height: 100%;
-    text-align: center;
+	display: inline-block;
+	position: relative;
+	width: 100%;
+	height: 100%;
+	text-align: center;
 }
 .full-image figure {
 	display: inline;
@@ -1328,6 +1366,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 +1387,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 +1453,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 {
@@ -1544,7 +1592,7 @@ html.light #bbox-overlay figcaption a {
 	color: #333;
 }
 #u2conf #u2btn {
-	margin: -1.5em 0;
+	margin: -2.4em 0;
 	padding: .8em 0;
 	width: 100%;
 	max-width: 12em;
@@ -1563,6 +1611,7 @@ html.light #bbox-overlay figcaption a {
 	line-height: 1.3em;
 }
 #u2tab {
+	border-collapse: collapse;
 	margin: 3em auto;
 	width: calc(100% - 2em);
 	max-width: 100em;
@@ -1573,7 +1622,7 @@ html.light #bbox-overlay figcaption a {
 #u2tab td {
 	border: 1px solid #ccc;
 	border-width: 0 0px 1px 0;
-	padding: .1em .3em;
+	padding: .2em .3em;
 }
 #u2tab td:nth-child(2) {
 	width: 5em;
@@ -1590,17 +1639,51 @@ html.light #bbox-overlay figcaption a {
 #u2tab tbody tr:hover td {
 	background: #222;
 }
+#u2etas {
+	background: #333;
+	padding: .2em .5em;
+	border-radius: .5em;
+	border-width: .25em 0;
+	width: 17em;
+	text-align: center;
+	white-space: nowrap;
+	display: inline-block;
+	font-family: 'scp', monospace, monospace;
+}
+#u2etas.o {
+	width: 20em;
+}
+#u2etas .o {
+	display: none;
+}
+#u2etas.o .o {
+	display: unset;
+}
+#u2etaw {
+	width: 18em;
+	font-size: .94em;
+	margin: 1.8em auto .5em auto;
+}
+#u2etas.o #u2etaw {
+	width: 21em;
+}
 #u2cards {
-	padding: 1em 0 .3em 1em;
-	margin: 1.5em auto -2.5em auto;
+	padding: 1em 1em .3em 1em;
+	margin: 0 auto -1.5em auto;
 	white-space: nowrap;
 	text-align: center;
 	overflow: hidden;
+	min-width: 24em;
 }
 #u2cards.w {
-	width: 45em;
+	width: 44em;
 	text-align: left;
 }
+#u2etaw.w {
+	width: 52em;
+	text-align: right;
+	margin: 3em auto -2.7em auto;
+}
 #u2cards a {
 	padding: .2em 1em;
 	border: 1px solid #777;
@@ -1707,6 +1790,14 @@ html.light #bbox-overlay figcaption a {
 	box-shadow: none;
 	opacity: .2;
 }
+#u2flagblock {
+	display: none;
+	margin: 2em auto 4em auto;
+	padding: .5em;
+	max-width: 27em;
+	text-align: center;
+	border: .2em dashed rgba(128, 128, 128, 0.3);
+}
 #u2foot {
 	color: #fff;
 	font-style: italic;
@@ -1741,7 +1832,27 @@ html.light #u2foot .warn span {
 	margin-bottom: -1em;
 }
 .prog {
-	font-family: monospace, monospace;
+	font-family: 'scp', monospace, monospace;
+}
+#u2tab span.inf,
+#u2tab span.ok,
+#u2tab span.err {
+	color: #fff;
+	padding: .22em;
+	border-radius: .2em;
+	border: 2px solid #f0f;
+}
+#u2tab span.inf {
+	background: #07a;
+	border-color: #0be;
+}
+#u2tab span.ok {
+	background: #380;
+	border-color: #8e4;
+}
+#u2tab span.err {
+	background: #900;
+	border-color: #d06;
 }
 #u2tab a>span {
 	font-weight: bold;

copyparty/web/browser.html

@@ -113,6 +113,8 @@
 	<div id="epi" class="logue">{{ logues[1] }}</div>
 
 	<h2><a href="/?h">control-panel</a></h2>
+	
+	<a href="#" id="repl">π</a>
 
 </div>
 

copyparty/web/browser.js

@@ -32,7 +32,7 @@ ebi('widget').innerHTML = (
 	'<div id="wtoggle">' +
 	'<span id="wfm"><a' +
 	' href="#" id="fren" tt="rename selected item$NHotkey: F2">✎<span>name</span></a><a' +
-	' href="#" id="fdel" tt="delete selected items$NHotkey: ctrl-K">⌫<span>delete</span></a><a' +
+	' href="#" id="fdel" tt="delete selected items$NHotkey: ctrl-K">⌫<span>del.</span></a><a' +
 	' href="#" id="fcut" tt="cut selected items &lt;small&gt;(then paste somewhere else)&lt;/small&gt;$NHotkey: ctrl-X">✂<span>cut</span></a><a' +
 	' href="#" id="fpst" tt="paste a previously cut/copied selection$NHotkey: ctrl-V">📋<span>paste</span></a>' +
 	'</span><span id="wzip"><a' +
@@ -40,10 +40,10 @@ ebi('widget').innerHTML = (
 	' href="#" id="selinv" tt="invert selection">sel.<br />inv.</a><a' +
 	' href="#" id="selzip" tt="download selection as archive">zip</a>' +
 	'</span><span id="wnp"><a' +
-	' href="#" id="npirc" tt="copy irc-formatted track info">📋irc</a><a' +
-	' href="#" id="nptxt" tt="copy plaintext track info">📋txt</a>' +
+	' href="#" id="npirc" tt="copy irc-formatted track info">📋<span>irc</span></a><a' +
+	' href="#" id="nptxt" tt="copy plaintext track info">📋<span>txt</span></a>' +
 	'</span><a' +
-	'	href="#" id="wtgrid" tt="toggle grid/list view">田</a><a' +
+	'	href="#" id="wtgrid" tt="toggle grid/list view$NHotkey: G">田</a><a' +
 	'	href="#" id="wtico">♫</a>' +
 	'</div>' +
 	'<div id="widgeti">' +
@@ -102,6 +102,12 @@ ebi('op_up2k').innerHTML = (
 	'	</div>\n' +
 	'</div>\n' +
 
+	'<div id="u2etaw"><div id="u2etas"><div class="o">\n' +
+	'	hash: <span id="u2etah" tt="average &lt;em&gt;hashing&lt;/em&gt; speed, and estimated time until finish">(no uploads are queued yet)</span><br />\n' +
+	'	send: <span id="u2etau" tt="average &lt;em&gt;upload&lt;/em&gt; speed and estimated time until finish">(no uploads are queued yet)</span><br />\n' +
+	'	</div><span class="o">done: </span><span id="u2etat" tt="average &lt;em&gt;total&lt;/em&gt; speed and estimated time until finish">(no uploads are queued yet)</span>\n' +
+	'</div></div>\n' +
+
 	'<div id="u2cards">\n' +
 	'	<a href="#" act="ok" tt="completed successfully">ok <span>0</span></a><a\n' +
 	'	href="#" act="ng" tt="failed / rejected / not-found">ng <span>0</span></a><a\n' +
@@ -121,6 +127,7 @@ ebi('op_up2k').innerHTML = (
 	'	<tbody></tbody>\n' +
 	'</table>\n' +
 
+	'<p id="u2flagblock"><b>the files were added to the queue</b><br />however there is a busy up2k in another browser tab,<br />so waiting for that to finish first</p>\n' +
 	'<p id="u2foot"></p>\n' +
 	'<p id="u2footfoot" data-perm="write">( you can use the <a href="#" id="u2nope">basic uploader</a> if you don\'t need lastmod timestamps, resumable uploads, or progress bars )</p>'
 );
@@ -160,6 +167,7 @@ ebi('tree').innerHTML = (
 	'	<a href="#" class="btn" step="2" id="twobytwo" tt="Hotkey: A">+</a>\n' +
 	'	<a href="#" class="btn" step="-2" id="twig" tt="Hotkey: D">&ndash;</a>\n' +
 	'	<a href="#" class="tgl btn" id="dyntree" tt="autogrow as tree expands">a</a>\n' +
+	'	<a href="#" class="btn" id="visdir" tt="scroll to selected folder">v</a>\n' +
 	'</div>\n' +
 	'<ul id="treeul"></ul>\n' +
 	'<div id="thx_ff">&nbsp;</div>'
@@ -276,7 +284,7 @@ var mpl = (function () {
 		r.os_ctl = !r.os_ctl && have_mctl;
 		bcfg_set('au_os_ctl', r.os_ctl);
 		if (!have_mctl)
-			toast.err(5, 'need firefox 82+ or chrome 73+');
+			toast.err(5, 'need firefox 82+ or chrome 73+\n(or iOS 15+ supposedly)');
 	};
 
 	ebi('au_osd_cv').onclick = function (e) {
@@ -391,6 +399,7 @@ function MPlayer() {
 	r.au_native2 = null;
 	r.au_ogvjs = null;
 	r.au_ogvjs2 = null;
+	r.loading = false;
 	r.tracks = {};
 	r.order = [];
 
@@ -414,18 +423,14 @@ function MPlayer() {
 		}
 	}
 
-	r.vol = sread('vol');
-	if (r.vol !== null)
-		r.vol = parseFloat(r.vol);
-	else
-		r.vol = 0.5;
+	r.vol = clamp(fcfg_get('vol', 0.5), 0, 1);
 
 	r.expvol = function (v) {
 		return 0.5 * v + 0.5 * v * v;
 	};
 
 	r.setvol = function (vol) {
-		r.vol = Math.max(Math.min(vol, 1), 0);
+		r.vol = clamp(vol, 0, 1);
 		swrite('vol', vol);
 		r.stopfade(true);
 
@@ -672,7 +677,7 @@ var pbar = (function () {
 
 		bctx.clearRect(0, 0, bc.w, bc.h);
 
-		if (!mp.au)
+		if (!mp.au || mp.loading)
 			return;
 
 		var sm = bc.w * 1.0 / mp.au.duration,
@@ -694,25 +699,26 @@ var pbar = (function () {
 	r.drawpos = function () {
 		var bc = r.buf,
 			pc = r.pos,
-			pctx = pc.ctx;
+			pctx = pc.ctx,
+			apos, adur;
 
 		pctx.clearRect(0, 0, pc.w, pc.h);
 
-		if (!mp.au || isNaN(mp.au.duration) || isNaN(mp.au.currentTime))
+		if (!mp.au || mp.loading || isNaN(adur = mp.au.duration) || isNaN(apos = mp.au.currentTime) || apos < 0 || adur < apos)
 			return;  // not-init || unsupp-codec
 
-		var sm = bc.w * 1.0 / mp.au.duration;
+		var sm = bc.w * 1.0 / adur;
 
 		pctx.fillStyle = light ? 'rgba(0,64,0,0.15)' : 'rgba(204,255,128,0.15)';
-		for (var p = 1, mins = mp.au.duration / 10; p <= mins; p++)
+		for (var p = 1, mins = adur / 10; p <= mins; p++)
 			pctx.fillRect(Math.floor(sm * p * 10), 0, 2, pc.h);
 
 		pctx.fillStyle = light ? 'rgba(0,64,0,0.5)' : 'rgba(192,255,96,0.5)';
-		for (var p = 1, mins = mp.au.duration / 60; p <= mins; p++)
+		for (var p = 1, mins = adur / 60; p <= mins; p++)
 			pctx.fillRect(Math.floor(sm * p * 60), 0, 2, pc.h);
 
 		var w = 8,
-			x = sm * mp.au.currentTime;
+			x = sm * apos;
 
 		pctx.fillStyle = '#573'; pctx.fillRect((x - w / 2) - 1, 0, w + 2, pc.h);
 		pctx.fillStyle = '#dfc'; pctx.fillRect((x - w / 2), 0, 8, pc.h);
@@ -723,8 +729,8 @@ var pbar = (function () {
 		pctx.font = '1em sans-serif';
 
 		var m = pctx.measureText.bind(pctx),
-			t1 = s2ms(mp.au.duration),
-			t2 = s2ms(mp.au.currentTime),
+			t1 = s2ms(adur),
+			t2 = s2ms(apos),
 			yt = pc.h / 3 * 2.1,
 			xt1 = pc.w - (m(t1).width + 12),
 			xt2 = x < pc.w / 2 ? (x + 12) : (Math.min(pc.w - m(t1 + ":88").width, x - 12) - m(t2).width);
@@ -921,14 +927,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;
 		}
 
@@ -955,7 +963,7 @@ var mpui = (function () {
 		}
 
 		// preload next song
-		if (mpl.preload && preloaded != mp.au.src) {
+		if (mpl.preload && !mp.loading && preloaded != mp.au.src) {
 			var pos = mp.au.currentTime,
 				len = mp.au.duration;
 
@@ -970,9 +978,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;
 })();
@@ -1011,6 +1019,21 @@ function need_ogv_for(url) {
 }
 
 
+function start_sinegen() {
+	var af = 'data:audio/wav;base64,UklGRlaxAgBXQVZFZm10IBAAAAABAAEARKwAAIhYAQACABAATElTVBoAAABJTkZPSVNGVA4AAABMYXZmNTguNzYuMTAwAGRhdGEQsQIAAAB',
+		body = 'iArcE8AYCCeEKggzaDeQOmA/0D/QPmQ/kDtsNggzhCgMJ8Qa4BGMCAQCe/Un7EPn+9h/1fvMm8hzxaPAM8AzwZ/Ac8SXyfvMf9f32D/lI+539//9';
+
+	while (af.length < 235304)
+		af += body;
+
+	var au = new Audio(af.slice(0, 235304));
+	au.onplay = au.pause.bind(au);
+	au.volume = 0.5;
+	au.play();
+	return au;
+}
+
+
 var audio_eq = (function () {
 	var r = {
 		"en": false,
@@ -1270,17 +1293,33 @@ function play(tid, is_ev, seek, call_depth) {
 
 	var url = mp.tracks[tid];
 	if (need_ogv_for(url)) {
+		var m = /.* Version\/([0-9]+)\.[0-9\.]+ Mobile\/[^ ]+ Safari\/[0-9\.]+$/.exec(navigator.userAgent),
+			safari = m ? parseInt(m[1]) : 99;
+
 		if (mp.au_ogvjs) {
 			mp.au = mp.au_ogvjs;
 		}
 		else if (window['OGVPlayer']) {
-			mp.au = mp.au_ogvjs = new OGVPlayer();
+			mp.loading = true;
+			try {
+				mp.au = mp.au_ogvjs = new OGVPlayer();
+			}
+			catch (ex) {
+				return toast.err(30, 'your browser cannot play ogg/vorbis/opus\n\n' + ex +
+					'\n\n<a href="#" onclick="new OGVPlayer();">click here</a> for a full crash report');
+			}
 			attempt_play = is_ev;
-			mp.au.addEventListener('error', evau_error, true);
-			mp.au.addEventListener('progress', pbar.drawpos);
-			mp.au.addEventListener('ended', next_song);
+			mp.au.onerror = evau_error;
+			mp.au.onprogress = pbar.drawpos;
+			mp.au.onended = next_song;
+			mp.au.onloadedmetadata = mp.au.onloadeddata = function () {
+				mp.loading = false;
+			};
 			widget.open();
 		}
+		else if (safari < 14) {
+			return toast.err(0, 'because this is an apple device,\nsafari 14 or newer is required to play ogg/vorbis/opus files\n\nyou are using safari ' + safari + '\n(every iOS browser is actually safari)');
+		}
 		else {
 			if (call_depth !== undefined)
 				return toast.err(0, 'failed to load ogv.js:\ncannot play ogg/opus in this browser\n(try a non-apple device)');
@@ -1298,18 +1337,26 @@ function play(tid, is_ev, seek, call_depth) {
 	else {
 		if (!mp.au_native) {
 			mp.au = mp.au_native = new Audio();
-			mp.au.addEventListener('error', evau_error, true);
-			mp.au.addEventListener('progress', pbar.drawpos);
-			mp.au.addEventListener('ended', next_song);
+			mp.au.onerror = evau_error;
+			mp.au.onprogress = pbar.drawpos;
+			mp.au.onended = next_song;
 			widget.open();
 		}
 		mp.au = mp.au_native;
+		mp.loading = false;
 	}
 
 	audio_eq.apply();
 
+	url += (url.indexOf('?') < 0 ? '?cache' : '&cache');
+	if (mp.au.src == url)
+		mp.au.currentTime = 0;
+	else {
+		mp.loading = mp.au == mp.au_ogvjs;
+		mp.au.src = url;
+	}
+
 	mp.au.tid = tid;
-	mp.au.src = url + (url.indexOf('?') < 0 ? '?cache' : '&cache');
 	mp.au.volume = mp.expvol(mp.vol);
 	var oid = 'a' + tid;
 	setclass(oid, 'play act');
@@ -1350,7 +1397,7 @@ function play(tid, is_ev, seek, call_depth) {
 		return true;
 	}
 	catch (ex) {
-		toast.err(0, 'playback failed: ' + ex);
+		toast.err(0, esc('playback failed: ' + ex));
 	}
 	setclass(oid, 'play');
 	setTimeout(next_song, 500);
@@ -1384,7 +1431,7 @@ function evau_error(e) {
 
 	err += '\n\nFile: «' + uricom_dec(eplaya.src.split('/').slice(-1)[0])[0] + '»';
 
-	toast.warn(15, err);
+	toast.warn(15, esc(err + ''));
 }
 
 
@@ -1425,9 +1472,16 @@ function autoplay_blocked(seek) {
 	go.textContent = 'Play "' + fn + '"';
 	go.onclick = function (e) {
 		unblocked(e);
-		// chrome 91 may permanently taint on a failed play()
-		// depending on win10 settings or something? idk
-		mp.au_native = mp.au_ogvjs = null;
+		if (mp.au !== mp.au_ogvjs)
+			// chrome 91 may permanently taint on a failed play()
+			// depending on win10 settings or something? idk
+			mp.au_native = null;
+		else
+			// iOS browsers allow playing ogg/vorbis/opus in the background
+			// if there is an <audio> tag which at some point played audio
+			if (!mp.sinegen)
+				mp.sinegen = start_sinegen();
+
 		play(tid, true, seek);
 		mp.fade_in();
 	};
@@ -1461,6 +1515,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;
@@ -1578,7 +1709,7 @@ var fileman = (function () {
 			r.clip = jread('fman_clip', []);
 
 		var nsel = msel.getsel().length;
-		clmod(bren, 'en', nsel == 1);
+		clmod(bren, 'en', nsel);
 		clmod(bdel, 'en', nsel);
 		clmod(bcut, 'en', nsel);
 		clmod(bpst, 'en', r.clip && r.clip.length);
@@ -1587,7 +1718,7 @@ var fileman = (function () {
 		bcut.style.display = have_mv && has(perms, 'move') ? '' : 'none';
 		bpst.style.display = have_mv && has(perms, 'write') ? '' : 'none';
 		bpst.setAttribute('tt', 'paste ' + r.clip.length + ' items$NHotkey: ctrl-V');
-		ebi('wfm').style.display = QS('#wfm a.en:not([display])') ? '' : 'none';
+		clmod(ebi('wfm'), 'act', QS('#wfm a.en:not([style])'));
 	};
 
 	r.rename = function (e) {
@@ -1610,7 +1741,7 @@ var fileman = (function () {
 
 			var vsp = vsplit(vp);
 			if (base != vsp[0])
-				return toast.err(0, 'bug:\n' + base + '\n' + vsp[0]);
+				return toast.err(0, esc('bug:\n' + base + '\n' + vsp[0]));
 
 			var vars = ft2dict(ebi(sel[a].id).closest('tr'));
 			mkeys = vars[1].concat(vars[2]);
@@ -1668,6 +1799,7 @@ var fileman = (function () {
 			'</table></div>'
 		]);
 
+		var cheap = f.length > 500;
 		if (sel.length == 1)
 			html.push(
 				'<div><table id="rn_f">\n' +
@@ -1680,8 +1812,9 @@ var fileman = (function () {
 			for (var a = 0; a < f.length; a++)
 				html.push(
 					'<tr><td>' +
-					'<button class="rn_dec" n="' + a + '">decode</button>',
-					'<button class="rn_reset" n="' + a + '">↺ reset</button></td>',
+					(cheap ? '</td>' :
+						'<button class="rn_dec" n="' + a + '">decode</button>' +
+						'<button class="rn_reset" n="' + a + '">↺ reset</button></td>') +
 					'<td><input type="text" id="rn_new" n="' + a + '" /></td>' +
 					'<td><input type="text" id="rn_old" n="' + a + '" readonly /></td></tr>');
 		}
@@ -1702,23 +1835,26 @@ var fileman = (function () {
 			f[a].inew = QS('#rn_new' + k);
 			f[a].inew.value = f[a].iold.value = f[a].ofn;
 
-			(function (a) {
-				f[a].inew.onkeydown = function (e) {
-					rn_ok(a, true);
+			if (!cheap)
+				(function (a) {
+					f[a].inew.onkeydown = function (e) {
+						rn_ok(a, true);
 
-					if (e.key == 'Escape')
-						return rn_cancel();
+						if (e.key == 'Escape')
+							return rn_cancel();
 
-					if (e.key == 'Enter')
-						return rn_apply();
-				};
-				QS('.rn_dec' + k).onclick = function () {
-					f[a].inew.value = uricom_dec(f[a].inew.value)[0];
-				};
-				QS('.rn_reset' + k).onclick = function () {
-					rn_reset(a);
-				};
-			})(a);
+						if (e.key == 'Enter')
+							return rn_apply();
+					};
+					QS('.rn_dec' + k).onclick = function (e) {
+						ev(e);
+						f[a].inew.value = uricom_dec(f[a].inew.value)[0];
+					};
+					QS('.rn_reset' + k).onclick = function (e) {
+						ev(e);
+						rn_reset(a);
+					};
+				})(a);
 		}
 		rn_reset(0);
 		tt.att(rui);
@@ -1826,7 +1962,7 @@ var fileman = (function () {
 					re = new RegExp(ptn, cs ? 'i' : '');
 			}
 			catch (ex) {
-				return toast.err(5, 'invalid regex:\n' + ex);
+				return toast.err(5, esc('invalid regex:\n' + ex));
 			}
 			toast.hide();
 
@@ -1858,7 +1994,7 @@ var fileman = (function () {
 				return rn_cancel();
 			}
 
-			toast.inf(0, 'renaming ' + f.length + ' items\n\n' + f[0].ofn);
+			toast.inf(0, esc('renaming ' + f.length + ' items\n\n' + f[0].ofn));
 			var dst = base + uricom_enc(f[0].inew.value, false);
 
 			function rename_cb() {
@@ -1905,7 +2041,7 @@ var fileman = (function () {
 				treectl.goto(get_evpath());
 				return;
 			}
-			toast.inf(0, 'deleting ' + (vps.length + 1) + ' items\n\n' + vp);
+			toast.inf(0, esc('deleting ' + (vps.length + 1) + ' items\n\n' + vp));
 
 			xhr.open('GET', vp + '?delete', true);
 			xhr.onreadystatechange = delete_cb;
@@ -1923,8 +2059,8 @@ var fileman = (function () {
 			deleter();
 		}
 
-		modal.confirm('===== DANGER =====\nDELETE these ' + vps.length + ' items?\n\n' + uricom_adec(vps).join('\n'), function () {
-			modal.confirm('Last chance! Delete?', deleter, null);
+		modal.confirm('<h6 style="color:#900">DANGER</h6>\n<b>DELETE these ' + vps.length + ' items?</b><ul>' + uricom_adec(vps, true).join('') + '</ul>', function () {
+			modal.confirm('<b>Last chance!</b> Delete?', deleter, null);
 		}, null);
 	};
 
@@ -1939,17 +2075,21 @@ var fileman = (function () {
 		if (!sel.length)
 			return toast.err(3, 'select at least 1 item to cut');
 
-		if (sel.length < 100)
-			for (var a = 0; a < sel.length; a++) {
-				vps.push(sel[a].vp);
-				var cl = ebi(sel[a].id).closest('tr').classList,
-					inv = cl.contains('c1');
-
-				cl.remove(inv ? 'c1' : 'c2');
-				cl.add(inv ? 'c2' : 'c1');
+		var els = [];
+		for (var a = 0; a < sel.length; a++) {
+			vps.push(sel[a].vp);
+			if (sel.length < 100) {
+				els.push(ebi(sel[a].id).closest('tr'));
+				clmod(els[a], 'fcut');
 			}
+		}
 
-		toast.inf(1, 'cut ' + sel.length + ' items');
+		setTimeout(function () {
+			for (var a = 0; a < els.length; a++)
+				clmod(els[a], 'fcut', 1);
+		}, 1);
+
+		toast.inf(1.5, 'cut ' + sel.length + ' items');
 		jwrite('fman_clip', vps);
 		r.tx(1);
 	};
@@ -1984,7 +2124,7 @@ var fileman = (function () {
 		}
 
 		if (exists.length)
-			toast.warn(30, 'these ' + exists.length + ' items cannot be pasted here (names already exist):\n\n' + uricom_adec(exists).join('\n'));
+			toast.warn(30, 'these ' + exists.length + ' items cannot be pasted here (names already exist):<ul>' + uricom_adec(exists, true).join('') + '</ul>');
 
 		if (!req.length)
 			return;
@@ -1999,7 +2139,7 @@ var fileman = (function () {
 				r.tx(srcdir);
 				return;
 			}
-			toast.inf(0, 'pasting ' + (req.length + 1) + ' items\n\n' + uricom_dec(vp)[0]);
+			toast.inf(0, esc('pasting ' + (req.length + 1) + ' items\n\n' + uricom_dec(vp)[0]));
 
 			var dst = get_evpath() + vp.split('/').slice(-1)[0];
 
@@ -2019,24 +2159,27 @@ var fileman = (function () {
 			paster();
 		}
 
-		modal.confirm('paste these ' + req.length + ' items here?\n\n' + uricom_adec(req).join('\n'), function () {
+		modal.confirm('paste these ' + req.length + ' items here?<ul>' + uricom_adec(req, true).join('') + '</ul>', function () {
 			paster();
 			jwrite('fman_clip', []);
 		}, 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();
@@ -2059,14 +2202,16 @@ var thegrid = (function () {
 	gfiles.style.display = 'none';
 	gfiles.innerHTML = (
 		'<div id="ghead">' +
-		'<a href="#" class="tgl btn" id="gridsel" tt="enable file selection; ctrl-click a file to override$NHotkey: S">multiselect</a> &nbsp; zoom ' +
+		'<a href="#" class="tgl btn" id="gridsel" tt="enable file selection; ctrl-click a file to override$NHotkey: S">multiselect</a> <span>zoom: ' +
 		'<a href="#" class="btn" z="-1.2" tt="Hotkey: shift-A">&ndash;</a> ' +
-		'<a href="#" class="btn" z="1.2" tt="Hotkey: shift-D">+</a> &nbsp; sort by: ' +
+		'<a href="#" class="btn" z="1.2" tt="Hotkey: shift-D">+</a></span> <span>chop: ' +
+		'<a href="#" class="btn" l="-1" tt="truncate filenames more (show less)">&ndash;</a> ' +
+		'<a href="#" class="btn" l="1" tt="truncate filenames less (show more)">+</a></span> <span>sort by: ' +
 		'<a href="#" s="href">name</a>, ' +
 		'<a href="#" s="sz">size</a>, ' +
 		'<a href="#" s="ts">date</a>, ' +
 		'<a href="#" s="ext">type</a>' +
-		'</div>' +
+		'</span></div>' +
 		'<div id="ggrid"></div>'
 	);
 	lfiles.parentNode.insertBefore(gfiles, lfiles);
@@ -2075,7 +2220,8 @@ var thegrid = (function () {
 		'thumbs': bcfg_get('thumbs', true),
 		'en': bcfg_get('griden', false),
 		'sel': bcfg_get('gridsel', false),
-		'sz': fcfg_get('gridsz', 10),
+		'sz': clamp(fcfg_get('gridsz', 10), 4, 40),
+		'ln': clamp(icfg_get('gridln', 3), 1, 7),
 		'isdirty': true,
 		'bbox': null
 	};
@@ -2095,8 +2241,7 @@ var thegrid = (function () {
 			loadgrid();
 		}
 		else {
-			lfiles.style.display = '';
-			gfiles.style.display = 'none';
+			ungrid();
 		}
 		pbar.onresize();
 		vbar.onresize();
@@ -2105,11 +2250,15 @@ var thegrid = (function () {
 	var btnclick = function (e) {
 		ev(e);
 		var s = this.getAttribute('s'),
-			z = this.getAttribute('z');
+			z = this.getAttribute('z'),
+			l = this.getAttribute('l');
 
 		if (z)
 			return setsz(z > 0 ? r.sz * z : r.sz / (-z));
 
+		if (l)
+			return setln(parseInt(l));
+
 		var t = lfiles.tHead.rows[0].cells;
 		for (var a = 0; a < t.length; a++)
 			if (t[a].getAttribute('name') == s) {
@@ -2120,7 +2269,7 @@ var thegrid = (function () {
 		r.setdirty();
 	};
 
-	var links = QSA('#ghead>a');
+	var links = QSA('#ghead a');
 	for (var a = 0; a < links.length; a++)
 		links[a].onclick = btnclick;
 
@@ -2133,19 +2282,35 @@ var thegrid = (function () {
 
 	r.setvis = function (vis) {
 		(r.en ? gfiles : lfiles).style.display = vis ? '' : 'none';
-	}
+	};
 
 	r.setdirty = function () {
 		r.dirty = true;
 		if (r.en) {
 			loadgrid();
 		}
+	};
+
+	function setln(v) {
+		if (v) {
+			r.ln += v;
+			if (r.ln < 1) r.ln = 1;
+			if (r.ln > 7) r.ln = v < 0 ? 7 : 99;
+			swrite('gridln', r.ln);
+			setTimeout(r.tippen, 20);
+		}
+		try {
+			document.documentElement.style.setProperty('--grid-ln', r.ln);
+		}
+		catch (ex) { }
 	}
+	setln();
 
 	function setsz(v) {
 		if (v !== undefined) {
-			r.sz = v;
+			r.sz = clamp(v, 4, 40);
 			swrite('gridsz', r.sz);
+			setTimeout(r.tippen, 20);
 		}
 		try {
 			document.documentElement.style.setProperty('--grid-sz', r.sz + 'em');
@@ -2161,7 +2326,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,
@@ -2203,14 +2368,56 @@ var thegrid = (function () {
 		var ths = QSA('#ggrid>a');
 
 		for (var a = 0, aa = ths.length; a < aa; a++) {
-			var tr = ebi(ths[a].getAttribute('ref')).closest('tr');
-			ths[a].setAttribute('class', tr.getAttribute('class'));
+			var tr = ebi(ths[a].getAttribute('ref')).closest('tr'),
+				cl = tr.getAttribute('class') || '';
+
+			if (ths[a].getAttribute('href').endsWith('/'))
+				cl += ' dir';
+
+			ths[a].setAttribute('class', cl);
 		}
 		var uns = QS('#ggrid a[ref="unsearch"]');
 		if (uns)
 			uns.onclick = function () {
 				ebi('unsearch').click();
 			};
+	};
+
+	r.tippen = function () {
+		var els = QSA('#ggrid>a>span'),
+			aa = els.length;
+
+		if (!aa)
+			return;
+
+		var cs = window.getComputedStyle(els[0]),
+			fs = parseFloat(cs.lineHeight),
+			pad = parseFloat(cs.paddingTop),
+			pels = [],
+			todo = [];
+
+		for (var a = 0; a < aa; a++) {
+			var vis = Math.round((els[a].offsetHeight - pad) / fs),
+				all = Math.round((els[a].scrollHeight - pad) / fs),
+				par = els[a].parentNode;
+
+			pels.push(par);
+			todo.push(vis < all ? par.getAttribute('ttt') : null);
+		}
+
+		for (var a = 0; a < todo.length; a++) {
+			if (todo[a])
+				pels[a].setAttribute('tt', todo[a]);
+			else
+				pels[a].removeAttribute('tt');
+		}
+
+		tt.att(ebi('ggrid'));
+	};
+
+	function ungrid() {
+		lfiles.style.display = '';
+		gfiles.style.display = 'none';
 	}
 
 	function loadgrid() {
@@ -2228,6 +2435,7 @@ var thegrid = (function () {
 		for (var a = 0, aa = files.length; a < aa; a++) {
 			var ao = files[a],
 				href = esc(ao.getAttribute('href')),
+				name = uricom_dec(vsplit(href)[1])[0],
 				ref = ao.getAttribute('id'),
 				isdir = href.split('?')[0].slice(-1)[0] == '/',
 				ac = isdir ? ' class="dir"' : '',
@@ -2260,7 +2468,8 @@ var thegrid = (function () {
 				ihref = '/.cpr/ico/' + ihref.slice(0, -1);
 			}
 
-			html.push('<a href="' + href + '" ref="' + ref + '"><img src="' +
+			html.push('<a href="' + href + '" ref="' + ref +
+				'"' + ac + ' ttt="' + esc(name) + '"><img src="' +
 				ihref + '" /><span' + ac + '>' + ao.innerHTML + '</span></a>');
 		}
 		ebi('ggrid').innerHTML = html.join('\n');
@@ -2272,6 +2481,7 @@ var thegrid = (function () {
 		r.dirty = false;
 		r.bagit();
 		r.loadsel();
+		setTimeout(r.tippen, 20);
 	}
 
 	r.bagit = function () {
@@ -2309,7 +2519,8 @@ var thegrid = (function () {
 })();
 
 
-function tree_scrollto() {
+function tree_scrollto(e) {
+	ev(e);
 	var act = QS('#treeul a.hl'),
 		ul = act ? act.offsetParent : null;
 
@@ -2769,7 +2980,7 @@ var treectl = (function () {
 	var treectl = {
 		"hidden": true,
 		"ls_cb": null,
-		"dir_cb": null
+		"dir_cb": tree_scrollto
 	},
 		entreed = false,
 		fixedpos = false,
@@ -2777,9 +2988,7 @@ var treectl = (function () {
 		prev_winh = null,
 		dyn = bcfg_get('dyntree', true),
 		dots = bcfg_get('dotfiles', false),
-		treesz = icfg_get('treesz', 16);
-
-	treesz = Math.min(Math.max(treesz, 4), 50);
+		treesz = clamp(icfg_get('treesz', 16), 4, 50);
 
 	treectl.entree = function (e) {
 		ev(e);
@@ -2822,7 +3031,7 @@ var treectl = (function () {
 	}
 
 	function onscroll() {
-		if (!entreed || treectl.hidden)
+		if (!entreed || treectl.hidden || document.visibilityState == 'hidden')
 			return;
 
 		var tree = ebi('tree'),
@@ -2858,12 +3067,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)
@@ -3078,7 +3282,13 @@ var treectl = (function () {
 		}
 		html.push('</tbody>');
 		html = html.join('\n');
-		ebi('files').innerHTML = html;
+		try {
+			ebi('files').innerHTML = html;
+		}
+		catch (ex) { //ie9
+			window.location.href = this.top;
+			return;
+		}
 
 		if (this.hpush)
 			hist_push(this.top);
@@ -3162,6 +3372,7 @@ var treectl = (function () {
 
 	ebi('entree').onclick = treectl.entree;
 	ebi('detree').onclick = treectl.detree;
+	ebi('visdir').onclick = tree_scrollto;
 	ebi('dotfiles').onclick = tdots;
 	ebi('dyntree').onclick = dyntree;
 	ebi('twig').onclick = scaletree;
@@ -3698,7 +3909,7 @@ var msel = (function () {
 		if (r.all && r.all.length) {
 			for (var a = 0; a < r.all.length; a++) {
 				var ao = r.all[a];
-				ao.sel = ebi(ao.id).closest('tr').classList.contains('sel');
+				ao.sel = clgot(ebi(ao.id).closest('tr'), 'sel');
 				if (ao.sel)
 					r.sel.push(ao);
 			}
@@ -3714,7 +3925,7 @@ var msel = (function () {
 				item = {};
 
 			item.id = links[a].getAttribute('id');
-			item.sel = links[a].closest('tr').classList.contains('sel');
+			item.sel = clgot(links[a].closest('tr'), 'sel');
 			item.vp = href.indexOf('/') !== -1 ? href : vbase + href;
 
 			r.all.push(item);

copyparty/web/md.css

@@ -8,6 +8,14 @@ html, body {
 	font-family: sans-serif;
 	line-height: 1.5em;
 }
+#repl {
+	position: absolute;
+	top: 0;
+	right: .2em;
+	border: none;
+	color: inherit;
+	background: none;
+}
 #mtw {
 	display: none;
 }
@@ -506,6 +514,9 @@ blink {
 		border-bottom: .07em solid #4ac;
 		padding: 0 .3em;
 	}
+	#repl {
+		display: none;
+	}
 	#toc>ul {
 		border-left: .1em solid #84c4dd;
 	}

copyparty/web/md.html

@@ -45,6 +45,7 @@
 		</div>
 		<div id="mp"></div>
 	</div>
+	<a href="#" id="repl">π</a>
 	
 	{%- if edit %}
 	<div id="helpbox">

copyparty/web/md.js

@@ -185,7 +185,7 @@ function md_plug_err(ex, js) {
     errbox.style.cssText = 'position:absolute;top:0;left:0;padding:1em .5em;background:#2b2b2b;color:#fc5'
     errbox.textContent = msg;
     errbox.onclick = function () {
-        modal.alert('<pre>' + ex.stack + '</pre>');
+        modal.alert('<pre>' + esc(ex.stack) + '</pre>');
     };
     if (o) {
         errbox.appendChild(o);

copyparty/web/md2.js

@@ -370,8 +370,8 @@ function save_cb() {
     }
 
     if (!r.ok) {
-        if (!this.btn.classList.contains('force-save')) {
-            this.btn.classList.add('force-save');
+        if (!clgot(this.btn, 'force-save')) {
+            clmod(this.btn, 'force-save', 1);
             var msg = [
                 'This file has been modified since you started editing it!\n',
                 'if you really want to overwrite, press save again.\n',
@@ -387,7 +387,7 @@ function save_cb() {
             return toast.err(0, 'Error! Save failed.  Maybe this JSON explains why:\n\n' + this.responseText);
     }
 
-    this.btn.classList.remove('force-save');
+    clmod(this.btn, 'force-save');
     //alert('save OK -- wrote ' + r.size + ' bytes.\n\nsha512: ' + r.sha512);
 
     run_savechk(r.lastmod, this.txt, this.btn, 0);

copyparty/web/mde.css

@@ -22,6 +22,15 @@ html, body {
 	bottom: auto;
 	top: 1.4em;
 }
+#repl {
+	position: absolute;
+	top: 0;
+	right: .5em;
+	border: none;
+	color: inherit;
+	background: none;
+	text-decoration: none;
+}
 #mn {
 	font-weight: normal;
 	margin: 1.3em 0 .7em 1em;

copyparty/web/mde.html

@@ -21,6 +21,7 @@
 			<textarea id="mt" style="display:none" autocomplete="off">{{ md }}</textarea>
 		</div>
 	</div>
+	<a href="#" id="repl">π</a>
 	<script>
 
 var last_modified = {{ lastmod }};

copyparty/web/mde.js

@@ -96,20 +96,16 @@ function md_changed(mde, on_srv) {
     var md_now = mde.value();
     var save_btn = QS('.editor-toolbar button.save');
 
-    if (md_now == window.md_saved)
-        save_btn.classList.add('disabled');
-    else
-        save_btn.classList.remove('disabled');
-
+    clmod(save_btn, 'disabled', md_now == window.md_saved);
     set_jumpto();
 }
 
 function save(mde) {
     var save_btn = QS('.editor-toolbar button.save');
-    if (save_btn.classList.contains('disabled'))
+    if (clgot(save_btn, 'disabled'))
         return toast.inf(2, 'no changes');
 
-    var force = save_btn.classList.contains('force-save');
+    var force = clgot(save_btn, 'force-save');
     function save2() {
         var txt = mde.value();
 
@@ -153,8 +149,8 @@ function save_cb() {
     }
 
     if (!r.ok) {
-        if (!this.btn.classList.contains('force-save')) {
-            this.btn.classList.add('force-save');
+        if (!clgot(this.btn, 'force-save')) {
+            clmod(this.btn, 'force-save', 1);
             var msg = [
                 'This file has been modified since you started editing it!\n',
                 'if you really want to overwrite, press save again.\n',
@@ -170,7 +166,7 @@ function save_cb() {
             return toast.err(0, 'Error! Save failed.  Maybe this JSON explains why:\n\n' + this.responseText);
     }
 
-    this.btn.classList.remove('force-save');
+    clmod(this.btn, 'force-save');
     //alert('save OK -- wrote ' + r.size + ' bytes.\n\nsha512: ' + r.sha512);
 
     // download the saved doc from the server and compare

copyparty/web/msg.css

@@ -11,6 +11,7 @@ html {
 	background: #333;
 	font-family: sans-serif;
 	text-shadow: 1px 1px 0px #000;
+	touch-action: manipulation;
 }
 html, body {
 	margin: 0;
@@ -25,4 +26,4 @@ pre {
 }
 a {
 	color: #fc5;
-}
+}

copyparty/web/splash.css

@@ -3,6 +3,9 @@ html, body, #wrap {
 	background: #f7f7f7;
 	font-family: sans-serif;
 }
+html {
+	touch-action: manipulation;
+}
 #wrap {
 	max-width: 40em;
 	margin: 2em auto;
@@ -26,6 +29,12 @@ a {
 	border-radius: .2em;
 	padding: .2em .8em;
 }
+#repl {
+	border: none;
+	background: none;
+	color: inherit;
+	padding: 0;
+}
 table {
 	border-collapse: collapse;
 }
@@ -73,4 +82,4 @@ html.dark input {
 }
 html.dark .num {
 	border-color: #777;
-}
+}

copyparty/web/splash.html

@@ -7,6 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=0.8">
     <link rel="stylesheet" media="screen" href="/.cpr/splash.css?_={{ ts }}">
+    <link rel="stylesheet" media="screen" href="/.cpr/ui.css?_={{ ts }}">
 </head>
 
 <body>
@@ -66,11 +67,13 @@
             </form>
         </ul>
     </div>
+	<a href="#" id="repl">π</a>
     <script>
 
 if (localStorage.getItem('lightmode') != 1)
     document.documentElement.setAttribute("class", "dark");
 
 </script>
+<script src="/.cpr/util.js?_={{ ts }}"></script>
 </body>
-</html>
+</html>

copyparty/web/ui.css

@@ -1,6 +1,11 @@
+html {
+	touch-action: manipulation;
+}
 #tt, #toast {
 	position: fixed;
 	max-width: 34em;
+	max-width: min(34em, 90%);
+	max-width: min(34em, calc(100% - 7em));
 	background: #222;
 	border: 0 solid #777;
 	box-shadow: 0 .2em .5em #222;
@@ -8,8 +13,9 @@
 	z-index: 9001;
 }
 #tt {
+	max-width: min(34em, calc(100% - 3.3em));
 	overflow: hidden;
-	margin-top: 1em;
+	margin: .7em 0;
 	padding: 0 1.3em;
 	height: 0;
 	opacity: .1;
@@ -20,7 +26,9 @@
 	right: -1em;
 	line-height: 1.5em;
 	padding: 1em 1.3em;
+	margin-left: 3em;
 	border-width: .4em 0;
+	overflow-wrap: break-word;
 	transform: translateX(100%);
 	transition:
 		transform .4s cubic-bezier(.2, 1.2, .5, 1),
@@ -28,7 +36,14 @@
 	text-shadow: 1px 1px 0 #000;
 	color: #fff;
 }
-#toastc {
+#toast a {
+	color: inherit;
+	text-shadow: inherit;
+	background: rgba(0, 0, 0, 0.4);
+	border-radius: .3em;
+	padding: .2em .3em;
+}
+#toast a#toastc {
 	display: inline-block;
 	position: absolute;
 	overflow: hidden;
@@ -73,7 +88,7 @@
 	background: #8e4;
 }
 #toast.warn {
-	background: #970;
+	background: #960;
 	border-color: #fc0;
 }
 #toast.warn #toastc {
@@ -101,6 +116,7 @@
 	padding: 1.5em 2em;
 	border-width: .5em 0;
 }
+#modalc code,
 #tt code {
 	background: #3c3c3c;
 	padding: .1em .3em;
@@ -119,6 +135,7 @@ html.light #tt,
 html.light #toast {
 	box-shadow: 0 .3em 1em rgba(0,0,0,0.4);
 }
+#modalc code,
 html.light #tt code {
 	background: #060;
 	color: #fff;
@@ -146,6 +163,7 @@ html.light #tt em {
 	text-align: center;
 }
 #modalc {
+	position: relative;
 	display: inline-block;
 	background: #f7f7f7;
 	color: #333;
@@ -164,9 +182,22 @@ html.light #tt em {
         min-width: 30em;
     }
 }
+#modalc li {
+	margin: 1em 0;
+}
+#modalc h6 {
+	font-size: 1.3em;
+	border-bottom: 1px solid #999;
+	margin: 0;
+	padding: .3em;
+	text-align: center;
+}
 #modalb {
+	position: sticky;
 	text-align: right;
 	padding-top: 1em;
+	bottom: 0;
+	right: 0;
 }
 #modalb a {
 	color: #000;
@@ -187,6 +218,8 @@ html.light #tt em {
 }
 #modali {
 	display: block;
+	background: #fff;
+	color: #000;
 	width: calc(100% - 1.25em);
     margin: 1em -.1em 0 -.1em;
 	padding: .5em;
@@ -196,4 +229,4 @@ html.light #tt em {
 }
 #modali:focus {
 	border-color: #06d;
-}
+}

copyparty/web/up2k.js

@@ -141,6 +141,15 @@ function U2pvis(act, btns) {
     r.tail = -1;
     r.wsz = 3;
 
+    var markup = {
+        '404': '<span class="err">404</span>',
+        'ERROR': '<span class="err">ERROR</span>',
+        'OS-error': '<span class="err">OS-error</span>',
+        'found': '<span class="inf">found</span>',
+        'YOLO': '<span class="inf">YOLO</span>',
+        'done': '<span class="ok">done</span>',
+    };
+
     r.addfile = function (entry, sz, draw) {
         r.tab.push({
             "hn": entry[0],
@@ -185,7 +194,7 @@ function U2pvis(act, btns) {
             return;
 
         var obj = ebi('f{0}{1}'.format(nfile, field.slice(1)));
-        obj.innerHTML = html;
+        obj.innerHTML = field == 'ht' ? (markup[html] || html) : html;
         if (field == 'hp') {
             obj.style.color = '';
             obj.style.background = '';
@@ -227,7 +236,7 @@ function U2pvis(act, btns) {
             p = r.perc(nb, 0, fobj.size, fobj.t_hashing);
 
         fo.hp = '{0}%, {1}, {2} MB/s'.format(
-            p[0].toFixed(2), p[1], p[2].toFixed(2)
+            f2f(p[0], 2), p[1], f2f(p[2], 2)
         );
         if (!r.is_act(fo.in))
             return;
@@ -249,7 +258,7 @@ function U2pvis(act, btns) {
 
         var p = r.perc(fo.bd, fo.bd0, fo.bt, fobj.t_uploading);
         fo.hp = '{0}%, {1}, {2} MB/s'.format(
-            p[0].toFixed(2), p[1], p[2].toFixed(2)
+            f2f(p[0], 2), p[1], f2f(p[2], 2)
         );
 
         if (!r.is_act(fo.in))
@@ -424,7 +433,7 @@ function U2pvis(act, btns) {
             td1 = '<td id="f' + nfile,
             td = '</td>' + td1,
             ret = td1 + 'n">' + row.hn +
-                td + 't">' + row.ht +
+                td + 't">' + (markup[row.ht] || row.ht) +
                 td + 'p" class="prog">' + row.hp + '</td>';
 
         if (as_html)
@@ -511,7 +520,7 @@ function up2k_init(subtle) {
             import_js('/.cpr/deps/' + fn, unmodal);
 
             if (is_https)
-                ebi('u2foot').innerHTML = shame + ' so <em>this</em> uploader will do like 500kB/s at best';
+                ebi('u2foot').innerHTML = shame + ' so <em>this</em> uploader will do like 500 KiB/s at best';
             else
                 ebi('u2foot').innerHTML = 'seems like ' + shame + ' so do that if you want more performance <span style="color:#' +
                     (sha_js == 'ac' ? 'c84">(expecting 20' : '8a5">(but dont worry too much, expect 100') + ' MiB/s)</span>';
@@ -587,8 +596,15 @@ function up2k_init(subtle) {
             "upload": []
         },
         "bytes": {
+            "total": 0,
             "hashed": 0,
-            "uploaded": 0
+            "uploaded": 0,
+            "finished": 0
+        },
+        "time": {
+            "hashing": 0,
+            "uploading": 0,
+            "busy": 0
         }
     };
 
@@ -709,11 +725,11 @@ function up2k_init(subtle) {
                     match = false;
 
             if (match) {
-                var msg = ['directory iterator got stuck on the following {0} items; good chance your browser is about to spinlock:'.format(missing.length)];
+                var msg = ['directory iterator got stuck on the following {0} items; good chance your browser is about to spinlock:<ul>'.format(missing.length)];
                 for (var a = 0; a < Math.min(20, missing.length); a++)
-                    msg.push(missing[a]);
+                    msg.push('<li>' + esc(missing[a]) + '</li>');
 
-                return modal.alert(msg.join('\n-- '), function () {
+                return modal.alert(msg.join('') + '</ul>', function () {
                     read_dirs(rd, [], [], good, bad, spins);
                 });
             }
@@ -784,12 +800,18 @@ function up2k_init(subtle) {
             });
         }
 
-        var msg = ['upload these ' + good_files.length + ' files?'];
+        good_files.sort(function (a, b) {
+            a = a[1];
+            b = b[1];
+            return a < b ? -1 : a > b ? 1 : 0;
+        });
+
+        var msg = ['{0} these {1} files?<ul>'.format(fsearch ? 'search' : 'upload', good_files.length)];
         for (var a = 0, aa = Math.min(20, good_files.length); a < aa; a++)
-            msg.push(good_files[a][1]);
+            msg.push('<li>' + esc(good_files[a][1]) + '</li>');
 
         if (ask_up && !fsearch)
-            return modal.confirm(msg.join('\n'), function () { up_them(good_files); }, null);
+            return modal.confirm(msg.join('') + '</ul>', function () { up_them(good_files); }, null);
 
         up_them(good_files);
     }
@@ -805,13 +827,13 @@ function up2k_init(subtle) {
         for (var a = 0; a < good_files.length; a++) {
             var fobj = good_files[a][0],
                 name = good_files[a][1],
-                fdir = '',
+                fdir = evpath,
                 now = Date.now(),
                 lmod = fobj.lastModified || now,
                 ofs = name.lastIndexOf('/') + 1;
 
             if (ofs) {
-                fdir = name.slice(0, ofs);
+                fdir += url_enc(name.slice(0, ofs));
                 name = name.slice(ofs);
             }
 
@@ -828,6 +850,9 @@ function up2k_init(subtle) {
             },
                 key = entry.name + '\n' + entry.size;
 
+            if (fsearch)
+                entry.srch = 1;
+
             if (seen[key])
                 continue;
 
@@ -840,6 +865,7 @@ function up2k_init(subtle) {
                 ''
             ], fobj.size, draw_each);
 
+            st.bytes.total += fobj.size;
             st.files.push(entry);
             if (turbo)
                 push_t(st.todo.head, entry);
@@ -878,6 +904,69 @@ function up2k_init(subtle) {
     }
     ebi('u2cleanup').onclick = u2cleanup;
 
+    var etaref = 0, etaskip = 0;
+    function etafun() {
+        var nhash = st.busy.head.length + st.busy.hash.length + st.todo.head.length + st.todo.hash.length,
+            nsend = st.busy.upload.length + st.todo.upload.length,
+            now = Date.now(),
+            td = (now - (etaref || now)) / 1000.0;
+
+        etaref = now;
+        //ebi('acc_info').innerHTML = humantime(st.time.busy) + ' ' + f2f(now / 1000, 1);
+
+        if (!nhash)
+            ebi('u2etah').innerHTML = 'Done ({0}, {1} files)'.format(humansize(st.bytes.hashed), pvis.ctr["ok"] + pvis.ctr["ng"]);
+
+        if (!nsend && !nhash)
+            ebi('u2etau').innerHTML = ebi('u2etat').innerHTML = (
+                'Done ({0}, {1} files)'.format(humansize(st.bytes.uploaded), pvis.ctr["ok"] + pvis.ctr["ng"]));
+
+        if (!st.busy.hash.length && !hashing_permitted())
+            nhash = 0;
+
+        if (!parallel_uploads || !(nhash + nsend) || (flag && flag.owner && !flag.ours))
+            return;
+
+        var t = [];
+        if (nhash) {
+            st.time.hashing += td;
+            t.push(['u2etah', st.bytes.hashed, st.bytes.hashed, st.time.hashing]);
+            if (fsearch)
+                t.push(['u2etat', st.bytes.hashed, st.bytes.hashed, st.time.hashing]);
+        }
+        if (nsend) {
+            st.time.uploading += td;
+            t.push(['u2etau', st.bytes.uploaded, st.bytes.finished, st.time.uploading]);
+        }
+        if ((nhash || nsend) && !fsearch) {
+            if (!st.bytes.finished) {
+                ebi('u2etat').innerHTML = '(preparing to upload)';
+            }
+            else {
+                st.time.busy += td;
+                t.push(['u2etat', st.bytes.finished, st.bytes.finished, st.time.busy]);
+            }
+        }
+        for (var a = 0; a < t.length; a++) {
+            var rem = st.bytes.total - t[a][2],
+                bps = t[a][1] / t[a][3],
+                eta = Math.floor(rem / bps);
+
+            if (t[a][1] < 1024 || t[a][3] < 0.1) {
+                ebi(t[a][0]).innerHTML = '(preparing to upload)';
+                continue;
+            }
+
+            if (etaskip)
+                continue;
+
+            ebi(t[a][0]).innerHTML = '{0}, {1}/s, {2}'.format(
+                humansize(rem), humansize(bps, 1), humantime(eta));
+        }
+        if (++etaskip > 2)
+            etaskip = 0;
+    }
+
     /////
     ////
     ///   actuator
@@ -916,32 +1005,33 @@ function up2k_init(subtle) {
     }
 
     function hashing_permitted() {
+        if (!parallel_uploads)
+            return false;
+
         if (multitask) {
-            var ahead = st.bytes.hashed - st.bytes.uploaded;
+            var ahead = st.bytes.hashed - st.bytes.finished;
             return ahead < 1024 * 1024 * 1024 * 4 &&
                 st.todo.handshake.length + st.busy.handshake.length < 16;
         }
         return handshakes_permitted() && 0 ==
             st.todo.handshake.length +
-            st.busy.handshake.length;
+            st.busy.handshake.length +
+            st.todo.upload.length +
+            st.busy.upload.length;
     }
 
     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();
 
@@ -963,11 +1053,40 @@ function up2k_init(subtle) {
 
                     window[(is_busy ? "add" : "remove") +
                         "EventListener"]("beforeunload", warn_uploader_busy);
+
+                    if (!is_busy) {
+                        var k = fsearch ? 'searches' : 'uploads',
+                            ks = fsearch ? 'Search' : 'Upload',
+                            tok = fsearch ? 'successful (found on server)' : 'completed successfully',
+                            tng = fsearch ? 'failed (NOT found on server)' : 'failed, sorry',
+                            ok = pvis.ctr["ok"],
+                            ng = pvis.ctr["ng"],
+                            t = ask_up ? 0 : 10;
+
+                        if (ok && ng)
+                            toast.warn(t, 'Finished, but some {0} failed:\n{1} {2},\n{3} {4}'.format(k, ok, tok, ng, tng));
+                        else if (ok > 1)
+                            toast.ok(t, 'All {1} {0} {2}'.format(k, ok, tok));
+                        else if (ok)
+                            toast.ok(t, '{0} {1}'.format(ks, tok));
+                        else if (ng > 1)
+                            toast.err(t, 'All {1} {0} {2}'.format(k, ng, tng));
+                        else if (ng)
+                            toast.err(t, '{0} {1}'.format(ks, tng));
+
+                        timer.rm(etafun);
+                    }
+                    else {
+                        timer.add(etafun, false);
+                        ebi('u2etas').style.textAlign = 'left';
+                    }
+                    etafun();
                 }
 
                 if (flag) {
                     if (is_busy) {
                         flag.take(now);
+                        ebi('u2flagblock').style.display = flag.ours ? '' : 'block';
                         if (!flag.ours)
                             return defer();
                     }
@@ -1032,7 +1151,7 @@ function up2k_init(subtle) {
                     return defer();
             }
         }
-        taskerd();
+        timer.add(taskerd, true);
         return taskerd;
     })();
 
@@ -1103,7 +1222,6 @@ function up2k_init(subtle) {
     function exec_hash() {
         var t = st.todo.hash.shift();
         st.busy.hash.push(t);
-        st.bytes.hashed += t.size;
         t.bytes_uploaded = 0;
 
         var bpend = 0,
@@ -1129,6 +1247,7 @@ function up2k_init(subtle) {
                 cdr = t.size;
 
             bpend += cdr - car;
+            st.bytes.hashed += cdr - car;
 
             function orz(e) {
                 if (!min_filebuf && nch == 1) {
@@ -1159,11 +1278,11 @@ function up2k_init(subtle) {
                 if (handled) {
                     pvis.move(t.n, 'ng');
                     apop(st.busy.hash, t);
-                    st.bytes.uploaded += t.size;
+                    st.bytes.finished += t.size;
                     return tasker();
                 }
 
-                toast.err(0, 'y o u   b r o k e    i t\nfile: ' + t.name + '\nerror: ' + err);
+                toast.err(0, 'y o u   b r o k e    i t\nfile: ' + esc(t.name + '') + '\nerror: ' + err);
             };
             reader.readAsArrayBuffer(
                 bobslice.call(t.fobj, car, cdr));
@@ -1251,21 +1370,22 @@ function up2k_init(subtle) {
                 }
             }
             apop(st.busy.head, t);
-            if (!ok)
+            if (!ok && !t.srch)
                 return push_t(st.todo.hash, t);
 
             t.done = true;
             st.bytes.hashed += t.size;
-            st.bytes.uploaded += t.size;
-            pvis.seth(t.n, 1, 'YOLO');
+            st.bytes.finished += t.size;
+            pvis.move(t.n, 'bz');
+            pvis.seth(t.n, 1, ok ? 'YOLO' : '404');
             pvis.seth(t.n, 2, "turbo'd");
-            pvis.move(t.n, 'ok');
+            pvis.move(t.n, ok ? 'ok' : 'ng');
         };
         xhr.onload = function (e) {
             try { orz(e); } catch (ex) { vis_exh(ex + '', '', '', '', ex); }
         };
 
-        xhr.open('HEAD', t.purl + t.name, true);
+        xhr.open('HEAD', t.purl + uricom_enc(t.name) + '?raw', true);
         xhr.send();
     }
 
@@ -1336,18 +1456,19 @@ function up2k_init(subtle) {
                     pvis.seth(t.n, 1, smsg);
                     pvis.move(t.n, smsg == '404' ? 'ng' : 'ok');
                     apop(st.busy.handshake, t);
-                    st.bytes.uploaded += t.size;
+                    st.bytes.finished += t.size;
                     t.done = true;
                     tasker();
                     return;
                 }
 
-                if (response.purl !== t.purl || response.name !== t.name) {
+                var rsp_purl = url_enc(response.purl);
+                if (rsp_purl !== t.purl || response.name !== t.name) {
                     // server renamed us (file exists / path restrictions)
-                    console.log("server-rename [" + t.purl + "] [" + t.name + "] to [" + response.purl + "] [" + response.name + "]");
-                    t.purl = response.purl;
+                    console.log("server-rename [" + t.purl + "] [" + t.name + "] to [" + rsp_purl + "] [" + response.name + "]");
+                    t.purl = rsp_purl;
                     t.name = response.name;
-                    pvis.seth(t.n, 0, linksplit(t.purl + t.name).join(' '));
+                    pvis.seth(t.n, 0, linksplit(uricom_dec(t.purl)[0] + t.name).join(' '));
                 }
 
                 var chunksize = get_chunksize(t.size),
@@ -1376,7 +1497,7 @@ function up2k_init(subtle) {
                 pvis.prog(t, 0, cbd[0]);
 
                 var done = true,
-                    msg = '&#x1f3b7;&#x1f41b;';
+                    msg = 'done';
 
                 if (t.postlist.length) {
                     var arr = st.todo.upload,
@@ -1403,12 +1524,12 @@ function up2k_init(subtle) {
 
                 if (done) {
                     t.done = true;
-                    st.bytes.uploaded += t.size - t.bytes_uploaded;
+                    st.bytes.finished += t.size - t.bytes_uploaded;
                     var spd1 = (t.size / ((t.t_hashed - t.t_hashing) / 1000.)) / (1024 * 1024.),
                         spd2 = (t.size / ((t.t_uploaded - t.t_uploading) / 1000.)) / (1024 * 1024.);
 
                     pvis.seth(t.n, 2, 'hash {0}, up {1} MB/s'.format(
-                        spd1.toFixed(2), spd2.toFixed(2)));
+                        f2f(spd1, 2), isNaN(spd2) ? '--' : f2f(spd2, 2)));
 
                     pvis.move(t.n, 'ok');
                 }
@@ -1436,7 +1557,7 @@ function up2k_init(subtle) {
                     return;
                 }
 
-                st.bytes.uploaded += t.size;
+                st.bytes.finished += t.size;
                 if (rsp.indexOf('partial upload exists') !== -1 ||
                     rsp.indexOf('file already exists') !== -1) {
                     err = rsp;
@@ -1471,7 +1592,7 @@ function up2k_init(subtle) {
             "lmod": t.lmod,
             "hash": t.hash
         };
-        if (fsearch)
+        if (t.srch)
             req.srch = 1;
 
         xhr.open('POST', t.purl, true);
@@ -1507,6 +1628,7 @@ function up2k_init(subtle) {
             var txt = ((xhr.response && xhr.response.err) || xhr.responseText) + '';
             if (xhr.status == 200) {
                 pvis.prog(t, npart, cdr - car);
+                st.bytes.finished += cdr - car;
                 st.bytes.uploaded += cdr - car;
                 t.bytes_uploaded += cdr - car;
             }
@@ -1574,6 +1696,7 @@ function up2k_init(subtle) {
             parent.appendChild(btn);
             ebi('u2conf').setAttribute('class', wide ? 'has_btn' : '');
             ebi('u2cards').setAttribute('class', wide ? 'w' : '');
+            ebi('u2etaw').setAttribute('class', wide ? 'w' : '');
         }
     }
     window.addEventListener('resize', onresize);
@@ -1661,7 +1784,7 @@ function up2k_init(subtle) {
 
     function draw_turbo() {
         var msgu = '<p class="warn">WARNING: turbo enabled, <span>&nbsp;client may not detect and resume incomplete uploads; see turbo-button tooltip</span></p>',
-            msgs = '<p class="warn">WARNING: turbo enabled, <span>&nbsp;search may give false-positives; see turbo-button tooltip</span></p>',
+            msgs = '<p class="warn">WARNING: turbo enabled, <span>&nbsp;search results can be incorrect; see turbo-button tooltip</span></p>',
             msg = fsearch ? msgs : msgu,
             omsg = fsearch ? msgu : msgs,
             html = ebi('u2foot').innerHTML,
@@ -1705,11 +1828,10 @@ function up2k_init(subtle) {
         catch (ex) { }
 
         try {
-            var fun = fsearch ? 'add' : 'remove',
-                ico = fsearch ? '🔎' : '🚀',
+            var ico = fsearch ? '🔎' : '🚀',
                 desc = fsearch ? 'Search' : 'Upload';
 
-            ebi('op_up2k').classList[fun]('srch');
+            clmod(ebi('op_up2k'), 'srch', fsearch);
             ebi('u2bm').innerHTML = ico + ' <sup>' + desc + '</sup>';
         }
         catch (ex) { }
@@ -1730,11 +1852,14 @@ function up2k_init(subtle) {
                 flag = up2k_flagbus();
             }
             catch (ex) {
-                console.log("flag error: " + ex.toString());
+                toast.err(5, "not supported on your browser:\n" + ex);
                 tgl_flag_en();
             }
         }
         else if (!flag_en && flag) {
+            if (flag.ours)
+                flag.give();
+
             flag.ch.close();
             flag = false;
         }
@@ -1765,9 +1890,9 @@ function up2k_init(subtle) {
     if (o)
         o.addEventListener('click', tgl_fsearch, false);
 
-    var nodes = ebi('u2conf').getElementsByTagName('a');
-    for (var a = nodes.length - 1; a >= 0; a--)
-        nodes[a].addEventListener('touchend', nop, false);
+    ebi('u2etas').onclick = function () {
+        clmod(ebi('u2etas'), 'o', 't');
+    };
 
     set_fsearch();
     bumpthread({ "target": 1 });

copyparty/web/util.js

@@ -39,7 +39,8 @@ function vis_exh(msg, url, lineNo, columnNo, error) {
 
     crashed = true;
     window.onerror = undefined;
-    var html = ['<h1>you hit a bug!</h1><p style="font-size:1.3em;margin:0">try to <a href="#" onclick="localStorage.clear();location.reload();">reset copyparty settings</a> if you are stuck here, or <a href="#" onclick="ignex();">ignore this</a> / <a href="#" onclick="ignex(true);">ignore all</a></p><p>please send me a screenshot arigathanks gozaimuch: <code>ed/irc.rizon.net</code> or <code>ed#2644</code><br />&nbsp; (and if you can, press F12 and include the "Console" tab in the screenshot too)</p><p>',
+    var con = is_touch ? '' : '<br />&nbsp; (and if you can, press F12 and include the "Console" tab in the screenshot too)',
+        html = ['<h1>you hit a bug!</h1><p style="font-size:1.3em;margin:0">try to <a href="#" onclick="localStorage.clear();location.reload();">reset copyparty settings</a> if you are stuck here, or <a href="#" onclick="ignex();">ignore this</a> / <a href="#" onclick="ignex(true);">ignore all</a></p><p>please send me a screenshot arigathanks gozaimuch: <code>ed/irc.rizon.net</code> or <code>ed#2644</code>' + con + '</p><p>',
         esc(url + ' @' + lineNo + ':' + columnNo), '<br />' + esc(String(msg)) + '</p>'];
 
     try {
@@ -63,10 +64,10 @@ function vis_exh(msg, url, lineNo, columnNo, error) {
             document.body.appendChild(exbox);
 
             var s = mknod('style');
-            s.innerHTML = '#exbox{background:#333;color:#ddd;font-family:sans-serif;font-size:0.8em;padding:0 1em 1em 1em;z-index:80386;position:fixed;top:0;left:0;right:0;bottom:0;width:100%;height:100%} #exbox h1{margin:.5em 1em 0 0;padding:0} #exbox h3{border-top:1px solid #999;margin:1em 0 0 0} #exbox a{text-decoration:underline;color:#fc0} #exbox code{color:#bf7;background:#222;padding:.1em;margin:.2em;font-size:1.1em;font-family:monospace,monospace} #exbox *{line-height:1.5em}';
+            s.innerHTML = '#exbox{background:#333;color:#ddd;font-family:sans-serif;font-size:0.8em;padding:0 1em 1em 1em;z-index:80386;position:fixed;top:0;left:0;right:0;bottom:0;width:100%;height:100%;overflow:auto;width:calc(100% - 2em)} #exbox h1{margin:.5em 1em 0 0;padding:0} #exbox h3{border-top:1px solid #999;margin:1em 0 0 0} #exbox a{text-decoration:underline;color:#fc0} #exbox code{color:#bf7;background:#222;padding:.1em;margin:.2em;font-size:1.1em;font-family:monospace,monospace} #exbox,#exbox *{line-height:1.5em;overflow-wrap:break-word}';
             document.head.appendChild(s);
         }
-        exbox.innerHTML = html.join('\n');
+        exbox.innerHTML = html.join('\n').replace(/https?:\/\/[^ \/]+\//g, '/');
         exbox.style.display = 'block';
     }
     catch (e) {
@@ -123,11 +124,18 @@ if (!String.startsWith) {
         return this.substring(i, i + s.length) === s;
     };
 }
+if (!Element.prototype.matches) {
+    Element.prototype.matches =
+        Element.prototype.oMatchesSelector ||
+        Element.prototype.msMatchesSelector ||
+        Element.prototype.mozMatchesSelector ||
+        Element.prototype.webkitMatchesSelector;
+}
 if (!Element.prototype.closest) {
     Element.prototype.closest = function (s) {
         var el = this;
         do {
-            if (el.msMatchesSelector(s)) return el;
+            if (el.matches(s)) return el;
             el = el.parentElement || el.parentNode;
         } while (el !== null && el.nodeType === 1);
     }
@@ -170,90 +178,37 @@ function crc32(str) {
 }
 
 
-function clmod(obj, cls, add) {
-    var re = new RegExp('\\s*\\b' + cls + '\\s*\\b', 'g');
-    if (add == 't')
-        add = !re.test(obj.className);
+function clmod(el, cls, add) {
+    if (el.classList) {
+        var have = el.classList.contains(cls);
+        if (add == 't')
+            add = !have;
 
-    obj.className = obj.className.replace(re, ' ') + (add ? ' ' + cls : '');
+        if (add != have)
+            el.classList[add ? 'add' : 'remove'](cls);
+
+        return;
+    }
+
+    var re = new RegExp('\\s*\\b' + cls + '\\s*\\b', 'g'),
+        n1 = el.className;
+
+    if (add == 't')
+        add = !re.test(n1);
+
+    var n2 = n1.replace(re, ' ') + (add ? ' ' + cls : '');
+
+    if (n1 != n2)
+        el.className = n2;
 }
 
 
-function sortfiles(nodes) {
-    var sopts = jread('fsort', [["href", 1, ""]]);
+function clgot(el, cls) {
+    if (el.classList)
+        return el.classList.contains(cls);
 
-    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;
+    var lst = (el.getAttribute('class') + '').split(/ /g);
+    return has(lst, cls);
 }
 
 
@@ -386,6 +341,16 @@ function uricom_enc(txt, do_fb_enc) {
     }
 }
 
+function url_enc(txt) {
+    var parts = txt.split('/'),
+        ret = [];
+
+    for (var a = 0; a < parts.length; a++)
+        ret.push(uricom_enc(parts[a]));
+
+    return ret.join('/');
+}
+
 
 function uricom_dec(txt) {
     try {
@@ -398,10 +363,12 @@ function uricom_dec(txt) {
 }
 
 
-function uricom_adec(arr) {
+function uricom_adec(arr, li) {
     var ret = [];
-    for (var a = 0; a < arr.length; a++)
-        ret.push(uricom_dec(arr[a])[0]);
+    for (var a = 0; a < arr.length; a++) {
+        var txt = uricom_dec(arr[a])[0];
+        ret.push(li ? '<li>' + esc(txt) + '</li>' : txt);
+    }
 
     return ret;
 }
@@ -446,6 +413,41 @@ function s2ms(s) {
 }
 
 
+function f2f(val, nd) {
+    // 10.toFixed(1) returns 10.00 for certain values of 10
+    val = (val * Math.pow(10, nd)).toFixed(0).split('.')[0];
+    return nd ? (val.slice(0, -nd) || '0') + '.' + val.slice(-nd) : val;
+}
+
+
+function humansize(b, terse) {
+    var i = 0, u = terse ? ['B', 'K', 'M', 'G'] : ['B', 'KB', 'MB', 'GB'];
+    while (b >= 1000 && i < u.length) {
+        b /= 1024;
+        i += 1;
+    }
+    return f2f(b, b >= 100 ? 0 : b >= 10 ? 1 : 2) + ' ' + u[i];
+}
+
+
+function humantime(v) {
+    if (v >= 60 * 60 * 24)
+        return v;
+
+    try {
+        return /.*(..:..:..).*/.exec(new Date(v * 1000).toUTCString())[1];
+    }
+    catch (ex) {
+        return v;
+    }
+}
+
+
+function clamp(v, a, b) {
+    return Math.min(Math.max(v, a), b);
+}
+
+
 function has(haystack, needle) {
     for (var a = 0; a < haystack.length; a++)
         if (haystack[a] == needle)
@@ -555,6 +557,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"),
@@ -571,6 +606,8 @@ var tt = (function () {
             r.skip = false;
             return;
         }
+        if (QS('body.bbox-open'))
+            return;
 
         var cfg = sread('tooltips');
         if (cfg !== null && cfg != '1')
@@ -583,28 +620,39 @@ var tt = (function () {
         r.el = this;
         var pos = this.getBoundingClientRect(),
             dir = this.getAttribute('ttd') || '',
-            left = pos.left < window.innerWidth / 2,
             top = pos.top < window.innerHeight / 2,
             big = this.className.indexOf(' ttb') !== -1;
 
         if (dir.indexOf('u') + 1) top = false;
         if (dir.indexOf('d') + 1) top = true;
-        if (dir.indexOf('l') + 1) left = false;
-        if (dir.indexOf('r') + 1) left = true;
 
         clmod(r.tt, 'b', big);
-        r.tt.style.top = top ? pos.bottom + 'px' : 'auto';
-        r.tt.style.bottom = top ? 'auto' : (window.innerHeight - pos.top) + 'px';
-        r.tt.style.left = left ? pos.left + 'px' : 'auto';
-        r.tt.style.right = left ? 'auto' : (window.innerWidth - pos.right) + 'px';
+        r.tt.style.left = '0';
+        r.tt.style.top = '0';
 
         r.tt.innerHTML = msg.replace(/\$N/g, "<br />");
+        var tw = r.tt.offsetWidth,
+            x = pos.left + (pos.right - pos.left) / 2 - tw / 2;
+
+        if (x < 0)
+            x = 8;
+
+        if (x + tw >= window.innerWidth - 8) {
+            x = window.innerWidth - tw - 8;
+        }
+
+        r.tt.style.left = x + 'px';
+        r.tt.style.top = top ? pos.bottom + 'px' : 'auto';
+        r.tt.style.bottom = top ? 'auto' : (window.innerHeight - pos.top) + 'px';
+
         r.el.addEventListener('mouseleave', r.hide);
+        window.addEventListener('scroll', r.hide);
         clmod(r.tt, 'show', 1);
     };
 
     r.hide = function (e) {
         ev(e);
+        window.removeEventListener('scroll', r.hide);
         clmod(r.tt, 'show');
         if (r.el)
             r.el.removeEventListener('mouseleave', r.hide);
@@ -612,13 +660,23 @@ var tt = (function () {
 
     if (is_touch && IPHONE) {
         var f1 = r.show,
-            f2 = r.hide;
+            f2 = r.hide,
+            q = [];
+
+        // if an onclick-handler creates a new timer,
+        // iOS 13.1.2 delays the entire handler by up to 401ms,
+        // win by using a shared timer instead
+
+        timer.add(function () {
+            while (q.length && Date.now() >= q[0][0])
+                q.shift()[1]();
+        });
 
         r.show = function () {
-            setTimeout(f1.bind(this), 301);
+            q.push([Date.now() + 100, f1.bind(this)]);
         };
         r.hide = function () {
-            setTimeout(f2.bind(this), 301);
+            q.push([Date.now() + 100, f2.bind(this)]);
         };
     }
 
@@ -674,6 +732,7 @@ var toast = (function () {
     obj.setAttribute('id', 'toast');
     document.body.appendChild(obj);
     r.visible = false;
+    r.txt = null;
 
     r.hide = function (e) {
         ev(e);
@@ -693,6 +752,7 @@ var toast = (function () {
         obj.className += ' vis';
         ebi('toastc').onclick = r.hide;
         r.visible = true;
+        r.txt = txt;
     };
 
     r.ok = function (ms, txt) {
@@ -736,12 +796,22 @@ var modal = (function () {
         a = ebi('modal-ok');
         a.onclick = ok;
 
-        (ebi('modali') || a).focus();
+        var inp = ebi('modali');
+        (inp || a).focus();
+        if (inp)
+            setTimeout(function () {
+                inp.setSelectionRange(0, inp.value.length, "forward");
+            }, 0);
+
+        document.addEventListener('focus', onfocus);
+        timer.add(onfocus);
     };
 
     r.hide = function () {
-        o.parentNode.removeChild(o);
+        timer.rm(onfocus);
+        document.removeEventListener('focus', onfocus);
         document.removeEventListener('keydown', onkey);
+        o.parentNode.removeChild(o);
         r.busy = false;
         setTimeout(next, 50);
     };
@@ -760,6 +830,17 @@ var modal = (function () {
             cb_ng(null);
     }
 
+    function onfocus(e) {
+        var ctr = ebi('modalc');
+        if (!ctr || !ctr.contains || !document.activeElement || ctr.contains(document.activeElement))
+            return;
+
+        setTimeout(function () {
+            ebi('modal-ok').focus();
+        }, 20);
+        ev(e);
+    }
+
     function onkey(e) {
         if (e.code == 'Enter') {
             var a = ebi('modal-ng');
@@ -820,3 +901,35 @@ 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)
+    });
+}
+
+
+function repl(e) {
+    ev(e);
+    modal.prompt('js repl (prefix with <code>,</code> to allow raise)', 'var v=Object.keys(localStorage); v.sort(); JSON.stringify(v)', function (cmd) {
+        if (!cmd)
+            return toast.inf(3, 'eval aborted');
+
+        if (cmd.startsWith(','))
+            return modal.alert(esc(eval(cmd.slice(1)) + ''))
+
+        try {
+            modal.alert(esc(eval(cmd) + ''));
+        }
+        catch (ex) {
+            modal.alert('<h6>exception</h6>' + esc(ex + ''));
+        }
+    });
+}
+if (ebi('repl'))
+    ebi('repl').onclick = repl;

docs/browser-icons.css

@@ -1,36 +1,3 @@
-/* put filetype icons inline with text
-#ggrid>a>span:before,
-#ggrid>a>span.dir:before {
-	display: inline;
-	line-height: 0;
-	font-size: 1.7em;
-	margin: -.7em .1em -.5em -.6em;
-}
-*/
-
-
-/* move folder icons top-left */
-#ggrid>a>span.dir:before {
-	content: initial;
-}
-#ggrid>a[href$="/"]:before {
-	content: '📂';
-}
-
-
-/* put filetype icons top-left */
-#ggrid>a:before {
-    display: block;
-    position: absolute;
-	padding: .3em 0;
-    margin: -.4em;
-    text-shadow: 0 0 .1em #000;
-	background: linear-gradient(135deg,rgba(255,255,255,0) 50%,rgba(255,255,255,0.2));
-	border-radius: .3em;
-    font-size: 2em;
-}
-
-
 /* video */
 #ggrid>a:is(
 [href$=".mkv"i],

docs/minimal-up2k.html

@@ -11,7 +11,7 @@
 
     #u2cleanup, #u2conf tr:first-child>td[rowspan]:not(#u2btn_cw),  /* most of the config options */
 
-    #u2cards  /* and the upload progress tabs */
+    #u2cards, #u2etaw  /* and the upload progress tabs */
 
     {display: none !important}  /* do it! */
 
@@ -19,7 +19,7 @@
 
     /* add some margins because now it's weird */
     .opview {margin-top: 2.5em}
-    #op_up2k {margin-top: 3em}
+    #op_up2k {margin-top: 6em}
 
     /* and embiggen the upload button */
     #u2conf #u2btn, #u2btn {padding:1.5em 0}

docs/notes.sh

@@ -126,6 +126,10 @@ e=6; s=10; d=~/dev/copyparty/srv/aus; n=1; p=0; e=$((e*60)); rm -rf $d; mkdir $d
 -v srv/aus:aus:r:ce2dsa:ce2ts:cmtp=fgsfds=bin/mtag/sleep.py
 sqlite3 .hist/up2k.db 'select * from mt where k="fgsfds" or k="t:mtp"' | tee /dev/stderr | wc -l
 
+# generate the sine meme
+for ((f=420;f<1200;f++)); do sz=$(ffmpeg -y -f lavfi -i sine=frequency=$f:duration=2 -vf volume=0.1 -ac 1 -ar 44100 -f s16le /dev/shm/a.wav 2>/dev/null; base64 -w0 </dev/shm/a.wav | gzip -c | wc -c); printf '%d %d\n' $f $sz; done | tee /dev/stderr | sort -nrk2,2
+ffmpeg -y -f lavfi -i sine=frequency=1050:duration=2 -vf volume=0.1 -ac 1 -ar 44100 /dev/shm/a.wav
+
 
 ##
 ## vscode
@@ -157,7 +161,7 @@ brew install python@2
 pip install virtualenv
 
 # readme toc
-cat README.md | awk '!/^#/{next} {lv=length($1);sub(/[^ ]+ /,"");bab=$0;gsub(/ /,"-",bab)} {printf "%" ((lv-1)*4+1) "s [%s](#%s)\n", "*",$0,bab}'
+cat README.md | awk 'function pr() { if (!h) {return}; if (/^ *[*!#]/||!s) {printf "%s\n",h;h=0;return}; if (/.../) {printf "%s - %s\n",h,$0;h=0}; };    /^#/{s=1;pr()} /^#* *(file indexing|install on android|dev env setup|just the sfx|complete release|optional gpl stuff)|`$/{s=0} /^#/{lv=length($1);sub(/[^ ]+ /,"");bab=$0;gsub(/ /,"-",bab); h=sprintf("%" ((lv-1)*4+1) "s [%s](#%s)", "*",$0,bab);next} !h{next} {sub(/:$/,"")} {pr()}' > toc; grep -E '^## readme toc' -B1000 -A2 <README.md >p1; grep -E '^## quickstart' -B2 -A999999 <README.md >p2; (cat p1; grep quickstart -A1000 <toc; cat p2) >README.md
 
 # fix firefox phantom breakpoints,
 # suggestions from bugtracker, doesnt work (debugger is not attachable)
@@ -173,7 +177,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/deps-docker/Dockerfile

@@ -3,7 +3,7 @@ WORKDIR /z
 ENV     ver_asmcrypto=5b994303a9d3e27e0915f72a10b6c2c51535a4dc \
         ver_hashwasm=4.7.0 \
         ver_marked=1.1.0 \
-        ver_ogvjs=1.8.0 \
+        ver_ogvjs=1.8.4 \
         ver_mde=2.14.0 \
         ver_codemirror=5.59.3 \
         ver_fontawesome=5.13.0 \
@@ -74,23 +74,16 @@ RUN     cd hash-wasm \
 # build ogvjs
 RUN     cd ogvjs-$ver_ogvjs \
         && cp -pv \
-            ogv.js \
             ogv-worker-audio.js \
             ogv-demuxer-ogg-wasm.js \
             ogv-demuxer-ogg-wasm.wasm \
-            ogv-demuxer-webm-wasm.js \
-            ogv-demuxer-webm-wasm.wasm \
             ogv-decoder-audio-opus-wasm.js \
             ogv-decoder-audio-opus-wasm.wasm \
             ogv-decoder-audio-vorbis-wasm.js \
             ogv-decoder-audio-vorbis-wasm.wasm \
-            /z/dist
-
-#            ogv-demuxer-ogg.js \
-#            ogv-demuxer-webm.js \
-#            ogv-decoder-audio-opus.js \
-#            ogv-decoder-audio-vorbis.js \
-#            dynamicaudio.swf \
+            /z/dist \
+        && cp -pv \
+            ogv-es2017.js /z/dist/ogv.js
 
 
 # build marked

scripts/deps-docker/zopfli.makefile

@@ -2,7 +2,7 @@ all: $(addsuffix .gz, $(wildcard *.*))
 
 %.gz: %
 	#brotli -q 11 $<
-	pigz -11 -J 34 -I 573 $<
+	pigz -11 -I 573 $<
 
 # pigz -11 -J 34 -I 100 -F < $< > $@.first
 

scripts/make-sfx.sh

@@ -37,6 +37,7 @@ gtar=$(command -v gtar || command -v gnutar) || true
 	sed()  { gsed  "$@"; }
 	find() { gfind "$@"; }
 	sort() { gsort "$@"; }
+	shuf() { gshuf "$@"; }
 	sha1sum() { shasum "$@"; }
 	unexpand() { gunexpand "$@"; }
 	command -v grealpath >/dev/null &&
@@ -239,7 +240,8 @@ awk '/^LOREM_IPSUM_WORDS/{o=1;print "LOREM_IPSUM_WORDS = u\"a\"";next} !o; /"""/
 tmv "$f"
 
 # up2k goes from 28k to 22k laff
-echo entabbening
+awk 'BEGIN{gensub(//,"",1)}' </dev/null &&
+echo entabbening &&
 find | grep -E '\.css$' | while IFS= read -r f; do
 	awk '{
 		sub(/^[ \t]+/,"");
@@ -253,6 +255,7 @@ find | grep -E '\.css$' | while IFS= read -r f; do
 	' <$f | sed 's/;\}$/}/' >t
 	tmv "$f"
 done
+unexpand -h 2>/dev/null &&
 find | grep -E '\.(js|html)$' | while IFS= read -r f; do
 	unexpand -t 4 --first-only <"$f" >t
 	tmv "$f"
@@ -301,7 +304,7 @@ for d in copyparty dep-j2; do find $d -type f; done |
 sed -r 's/(.*)\.(.*)/\2 \1/' | LC_ALL=C sort |
 sed -r 's/([^ ]*) (.*)/\2.\1/' | grep -vE '/list1?$' > list1
 
-(grep -vE '\.(gz|br)$' list1; grep -E '\.(gz|br)$' list1) >list || true
+(grep -vE '\.(gz|br)$' list1; grep -E '\.(gz|br)$' list1 | shuf) >list || true
 
 echo creating tar
 args=(--owner=1000 --group=1000)

scripts/sfx.py

@@ -364,7 +364,7 @@ def confirm(rv):
     except:
         pass
 
-    sys.exit(rv)
+    sys.exit(rv or 1)
 
 
 def run(tmp, j2):

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":

tests/test_httpcli.py

@@ -39,6 +39,7 @@ class Cfg(Namespace):
             no_scandir=False,
             no_sendfile=True,
             no_rescan=True,
+            re_maxage=0,
             ihead=False,
             nih=True,
             mtp=[],

tests/test_vfs.py

@@ -26,6 +26,7 @@ class Cfg(Namespace):
             "no_hash": False,
             "css_browser": None,
             "no_voldump": True,
+            "re_maxage": 0,
             "rproxy": 0,
         }
         ex.update(ex2)