v0.4.1

.gitignore

@@ -8,17 +8,15 @@ copyparty.egg-info/
 buildenv/
 build/
 dist/
-*.rst
-.env/
+sfx/
+.venv/
 
-# sublime
+# ide
 *.sublime-workspace
 
 # winmerge
 *.bak
 
-# other licenses
-contrib/
-
-# deps
-copyparty/web/deps
+# derived
+copyparty/web/deps/
+srv/

.vscode/launch.json

@@ -15,7 +15,7 @@
                 "-a",
                 "ed:wark",
                 "-v",
-                "/home/ed/inc:inc:r:aed"
+                "srv::r:aed"
             ]
         },
         {

.vscode/settings.json

@@ -55,6 +55,6 @@
     //
     //  things you may wanna edit:
     //
-    "python.pythonPath": ".env/bin/python",
+    "python.pythonPath": ".venv/bin/python",
     //"python.linting.enabled": true,
 }

README.md

@@ -1,6 +1,6 @@
 # ⇆🎉 copyparty
 
-* http file sharing hub (py2/py3)
+* http file sharing hub (py2/py3) [(on PyPI)](https://pypi.org/project/copyparty/)
 * MIT-Licensed, 2019-05-26, ed @ irc.rizon.net
 
 
@@ -34,8 +34,10 @@ turn your phone or raspi into a portable file server with resumable uploads/down
 * [ ] download as zip
 * [x] volumes
 * [x] accounts
+* [x] markdown viewer
+* [x] markdown editor
 
-summary: close to beta
+summary: it works! you can use it! (but technically not even close to beta)
 
 
 # dependencies
@@ -47,6 +49,28 @@ optional, enables thumbnails:
 * `Pillow` (requires py2.7 or py3.5+)
 
 
+# sfx
+
+currently there are two self-contained binaries:
+* `copyparty-sfx.sh` for unix (linux and osx) -- smaller, more robust
+* `copyparty-sfx.py` for windows (unix too) -- crossplatform, beta
+
+launch either of them and it'll unpack and run copyparty, assuming you have python installed of course
+
+pls note that `copyparty-sfx.sh` will fail if you rename `copyparty-sfx.py` to `copyparty.py` and keep it in the same folder because `sys.path` is funky
+
+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 for either msys2 or WSL if you're on windows)
+* `724K` original size as of v0.4.0
+* `256K` after `./scripts/make-sfx.sh re no-ogv`
+* `164K` after `./scripts/make-sfx.sh re no-ogv no-cm`
+
+the features you can opt to drop are
+* `ogv`.js, the opus/vorbis decoder which is needed by apple devices to play foss audio files
+* `cm`/easymde, the "fancy" markdown editor
+
+for the `re`pack to work, first run one of the sfx'es once to unpack it
+
+
 # install on android
 
 install [Termux](https://termux.com/) (see [ocv.me/termux](https://ocv.me/termux/)) and then copy-paste this into Termux (long-tap) all at once:
@@ -61,8 +85,8 @@ after the initial setup (and restarting bash), you can launch copyparty at any t
 # dev env setup
 
 ```sh
-python3 -m venv .env
-. .env/bin/activate
+python3 -m venv .venv
+. .venv/bin/activate
 pip install jinja2  # mandatory deps
 pip install Pillow  # thumbnail deps
 pip install black bandit pylint flake8  # vscode tooling
@@ -76,12 +100,16 @@ in the `scripts` folder:
 * run `make -C deps-docker` to build all dependencies
 * create github release with `make-tgz-release.sh`
 * upload to pypi with `make-pypi-release.(sh|bat)`
+* create sfx with `make-sfx.sh`
 
 
 # todo
 
 roughly sorted by priority
 
+* up2k handle filename too long
+* up2k fails on empty files? alert then stuck
+* drop onto folders
 * look into android thumbnail cache file format
 * support pillow-simd
 * cache sha512 chunks on client

copyparty/__init__.py

@@ -5,11 +5,19 @@ import platform
 import sys
 import os
 
-WINDOWS = platform.system() == "Windows"
 PY2 = sys.version_info[0] == 2
 if PY2:
     sys.dont_write_bytecode = True
 
+WINDOWS = False
+if platform.system() == "Windows":
+    WINDOWS = [int(x) for x in platform.version().split(".")]
+
+VT100 = not WINDOWS or WINDOWS >= [10, 0, 14393]
+# introduced in anniversary update
+
+MACOS = platform.system() == "Darwin"
+
 
 class EnvParams(object):
     def __init__(self):
@@ -24,6 +32,7 @@ class EnvParams(object):
                 + "/copyparty"
             )
 
+        self.cfg = self.cfg.replace("\\", "/")
         try:
             os.makedirs(self.cfg)
         except:

copyparty/__main__.py

@@ -15,8 +15,8 @@ import locale
 import argparse
 from textwrap import dedent
 
-from .__init__ import E, WINDOWS
-from .__version__ import S_VERSION, S_BUILD_DT
+from .__init__ import E, WINDOWS, VT100
+from .__version__ import S_VERSION, S_BUILD_DT, CODENAME
 from .svchub import SvcHub
 from .util import py_desc
 
@@ -28,7 +28,7 @@ class RiceFormatter(argparse.HelpFormatter):
         except the help += [...] line now has colors
         """
         fmt = "\033[36m (default: \033[35m%(default)s\033[36m)\033[0m"
-        if WINDOWS:
+        if not VT100:
             fmt = " (default: %(default)s)"
 
         help = action.help
@@ -85,8 +85,13 @@ def ensure_cert():
 
 
 def main():
-    f = "\033[36mcopyparty v{} ({})\n   python v{}\033[0m\n"
-    print(f.format(S_VERSION, S_BUILD_DT, py_desc()))
+    if WINDOWS:
+        os.system("")  # enables colors
+
+    desc = py_desc().replace("[", "\033[1;30m[")
+
+    f = '\033[36mcopyparty v{} "\033[35m{}\033[36m" ({})\n{}\033[0m\n'
+    print(f.format(S_VERSION, CODENAME, S_BUILD_DT, desc))
 
     ensure_locale()
     ensure_cert()

copyparty/__version__.py

@@ -1,7 +1,8 @@
 # coding: utf-8
 
-VERSION = (0, 2, 3)
-BUILD_DT = (2020, 1, 19)
+VERSION = (0, 4, 1)
+CODENAME = "NIH"
+BUILD_DT = (2020, 5, 14)
 
 S_VERSION = ".".join(map(str, VERSION))
 S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

copyparty/authsrv.py

@@ -97,24 +97,18 @@ class VFS(object):
 
     def ls(self, rem, uname):
         """return user-readable [fsdir,real,virt] items at vpath"""
+        virt_vis = {}  # nodes readable by user
         abspath = self.canonical(rem)
-        real = [fsdec(x) for x in os.listdir(fsenc(abspath))]
+        items = os.listdir(fsenc(abspath))
+        real = [fsdec(x) for x in items]
         real.sort()
-        if rem:
-            virt_vis = []
-        else:
-            virt_all = []  # all nodes that exist
-            virt_vis = []  # nodes readable by user
+        if not rem:
             for name, vn2 in sorted(self.nodes.items()):
-                virt_all.append(name)
                 if uname in vn2.uread:
-                    virt_vis.append(name)
+                    virt_vis[name] = vn2
 
-            for name in virt_all:
-                try:
-                    real.remove(name)
-                except ValueError:
-                    pass
+            # no vfs nodes in the list of real inodes
+            real = [x for x in real if x not in self.nodes]
 
         return [abspath, real, virt_vis]
 
@@ -141,9 +135,9 @@ class AuthSrv(object):
         self.warn_anonwrite = True
 
         if WINDOWS:
-            self.re_vol = re.compile(r'^([a-zA-Z]:[\\/][^:]*|[^:]*):([^:]*):(.*)')
+            self.re_vol = re.compile(r"^([a-zA-Z]:[\\/][^:]*|[^:]*):([^:]*):(.*)")
         else:
-            self.re_vol = re.compile(r'^([^:]*):([^:]*):(.*)')
+            self.re_vol = re.compile(r"^([^:]*):([^:]*):(.*)")
 
         self.mutex = threading.Lock()
         self.reload()
@@ -230,7 +224,7 @@ class AuthSrv(object):
                 try:
                     src, dst, perms = vol_match.groups()
                 except:
-                    raise Exception('invalid -v argument')
+                    raise Exception("invalid -v argument")
 
                 src = fsdec(os.path.abspath(fsenc(src)))
                 dst = dst.strip("/")
@@ -274,13 +268,28 @@ class AuthSrv(object):
             v.uread = mread[dst]
             v.uwrite = mwrite[dst]
 
+        missing_users = {}
+        for d in [mread, mwrite]:
+            for _, ul in d.items():
+                for usr in ul:
+                    if usr != "*" and usr not in user:
+                        missing_users[usr] = 1
+
+        if missing_users:
+            self.log(
+                "\033[31myou must -a the following users: "
+                + ", ".join(k for k in sorted(missing_users))
+                + "\033[0m"
+            )
+            raise Exception("invalid config")
+
         try:
-            vfs.get("/", "*", False, True)
-            if self.warn_anonwrite:
+            v, _ = vfs.get("/", "*", False, True)
+            if self.warn_anonwrite and os.getcwd() == v.realpath:
                 self.warn_anonwrite = False
                 self.log(
                     "\033[31manyone can read/write the current directory: {}\033[0m".format(
-                        os.getcwd()
+                        v.realpath
                     )
                 )
         except Pebkac:

copyparty/broker_mp.py

@@ -4,7 +4,7 @@ from __future__ import print_function, unicode_literals
 import time
 import threading
 
-from .__init__ import PY2, WINDOWS
+from .__init__ import PY2, WINDOWS, VT100
 from .broker_util import try_exec
 from .broker_mpw import MpWorker
 from .util import mp
@@ -141,7 +141,7 @@ class BrokerMp(object):
 
     def debug_load_balancer(self):
         fmt = "\033[1m{}\033[0;36m{:4}\033[0m "
-        if WINDOWS:
+        if not VT100:
             fmt = "({}{:4})"
 
         last = ""

copyparty/broker_mpw.py

@@ -73,7 +73,7 @@ class MpWorker(object):
                 if PY2:
                     sck = pickle.loads(sck)  # nosec
 
-                self.log(str(addr), "-" * 4 + "C-qpop")
+                self.log("%s %s" % addr, "-" * 4 + "C-qpop")
                 self.httpsrv.accept(sck, addr)
 
                 with self.mutex:

copyparty/broker_thr.py

@@ -28,7 +28,7 @@ class BrokerThr(object):
     def put(self, want_retval, dest, *args):
         if dest == "httpconn":
             sck, addr = args
-            self.log(str(addr), "-" * 4 + "C-qpop")
+            self.log("%s %s" % addr, "-" * 4 + "C-qpop")
             self.httpsrv.accept(sck, addr)
 
         else:

copyparty/broker_util.py

@@ -4,13 +4,7 @@ from __future__ import print_function, unicode_literals
 
 import traceback
 
-from .__init__ import PY2
-from .util import Pebkac
-
-if not PY2:
-    from queue import Queue
-else:
-    from Queue import Queue  # pylint: disable=import-error,no-name-in-module
+from .util import Pebkac, Queue
 
 
 class ExceptionalQueue(Queue, object):

copyparty/httpcli.py

@@ -8,16 +8,15 @@ import time
 import json
 from datetime import datetime
 import calendar
-import mimetypes
 
-from .__init__ import E, PY2
+from .__init__ import E, PY2, WINDOWS
 from .util import *  # noqa  # pylint: disable=unused-wildcard-import
 
 if not PY2:
     unicode = str
     from html import escape as html_escape
 else:
-    from cgi import escape as html_escape
+    from cgi import escape as html_escape  # pylint: disable=no-name-in-module
 
 
 class HttpCli(object):
@@ -42,6 +41,14 @@ class HttpCli(object):
     def log(self, msg):
         self.log_func(self.log_src, msg)
 
+    def _check_nonfatal(self, ex):
+        return ex.code in [403, 404]
+
+    def _assert_safe_rem(self, rem):
+        # sanity check to prevent any disasters
+        if rem.startswith("/") or rem.startswith("../") or "/../" in rem:
+            raise Exception("that was close")
+
     def run(self):
         """returns true if connection can be reused"""
         self.keepalive = False
@@ -62,9 +69,13 @@ class HttpCli(object):
                 raise Pebkac(400, "bad headers:\n" + "\n".join(headerlines))
 
         except Pebkac as ex:
+            # self.log("pebkac at httpcli.run #1: " + repr(ex))
+            self.keepalive = self._check_nonfatal(ex)
             self.loud_reply(str(ex), status=ex.code)
-            return False
+            return self.keepalive
 
+        # normalize incoming headers to lowercase;
+        # outgoing headers however are Correct-Case
         for header_line in headerlines[1:]:
             k, v = header_line.split(":", 1)
             self.headers[k.lower()] = v.strip()
@@ -122,29 +133,52 @@ class HttpCli(object):
 
         except Pebkac as ex:
             try:
+                # self.log("pebkac at httpcli.run #2: " + repr(ex))
+                self.keepalive = self._check_nonfatal(ex)
                 self.loud_reply(str(ex), status=ex.code)
+                return self.keepalive
             except Pebkac:
-                pass
+                return False
 
-            return False
+    def send_headers(self, length, status=200, mime=None, headers={}):
+        response = ["HTTP/1.1 {} {}".format(status, HTTPCODE[status])]
+
+        if length is None:
+            self.keepalive = False
+        else:
+            response.append("Content-Length: " + str(length))
+
+        # close if unknown length, otherwise take client's preference
+        response.append("Connection: " + ("Keep-Alive" if self.keepalive else "Close"))
+
+        # headers{} overrides anything set previously
+        self.out_headers.update(headers)
+
+        # default to utf8 html if no content-type is set
+        try:
+            mime = mime or self.out_headers["Content-Type"]
+        except KeyError:
+            mime = "text/html; charset=UTF-8"
+
+        self.out_headers["Content-Type"] = mime
 
-    def reply(self, body, status=200, mime="text/html", headers=[]):
-        # TODO something to reply with user-supplied values safely
-        response = [
-            "HTTP/1.1 {} {}".format(status, HTTPCODE[status]),
-            "Content-Type: " + mime,
-            "Content-Length: " + str(len(body)),
-            "Connection: " + ("Keep-Alive" if self.keepalive else "Close"),
-        ]
         for k, v in self.out_headers.items():
             response.append("{}: {}".format(k, v))
 
-        response.extend(headers)
-        response_str = "\r\n".join(response).encode("utf-8")
         try:
-            self.s.sendall(response_str + b"\r\n\r\n" + body)
+            # best practice to separate headers and body into different packets
+            self.s.sendall("\r\n".join(response).encode("utf-8") + b"\r\n\r\n")
         except:
-            raise Pebkac(400, "client disconnected before http response")
+            raise Pebkac(400, "client d/c while replying headers")
+
+    def reply(self, body, status=200, mime=None, headers={}):
+        # TODO something to reply with user-supplied values safely
+        self.send_headers(len(body), status, mime, headers)
+
+        try:
+            self.s.sendall(body)
+        except:
+            raise Pebkac(400, "client d/c while replying body")
 
         return body
 
@@ -195,12 +229,15 @@ class HttpCli(object):
             return self.tx_mounts()
 
         return self.tx_browser()
-        
+
     def handle_post(self):
         self.log("POST " + self.req)
 
         if self.headers.get("expect", "").lower() == "100-continue":
-            self.s.sendall(b"HTTP/1.1 100 Continue\r\n\r\n")
+            try:
+                self.s.sendall(b"HTTP/1.1 100 Continue\r\n\r\n")
+            except:
+                raise Pebkac(400, "client d/c before 100 continue")
 
         ctype = self.headers.get("content-type", "").lower()
         if not ctype:
@@ -224,11 +261,21 @@ class HttpCli(object):
 
         act = self.parser.require("act", 64)
 
+        if act == "login":
+            return self.handle_login()
+
+        if act == "mkdir":
+            return self.handle_mkdir()
+
+        if act == "new_md":
+            # kinda silly but has the least side effects
+            return self.handle_new_md()
+
         if act == "bput":
             return self.handle_plain_upload()
 
-        if act == "login":
-            return self.handle_login()
+        if act == "tput":
+            return self.handle_text_upload()
 
         raise Pebkac(422, 'invalid action "{}"'.format(act))
 
@@ -267,8 +314,9 @@ class HttpCli(object):
 
         vfs, rem = self.conn.auth.vfs.get(self.vpath, self.uname, False, True)
 
-        body["vdir"] = os.path.join(vfs.realpath, rem)
-        body["addr"] = self.conn.addr[0]
+        body["vdir"] = self.vpath
+        body["rdir"] = os.path.join(vfs.realpath, rem)
+        body["addr"] = self.addr[0]
 
         x = self.conn.hsrv.broker.put(True, "up2k.handle_json", body)
         response = x.get()
@@ -292,7 +340,7 @@ class HttpCli(object):
 
         x = self.conn.hsrv.broker.put(True, "up2k.handle_chunk", wark, chash)
         response = x.get()
-        chunksize, cstart, path = response
+        chunksize, cstart, path, lastmod = response
 
         if self.args.nw:
             path = os.devnull
@@ -336,7 +384,15 @@ class HttpCli(object):
                 self.log("clone {} done".format(cstart[0]))
 
         x = self.conn.hsrv.broker.put(True, "up2k.confirm_chunk", wark, chash)
-        response = x.get()
+        num_left = x.get()
+
+        if not WINDOWS and num_left == 0:
+            times = (int(time.time()), int(lastmod))
+            self.log("no more chunks, setting times {}".format(times))
+            try:
+                os.utime(path, times)
+            except:
+                self.log("failed to utime ({}, {})".format(path, times))
 
         self.loud_reply("thank")
         return True
@@ -351,19 +407,85 @@ class HttpCli(object):
             msg = "naw dude"
             pwd = "x"  # nosec
 
-        h = ["Set-Cookie: cppwd={}; Path=/".format(pwd)]
+        h = {"Set-Cookie": "cppwd={}; Path=/".format(pwd)}
         html = self.conn.tpl_msg.render(h1=msg, h2='<a href="/">ack</a>', redir="/")
         self.reply(html.encode("utf-8"), headers=h)
         return True
 
+    def handle_mkdir(self):
+        new_dir = self.parser.require("name", 512)
+        self.parser.drop()
+
+        nullwrite = self.args.nw
+        vfs, rem = self.conn.auth.vfs.get(self.vpath, self.uname, False, True)
+        self._assert_safe_rem(rem)
+
+        sanitized = sanitize_fn(new_dir)
+
+        if not nullwrite:
+            fdir = os.path.join(vfs.realpath, rem)
+            fn = os.path.join(fdir, sanitized)
+
+            if not os.path.isdir(fsenc(fdir)):
+                raise Pebkac(500, "parent folder does not exist")
+
+            if os.path.isdir(fsenc(fn)):
+                raise Pebkac(500, "that folder exists already")
+
+            try:
+                os.mkdir(fsenc(fn))
+            except:
+                raise Pebkac(500, "mkdir failed, check the logs")
+
+        vpath = "{}/{}".format(self.vpath, sanitized).lstrip("/")
+        html = self.conn.tpl_msg.render(
+            h2='<a href="/{}">go to /{}</a>'.format(
+                quotep(vpath), html_escape(vpath, quote=False)
+            ),
+            pre="aight",
+            click=True,
+        )
+        self.reply(html.encode("utf-8", "replace"))
+        return True
+
+    def handle_new_md(self):
+        new_file = self.parser.require("name", 512)
+        self.parser.drop()
+
+        nullwrite = self.args.nw
+        vfs, rem = self.conn.auth.vfs.get(self.vpath, self.uname, False, True)
+        self._assert_safe_rem(rem)
+
+        if not new_file.endswith(".md"):
+            new_file += ".md"
+
+        sanitized = sanitize_fn(new_file)
+
+        if not nullwrite:
+            fdir = os.path.join(vfs.realpath, rem)
+            fn = os.path.join(fdir, sanitized)
+
+            if os.path.exists(fsenc(fn)):
+                raise Pebkac(500, "that file exists already")
+
+            with open(fsenc(fn), "wb") as f:
+                f.write(b"`GRUNNUR`\n")
+
+        vpath = "{}/{}".format(self.vpath, sanitized).lstrip("/")
+        html = self.conn.tpl_msg.render(
+            h2='<a href="/{}?edit">go to /{}?edit</a>'.format(
+                quotep(vpath), html_escape(vpath, quote=False)
+            ),
+            pre="aight",
+            click=True,
+        )
+        self.reply(html.encode("utf-8", "replace"))
+        return True
+
     def handle_plain_upload(self):
         nullwrite = self.args.nw
         vfs, rem = self.conn.auth.vfs.get(self.vpath, self.uname, False, True)
-
-        # rem is escaped at this point,
-        # this is just a sanity check to prevent any disasters
-        if rem.startswith("/") or rem.startswith("../") or "/../" in rem:
-            raise Exception("that was close")
+        self._assert_safe_rem(rem)
 
         files = []
         errmsg = ""
@@ -382,10 +504,12 @@ class HttpCli(object):
                     if not os.path.isdir(fsenc(fdir)):
                         raise Pebkac(404, "that folder does not exist")
 
-                    # TODO broker which avoid this race
-                    # and provides a new filename if taken
+                    # TODO broker which avoid this race and
+                    # provides a new filename if taken (same as up2k)
                     if os.path.exists(fsenc(fn)):
-                        fn += ".{:.6f}".format(time.time())
+                        fn += ".{:.6f}-{}".format(time.time(), self.addr[0])
+                        # using current-time instead of t0 cause clients
+                        # may reuse a name for multiple files in one post
 
                 try:
                     with open(fsenc(fn), "wb") as f:
@@ -405,7 +529,7 @@ class HttpCli(object):
         except Pebkac as ex:
             errmsg = str(ex)
 
-        td = time.time() - t0
+        td = max(0.1, time.time() - t0)
         sz_total = sum(x[0] for x in files)
         spd = (sz_total / td) / (1024 * 1024)
 
@@ -452,32 +576,93 @@ class HttpCli(object):
         self.parser.drop()
         return True
 
-    def tx_file(self, req_path):
-        do_send = True
-        status = 200
-        extra_headers = []
-        logmsg = "{:4} {} ".format("", self.req)
-        logtail = ""
-
-        #
-        # if request is for foo.js, check if we have foo.js.gz
-
-        is_gzip = False
-        fs_path = req_path
+    def handle_text_upload(self):
         try:
-            file_sz = os.path.getsize(fsenc(fs_path))
+            cli_lastmod3 = int(self.parser.require("lastmod", 16))
         except:
-            is_gzip = True
-            fs_path += ".gz"
-            try:
-                file_sz = os.path.getsize(fsenc(fs_path))
-            except:
-                raise Pebkac(404)
+            raise Pebkac(400, "could not read lastmod from request")
 
+        nullwrite = self.args.nw
+        vfs, rem = self.conn.auth.vfs.get(self.vpath, self.uname, False, True)
+        self._assert_safe_rem(rem)
+
+        # TODO:
+        #   the per-volume read/write permissions must be replaced with permission flags
+        #   which would decide how to handle uploads to filenames which are taken,
+        #   current behavior of creating a new name is a good default for binary files
+        #   but should also offer a flag to takeover the filename and rename the old one
         #
-        # if-modified
+        # stopgap:
+        if not rem.endswith(".md"):
+            raise Pebkac(400, "only markdown pls")
 
-        file_ts = os.path.getmtime(fsenc(fs_path))
+        if nullwrite:
+            response = json.dumps({"ok": True, "lastmod": 0})
+            self.log(response)
+            # TODO reply should parser.drop()
+            self.parser.drop()
+            self.reply(response.encode("utf-8"))
+            return True
+
+        fp = os.path.join(vfs.realpath, rem)
+        srv_lastmod = -1
+        try:
+            st = os.stat(fsenc(fp))
+            srv_lastmod = st.st_mtime
+            srv_lastmod3 = int(srv_lastmod * 1000)
+        except OSError as ex:
+            if ex.errno != 2:
+                raise
+
+        # if file exists, chekc that timestamp matches the client's
+        if srv_lastmod >= 0:
+            if cli_lastmod3 not in [-1, srv_lastmod3]:
+                response = json.dumps(
+                    {
+                        "ok": False,
+                        "lastmod": srv_lastmod3,
+                        "now": int(time.time() * 1000),
+                    }
+                )
+                self.log(
+                    "{} - {} = {}".format(
+                        srv_lastmod3, cli_lastmod3, srv_lastmod3 - cli_lastmod3
+                    )
+                )
+                self.log(response)
+                self.parser.drop()
+                self.reply(response.encode("utf-8"))
+                return True
+
+            # TODO another hack re: pending permissions rework
+            mdir, mfile = os.path.split(fp)
+            mfile2 = "{}.{:.3f}.md".format(mfile[:-3], srv_lastmod)
+            try:
+                os.mkdir(os.path.join(mdir, ".hist"))
+            except:
+                pass
+            os.rename(fp, os.path.join(mdir, ".hist", mfile2))
+
+        p_field, _, p_data = next(self.parser.gen)
+        if p_field != "body":
+            raise Pebkac(400, "expected body, got {}".format(p_field))
+
+        with open(fp, "wb") as f:
+            sz, sha512, _ = hashcopy(self.conn, p_data, f)
+
+        new_lastmod = os.stat(fsenc(fp)).st_mtime
+        new_lastmod3 = int(new_lastmod * 1000)
+        sha512 = sha512[:56]
+
+        response = json.dumps(
+            {"ok": True, "lastmod": new_lastmod3, "size": sz, "sha512": sha512}
+        )
+        self.log(response)
+        self.parser.drop()
+        self.reply(response.encode("utf-8"))
+        return True
+
+    def _chk_lastmod(self, file_ts):
         file_dt = datetime.utcfromtimestamp(file_ts)
         file_lastmod = file_dt.strftime("%a, %d %b %Y %H:%M:%S GMT")
 
@@ -486,14 +671,82 @@ class HttpCli(object):
             try:
                 cli_dt = time.strptime(cli_lastmod, "%a, %d %b %Y %H:%M:%S GMT")
                 cli_ts = calendar.timegm(cli_dt)
-                do_send = int(file_ts) > int(cli_ts)
+                return file_lastmod, int(file_ts) > int(cli_ts)
             except:
                 self.log("bad lastmod format: {}".format(cli_lastmod))
-                do_send = file_lastmod != cli_lastmod
+                self.log("   expected format: {}".format(file_lastmod))
+                return file_lastmod, file_lastmod != cli_lastmod
 
+        return file_lastmod, True
+
+    def tx_file(self, req_path):
+        status = 200
+        logmsg = "{:4} {} ".format("", self.req)
+        logtail = ""
+
+        #
+        # if request is for foo.js, check if we have foo.js.{gz,br}
+
+        file_ts = 0
+        editions = {}
+        for ext in ["", ".gz", ".br"]:
+            try:
+                fs_path = req_path + ext
+                st = os.stat(fsenc(fs_path))
+                file_ts = max(file_ts, st.st_mtime)
+                editions[ext or "plain"] = [fs_path, st.st_size]
+            except:
+                pass
+
+        if not editions:
+            raise Pebkac(404)
+
+        #
+        # if-modified
+
+        file_lastmod, do_send = self._chk_lastmod(file_ts)
+        self.out_headers["Last-Modified"] = file_lastmod
         if not do_send:
             status = 304
 
+        #
+        # Accept-Encoding and UA decides which edition to send
+
+        decompress = False
+        supported_editions = [
+            x.strip()
+            for x in self.headers.get("accept-encoding", "").lower().split(",")
+        ]
+        if ".br" in editions and "br" in supported_editions:
+            is_compressed = True
+            selected_edition = ".br"
+            fs_path, file_sz = editions[".br"]
+            self.out_headers["Content-Encoding"] = "br"
+        elif ".gz" in editions:
+            is_compressed = True
+            selected_edition = ".gz"
+            fs_path, file_sz = editions[".gz"]
+            if "gzip" not in supported_editions:
+                decompress = True
+            else:
+                ua = self.headers.get("user-agent", "")
+                if re.match(r"MSIE [4-6]\.", ua) and " SV1" not in ua:
+                    decompress = True
+
+            if not decompress:
+                self.out_headers["Content-Encoding"] = "gzip"
+        else:
+            is_compressed = False
+            selected_edition = "plain"
+
+        try:
+            fs_path, file_sz = editions[selected_edition]
+            logmsg += "{} ".format(selected_edition.lstrip("."))
+        except:
+            # client is old and we only have .br
+            # (could make brotli a dep to fix this but it's not worth)
+            raise Pebkac(404)
+
         #
         # partial
 
@@ -501,7 +754,8 @@ class HttpCli(object):
         upper = file_sz
         hrange = self.headers.get("range")
 
-        if do_send and not is_gzip and hrange:
+        # let's not support 206 with compression
+        if do_send and not is_compressed and hrange:
             try:
                 a, b = hrange.split("=", 1)[1].split("-")
 
@@ -522,27 +776,12 @@ class HttpCli(object):
                 raise Pebkac(400, "invalid range requested: " + hrange)
 
             status = 206
-            extra_headers.append(
-                "Content-Range: bytes {}-{}/{}".format(lower, upper - 1, file_sz)
+            self.out_headers["Content-Range"] = "bytes {}-{}/{}".format(
+                lower, upper - 1, file_sz
             )
 
             logtail += " [\033[36m{}-{}\033[0m]".format(lower, upper)
 
-        #
-        # Accept-Encoding and UA decides if we can send gzip as-is
-
-        decompress = False
-        if is_gzip:
-            if "gzip" not in self.headers.get("accept-encoding", "").lower():
-                decompress = True
-            else:
-                ua = self.headers.get("user-agent", "")
-                if re.match(r"MSIE [4-6]\.", ua) and " SV1" not in ua:
-                    decompress = True
-
-            if not decompress:
-                extra_headers.append("Content-Encoding: gzip")
-
         if decompress:
             open_func = gzip.open
             open_args = [fsenc(fs_path), "rb"]
@@ -556,23 +795,15 @@ class HttpCli(object):
         #
         # send reply
 
+        self.out_headers["Accept-Ranges"] = "bytes"
+        self.send_headers(
+            length=upper - lower,
+            status=status,
+            mime=guess_mime(req_path)[0] or "application/octet-stream",
+        )
+
         logmsg += str(status) + logtail
 
-        mime = mimetypes.guess_type(req_path)[0] or "application/octet-stream"
-
-        headers = [
-            "HTTP/1.1 {} {}".format(status, HTTPCODE[status]),
-            "Content-Type: " + mime,
-            "Content-Length: " + str(upper - lower),
-            "Accept-Ranges: bytes",
-            "Last-Modified: " + file_lastmod,
-            "Connection: " + ("Keep-Alive" if self.keepalive else "Close"),
-        ]
-
-        headers.extend(extra_headers)
-        headers = "\r\n".join(headers).encode("utf-8") + b"\r\n\r\n"
-        self.s.sendall(headers)
-
         if self.mode == "HEAD" or not do_send:
             self.log(logmsg)
             return True
@@ -601,6 +832,62 @@ class HttpCli(object):
         self.log(logmsg)
         return True
 
+    def tx_md(self, fs_path):
+        logmsg = "{:4} {} ".format("", self.req)
+        if "edit2" in self.uparam:
+            html_path = "web/mde.html"
+            template = self.conn.tpl_mde
+        else:
+            html_path = "web/md.html"
+            template = self.conn.tpl_md
+
+        html_path = os.path.join(E.mod, html_path)
+
+        st = os.stat(fsenc(fs_path))
+        # sz_md = st.st_size
+        ts_md = st.st_mtime
+
+        st = os.stat(fsenc(html_path))
+        ts_html = st.st_mtime
+
+        # TODO dont load into memory ;_;
+        #   (trivial fix, count the &'s)
+        with open(fsenc(fs_path), "rb") as f:
+            md = f.read().replace(b"&", b"&amp;")
+            sz_md = len(md)
+
+        file_ts = max(ts_md, ts_html)
+        file_lastmod, do_send = self._chk_lastmod(file_ts)
+        self.out_headers["Last-Modified"] = file_lastmod
+        self.out_headers["Cache-Control"] = "no-cache"
+        status = 200 if do_send else 304
+
+        targs = {
+            "edit": "edit" in self.uparam,
+            "title": html_escape(self.vpath, quote=False),
+            "lastmod": int(ts_md * 1000),
+            "md": "",
+        }
+        sz_html = len(template.render(**targs).encode("utf-8"))
+        self.send_headers(sz_html + sz_md, status)
+
+        logmsg += str(status)
+        if self.mode == "HEAD" or not do_send:
+            self.log(logmsg)
+            return True
+
+        # TODO jinja2 can stream this right?
+        targs["md"] = md.decode("utf-8", "replace")
+        html = template.render(**targs).encode("utf-8")
+        try:
+            self.s.sendall(html)
+        except:
+            self.log(logmsg + " \033[31md/c\033[0m")
+            return False
+
+        self.log(logmsg + " " + str(len(html)))
+        return True
+
     def tx_mounts(self):
         rvol = [x + "/" if x else x for x in self.rvol]
         wvol = [x + "/" if x else x for x in self.wvol]
@@ -620,7 +907,9 @@ class HttpCli(object):
 
                 vpnodes.append([quotep(vpath) + "/", html_escape(node, quote=False)])
 
-        vn, rem = self.auth.vfs.get(self.vpath, self.uname, self.readable, self.writable)
+        vn, rem = self.auth.vfs.get(
+            self.vpath, self.uname, self.readable, self.writable
+        )
         abspath = vn.canonical(rem)
 
         if not os.path.exists(fsenc(abspath)):
@@ -628,29 +917,58 @@ class HttpCli(object):
             raise Pebkac(404)
 
         if not os.path.isdir(fsenc(abspath)):
+            if abspath.endswith(".md") and "raw" not in self.uparam:
+                return self.tx_md(abspath)
+
             return self.tx_file(abspath)
 
         fsroot, vfs_ls, vfs_virt = vn.ls(rem, self.uname)
-        vfs_ls.extend(vfs_virt)
+        vfs_ls.extend(vfs_virt.keys())
+
+        # check for old versions of files,
+        hist = {}  # [num-backups, most-recent, hist-path]
+        histdir = os.path.join(fsroot, ".hist")
+        ptn = re.compile(r"(.*)\.([0-9]+\.[0-9]{3})(\.[^\.]+)$")
+        try:
+            for hfn in os.listdir(histdir):
+                m = ptn.match(hfn)
+                if not m:
+                    continue
+
+                fn = m.group(1) + m.group(3)
+                n, ts, _ = hist.get(fn, [0, 0, ""])
+                hist[fn] = [n + 1, max(ts, float(m.group(2))), hfn]
+        except:
+            pass
 
         dirs = []
         files = []
         for fn in exclude_dotfiles(vfs_ls):
+            base = ""
             href = fn
             if self.absolute_urls and vpath:
-                href = "/" + vpath + "/" + fn
+                base = "/" + vpath + "/"
+                href = base + fn
+
+            if fn in vfs_virt:
+                fspath = vfs_virt[fn].realpath
+            else:
+                fspath = fsroot + "/" + fn
 
-            fspath = fsroot + "/" + fn
             try:
                 inf = os.stat(fsenc(fspath))
-            except FileNotFoundError as ex:
-                self.log("broken symlink: {}".format(fspath))
+            except:
+                self.log("broken symlink: {}".format(repr(fspath)))
                 continue
 
             is_dir = stat.S_ISDIR(inf.st_mode)
             if is_dir:
                 margin = "DIR"
                 href += "/"
+            elif fn in hist:
+                margin = '<a href="{}.hist/{}">#{}</a>'.format(
+                    base, html_escape(hist[fn][2], quote=True), hist[fn][0]
+                )
             else:
                 margin = "-"
 
@@ -684,7 +1002,7 @@ class HttpCli(object):
             ts=ts,
             prologue=logues[0],
             epilogue=logues[1],
+            title=html_escape(self.vpath, quote=False),
         )
         self.reply(html.encode("utf-8", "replace"))
         return True
-

copyparty/httpconn.py

@@ -2,9 +2,24 @@
 from __future__ import print_function, unicode_literals
 
 import os
+import sys
 import ssl
 import socket
-import jinja2
+
+try:
+    import jinja2
+except ImportError:
+    print(
+        """\033[1;31m
+  you do not have jinja2 installed,\033[33m
+  choose one of these:\033[0m
+   * apt install python-jinja2
+   * python3 -m pip install --user jinja2
+   * (try another python version, if you have one)
+   * (try copyparty.sfx instead)
+"""
+    )
+    sys.exit(1)
 
 from .__init__ import E
 from .util import Unrecv
@@ -35,6 +50,8 @@ class HttpConn(object):
         self.tpl_mounts = env.get_template("splash.html")
         self.tpl_browser = env.get_template("browser.html")
         self.tpl_msg = env.get_template("msg.html")
+        self.tpl_md = env.get_template("md.html")
+        self.tpl_mde = env.get_template("mde.html")
 
     def respath(self, res_name):
         return os.path.join(E.mod, "web", res_name)
@@ -48,6 +65,8 @@ class HttpConn(object):
         if self.cert_path:
             try:
                 method = self.s.recv(4, socket.MSG_PEEK)
+            except socket.timeout:
+                return
             except AttributeError:
                 # jython does not support msg_peek; forget about https
                 method = self.s.recv(4)

copyparty/httpsrv.py

@@ -6,7 +6,7 @@ import time
 import socket
 import threading
 
-from .__init__ import E
+from .__init__ import E, MACOS
 from .httpconn import HttpConn
 from .authsrv import AuthSrv
 
@@ -38,7 +38,7 @@ class HttpSrv(object):
 
     def accept(self, sck, addr):
         """takes an incoming tcp connection and creates a thread to handle it"""
-        self.log(str(addr), "-" * 5 + "C-cthr")
+        self.log("%s %s" % addr, "-" * 5 + "C-cthr")
         thr = threading.Thread(target=self.thr_client, args=(sck, addr))
         thr.daemon = True
         thr.start()
@@ -66,19 +66,25 @@ class HttpSrv(object):
                 thr.start()
 
         try:
-            self.log(str(addr), "-" * 6 + "C-crun")
+            self.log("%s %s" % addr, "-" * 6 + "C-crun")
             cli.run()
 
         finally:
-            self.log(str(addr), "-" * 7 + "C-done")
+            self.log("%s %s" % addr, "-" * 7 + "C-done")
             try:
                 sck.shutdown(socket.SHUT_RDWR)
                 sck.close()
             except (OSError, socket.error) as ex:
-                if ex.errno not in [107, 57, 9]:
-                    # 107 Transport endpoint not connected
-                    #  57 Socket is not connected
-                    #   9 Bad file descriptor
+                if not MACOS:
+                    self.log(
+                        "%s %s" % addr,
+                        "shut_rdwr err:\n  {}\n  {}".format(repr(sck), ex),
+                    )
+                if ex.errno not in [10038, 107, 57, 9]:
+                    # 10038 No longer considered a socket
+                    #   107 Transport endpoint not connected
+                    #    57 Socket is not connected
+                    #     9 Bad file descriptor
                     raise
             finally:
                 with self.mutex:

copyparty/stolen/surrogateescape.py

@@ -10,11 +10,12 @@ Original source: misc/python/surrogateescape.py in https://bitbucket.org/haypo/m
 
 # This code is released under the Python license and the BSD 2-clause license
 
+import platform
 import codecs
 import sys
 
 PY3 = sys.version_info[0] > 2
-
+WINDOWS = platform.system() == "Windows"
 FS_ERRORS = "surrogateescape"
 
 
@@ -168,6 +169,11 @@ FS_ENCODING = sys.getfilesystemencoding()
 # FS_ENCODING = 'UTF-8'; fn = b('[abc\xff]'); encoded = u('[abc\udcff]')
 
 
+if WINDOWS and not PY3:
+    # py2 thinks win* is mbcs, probably a bug? anyways this works
+    FS_ENCODING = 'utf-8'
+
+
 # normalize the filesystem encoding name.
 # For example, we expect "utf-8", not "UTF8".
 FS_ENCODING = codecs.lookup(FS_ENCODING).name

copyparty/svchub.py

@@ -8,7 +8,7 @@ import threading
 from datetime import datetime, timedelta
 import calendar
 
-from .__init__ import PY2, WINDOWS
+from .__init__ import PY2, WINDOWS, MACOS, VT100
 from .tcpsrv import TcpSrv
 from .up2k import Up2k
 from .util import mp
@@ -84,22 +84,23 @@ class SvcHub(object):
                 dt = dt.replace(hour=0, minute=0, second=0)
                 self.next_day = calendar.timegm(dt.utctimetuple())
 
-            ts = datetime.utcfromtimestamp(now).strftime("%H:%M:%S.%f")[:-3]
-
-            if not WINDOWS:
-                fmt = "\033[36m{} \033[33m{:21} \033[0m{}"
-            else:
+            fmt = "\033[36m{} \033[33m{:21} \033[0m{}"
+            if not VT100:
                 fmt = "{} {:21} {}"
                 if "\033" in msg:
                     msg = self.ansi_re.sub("", msg)
                 if "\033" in src:
                     src = self.ansi_re.sub("", src)
 
+            ts = datetime.utcfromtimestamp(now).strftime("%H:%M:%S.%f")[:-3]
             msg = fmt.format(ts, src, msg)
             try:
                 print(msg)
             except UnicodeEncodeError:
-                print(msg.encode("utf-8", "replace").decode())
+                try:
+                    print(msg.encode("utf-8", "replace").decode())
+                except:
+                    print(msg.encode("ascii", "replace").decode())
 
     def check_mp_support(self):
         vmin = sys.version_info[1]
@@ -110,6 +111,8 @@ class SvcHub(object):
                 return msg
             elif vmin < 3:
                 return msg
+        elif MACOS:
+            return "multiprocessing is wonky on mac osx;"
         else:
             msg = "need python 2.7 or 3.3+ for multiprocessing;"
             if not PY2 and vmin < 3:
@@ -130,6 +133,9 @@ class SvcHub(object):
             self.log("root", "multiprocessing disabled by argument -j 0;")
             return False
 
+        if mp.cpu_count() <= 1:
+            return False
+
         try:
             # support vscode debugger (bonus: same behavior as on windows)
             mp.set_start_method("spawn", True)

copyparty/tcpsrv.py

@@ -24,7 +24,7 @@ class TcpSrv(object):
         ip = "127.0.0.1"
         eps = {ip: "local only"}
         if self.args.i != ip:
-            eps = self.detect_interfaces(self.args.i) or eps
+            eps = self.detect_interfaces(self.args.i) or {self.args.i: "external"}
 
         for ip, desc in sorted(eps.items(), key=lambda x: x[1]):
             self.log(
@@ -64,14 +64,14 @@ class TcpSrv(object):
 
             self.log("tcpsrv", "-" * 2 + "C-acc1")
             sck, addr = self.srv.accept()
-            self.log(str(addr), "-" * 3 + "C-acc2")
+            self.log("%s %s" % addr, "-" * 3 + "C-acc2")
             self.num_clients.add()
             self.hub.broker.put(False, "httpconn", sck, addr)
 
     def shutdown(self):
         self.log("tcpsrv", "ok bye")
 
-    def detect_interfaces(self, ext_ip):
+    def detect_interfaces(self, listen_ip):
         eps = {}
 
         # get all ips and their interfaces
@@ -85,29 +85,39 @@ class TcpSrv(object):
             for ln in ip_addr.split("\n"):
                 try:
                     ip, dev = r.match(ln.rstrip()).groups()
-                    if ext_ip in ["0.0.0.0", ip]:
+                    if listen_ip in ["0.0.0.0", ip]:
                         eps[ip] = dev
                 except:
                     pass
 
-        # get ip with default route
+        default_route = None
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        try:
-            s.connect(("10.255.255.255", 1))
-            ip = s.getsockname()[0]
-        except (OSError, socket.error) as ex:
-            if ex.errno not in [101, 10065]:
-                raise
-
-            return None
+        for ip in [
+            "10.255.255.255",
+            "172.31.255.255",
+            "192.168.255.255",
+            "239.255.255.255",
+            # could add 1.1.1.1 as a final fallback
+            # but external connections is kinshi
+        ]:
+            try:
+                s.connect((ip, 1))
+                # raise OSError(13, "a")
+                default_route = s.getsockname()[0]
+                break
+            except (OSError, socket.error) as ex:
+                if ex.errno == 13:
+                    self.log("tcpsrv", "eaccess {} (trying next)".format(ip))
+                elif ex.errno not in [101, 10065, 10051]:
+                    self.log("tcpsrv", "route lookup failed; err {}".format(ex.errno))
 
         s.close()
 
-        if ext_ip in ["0.0.0.0", ip]:
+        if default_route and listen_ip in ["0.0.0.0", default_route]:
             desc = "\033[32mexternal"
             try:
-                eps[ip] += ", " + desc
+                eps[default_route] += ", " + desc
             except:
-                eps[ip] = desc
+                eps[default_route] = desc
 
         return eps

copyparty/up2k.py

@@ -6,12 +6,14 @@ import os
 import re
 import time
 import math
+import shutil
 import base64
 import hashlib
 import threading
 from copy import deepcopy
 
-from .util import Pebkac
+from .__init__ import WINDOWS
+from .util import Pebkac, Queue, fsenc, sanitize_fn
 
 
 class Up2k(object):
@@ -35,30 +37,57 @@ class Up2k(object):
         self.registry = {}
         self.mutex = threading.Lock()
 
+        if WINDOWS:
+            # usually fails to set lastmod too quickly
+            self.lastmod_q = Queue()
+            thr = threading.Thread(target=self._lastmodder)
+            thr.daemon = True
+            thr.start()
+
         # static
         self.r_hash = re.compile("^[0-9a-zA-Z_-]{43}$")
 
     def handle_json(self, cj):
+        cj["name"] = sanitize_fn(cj["name"])
         wark = self._get_wark(cj)
+        now = time.time()
         with self.mutex:
-            try:
+            # TODO use registry persistence here to symlink any matching wark
+            if wark in self.registry:
                 job = self.registry[wark]
-                if job["vdir"] != cj["vdir"] or job["name"] != cj["name"]:
-                    print("\n".join([job["vdir"], cj["vdir"], job["name"], cj["name"]]))
-                    raise Pebkac(400, "unexpected filepath")
-
-            except KeyError:
+                if job["rdir"] != cj["rdir"] or job["name"] != cj["name"]:
+                    src = os.path.join(job["rdir"], job["name"])
+                    dst = os.path.join(cj["rdir"], cj["name"])
+                    if job["need"]:
+                        self.log("up2k", "unfinished:\n  {0}\n  {1}".format(src, dst))
+                        err = "partial upload exists at a different location; please resume uploading here instead:\n{0}{1} ".format(
+                            job["vdir"], job["name"]
+                        )
+                        raise Pebkac(400, err)
+                    else:
+                        # symlink to the client-provided name,
+                        # returning the previous upload info
+                        job = deepcopy(job)
+                        suffix = self._suffix(dst, now, job["addr"])
+                        job["name"] = cj["name"] + suffix
+                        self._symlink(src, dst + suffix)
+            else:
                 job = {
                     "wark": wark,
-                    "t0": int(time.time()),
+                    "t0": now,
                     "addr": cj["addr"],
                     "vdir": cj["vdir"],
+                    "rdir": cj["rdir"],
                     # client-provided, sanitized by _get_wark:
                     "name": cj["name"],
                     "size": cj["size"],
+                    "lmod": cj["lmod"],
                     "hash": deepcopy(cj["hash"]),
                 }
 
+                path = os.path.join(job["rdir"], job["name"])
+                job["name"] += self._suffix(path, now, cj["addr"])
+
                 # one chunk may occur multiple times in a file;
                 # filter to unique values for the list of missing chunks
                 # (preserve order to reduce disk thrashing)
@@ -74,10 +103,47 @@ class Up2k(object):
             return {
                 "name": job["name"],
                 "size": job["size"],
+                "lmod": job["lmod"],
                 "hash": job["need"],
                 "wark": wark,
             }
 
+    def _suffix(self, fpath, ts, ip):
+        # TODO broker which avoid this race and
+        # provides a new filename if taken (same as bup)
+        if not os.path.exists(fsenc(fpath)):
+            return ""
+
+        return ".{:.6f}-{}".format(ts, ip)
+
+    def _symlink(self, src, dst):
+        # TODO store this in linktab so we never delete src if there are links to it
+        self.log("up2k", "linking dupe:\n  {0}\n  {1}".format(src, dst))
+        try:
+            lsrc = src
+            ldst = dst
+            fs1 = os.stat(fsenc(os.path.split(src)[0])).st_dev
+            fs2 = os.stat(fsenc(os.path.split(dst)[0])).st_dev
+            if fs1 == 0:
+                # py2 on winxp or other unsupported combination
+                raise OSError()
+            elif fs1 == fs2:
+                # same fs; make symlink as relative as possible
+                nsrc = src.replace("\\", "/").split("/")
+                ndst = dst.replace("\\", "/").split("/")
+                nc = 0
+                for a, b in zip(nsrc, ndst):
+                    if a != b:
+                        break
+                    nc += 1
+                if nc > 1:
+                    lsrc = nsrc[nc:]
+                    lsrc = "../" * (len(lsrc) - 1) + "/".join(lsrc)
+            os.symlink(fsenc(lsrc), fsenc(ldst))
+        except (AttributeError, OSError) as ex:
+            self.log("up2k", "cannot symlink; creating copy")
+            shutil.copy2(fsenc(src), fsenc(dst))
+
     def handle_chunk(self, wark, chash):
         with self.mutex:
             job = self.registry.get(wark)
@@ -94,13 +160,21 @@ class Up2k(object):
         chunksize = self._get_chunksize(job["size"])
         ofs = [chunksize * x for x in nchunk]
 
-        path = os.path.join(job["vdir"], job["name"])
+        path = os.path.join(job["rdir"], job["name"])
 
-        return [chunksize, ofs, path]
+        return [chunksize, ofs, path, job["lmod"]]
 
     def confirm_chunk(self, wark, chash):
         with self.mutex:
-            self.registry[wark]["need"].remove(chash)
+            job = self.registry[wark]
+            job["need"].remove(chash)
+            ret = len(job["need"])
+
+            if WINDOWS and ret == 0:
+                path = os.path.join(job["rdir"], job["name"])
+                self.lastmod_q.put([path, (int(time.time()), int(job["lmod"]))])
+
+            return ret
 
     def _get_chunksize(self, filesize):
         chunksize = 1024 * 1024
@@ -115,7 +189,7 @@ class Up2k(object):
                 stepsize *= mul
 
     def _get_wark(self, cj):
-        if len(cj["name"]) > 1024 or len(cj["hash"]) > 256:
+        if len(cj["name"]) > 1024 or len(cj["hash"]) > 512 * 1024:  # 16TiB
             raise Pebkac(400, "name or numchunks not according to spec")
 
         for k in cj["hash"]:
@@ -124,6 +198,12 @@ class Up2k(object):
                     400, "at least one hash is not according to spec: {}".format(k)
                 )
 
+        # try to use client-provided timestamp, don't care if it fails somehow
+        try:
+            cj["lmod"] = int(cj["lmod"])
+        except:
+            cj["lmod"] = int(time.time())
+
         # server-reproducible file identifier, independent of name or location
         ident = [self.salt, str(cj["size"])]
         ident.extend(cj["hash"])
@@ -138,8 +218,21 @@ class Up2k(object):
 
     def _new_upload(self, job):
         self.registry[job["wark"]] = job
-        path = os.path.join(job["vdir"], job["name"])
-        with open(path, "wb") as f:
+        path = os.path.join(job["rdir"], job["name"])
+        with open(fsenc(path), "wb") as f:
             f.seek(job["size"] - 1)
             f.write(b"e")
 
+    def _lastmodder(self):
+        while True:
+            ready = []
+            while not self.lastmod_q.empty():
+                ready.append(self.lastmod_q.get())
+
+            # self.log("lmod", "got {}".format(len(ready)))
+            time.sleep(5)
+            for path, times in ready:
+                try:
+                    os.utime(fsenc(path), times)
+                except:
+                    self.log("lmod", "failed to utime ({}, {})".format(path, times))

copyparty/util.py

@@ -8,9 +8,10 @@ import struct
 import hashlib
 import platform
 import threading
+import mimetypes
 import subprocess as sp  # nosec
 
-from .__init__ import PY2
+from .__init__ import PY2, WINDOWS
 from .stolen import surrogateescape
 
 FAKE_MP = False
@@ -27,12 +28,16 @@ except ImportError:
 if not PY2:
     from urllib.parse import unquote_to_bytes as unquote
     from urllib.parse import quote_from_bytes as quote
+    from queue import Queue
 else:
     from urllib import unquote  # pylint: disable=no-name-in-module
     from urllib import quote  # pylint: disable=no-name-in-module
+    from Queue import Queue  # pylint: disable=import-error,no-name-in-module
 
 surrogateescape.register_surrogateescape()
 FS_ENCODING = sys.getfilesystemencoding()
+if WINDOWS and PY2:
+    FS_ENCODING = "utf-8"
 
 
 HTTPCODE = {
@@ -186,7 +191,7 @@ class MultipartParser(object):
             buf = self.sr.recv(bufsz)
             if not buf:
                 # abort: client disconnected
-                raise Pebkac(400, "client disconnected during multipart post")
+                raise Pebkac(400, "client d/c during multipart post")
 
             while True:
                 ofs = buf.find(self.boundary)
@@ -220,7 +225,7 @@ class MultipartParser(object):
                 buf2 = self.sr.recv(bufsz)
                 if not buf2:
                     # abort: client disconnected
-                    raise Pebkac(400, "client disconnected during multipart post")
+                    raise Pebkac(400, "client d/c during multipart post")
 
                 buf += buf2
 
@@ -351,7 +356,30 @@ def undot(path):
 
 
 def sanitize_fn(fn):
-    return fn.replace("\\", "/").split("/")[-1].strip()
+    fn = fn.replace("\\", "/").split("/")[-1]
+
+    if WINDOWS:
+        for bad, good in [
+            ["<", "＜"],
+            [">", "＞"],
+            [":", "："],
+            ['"', "＂"],
+            ["/", "／"],
+            ["\\", "＼"],
+            ["|", "｜"],
+            ["?", "？"],
+            ["*", "＊"],
+        ]:
+            fn = fn.replace(bad, good)
+
+        bad = ["con", "prn", "aux", "nul"]
+        for n in range(1, 10):
+            bad += "com{0} lpt{0}".format(n).split(" ")
+
+        if fn.lower() in bad:
+            fn = "_" + fn
+
+    return fn.strip()
 
 
 def exclude_dotfiles(filepaths):
@@ -362,24 +390,24 @@ def exclude_dotfiles(filepaths):
 
 def quotep(txt):
     """url quoter which deals with bytes correctly"""
-    btxt = fsenc(txt)
+    btxt = w8enc(txt)
     quot1 = quote(btxt, safe=b"/")
     if not PY2:
         quot1 = quot1.encode("ascii")
 
     quot2 = quot1.replace(b" ", b"+")
-    return fsdec(quot2)
+    return w8dec(quot2)
 
 
 def unquotep(txt):
     """url unquoter which deals with bytes correctly"""
-    btxt = fsenc(txt)
+    btxt = w8enc(txt)
     unq1 = btxt.replace(b"+", b" ")
     unq2 = unquote(unq1)
-    return fsdec(unq2)
+    return w8dec(unq2)
 
 
-def fsdec(txt):
+def w8dec(txt):
     """decodes filesystem-bytes to wtf8"""
     if PY2:
         return surrogateescape.decodefilename(txt)
@@ -387,7 +415,7 @@ def fsdec(txt):
     return txt.decode(FS_ENCODING, "surrogateescape")
 
 
-def fsenc(txt):
+def w8enc(txt):
     """encodes wtf8 to filesystem-bytes"""
     if PY2:
         return surrogateescape.encodefilename(txt)
@@ -395,6 +423,19 @@ def fsenc(txt):
     return txt.encode(FS_ENCODING, "surrogateescape")
 
 
+if PY2 and WINDOWS:
+    # moonrunes become \x3f with bytestrings,
+    # losing mojibake support is worth
+    def _not_actually_mbcs(txt):
+        return txt
+
+    fsenc = _not_actually_mbcs
+    fsdec = _not_actually_mbcs
+else:
+    fsenc = w8enc
+    fsdec = w8dec
+
+
 def read_socket(sr, total_size):
     remains = total_size
     while remains > 0:
@@ -404,7 +445,7 @@ def read_socket(sr, total_size):
 
         buf = sr.recv(bufsz)
         if not buf:
-            raise Pebkac(400, "client disconnected during binary post")
+            raise Pebkac(400, "client d/c during binary post")
 
         remains -= len(buf)
         yield buf
@@ -457,6 +498,13 @@ def unescape_cookie(orig):
     return ret
 
 
+def guess_mime(url):
+    if url.endswith(".md"):
+        return ["text/plain; charset=UTF-8"]
+
+    return mimetypes.guess_type(url)
+
+
 def runcmd(*argv):
     p = sp.Popen(argv, stdout=sp.PIPE, stderr=sp.PIPE)
     stdout, stderr = p.communicate()
@@ -480,6 +528,7 @@ def gzip_orig_sz(fn):
 
 
 def py_desc():
+    interp = platform.python_implementation()
     py_ver = ".".join([str(x) for x in sys.version_info])
     ofs = py_ver.find(".final.")
     if ofs > 0:
@@ -487,8 +536,14 @@ def py_desc():
 
     bitness = struct.calcsize(b"P") * 8
     host_os = platform.system()
+    compiler = platform.python_compiler()
 
-    return "{0} on {1}{2}".format(py_ver, host_os, bitness)
+    os_ver = re.search(r"([0-9]+\.[0-9\.]+)", platform.version())
+    os_ver = os_ver.group(1) if os_ver else ""
+
+    return "{:>9} v{} on {}{} {} [{}]".format(
+        interp, py_ver, host_os, bitness, os_ver, compiler
+    )
 
 
 class Pebkac(Exception):

copyparty/web/browser.css

@@ -36,12 +36,12 @@ body {
 	padding: .35em .5em .2em .5em;
 	border-radius: 0 .3em .3em 0;
 	box-shadow: .1em .1em .4em #222;
-	margin: 2em 0 1em 0;
+	margin: 1.3em 0 0 0;
 	font-size: 1.4em;
 }
 #files {
 	border-collapse: collapse;
-	margin-top: 1em;
+	margin-top: 2em;
 }
 #files tbody a {
 	display: block;
@@ -68,7 +68,7 @@ a {
 }
 #files thead th:last-child {
 	background: #444;
-	border-radius: .7em 0 0 0;
+	border-radius: .7em .7em 0 0;
 }
 #files thead th:first-child {
 	background: #222;

copyparty/web/browser.html

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>copyparty</title>
+    <title>⇆🎉 {{ title }}</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=0.8">
     <link rel="stylesheet" type="text/css" media="screen" href="/.cpr/browser.css{{ ts }}">
@@ -13,16 +13,16 @@
 </head>
 
 <body>
+    {%- if can_upload %}
+    {%- include 'upload.html' %}
+    {%- endif %}
+    
     <h1 id="path">
         {%- for n in vpnodes %}
         <a href="/{{ n[0] }}">{{ n[1] }}</a>
         {%- endfor %}
     </h1>
     
-    {%- if can_upload %}
-    {%- include 'upload.html' %}
-    {%- endif %}
-    
     {%- if can_read %}
     {%- if prologue %}
     <div id="pro" class="logue">{{ prologue }}</div>

copyparty/web/browser.js

@@ -34,6 +34,7 @@ window.onerror = function (msg, url, lineNo, columnNo, error) {
 					esc(String(error[find[a]])).replace(/\n/g, '<br />\n'));
 	}
 	document.body.style.fontSize = '0.8em';
+	document.body.style.padding = '0 1em 1em 1em';
 	hcroak(html.join('\n'));
 };
 
@@ -78,6 +79,39 @@ function ev(e) {
 }
 
 
+function sortTable(table, col) {
+	var tb = table.tBodies[0], // use `<tbody>` to ignore `<thead>` and `<tfoot>` rows
+		th = table.tHead.rows[0].cells,
+		tr = Array.prototype.slice.call(tb.rows, 0),
+		i, reverse = th[col].className == 'sort1' ? -1 : 1;
+	for (var a = 0, thl = th.length; a < thl; a++)
+		th[a].className = '';
+	th[col].className = 'sort' + reverse;
+	var stype = th[col].getAttribute('sort');
+	tr = tr.sort(function (a, b) {
+		var v1 = a.cells[col].textContent.trim();
+		var v2 = b.cells[col].textContent.trim();
+		if (stype == 'int') {
+			v1 = parseInt(v1.replace(/,/g, ''));
+			v2 = parseInt(v2.replace(/,/g, ''));
+			return reverse * (v1 - v2);
+		}
+		return reverse * (v1.localeCompare(v2));
+	});
+	for (i = 0; i < tr.length; ++i) tb.appendChild(tr[i]);
+}
+function makeSortable(table) {
+	var th = table.tHead, i;
+	th && (th = th.rows[0]) && (th = th.cells);
+	if (th) i = th.length;
+	else return; // if no `<thead>` then do nothing
+	while (--i >= 0) (function (i) {
+		th[i].addEventListener('click', function () { sortTable(table, i) });
+	}(i));
+}
+makeSortable(o('files'));
+
+
 // extract songs + add play column
 var mp = (function () {
 	var tracks = [];

copyparty/web/md.css

@@ -0,0 +1,473 @@
+html, body {
+	color: #333;
+	background: #eee;
+	font-family: sans-serif;
+	line-height: 1.5em;
+}
+#mtw {
+	display: none;
+}
+#mw {
+	margin: 0 auto;
+}
+pre, code, a {
+	color: #480;
+	background: #f7f7f7;
+	border: .07em solid #ddd;
+	border-radius: .2em;
+	padding: .1em .3em;
+	margin: 0 .1em;
+}
+code {
+	font-size: .96em;
+}
+pre, code {
+	font-family: monospace, monospace;
+	white-space: pre-wrap;
+	word-break: break-all;
+}
+pre {
+	counter-reset: precode;
+}
+pre code {
+	counter-increment: precode;
+	display: inline-block;
+	margin: 0 -.3em;
+	padding: .4em .5em;
+	border: none;
+	border-bottom: 1px solid #cdc;
+	min-width: calc(100% - .6em);
+	line-height: 1.1em;
+}
+pre code:last-child {
+	border-bottom: none;
+}
+pre code:before {
+	content: counter(precode);
+	-webkit-user-select: none;
+	display: inline-block;
+	text-align: right;
+	font-size: .75em;
+	color: #48a;
+	width: 4em;
+	padding-right: 1.5em;
+	margin-left: -5.5em;
+}
+pre code:hover {
+	background: #fec;
+	color: #360;
+}
+h1, h2 {
+	line-height: 1.5em;
+}
+h1 {
+	font-size: 1.7em;
+	text-align: center;
+	border: 1em solid #777;
+	border-width: .05em 0;
+	margin: 3em 0;
+}
+h2 {
+	font-size: 1.5em;
+	font-weight: normal;
+	background: #f7f7f7;
+	border-top: .07em solid #fff;
+	border-bottom: .07em solid #bbb;
+	border-radius: .5em .5em 0 0;
+	padding-left: .4em;
+	margin-top: 3em;
+}
+h3 {
+	border-bottom: .1em solid #999;
+}
+h1 a, h3 a, h5 a,
+h2 a, h4 a, h6 a {
+	color: inherit;
+	display: block;
+	background: none;
+	border: none;
+	padding: 0;
+	margin: 0;
+}
+#mp ul,
+#mp ol {
+	border-left: .3em solid #ddd;
+}
+#m>ul,
+#m>ol {
+	border-color: #bbb;
+}
+#mp ul>li {
+	list-style-type: disc;
+}
+#mp ul>li,
+#mp ol>li {
+	margin: .7em 0;
+}
+p>em,
+li>em {
+	color: #c50;
+	padding: .1em;
+	border-bottom: .1em solid #bbb;
+}
+blockquote {
+	font-family: serif;
+	background: #f7f7f7;
+	border: .07em dashed #ccc;
+	padding: 0 2em;
+	margin: 1em 0;
+}
+small {
+	opacity: .8;
+}
+#toc {
+	margin: 0 1em;
+	-ms-scroll-chaining: none;
+	overscroll-behavior-y: none;
+}
+#toc ul {
+	padding-left: 1em;
+}
+#toc>ul {
+	text-align: left;
+	padding-left: .5em;
+}
+#toc li {
+	list-style-type: none;
+	line-height: 1.2em;
+	margin: .5em 0;
+}
+#toc a {
+	color: #057;
+	border: none;
+	background: none;
+	display: block;
+	margin-left: -.3em;
+	padding: .2em .3em;
+}
+#toc a.act {
+	color: #fff;
+	background: #07a;
+}
+.todo_pend,
+.todo_done {
+	z-index: 99;
+	position: relative;
+	display: inline-block;
+	font-family: monospace, monospace;
+	font-weight: bold;
+	font-size: 1.3em;
+	line-height: .1em;
+	margin: -.5em 0 -.5em -.85em;
+	top: .1em;
+	color: #b29;
+}
+.todo_done {
+	color: #6b3;
+	text-shadow: .02em 0 0 #6b3;
+}
+table {
+	border-collapse: collapse;
+}
+td {
+	padding: .2em .5em;
+	border: .12em solid #aaa;
+}
+th {
+	border: .12em solid #aaa;
+}
+blink {
+	animation: blinker .7s cubic-bezier(.9, 0, .1, 1) infinite;
+}
+@keyframes blinker {
+	10% {
+		opacity: 0;
+	}
+	60% {
+		opacity: 1;
+	}
+}
+
+@media screen {
+	html, body {
+		margin: 0;
+		padding: 0;
+		outline: 0;
+		border: none;
+		width: 100%;
+		height: 100%;
+	}
+	#mw {
+		padding: 0 1em;
+		margin: 0 auto;
+		right: 0;
+	}
+	#mp {
+		max-width: 54em;
+		margin-bottom: 6em;
+	}
+	a {
+		color: #fff;
+		background: #39b;
+		text-decoration: none;
+		padding: 0 .3em;
+		border: none;
+		border-bottom: .07em solid #079;
+	}
+	h2 {
+		color: #fff;
+		background: #555;
+		margin-top: 2em;
+		border-bottom: .22em solid #999;
+		border-top: none;
+	}
+	h1 {
+		color: #fff;
+		background: #444;
+		font-weight: normal;
+		border-top: .4em solid #fb0;
+		border-bottom: .4em solid #777;
+		border-radius: 0 1em 0 1em;
+		margin: 3em 0 1em 0;
+		padding: .5em 0;
+	}
+	#mn {
+		padding: 1.3em 0 .7em 1em;
+		border-bottom: 1px solid #ccc;
+		background: #eee;
+		z-index: 10;
+		width: calc(100% - 1em);
+	}
+	#mn.undocked {
+        position: fixed;
+		padding: 1.7em 0 1.5em 1em;
+		box-shadow: 0 0 .5em rgba(0, 0, 0, 0.3);
+		background: #f7f7f7;
+	}
+	#mn a {
+		color: #444;
+		background: none;
+		margin: 0 0 0 -.2em;
+		padding: .3em 0 .3em .4em;
+		text-decoration: none;
+		border: none;
+		/* ie: */
+		border-bottom: .1em solid #777\9;
+		margin-right: 1em\9;
+	}
+	#mn a:first-child {
+		padding-left: .5em;
+	}
+	#mn a:last-child {
+		padding-right: .5em;
+	}
+	#mn a:not(:last-child):after {
+		content: '';
+		width: 1.05em;
+		height: 1.05em;
+		margin: -.2em .3em -.2em -.4em;
+		display: inline-block;
+		border: 1px solid rgba(0,0,0,0.2);
+		border-width: .2em .2em 0 0;
+		transform: rotate(45deg);
+	}
+	#mn a:hover {
+		color: #000;
+		text-decoration: underline;
+	}
+	#mh {
+		padding: .4em 1em;
+		position: relative;
+		width: 100%;
+		width: calc(100% - 3em);
+		background: #eee;
+		z-index: 9;
+		top: 0;
+	}
+	#mh a {
+		color: #444;
+		background: none;
+		text-decoration: underline;
+		border: none;
+	}
+
+
+
+	html.dark,
+	html.dark body {
+		background: #222;
+		color: #ccc;
+	}
+	html.dark #toc a {
+		color: #ccc;
+		border-left: .4em solid #444;
+		border-bottom: .1em solid #333;
+	}
+	html.dark #toc a.act {
+		color: #fff;
+		border-left: .4em solid #3ad;
+	}
+	html.dark #toc li {
+		border-width: 0;
+	}
+	html.dark #mp a {
+		background: #057;
+	}
+	html.dark #mp h1 a, html.dark #mp h4 a,
+	html.dark #mp h2 a, html.dark #mp h5 a,
+	html.dark #mp h3 a, html.dark #mp h6 a {
+		color: inherit;
+		background: none;
+	}
+	html.dark pre,
+	html.dark code {
+		color: #8c0;
+		background: #1a1a1a;
+		border: .07em solid #333;
+	}
+	html.dark #mp ul,
+	html.dark #mp ol {
+		border-color: #444;
+	}
+	html.dark #m>ul,
+	html.dark #m>ol {
+		border-color: #555;
+	}
+	html.dark p>em,
+	html.dark li>em {
+		color: #f94;
+		border-color: #666;
+	}
+	html.dark h1 {
+		background: #383838;
+		border-top: .4em solid #b80;
+		border-bottom: .4em solid #4c4c4c;
+	}
+	html.dark h2 {
+		background: #444;
+		border-bottom: .22em solid #555;
+	}
+	html.dark td,
+	html.dark th {
+		border-color: #444;
+	}
+	html.dark blockquote {
+		background: #282828;
+		border: .07em dashed #444;
+	}
+	html.dark #mn a:not(:last-child):after {
+		border-color: rgba(255,255,255,0.3);
+	}
+	html.dark #mn a {
+		color: #ccc;
+	}
+	html.dark #mn {
+		border-bottom: 1px solid #333;
+	}
+	html.dark #mn,
+	html.dark #mh {
+		background: #222;
+	}
+	html.dark #mh a {
+		color: #ccc;
+		background: none;
+	}
+}
+
+@media screen and (min-width: 70em) {
+	#mw {
+		position: fixed;
+		overflow-y: auto;
+		left: 14em;
+		left: calc(100% - 57em);
+		max-width: none;
+		bottom: 0;
+		scrollbar-color: #eb0 #f7f7f7;
+	}
+	#toc {
+		width: 13em;
+		width: calc(100% - 57.3em);
+		max-width: 30em;
+		background: #eee;
+		position: fixed;
+		overflow-y: auto;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		padding: 0;
+		margin: 0;
+		scrollbar-color: #eb0 #f7f7f7;
+		box-shadow: 0 0 1em rgba(0,0,0,0.1);
+		border-top: 1px solid #d7d7d7;
+	}
+	#toc li {
+		border-left: .3em solid #ccc;
+	}
+	#toc::-webkit-scrollbar-track {
+		background: #f7f7f7;
+	}
+	#toc::-webkit-scrollbar {
+		background: #f7f7f7;
+		width: .8em;
+	}
+	#toc::-webkit-scrollbar-thumb {
+		background: #eb0;
+	}
+
+
+	
+	html.dark #toc {
+		background: #282828;
+		border-top: 1px solid #2c2c2c;
+		box-shadow: 0 0 1em #181818;
+	}
+	html.dark #toc,
+	html.dark #mw {
+		scrollbar-color: #b80 #282828;
+	}
+	html.dark #toc::-webkit-scrollbar-track {
+		background: #282828;
+	}
+	html.dark #toc::-webkit-scrollbar {
+		background: #282828;
+		width: .8em;
+	}
+	html.dark #toc::-webkit-scrollbar-thumb {
+		background: #eb0;
+	}
+	html.dark #mn.undocked {
+		box-shadow: 0 0 .5em #555;
+		border: none;
+		background: #0a0a0a;
+	}
+}
+@media screen and (min-width: 87.5em) {
+	#toc { width: 30em }
+	#mw { left: 30.5em }
+}
+@media print {
+	a {
+		color: #079;
+		text-decoration: none;
+		border-bottom: .07em solid #4ac;
+		padding: 0 .3em;
+	}
+	#toc {
+		margin: 0 !important;
+	}
+	#toc>ul {
+		border-left: .1em solid #84c4dd;
+	}
+	#mn, #mh {
+		display: none;
+	}
+}
+
+/*
+*[data-ln]:before {
+	content: attr(data-ln);
+	font-size: .8em;
+	margin: 0 .4em;
+	color: #f0c;
+}
+*/

copyparty/web/md.html

@@ -0,0 +1,98 @@
+<!DOCTYPE html><html><head>
+	<meta charset="utf-8">
+	<title>📝🎉 {{ title }}</title> <!-- 📜 -->
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=0.7">
+	<link href="/.cpr/md.css" rel="stylesheet">
+	{%- if edit %}
+	<link href="/.cpr/md2.css" rel="stylesheet">
+	{%- endif %}
+</head>
+<body>
+	<div id="mn">navbar</div>
+	<div id="mh">
+		<a id="lightswitch" href="#">go dark</a>
+		<a id="navtoggle" href="#">hide nav</a>
+		{%- if edit %}
+			<a id="save" href="?edit">save</a>
+			<a id="sbs" href="#">sbs</a>
+			<a id="nsbs" href="#">editor</a>
+			<a id="help" href="#">help</a>
+		{%- else %}
+			<a href="?edit">edit (basic)</a>
+			<a href="?edit2">edit (fancy)</a>
+		{%- endif %}
+	</div>
+	<div id="toc"></div>
+	<div id="mtw">
+		<textarea id="mt">{{ md }}</textarea>
+	</div>
+	<div id="mw">
+		<div id="ml">
+			<div style="text-align:center;margin:5em 0">
+				<div style="font-size:2em;margin:1em 0">Loading</div>
+				if you're still reading this, check that javascript is allowed
+			</div>
+		</div>
+		<div id="mp"></div>
+	</div>
+	
+	{%- if edit %}
+	<div id="helpbox">
+		<textarea>
+
+write markdown (html is permitted)
+
+### hotkey list
+* `Ctrl-S` to save
+* `Ctrl-H` / `Ctrl-Shift-H` to create a header
+* `TAB` / `Shift-TAB` to indent/dedent a selection
+
+### toolbar
+1. toggle dark mode
+2. show/hide navigation bar
+3. save changes on server
+4. side-by-side editing
+5. toggle editor/preview
+6. this thing :^)
+
+.
+
+		</textarea>
+	</div>
+	{%- endif %}
+	
+	<script>
+
+var link_md_as_html = false;  // TODO (does nothing)
+var last_modified = {{ lastmod }};
+
+(function () {
+    var btn = document.getElementById("lightswitch");
+    var toggle = function (e) {
+		if (e) e.preventDefault();
+        var dark = !document.documentElement.getAttribute("class");
+        document.documentElement.setAttribute("class", dark ? "dark" : "");
+        btn.innerHTML = "go " + (dark ? "light" : "dark");
+        if (window.localStorage)
+            localStorage.setItem('darkmode', dark ? 1 : 0);
+    };
+    btn.onclick = toggle;
+    if (window.localStorage && localStorage.getItem('darkmode') == 1)
+		toggle();
+})();
+
+if (!String.startsWith) {
+	String.prototype.startsWith = function(s, i) {
+		i = i>0 ? i|0 : 0;
+		return this.substring(i, i + s.length) === s;
+	};
+}
+
+	</script>
+	<script src="/.cpr/deps/marked.full.js"></script>
+	<script src="/.cpr/md.js"></script>
+	{%- if edit %}
+		<script src="/.cpr/md2.js"></script>
+	{%- endif %}
+</body></html>

copyparty/web/md.js

@@ -0,0 +1,404 @@
+var dom_toc = document.getElementById('toc');
+var dom_wrap = document.getElementById('mw');
+var dom_hbar = document.getElementById('mh');
+var dom_nav = document.getElementById('mn');
+var dom_pre = document.getElementById('mp');
+var dom_src = document.getElementById('mt');
+var dom_navtgl = document.getElementById('navtoggle');
+
+
+// chrome 49 needs this
+var chromedbg = function () { console.log(arguments); }
+
+// null-logger
+var dbg = function () { };
+
+// replace dbg with the real deal here or in the console:
+// dbg = chromedbg
+// dbg = console.log
+
+
+function hesc(txt) {
+    return txt.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+
+
+function cls(dom, name, add) {
+    var re = new RegExp('(^| )' + name + '( |$)');
+    var lst = (dom.getAttribute('class') + '').replace(re, "$1$2").replace(/  /, "");
+    dom.setAttribute('class', lst + (add ? ' ' + name : ''));
+}
+
+
+// add navbar
+(function () {
+    var n = document.location + '';
+    n = n.substr(n.indexOf('//') + 2).split('?')[0].split('/');
+    n[0] = 'top';
+    var loc = [];
+    var nav = [];
+    for (var a = 0; a < n.length; a++) {
+        if (a > 0)
+            loc.push(n[a]);
+
+        var dec = hesc(decodeURIComponent(n[a]));
+
+        nav.push('<a href="/' + loc.join('/') + '">' + dec + '</a>');
+    }
+    dom_nav.innerHTML = nav.join('');
+})();
+
+
+// faster than replacing the entire html (chrome 1.8x, firefox 1.6x)
+function copydom(src, dst, lv) {
+    var sc = src.childNodes,
+        dc = dst.childNodes;
+
+    if (sc.length !== dc.length) {
+        dbg("replace L%d (%d/%d) |%d|",
+            lv, sc.length, dc.length, src.innerHTML.length);
+
+        dst.innerHTML = src.innerHTML;
+        return;
+    }
+
+    var rpl = [];
+    for (var a = sc.length - 1; a >= 0; a--) {
+        var st = sc[a].tagName,
+            dt = dc[a].tagName;
+
+        if (st !== dt) {
+            dbg("replace L%d (%d/%d) type %s/%s", lv, a, sc.length, st, dt);
+            rpl.push(a);
+            continue;
+        }
+
+        var sa = sc[a].attributes || [],
+            da = dc[a].attributes || [];
+
+        if (sa.length !== da.length) {
+            dbg("replace L%d (%d/%d) attr# %d/%d",
+                lv, a, sc.length, sa.length, da.length);
+
+            rpl.push(a);
+            continue;
+        }
+
+        var dirty = false;
+        for (var b = sa.length - 1; b >= 0; b--) {
+            var name = sa[b].name,
+                sv = sa[b].value,
+                dv = dc[a].getAttribute(name);
+
+            if (name == "data-ln" && sv !== dv) {
+                dc[a].setAttribute(name, sv);
+                continue;
+            }
+
+            if (sv !== dv) {
+                dbg("replace L%d (%d/%d) attr %s [%s] [%s]",
+                    lv, a, sc.length, name, sv, dv);
+
+                dirty = true;
+                break;
+            }
+        }
+        if (dirty)
+            rpl.push(a);
+    }
+
+    // TODO pure guessing
+    if (rpl.length > sc.length / 3) {
+        dbg("replace L%d fully, %s (%d/%d) |%d|",
+            lv, rpl.length, sc.length, src.innerHTML.length);
+
+        dst.innerHTML = src.innerHTML;
+        return;
+    }
+
+    // repl is reversed; build top-down
+    var nbytes = 0;
+    for (var a = rpl.length - 1; a >= 0; a--) {
+        var html = sc[rpl[a]].outerHTML;
+        dc[rpl[a]].outerHTML = html;
+        nbytes += html.length;
+    }
+    if (nbytes > 0)
+        dbg("replaced %d bytes L%d", nbytes, lv);
+
+    for (var a = 0; a < sc.length; a++)
+        copydom(sc[a], dc[a], lv + 1);
+
+    if (src.innerHTML !== dst.innerHTML) {
+        dbg("setting %d bytes L%d", src.innerHTML.length, lv);
+        dst.innerHTML = src.innerHTML;
+    }
+}
+
+
+function convert_markdown(md_text) {
+    marked.setOptions({
+        //headerPrefix: 'h-',
+        breaks: true,
+        gfm: true
+    });
+    var md_html = marked(md_text);
+    var md_dom = new DOMParser().parseFromString(md_html, "text/html").body;
+
+    // todo-lists (should probably be a marked extension)
+    var nodes = md_dom.getElementsByTagName('input');
+    for (var a = nodes.length - 1; a >= 0; a--) {
+        var dom_box = nodes[a];
+        if (dom_box.getAttribute('type') !== 'checkbox')
+            continue;
+
+        var dom_li = dom_box.parentNode;
+        var done = dom_box.getAttribute('checked');
+        done = done !== null;
+        var clas = done ? 'done' : 'pend';
+        var char = done ? 'Y' : 'N';
+
+        dom_li.setAttribute('class', 'task-list-item');
+        dom_li.style.listStyleType = 'none';
+        var html = dom_li.innerHTML;
+        dom_li.innerHTML =
+            '<span class="todo_' + clas + '">' + char + '</span>' +
+            html.substr(html.indexOf('>') + 1);
+    }
+
+    // separate <code> for each line in <pre>
+    var nodes = md_dom.getElementsByTagName('pre');
+    for (var a = nodes.length - 1; a >= 0; a--) {
+        var el = nodes[a];
+
+        var is_precode =
+            el.tagName == 'PRE' &&
+            el.childNodes.length === 1 &&
+            el.childNodes[0].tagName == 'CODE';
+
+        if (!is_precode)
+            continue;
+
+        var nline = parseInt(el.getAttribute('data-ln')) + 1;
+        var lines = el.innerHTML.replace(/\r?\n<\/code>$/i, '</code>').split(/\r?\n/g);
+        for (var b = 0; b < lines.length - 1; b++)
+            lines[b] += '</code>\n<code data-ln="' + (nline + b) + '">';
+
+        el.innerHTML = lines.join('');
+    }
+
+    // self-link headers
+    var id_seen = {},
+        dyn = md_dom.getElementsByTagName('*');
+
+    nodes = [];
+    for (var a = 0, aa = dyn.length; a < aa; a++)
+        if (/^[Hh]([1-6])/.exec(dyn[a].tagName) !== null)
+            nodes.push(dyn[a]);
+
+    for (var a = 0; a < nodes.length; a++) {
+        el = nodes[a];
+        var id = el.getAttribute('id'),
+            orig_id = id;
+
+        if (id_seen[id]) {
+            for (var n = 1; n < 4096; n++) {
+                id = orig_id + '-' + n;
+                if (!id_seen[id])
+                    break;
+            }
+            el.setAttribute('id', id);
+        }
+        id_seen[id] = 1;
+        el.innerHTML = '<a href="#' + id + '">' + el.innerHTML + '</a>';
+    }
+
+    copydom(md_dom, dom_pre, 0);
+}
+
+
+function init_toc() {
+    var loader = document.getElementById('ml');
+    loader.parentNode.removeChild(loader);
+
+    var anchors = [];  // list of toc entries, complex objects
+    var anchor = null; // current toc node
+    var html = [];     // generated toc html
+    var lv = 0;        // current indentation level in the toc html
+
+    var manip_nodes_dyn = dom_pre.getElementsByTagName('*');
+    var manip_nodes = [];
+    for (var a = 0, aa = manip_nodes_dyn.length; a < aa; a++)
+        manip_nodes.push(manip_nodes_dyn[a]);
+
+    for (var a = 0, aa = manip_nodes.length; a < aa; a++) {
+        var elm = manip_nodes[a];
+        var m = /^[Hh]([1-6])/.exec(elm.tagName);
+        var is_header = m !== null;
+        if (is_header) {
+            var nlv = m[1];
+            while (lv < nlv) {
+                html.push('<ul>');
+                lv++;
+            }
+            while (lv > nlv) {
+                html.push('</ul>');
+                lv--;
+            }
+
+            html.push('<li>' + elm.innerHTML + '</li>');
+
+            if (anchor != null)
+                anchors.push(anchor);
+
+            anchor = {
+                elm: elm,
+                kids: [],
+                y: null
+            };
+        }
+        if (!is_header && anchor)
+            anchor.kids.push(elm);
+    }
+    dom_toc.innerHTML = html.join('\n');
+    if (anchor != null)
+        anchors.push(anchor);
+
+    // copy toc links into the toc list
+    var atoc = dom_toc.getElementsByTagName('a');
+    for (var a = 0, aa = anchors.length; a < aa; a++)
+        anchors[a].lnk = atoc[a];
+
+    // collect vertical position of all toc items (headers in document)
+    function freshen_offsets() {
+        var top = window.pageYOffset || document.documentElement.scrollTop;
+        for (var a = anchors.length - 1; a >= 0; a--) {
+            var y = top + anchors[a].elm.getBoundingClientRect().top;
+            y = Math.round(y * 10.0) / 10;
+            if (anchors[a].y === y)
+                break;
+
+            anchors[a].y = y;
+        }
+    }
+
+    // hilight the correct toc items + scroll into view
+    function freshen_toclist() {
+        if (anchors.length == 0)
+            return;
+
+        var ptop = window.pageYOffset || document.documentElement.scrollTop;
+        var hit = anchors.length - 1;
+        for (var a = 0; a < anchors.length; a++) {
+            if (anchors[a].y >= ptop - 8) {  //???
+                hit = a;
+                break;
+            }
+        }
+
+        var links = dom_toc.getElementsByTagName('a');
+        if (!anchors[hit].active) {
+            for (var a = 0; a < anchors.length; a++) {
+                if (anchors[a].active) {
+                    anchors[a].active = false;
+                    links[a].setAttribute('class', '');
+                }
+            }
+            anchors[hit].active = true;
+            links[hit].setAttribute('class', 'act');
+        }
+
+        var pane_height = parseInt(getComputedStyle(dom_toc).height);
+        var link_bounds = links[hit].getBoundingClientRect();
+        var top = link_bounds.top - (pane_height / 6);
+        var btm = link_bounds.bottom + (pane_height / 6);
+        if (top < 0)
+            dom_toc.scrollTop -= -top;
+        else if (btm > pane_height)
+            dom_toc.scrollTop += btm - pane_height;
+    }
+
+    function refresh() {
+        freshen_offsets();
+        freshen_toclist();
+    }
+
+    return { "refresh": refresh }
+}
+
+
+// "main" :p
+convert_markdown(dom_src.value);
+var toc = init_toc();
+
+
+// scroll handler
+var redraw = (function () {
+    var sbs = false;
+    function onresize() {
+        sbs = window.matchMedia('(min-width: 64em)').matches;
+        var y = (dom_hbar.offsetTop + dom_hbar.offsetHeight) + 'px';
+        if (sbs) {
+            dom_toc.style.top = y;
+            dom_wrap.style.top = y;
+            dom_toc.style.marginTop = '0';
+        }
+        onscroll();
+    }
+
+    function onscroll() {
+        toc.refresh();
+    }
+
+    window.onresize = onresize;
+    window.onscroll = onscroll;
+    dom_wrap.onscroll = onscroll;
+
+    onresize();
+    return onresize;
+})();
+
+
+dom_navtgl.onclick = function () {
+    var timeout = null;
+    function show_nav(e) {
+        if (e && e.target == dom_hbar && e.pageX && e.pageX < dom_hbar.offsetWidth / 2)
+            return;
+
+        clearTimeout(timeout);
+        dom_nav.style.display = 'block';
+    }
+    function hide_nav() {
+        clearTimeout(timeout);
+        timeout = setTimeout(function () {
+            dom_nav.style.display = 'none';
+        }, 30);
+    }
+    var hidden = dom_navtgl.innerHTML == 'hide nav';
+    dom_navtgl.innerHTML = hidden ? 'show nav' : 'hide nav';
+    if (hidden) {
+        dom_nav.setAttribute('class', 'undocked');
+        dom_nav.style.display = 'none';
+        dom_nav.style.top = dom_hbar.offsetHeight + 'px';
+        dom_nav.onmouseenter = show_nav;
+        dom_nav.onmouseleave = hide_nav;
+        dom_hbar.onmouseenter = show_nav;
+        dom_hbar.onmouseleave = hide_nav;
+    }
+    else {
+        dom_nav.setAttribute('class', '');
+        dom_nav.style.display = 'block';
+        dom_nav.style.top = '0';
+        dom_nav.onmouseenter = null;
+        dom_nav.onmouseleave = null;
+        dom_hbar.onmouseenter = null;
+        dom_hbar.onmouseleave = null;
+    }
+    if (window.localStorage)
+        localStorage.setItem('hidenav', hidden ? 1 : 0);
+
+    redraw();
+};
+
+if (window.localStorage && localStorage.getItem('hidenav') == 1)
+    dom_navtgl.onclick();

copyparty/web/md2.css

@@ -0,0 +1,108 @@
+#toc {
+    display: none;
+}
+#mtw {
+    display: block;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: calc(100% - 58em);
+}
+#mw {
+    left: calc(100% - 57em);
+    overflow-y: auto;
+    position: fixed;
+    bottom: 0;
+}
+
+
+/* single-screen */
+#mtw.preview,
+#mw.editor {
+    opacity: 0;
+    z-index: 1;
+}
+#mw.preview,
+#mtw.editor {
+    z-index: 5;
+}
+#mtw.single,
+#mw.single {
+    margin: 0;
+    left: 1em;
+    left: max(1em, calc((100% - 58em) / 2));
+}
+#mtw.single {
+    width: 57em;
+    width: min(57em, calc(100% - 2em));
+}
+
+
+#mp {
+    position: relative;
+}
+#mt, #mtr {
+    width: 100%;
+    height: calc(100% - 5px);
+    color: #444;
+    background: #f7f7f7;
+    border: 1px solid #999;
+    outline: none;
+    padding: 0;
+    margin: 0;
+    font-family: 'consolas', monospace, monospace;
+    white-space: pre-wrap;
+    word-break: break-word;
+    overflow-wrap: break-word;
+    word-wrap: break-word; /*ie*/
+    overflow-y: scroll;
+    line-height: 1.3em;
+    font-size: .9em;
+    position: relative;
+    scrollbar-color: #eb0 #f7f7f7;
+}
+html.dark #mt {
+    color: #eee;
+    background: #222;
+    border: 1px solid #777;
+    scrollbar-color: #b80 #282828;
+}
+#mtr {
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+#save.force-save {
+    color: #400;
+    background: #f97;
+    border-radius: .15em;
+}
+#save.disabled {
+    opacity: .4;
+}
+#helpbox {
+    display: none;
+    position: fixed;
+    background: #f7f7f7;
+    box-shadow: 0 .5em 2em #777;
+    border-radius: .4em;
+    padding: 2em;
+    top: 4em;
+    overflow-y: auto;
+    height: calc(100% - 12em);
+    left: calc(50% - 15em);
+    right: 0;
+    width: 30em;
+    z-index: 9001;
+}
+#helpclose {
+    display: block;
+}
+html.dark #helpbox {
+    background: #222;
+    box-shadow: 0 .5em 2em #444;
+    border: 1px solid #079;
+    border-width: 1px 0;
+}
+
+# mt {opacity: .5;top:1px}

copyparty/web/md2.js

@@ -0,0 +1,636 @@
+// server state
+var server_md = dom_src.value;
+
+
+// dom nodes
+var dom_swrap = document.getElementById('mtw');
+var dom_sbs = document.getElementById('sbs');
+var dom_nsbs = document.getElementById('nsbs');
+var dom_ref = (function () {
+    var d = document.createElement('div');
+    d.setAttribute('id', 'mtr');
+    dom_swrap.appendChild(d);
+    d = document.getElementById('mtr');
+    // hide behind the textarea (offsetTop is not computed if display:none)
+    dom_src.style.zIndex = '4';
+    d.style.zIndex = '3';
+    return d;
+})();
+
+
+// line->scrollpos maps
+var map_src = [];
+var map_pre = [];
+function genmap(dom) {
+    var ret = [];
+    var last_y = -1;
+    var parent_y = 0;
+    var parent_n = null;
+    var nodes = dom.querySelectorAll('*[data-ln]');
+    for (var a = 0; a < nodes.length; a++) {
+        var n = nodes[a];
+        var ln = parseInt(n.getAttribute('data-ln'));
+        if (ln in ret)
+            continue;
+
+        var y = 0;
+        var par = n.offsetParent;
+        if (par != parent_n) {
+            while (par && par != dom) {
+                y += par.offsetTop;
+                par = par.offsetParent;
+            }
+            if (par != dom)
+                continue;
+
+            parent_y = y;
+            parent_n = n.offsetParent;
+        }
+        while (ln > ret.length)
+            ret.push(null);
+
+        var y = parent_y + n.offsetTop;
+        if (y <= last_y)
+            //console.log('awawa');
+            continue;
+
+        //console.log('%d  %d  (%d+%d)', a, y, parent_y, n.offsetTop);
+        ret.push(y);
+        last_y = y;
+    }
+    return ret;
+}
+
+
+// input handler
+var action_stack = null;
+var nlines = 0;
+var draw_md = (function () {
+    var delay = 1;
+    function draw_md() {
+        var t0 = new Date().getTime();
+        var src = dom_src.value;
+        convert_markdown(src);
+
+        var lines = hesc(src).replace(/\r/g, "").split('\n');
+        nlines = lines.length;
+        var html = [];
+        for (var a = 0; a < lines.length; a++)
+            html.push('<span data-ln="' + (a + 1) + '">' + lines[a] + "</span>");
+
+        dom_ref.innerHTML = html.join('\n');
+        map_src = genmap(dom_ref);
+        map_pre = genmap(dom_pre);
+
+        cls(document.getElementById('save'), 'disabled', src == server_md);
+
+        var t1 = new Date().getTime();
+        delay = t1 - t0 > 150 ? 25 : 1;
+    }
+
+    var timeout = null;
+    dom_src.oninput = function (e) {
+        clearTimeout(timeout);
+        timeout = setTimeout(draw_md, delay);
+        if (action_stack)
+            action_stack.push();
+    };
+
+    draw_md();
+    return draw_md;
+})();
+
+
+// resize handler
+redraw = (function () {
+    function onresize() {
+        var y = (dom_hbar.offsetTop + dom_hbar.offsetHeight) + 'px';
+        dom_wrap.style.top = y;
+        dom_swrap.style.top = y;
+        dom_ref.style.width = getComputedStyle(dom_src).offsetWidth + 'px';
+        map_src = genmap(dom_ref);
+        map_pre = genmap(dom_pre);
+        dbg(document.body.clientWidth + 'x' + document.body.clientHeight);
+    }
+    function setsbs() {
+        dom_wrap.setAttribute('class', '');
+        dom_swrap.setAttribute('class', '');
+        onresize();
+    }
+    function modetoggle() {
+        mode = dom_nsbs.innerHTML;
+        dom_nsbs.innerHTML = mode == 'editor' ? 'preview' : 'editor';
+        mode += ' single';
+        dom_wrap.setAttribute('class', mode);
+        dom_swrap.setAttribute('class', mode);
+        onresize();
+    }
+
+    window.onresize = onresize;
+    window.onscroll = null;
+    dom_wrap.onscroll = null;
+    dom_sbs.onclick = setsbs;
+    dom_nsbs.onclick = modetoggle;
+
+    onresize();
+    return onresize;
+})();
+
+
+// scroll handlers
+(function () {
+    var skip_src = false, skip_pre = false;
+
+    function scroll(src, srcmap, dst, dstmap) {
+        var y = src.scrollTop;
+        if (y < 8) {
+            dst.scrollTop = 0;
+            return;
+        }
+        if (y + 8 + src.clientHeight > src.scrollHeight) {
+            dst.scrollTop = dst.scrollHeight - dst.clientHeight;
+            return;
+        }
+        y += src.clientHeight / 2;
+        var sy1 = -1, sy2 = -1, dy1 = -1, dy2 = -1;
+        for (var a = 1; a < nlines + 1; a++) {
+            if (srcmap[a] === null || dstmap[a] === null)
+                continue;
+
+            if (srcmap[a] > y) {
+                sy2 = srcmap[a];
+                dy2 = dstmap[a];
+                break;
+            }
+            sy1 = srcmap[a];
+            dy1 = dstmap[a];
+        }
+        if (sy1 == -1)
+            return;
+
+        var dy = dy1;
+        if (sy2 != -1 && dy2 != -1) {
+            var mul = (y - sy1) / (sy2 - sy1);
+            dy = dy1 + (dy2 - dy1) * mul;
+        }
+        dst.scrollTop = dy - dst.clientHeight / 2;
+    }
+
+    dom_src.onscroll = function () {
+        //dbg: dom_ref.scrollTop = dom_src.scrollTop;
+        if (skip_src) {
+            skip_src = false;
+            return;
+        }
+        skip_pre = true;
+        scroll(dom_src, map_src, dom_wrap, map_pre);
+    };
+
+    dom_wrap.onscroll = function () {
+        if (skip_pre) {
+            skip_pre = false;
+            return;
+        }
+        skip_src = true;
+        scroll(dom_wrap, map_pre, dom_src, map_src);
+    };
+})();
+
+
+// save handler
+function save(e) {
+    if (e) e.preventDefault();
+    var save_btn = document.getElementById("save"),
+        save_cls = save_btn.getAttribute('class') + '';
+
+    if (save_cls.indexOf('disabled') >= 0) {
+        alert('there is nothing to save');
+        return;
+    }
+
+    var force = (save_cls.indexOf('force-save') >= 0);
+    if (force && !confirm('confirm that you wish to lose the changes made on the server since you opened this document')) {
+        alert('ok, aborted');
+        return;
+    }
+
+    var txt = dom_src.value;
+
+    var fd = new FormData();
+    fd.append("act", "tput");
+    fd.append("lastmod", (force ? -1 : last_modified));
+    fd.append("body", txt);
+
+    var url = (document.location + '').split('?')[0] + '?raw';
+    var xhr = new XMLHttpRequest();
+    xhr.open('POST', url, true);
+    xhr.responseType = 'text';
+    xhr.onreadystatechange = save_cb;
+    xhr.btn = save_btn;
+    xhr.txt = txt;
+    xhr.send(fd);
+}
+
+function save_cb() {
+    if (this.readyState != XMLHttpRequest.DONE)
+        return;
+
+    if (this.status !== 200) {
+        alert('Error!  The file was NOT saved.\n\n' + this.status + ": " + (this.responseText + '').replace(/^<pre>/, ""));
+        return;
+    }
+
+    var r;
+    try {
+        r = JSON.parse(this.responseText);
+    }
+    catch (ex) {
+        alert('Failed to parse reply from server:\n\n' + this.responseText);
+        return;
+    }
+
+    if (!r.ok) {
+        if (!this.btn.classList.contains('force-save')) {
+            this.btn.classList.add('force-save');
+            var msg = [
+                'This file has been modified since you started editing it!\n',
+                'if you really want to overwrite, press save again.\n',
+                'modified ' + ((r.now - r.lastmod) / 1000) + ' seconds ago,',
+                ((r.lastmod - last_modified) / 1000) + ' sec after you opened it\n',
+                last_modified + ' lastmod when you opened it,',
+                r.lastmod + ' lastmod on the server now,',
+                r.now + ' server time now,\n',
+            ];
+            alert(msg.join('\n'));
+        }
+        else {
+            alert('Error! Save failed.  Maybe this JSON explains why:\n\n' + this.responseText);
+        }
+        return;
+    }
+
+    this.btn.classList.remove('force-save');
+    //alert('save OK -- wrote ' + r.size + ' bytes.\n\nsha512: ' + r.sha512);
+
+    // download the saved doc from the server and compare
+    var url = (document.location + '').split('?')[0] + '?raw';
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', url, true);
+    xhr.responseType = 'text';
+    xhr.onreadystatechange = save_chk;
+    xhr.btn = this.save_btn;
+    xhr.txt = this.txt;
+    xhr.lastmod = r.lastmod;
+    xhr.send();
+}
+
+function save_chk() {
+    if (this.readyState != XMLHttpRequest.DONE)
+        return;
+
+    if (this.status !== 200) {
+        alert('Error!  The file was NOT saved.\n\n' + this.status + ": " + (this.responseText + '').replace(/^<pre>/, ""));
+        return;
+    }
+
+    var doc1 = this.txt.replace(/\r\n/g, "\n");
+    var doc2 = this.responseText.replace(/\r\n/g, "\n");
+    if (doc1 != doc2) {
+        alert(
+            'Error! The document on the server does not appear to have saved correctly (your editor contents and the server copy is not identical). Place the document on your clipboard for now and check the server logs for hints\n\n' +
+            'Length: yours=' + doc1.length + ', server=' + doc2.length
+        );
+        alert('yours, ' + doc1.length + ' byte:\n[' + doc1 + ']');
+        alert('server, ' + doc2.length + ' byte:\n[' + doc2 + ']');
+        return;
+    }
+
+    last_modified = this.lastmod;
+    server_md = this.txt;
+    draw_md();
+
+    var ok = document.createElement('div');
+    ok.setAttribute('style', 'font-size:6em;font-family:serif;font-weight:bold;color:#cf6;background:#444;border-radius:.3em;padding:.6em 0;position:fixed;top:30%;left:calc(50% - 2em);width:4em;text-align:center;z-index:9001;transition:opacity 0.2s ease-in-out;opacity:1');
+    ok.innerHTML = 'OK✔️';
+    var parent = document.getElementById('m');
+    document.documentElement.appendChild(ok);
+    setTimeout(function () {
+        ok.style.opacity = 0;
+    }, 500);
+    setTimeout(function () {
+        ok.parentNode.removeChild(ok);
+    }, 750);
+}
+
+
+// returns car/cdr (selection bounds) and n1/n2 (grown to full lines)
+function linebounds(just_car) {
+    var car = dom_src.selectionStart,
+        cdr = dom_src.selectionEnd;
+
+    dbg(car, cdr);
+
+    if (just_car)
+        cdr = car;
+
+    var md = dom_src.value,
+        n1 = Math.max(car, 0),
+        n2 = Math.min(cdr, md.length - 1);
+
+    if (n1 < n2 && md[n1] == '\n')
+        n1++;
+
+    if (n1 < n2 && md[n2 - 1] == '\n')
+        n2 -= 2;
+
+    n1 = md.lastIndexOf('\n', n1 - 1) + 1;
+    n2 = md.indexOf('\n', n2);
+    if (n2 < n1)
+        n2 = md.length;
+
+    return {
+        "car": car,
+        "cdr": cdr,
+        "n1": n1,
+        "n2": n2,
+        "md": md
+    }
+}
+
+
+// linebounds + the three textranges
+function getsel() {
+    var s = linebounds(false);
+    s.pre = s.md.substring(0, s.n1);
+    s.sel = s.md.substring(s.n1, s.n2);
+    s.post = s.md.substring(s.n2);
+    return s;
+}
+
+
+// place modified getsel into markdown
+function setsel(s) {
+    if (s.car != s.cdr) {
+        s.car = s.pre.length;
+        s.cdr = s.pre.length + s.sel.length;
+    }
+    dom_src.value = [s.pre, s.sel, s.post].join('');
+    dom_src.setSelectionRange(s.car, s.cdr);
+    dom_src.oninput();
+}
+
+
+// indent/dedent
+function md_indent(dedent) {
+    var s = getsel(),
+        sel0 = s.sel;
+
+    if (dedent)
+        s.sel = s.sel.replace(/^  /, "").replace(/\n  /g, "\n");
+    else
+        s.sel = '  ' + s.sel.replace(/\n/g, '\n  ');
+
+    if (s.car == s.cdr)
+        s.car = s.cdr += s.sel.length - sel0.length;
+
+    setsel(s);
+}
+
+
+// header
+function md_header(dedent) {
+    var s = getsel(),
+        sel0 = s.sel;
+
+    if (dedent)
+        s.sel = s.sel.replace(/^#/, "").replace(/^ +/, "");
+    else
+        s.sel = s.sel.replace(/^(#*) ?/, "#$1 ");
+
+    if (s.car == s.cdr)
+        s.car = s.cdr += s.sel.length - sel0.length;
+
+    setsel(s);
+}
+
+
+// smart-home
+function md_home(shift) {
+    var s = linebounds(!shift),
+        ln = s.md.substring(s.n1, s.n2),
+        m = /^[ \t#>+-]*(\* )?([0-9]+\. +)?/.exec(ln),
+        home = s.n1 + m[0].length,
+        car = (s.car == home) ? s.n1 : home,
+        cdr = shift ? s.cdr : car;
+
+    if (car > cdr)
+        car = [cdr, cdr = car][0];
+
+    dom_src.setSelectionRange(car, cdr);
+}
+
+
+// autoindent
+function md_newline() {
+    var s = linebounds(true),
+        ln = s.md.substring(s.n1, s.n2),
+        m = /^[ \t>+-]*(\* )?([0-9]+\. +)?/.exec(ln);
+
+    s.pre = s.md.substring(0, s.car) + '\n' + m[0];
+    s.sel = '';
+    s.post = s.md.substring(s.car);
+    s.car = s.cdr = s.pre.length;
+    setsel(s);
+}
+
+
+// hotkeys / toolbar
+(function () {
+    function keydown(ev) {
+        ev = ev || window.event;
+        var kc = ev.keyCode || ev.which;
+        var ctrl = ev.ctrlKey || ev.metaKey;
+        //console.log(ev.code, kc);
+        if (ctrl && (ev.code == "KeyS" || kc == 83)) {
+            save();
+            return false;
+        }
+        if (document.activeElement == dom_src) {
+            if (ev.code == "Tab" || kc == 9) {
+                md_indent(ev.shiftKey);
+                return false;
+            }
+            if (ctrl && (ev.code == "KeyH" || kc == 72)) {
+                md_header(ev.shiftKey);
+                return false;
+            }
+            if (!ctrl && (ev.code == "Home" || kc == 36)) {
+                md_home(ev.shiftKey);
+                return false;
+            }
+            if (!ctrl && !ev.shiftKey && (ev.code == "Enter" || kc == 13)) {
+                md_newline();
+                return false;
+            }
+            if (ctrl && (ev.code == "KeyZ" || kc == 90)) {
+                if (ev.shiftKey)
+                    action_stack.redo();
+                else
+                    action_stack.undo();
+
+                return false;
+            }
+            if (ctrl && (ev.code == "KeyY" || kc == 89)) {
+                action_stack.redo();
+                return false;
+            }
+        }
+    }
+    document.onkeydown = keydown;
+    document.getElementById('save').onclick = save;
+})();
+
+
+document.getElementById('help').onclick = function (e) {
+    if (e) e.preventDefault();
+    var dom = document.getElementById('helpbox');
+    var dtxt = dom.getElementsByTagName('textarea');
+    if (dtxt.length > 0)
+        dom.innerHTML = '<a href="#" id="helpclose">close</a>' + marked(dtxt[0].value);
+
+    dom.style.display = 'block';
+    document.getElementById('helpclose').onclick = function () {
+        dom.style.display = 'none';
+    };
+};
+
+
+// blame steen
+action_stack = (function () {
+    var undos = [];
+    var redos = [];
+    var sched_cpos = 0;
+    var sched_timer = null;
+    var ignore = false;
+    var ref = dom_src.value;
+
+    function diff(from, to, cpos) {
+        if (from === to)
+            return null;
+
+        var car = 0,
+            max = Math.max(from.length, to.length);
+
+        for (; car < max; car++)
+            if (from[car] != to[car])
+                break;
+
+        var p1 = from.length,
+            p2 = to.length;
+
+        while (p1 --> 0 && p2 --> 0)
+            if (from[p1] != to[p2])
+                break;
+
+        if (car > ++p1) {
+            car = p1;
+        }
+
+        var txt = from.substring(car, p1)
+        return {
+            car: car,
+            cdr: ++p2,
+            txt: txt,
+            cpos: cpos
+        };
+    }
+
+    function undiff(from, change) {
+        return {
+            txt: from.substring(0, change.car) + change.txt + from.substring(change.cdr),
+            cpos: change.cpos
+        };
+    }
+
+    function apply(src, dst) {
+        dbg('undos(%d) redos(%d)', undos.length, redos.length);
+
+        if (src.length === 0)
+            return false;
+
+        var patch = src.pop(),
+            applied = undiff(ref, patch),
+            cpos = patch.cpos - (patch.cdr - patch.car) + patch.txt.length,
+            reverse = diff(ref, applied.txt, cpos);
+
+        if (reverse === null)
+            return false;
+
+        dst.push(reverse);
+        ref = applied.txt;
+        ignore = true; // just some browsers
+        dom_src.value = ref;
+        dom_src.setSelectionRange(cpos, cpos);
+        ignore = true; // all browsers
+        draw_md();
+        return true;
+    }
+
+    function schedule_push() {
+        if (ignore) {
+            ignore = false;
+            return;
+        }
+        redos = [];
+        clearTimeout(sched_timer);
+        sched_cpos = dom_src.selectionEnd;
+        sched_timer = setTimeout(push, 500);
+    }
+
+    function undo() {
+        if (redos.length == 0) {
+            clearTimeout(sched_timer);
+            push();
+        }
+        return apply(undos, redos);
+    }
+
+    function redo() {
+        return apply(redos, undos);
+    }
+
+    function push() {
+        var newtxt = dom_src.value;
+        var change = diff(ref, newtxt, sched_cpos);
+        if (change !== null)
+            undos.push(change);
+
+        ref = newtxt;
+        dbg('undos(%d) redos(%d)', undos.length, redos.length);
+        if (undos.length > 0)
+            dbg(undos.slice(-1)[0]);
+        if (redos.length > 0)
+            dbg(redos.slice(-1)[0]);
+    }
+
+    return {
+        push: push,
+        undo: undo,
+        redo: redo,
+        push: schedule_push,
+        _undos: undos,
+        _redos: redos,
+        _ref: ref
+    }
+})();
+
+/*
+document.getElementById('help').onclick = function () {
+    var c1 = getComputedStyle(dom_src).cssText.split(';');
+    var c2 = getComputedStyle(dom_ref).cssText.split(';');
+    var max = Math.min(c1.length, c2.length);
+    for (var a = 0; a < max; a++)
+        if (c1[a] !== c2[a])
+            console.log(c1[a] + '\n' + c2[a]);
+}
+*/

copyparty/web/mde.css

@@ -0,0 +1,313 @@
+html .editor-toolbar>button { margin-left: -1px; border: 1px solid rgba(0,0,0,0.1) }
+html .editor-toolbar>button+button { border-left: 1px solid rgba(0,0,0,0) }
+html .editor-toolbar>button:hover,
+html .editor-toolbar>button:active { box-shadow: 0 .1em .3em #999; z-index: 9 }
+html .editor-toolbar>button:active,
+html .editor-toolbar>button.active { border-color: rgba(0,0,0,0.4); background: #fc0 }
+html .editor-toolbar>i.separator { border-left: 1px solid #ccc; }
+html .editor-toolbar.disabled-for-preview>button:not(.no-disable) { opacity: .35 }
+
+html {
+    line-height: 1.5em;
+}
+html, body {
+    margin: 0;
+    padding: 0;
+    min-height: 100%;
+    font-family: sans-serif;
+    background: #f7f7f7;
+    color: #333;
+}
+#mn {
+    font-weight: normal;
+    margin: 1.3em 0 .7em 1em;
+}
+#mn a {
+    color: #444;
+    margin: 0 0 0 -.2em;
+    padding: 0 0 0 .4em;
+    text-decoration: none;
+    /* ie: */
+    border-bottom: .1em solid #777\9;
+    margin-right: 1em\9;
+}
+#mn a:first-child {
+    padding-left: .5em;
+}
+#mn a:last-child {
+    padding-right: .5em;
+}
+#mn a:not(:last-child):after {
+    content: '';
+    width: 1.05em;
+    height: 1.05em;
+    margin: -.2em .3em -.2em -.4em;
+    display: inline-block;
+    border: 1px solid rgba(0,0,0,0.2);
+    border-width: .2em .2em 0 0;
+    transform: rotate(45deg);
+}
+#mn a:hover {
+    color: #000;
+    text-decoration: underline;
+}
+
+html .editor-toolbar>button.disabled {
+    opacity: .35;
+    pointer-events: none;
+}
+html .editor-toolbar>button.save.force-save {
+    background: #f97;
+}
+
+/*
+*[data-ln]:before {
+	content: attr(data-ln);
+	font-size: .8em;
+	margin: 0 .4em;
+	color: #f0c;
+}
+.cm-header { font-size: .4em !important }
+*/
+
+
+
+
+
+/* copied from md.css for now */
+.mdo pre,
+.mdo code,
+.mdo a {
+	color: #480;
+	background: #f7f7f7;
+	border: .07em solid #ddd;
+	border-radius: .2em;
+	padding: .1em .3em;
+	margin: 0 .1em;
+}
+.mdo code {
+	font-size: .96em;
+}
+.mdo pre,
+.mdo code {
+	font-family: monospace, monospace;
+	white-space: pre-wrap;
+	word-break: break-all;
+}
+.mdo pre code {
+	display: block;
+	margin: 0 -.3em;
+	padding: .4em .5em;
+	line-height: 1.1em;
+}
+.mdo a {
+    color: #fff;
+    background: #39b;
+    text-decoration: none;
+    padding: 0 .3em;
+    border: none;
+    border-bottom: .07em solid #079;
+}
+.mdo h2 {
+    color: #fff;
+    background: #555;
+    margin-top: 2em;
+    border-bottom: .22em solid #999;
+    border-top: none;
+}
+.mdo h1 {
+    color: #fff;
+    background: #444;
+    font-weight: normal;
+    border-top: .4em solid #fb0;
+    border-bottom: .4em solid #777;
+    border-radius: 0 1em 0 1em;
+    margin: 3em 0 1em 0;
+    padding: .5em 0;
+}
+h1, h2 {
+	line-height: 1.5em;
+}
+h1 {
+	font-size: 1.7em;
+	text-align: center;
+	border: 1em solid #777;
+	border-width: .05em 0;
+	margin: 3em 0;
+}
+h2 {
+	font-size: 1.5em;
+	font-weight: normal;
+	background: #f7f7f7;
+	border-top: .07em solid #fff;
+	border-bottom: .07em solid #bbb;
+	border-radius: .5em .5em 0 0;
+	padding-left: .4em;
+	margin-top: 3em;
+}
+.mdo ul,
+.mdo ol {
+	border-left: .3em solid #ddd;
+}
+.mdo>ul,
+.mdo>ol {
+	border-color: #bbb;
+}
+.mdo ul>li {
+	list-style-type: disc;
+}
+.mdo ul>li,
+.mdo ol>li {
+	margin: .7em 0;
+}
+p>em,
+li>em {
+	color: #c50;
+	padding: .1em;
+	border-bottom: .1em solid #bbb;
+}
+blockquote {
+	font-family: serif;
+	background: #f7f7f7;
+	border: .07em dashed #ccc;
+	padding: 0 2em;
+	margin: 1em 0;
+}
+small {
+	opacity: .8;
+}
+table {
+	border-collapse: collapse;
+}
+td {
+	padding: .2em .5em;
+	border: .12em solid #aaa;
+}
+th {
+	border: .12em solid #aaa;
+}
+
+
+
+
+
+/* mde support */
+.mdo {
+    padding: 1em;
+    background: #f7f7f7;
+}
+html.dark .mdo {
+    background: #1c1c1c;
+}
+.CodeMirror {
+    background: #f7f7f7;
+}
+
+
+
+
+
+/* darkmode */
+html.dark .mdo,
+html.dark .CodeMirror {
+    border-color: #222;
+}
+html.dark,
+html.dark body,
+html.dark .CodeMirror {
+    background: #222;
+    color: #ccc;
+}
+html.dark .CodeMirror-cursor {
+    border-color: #fff;
+}
+html.dark .CodeMirror-selected {
+    box-shadow: 0 0 1px #0cf inset;
+}
+html.dark .CodeMirror-selected,
+html.dark .CodeMirror-selectedtext {
+    border-radius: .1em;
+    background: #246;
+    color: #fff;
+}
+html.dark .mdo a {
+    background: #057;
+}
+html.dark .mdo h1 a, html.dark .mdo h4 a,
+html.dark .mdo h2 a, html.dark .mdo h5 a,
+html.dark .mdo h3 a, html.dark .mdo h6 a {
+    color: inherit;
+    background: none;
+}
+html.dark pre,
+html.dark code {
+    color: #8c0;
+    background: #1a1a1a;
+    border: .07em solid #333;
+}
+html.dark .mdo ul,
+html.dark .mdo ol {
+    border-color: #444;
+}
+html.dark .mdo>ul,
+html.dark .mdo>ol {
+    border-color: #555;
+}
+html.dark p>em,
+html.dark li>em {
+    color: #f94;
+    border-color: #666;
+}
+html.dark h1 {
+    background: #383838;
+    border-top: .4em solid #b80;
+    border-bottom: .4em solid #4c4c4c;
+}
+html.dark h2 {
+    background: #444;
+    border-bottom: .22em solid #555;
+}
+html.dark td,
+html.dark th {
+    border-color: #444;
+}
+html.dark blockquote {
+    background: #282828;
+    border: .07em dashed #444;
+}
+
+
+
+html.dark #mn a {
+    color: #ccc;
+}
+html.dark #mn a:not(:last-child):after {
+    border-color: rgba(255,255,255,0.3);
+}
+html.dark .editor-toolbar {
+    border-color: #2c2c2c;
+    background: #1c1c1c;
+}
+html.dark .editor-toolbar>i.separator {
+    border-left: 1px solid #444;
+    border-right: 1px solid #111;
+}
+html.dark .editor-toolbar>button {
+    margin-left: -1px; border: 1px solid rgba(255,255,255,0.1);
+    color: #aaa;
+}
+
+
+
+html.dark .editor-toolbar>button:hover {
+    color: #333;
+}
+html.dark .editor-toolbar>button.active {
+    color: #333;
+    border-color: #ec1;
+    background: #c90;
+}
+html.dark .editor-toolbar::after,
+html.dark .editor-toolbar::before {
+    background: none;
+}

copyparty/web/mde.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html><html><head>
+	<meta charset="utf-8">
+	<title>📝🎉 {{ title }}</title>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=0.7">
+	<link href="/.cpr/mde.css" rel="stylesheet">
+	<link href="/.cpr/deps/mini-fa.css" rel="stylesheet">
+	<link href="/.cpr/deps/easymde.css" rel="stylesheet">
+</head>
+<body>
+	<div id="mw">
+		<div id="mn"></div>
+		<div id="ml">
+			<div style="text-align:center;margin:5em 0">
+				<div style="font-size:2em;margin:1em 0">Loading</div>
+				if you're still reading this, check that javascript is allowed
+			</div>
+		</div>
+		<div id="m">
+			<textarea id="mt" style="display:none">{{ md }}</textarea>
+		</div>
+	</div>
+	<script>
+
+var link_md_as_html = false;  // TODO (does nothing)
+var last_modified = {{ lastmod }};
+
+var lightswitch = (function () {
+	var fun = function () {
+		var dark = !!!document.documentElement.getAttribute("class");
+		document.documentElement.setAttribute("class", dark ? "dark" : "");
+		if (window.localStorage)
+			localStorage.setItem('darkmode', dark ? 1 : 0);
+	};
+	if (window.localStorage && localStorage.getItem('darkmode') == 1)
+		fun();
+	
+	return fun;
+})();
+
+	</script>
+	<script src="/.cpr/deps/easymde.full.js"></script>
+	<script src="/.cpr/mde.js"></script>
+</body></html>

copyparty/web/mde.js

@@ -0,0 +1,224 @@
+var dom_wrap = document.getElementById('mw');
+var dom_nav = document.getElementById('mn');
+var dom_doc = document.getElementById('m');
+var dom_md = document.getElementById('mt');
+
+(function () {
+    var n = document.location + '';
+    n = n.substr(n.indexOf('//') + 2).split('?')[0].split('/');
+    n[0] = 'top';
+    var loc = [];
+    var nav = [];
+    for (var a = 0; a < n.length; a++) {
+        if (a > 0)
+            loc.push(n[a]);
+
+        var dec = decodeURIComponent(n[a]).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+
+        nav.push('<a href="/' + loc.join('/') + '">' + dec + '</a>');
+    }
+    dom_nav.innerHTML = nav.join('');
+})();
+
+var mde = (function () {
+    var tbar = [
+        {
+            name: "light",
+            title: "light",
+            className: "fa fa-lightbulb",
+            action: lightswitch
+        }, {
+            name: "save",
+            title: "save",
+            className: "fa fa-save",
+            action: save
+        }, '|',
+        'bold', 'italic', 'strikethrough', 'heading', '|',
+        'code', 'quote', 'unordered-list', 'ordered-list', 'clean-block', '|',
+        'link', 'image', 'table', 'horizontal-rule', '|',
+        'preview', 'side-by-side', 'fullscreen', '|',
+        'undo', 'redo'];
+
+    var mde = new EasyMDE({
+        autoDownloadFontAwesome: false,
+        autofocus: true,
+        spellChecker: false,
+        renderingConfig: {
+            markedOptions: {
+                breaks: true,
+                gfm: true
+            }
+        },
+        shortcuts: {
+            "save": "Ctrl-S"
+        },
+        insertTexts: ["[](", ")"],
+        indentWithTabs: false,
+        tabSize: 2,
+        toolbar: tbar,
+        previewClass: 'mdo',
+        onToggleFullScreen: set_jumpto,
+    });
+    md_changed(mde, true);
+    mde.codemirror.on("change", function () {
+        md_changed(mde);
+    });
+    var loader = document.getElementById('ml');
+    loader.parentNode.removeChild(loader);
+    return mde;
+})();
+
+function set_jumpto() {
+    document.querySelector('.editor-preview-side').onclick = jumpto;
+}
+
+function jumpto(ev) {
+    var tgt = ev.target || ev.srcElement;
+    var ln = null;
+    while (tgt && !ln) {
+        ln = tgt.getAttribute('data-ln');
+        tgt = tgt.parentElement;
+    }
+    var ln = parseInt(ln);
+    console.log(ln);
+    var cm = mde.codemirror;
+    var y = cm.heightAtLine(ln - 1, 'local');
+    var y2 = cm.heightAtLine(ln, 'local');
+    cm.scrollTo(null, y + (y2 - y) - cm.getScrollInfo().clientHeight / 2);
+}
+
+function md_changed(mde, on_srv) {
+    if (on_srv)
+        window.md_saved = mde.value();
+
+    var md_now = mde.value();
+    var save_btn = document.querySelector('.editor-toolbar button.save');
+
+    if (md_now == window.md_saved)
+        save_btn.classList.add('disabled');
+    else
+        save_btn.classList.remove('disabled');
+
+    set_jumpto();
+}
+
+function save(mde) {
+    var save_btn = document.querySelector('.editor-toolbar button.save');
+    if (save_btn.classList.contains('disabled')) {
+        alert('there is nothing to save');
+        return;
+    }
+    var force = save_btn.classList.contains('force-save');
+    if (force && !confirm('confirm that you wish to lose the changes made on the server since you opened this document')) {
+        alert('ok, aborted');
+        return;
+    }
+
+    var txt = mde.value();
+
+    var fd = new FormData();
+    fd.append("act", "tput");
+    fd.append("lastmod", (force ? -1 : last_modified));
+    fd.append("body", txt);
+
+    var url = (document.location + '').split('?')[0] + '?raw';
+    var xhr = new XMLHttpRequest();
+    xhr.open('POST', url, true);
+    xhr.responseType = 'text';
+    xhr.onreadystatechange = save_cb;
+    xhr.btn = save_btn;
+    xhr.mde = mde;
+    xhr.txt = txt;
+    xhr.send(fd);
+}
+
+function save_cb() {
+    if (this.readyState != XMLHttpRequest.DONE)
+        return;
+
+    if (this.status !== 200) {
+        alert('Error!  The file was NOT saved.\n\n' + this.status + ": " + (this.responseText + '').replace(/^<pre>/, ""));
+        return;
+    }
+
+    var r;
+    try {
+        r = JSON.parse(this.responseText);
+    }
+    catch (ex) {
+        alert('Failed to parse reply from server:\n\n' + this.responseText);
+        return;
+    }
+
+    if (!r.ok) {
+        if (!this.btn.classList.contains('force-save')) {
+            this.btn.classList.add('force-save');
+            var msg = [
+                'This file has been modified since you started editing it!\n',
+                'if you really want to overwrite, press save again.\n',
+                'modified ' + ((r.now - r.lastmod) / 1000) + ' seconds ago,',
+                ((r.lastmod - last_modified) / 1000) + ' sec after you opened it\n',
+                last_modified + ' lastmod when you opened it,',
+                r.lastmod + ' lastmod on the server now,',
+                r.now + ' server time now,\n',
+            ];
+            alert(msg.join('\n'));
+        }
+        else {
+            alert('Error! Save failed.  Maybe this JSON explains why:\n\n' + this.responseText);
+        }
+        return;
+    }
+
+    this.btn.classList.remove('force-save');
+    //alert('save OK -- wrote ' + r.size + ' bytes.\n\nsha512: ' + r.sha512);
+
+    // download the saved doc from the server and compare
+    var url = (document.location + '').split('?')[0] + '?raw';
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', url, true);
+    xhr.responseType = 'text';
+    xhr.onreadystatechange = save_chk;
+    xhr.btn = this.save_btn;
+    xhr.mde = this.mde;
+    xhr.txt = this.txt;
+    xhr.lastmod = r.lastmod;
+    xhr.send();
+}
+
+function save_chk() {
+    if (this.readyState != XMLHttpRequest.DONE)
+        return;
+
+    if (this.status !== 200) {
+        alert('Error!  The file was NOT saved.\n\n' + this.status + ": " + (this.responseText + '').replace(/^<pre>/, ""));
+        return;
+    }
+
+    var doc1 = this.txt.replace(/\r\n/g, "\n");
+    var doc2 = this.responseText.replace(/\r\n/g, "\n");
+    if (doc1 != doc2) {
+        alert(
+            'Error! The document on the server does not appear to have saved correctly (your editor contents and the server copy is not identical). Place the document on your clipboard for now and check the server logs for hints\n\n' +
+            'Length: yours=' + doc1.length + ', server=' + doc2.length
+        );
+        alert('yours, ' + doc1.length + ' byte:\n[' + doc1 + ']');
+        alert('server, ' + doc2.length + ' byte:\n[' + doc2 + ']');
+        return;
+    }
+
+    last_modified = this.lastmod;
+    md_changed(this.mde, true);
+
+    var ok = document.createElement('div');
+    ok.setAttribute('style', 'font-size:6em;font-family:serif;font-weight:bold;color:#cf6;background:#444;border-radius:.3em;padding:.6em 0;position:fixed;top:30%;left:calc(50% - 2em);width:4em;text-align:center;z-index:9001;transition:opacity 0.2s ease-in-out;opacity:1');
+    ok.innerHTML = 'OK✔️';
+    var parent = document.getElementById('m');
+    document.documentElement.appendChild(ok);
+    setTimeout(function () {
+        ok.style.opacity = 0;
+    }, 500);
+    setTimeout(function () {
+        ok.parentNode.removeChild(ok);
+    }, 750);
+}

copyparty/web/msg.html

@@ -31,6 +31,10 @@
         {%- if html %}
         {{ html }}
         {%- endif %}
+
+        {%- if click %}
+        <script>document.getElementsByTagName("a")[0].click()</script>
+        {%- endif %}
     </div>
 
     {%- if redir %}

copyparty/web/splash.css

@@ -13,6 +13,7 @@ h1 {
 	border-bottom: 1px solid #ccc;
 	margin: 2em 0 .4em 0;
 	padding: 0 0 .2em 0;
+	font-weight: normal;
 }
 li {
 	margin: 1em 0;
@@ -24,4 +25,29 @@ a {
 	border-bottom: 1px solid #aaa;
 	border-radius: .2em;
 	padding: .2em .8em;
+}
+
+
+html.dark,
+html.dark body,
+html.dark #wrap {
+	background: #222;
+	color: #ccc;
+}
+html.dark h1 {
+	border-color: #777;
+}
+html.dark a {
+	color: #fff;
+	background: #057;
+	border-color: #37a;
+}
+html.dark input {
+	color: #fff;
+	background: #624;
+	border: 1px solid #c27;
+	border-width: 1px 0 0 0;
+	border-radius: .5em;
+	padding: .5em .7em;
+	margin: 0 .5em 0 0;
 }

copyparty/web/splash.html

@@ -36,7 +36,11 @@
             </form>
         </ul>
     </div>
-    <!-- script src="/.cpr/splash.js"></script -->
-</body>
+    <script>
 
+if (window.localStorage && localStorage.getItem('darkmode') == 1)
+    document.documentElement.setAttribute("class", "dark");
+
+</script>
+</body>
 </html>

copyparty/web/up2k.js

@@ -34,6 +34,7 @@ window.onerror = function (msg, url, lineNo, columnNo, error) {
                     esc(String(error[find[a]])).replace(/\n/g, '<br />\n'));
     }
     document.body.style.fontSize = '0.8em';
+    document.body.style.padding = '0 1em 1em 1em';
     hcroak(html.join('\n'));
 };
 
@@ -58,22 +59,91 @@ function o(id) {
 
 
 (function () {
-    // chrome requires https to use crypto.subtle,
-    // usually it's undefined but some chromes throw on invoke
-    try {
-        crypto.subtle.digest(
-            'SHA-512', new Uint8Array(1)
-        ).then(
-            function (x) { up2k_init(true) },
-            function (x) { up2k_init(false) }
-        );
-    }
-    catch (ex) {
-        up2k_init(false);
+    var ops = document.querySelectorAll('#ops>a');
+    for (var a = 0; a < ops.length; a++) {
+        ops[a].onclick = opclick;
     }
 })();
 
 
+function opclick(ev) {
+    if (ev) //ie
+        ev.preventDefault();
+
+    var dest = this.getAttribute('data-dest');
+    goto(dest);
+
+    // writing a blank value makes ie8 segfault w
+    if (window.localStorage)
+        localStorage.setItem('opmode', dest || '.');
+
+    var input = document.querySelector('.opview.act input:not([type="hidden"])')
+    if (input)
+        input.focus();
+}
+
+
+function goto(dest) {
+    var obj = document.querySelectorAll('.opview.act');
+    for (var a = obj.length - 1; a >= 0; a--)
+        obj[a].classList.remove('act');
+
+    var obj = document.querySelectorAll('#ops>a');
+    for (var a = obj.length - 1; a >= 0; a--)
+        obj[a].classList.remove('act');
+
+    if (dest) {
+        document.getElementById('op_' + dest).classList.add('act');
+        document.querySelector('#ops>a[data-dest=' + dest + ']').classList.add('act');
+
+        var fn = window['goto_' + dest];
+        if (fn)
+            fn();
+    }
+}
+
+
+function goto_up2k() {
+    if (up2k === false)
+        return goto('bup');
+
+    if (!up2k)
+        return setTimeout(goto_up2k, 100);
+
+    up2k.init_deps();
+}
+
+
+(function () {
+    goto();
+    if (window.localStorage) {
+        var op = localStorage.getItem('opmode');
+        if (op !== null && op !== '.')
+            goto(op);
+    }
+    document.getElementById('ops').style.display = 'block';
+})();
+
+
+// chrome requires https to use crypto.subtle,
+// usually it's undefined but some chromes throw on invoke
+var up2k = null;
+try {
+    crypto.subtle.digest(
+        'SHA-512', new Uint8Array(1)
+    ).then(
+        function (x) { up2k = up2k_init(true) },
+        function (x) { up2k = up2k_init(false) }
+    );
+}
+catch (ex) {
+    try {
+        up2k = up2k_init(false);
+    }
+    catch (ex) { }
+}
+
+
 function up2k_init(have_crypto) {
     //have_crypto = false;
     var need_filereader_cache = undefined;
@@ -94,7 +164,7 @@ function up2k_init(have_crypto) {
         o('u2notbtn').innerHTML = '';
     }
 
-    var post_url = o('bup').getElementsByTagName('form')[0].getAttribute('action');
+    var post_url = o('op_bup').getElementsByTagName('form')[0].getAttribute('action');
     if (post_url && post_url.charAt(post_url.length - 1) !== '/')
         post_url += '/';
 
@@ -105,13 +175,7 @@ function up2k_init(have_crypto) {
         shame = 'your browser is impressively ancient';
 
     // upload ui hidden by default, clicking the header shows it
-    function toggle_upload_visible(ev) {
-        if (ev)
-            ev.preventDefault();
-        
-        o('u2tgl').style.display = 'none';
-        o('u2body').style.display = 'block';
-
+    function init_deps() {
         if (!have_crypto && !window.asmCrypto) {
             showmodal('<h1>loading sha512.js</h1><h2>since ' + shame + '</h2><h4>thanks chrome</h4>');
             import_js('/.cpr/deps/sha512.js', unmodal);
@@ -122,11 +186,10 @@ function up2k_init(have_crypto) {
                 o('u2foot').innerHTML = 'seems like ' + shame + ' so do that if you want more performance';
         }
     };
-    o('u2tgl').onclick = toggle_upload_visible;
-    
+
     // show uploader if the user only has write-access
     if (!o('files'))
-        toggle_upload_visible();
+        goto('up2k');
 
     // shows or clears an error message in the basic uploader ui
     function setmsg(msg) {
@@ -142,15 +205,15 @@ function up2k_init(have_crypto) {
 
     // switches to the basic uploader with msg as error message
     function un2k(msg) {
-        o('up2k').style.display = 'none';
-        o('bup').style.display = 'block';
         setmsg(msg);
+        return false;
     }
 
     // handle user intent to use the basic uploader instead
     o('u2nope').onclick = function (e) {
         e.preventDefault();
-        un2k();
+        setmsg('');
+        goto('bup');
     };
 
     if (!String.prototype.format) {
@@ -168,7 +231,7 @@ function up2k_init(have_crypto) {
         if (val === null)
             return parseInt(o(name).value);
 
-        o(name).value = val
+        o(name).value = val;
         return val;
     }
 
@@ -213,15 +276,13 @@ function up2k_init(have_crypto) {
         }
     };
 
-    var bobslice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
+    var bobslice = null;
+    if (window.File)
+        bobslice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
 
     if (!bobslice || !window.FileReader || !window.FileList)
         return un2k("this is the basic uploader; up2k needs at least<br />chrome 21 // firefox 13 // edge 12 // opera 12 // safari 5.1");
 
-    // probably safe now
-    o('up2k').style.display = 'block';
-    o('bup').style.display = 'none';
-
     function nav() {
         o('file' + fdom_ctr).click();
     }
@@ -272,12 +333,15 @@ function up2k_init(have_crypto) {
                 bad_files.push([a, fobj.name]);
                 continue;
             }
+            var now = new Date().getTime();
+            var lmod = fobj.lastModified || now;
             var entry = {
                 "n": parseInt(st.files.length.toString()),
-                "t0": new Date().getTime(),  // TODO remove probably
+                "t0": now,  // TODO remove probably
                 "fobj": fobj,
                 "name": fobj.name,
                 "size": fobj.size,
+                "lmod": lmod / 1000,
                 "hash": []
             };
 
@@ -291,7 +355,7 @@ function up2k_init(have_crypto) {
                 continue;
 
             var tr = document.createElement('tr');
-            tr.innerHTML = '<td></td><td id="f{0}t">hashing</td><td id="f{0}p" class="prog"></td>'.format(st.files.length);
+            tr.innerHTML = '<td id="f{0}n"></td><td id="f{0}t">hashing</td><td id="f{0}p" class="prog"></td>'.format(st.files.length);
             tr.getElementsByTagName('td')[0].textContent = entry.name;
             o('u2tab').appendChild(tr);
 
@@ -639,6 +703,12 @@ function up2k_init(have_crypto) {
             if (xhr.status == 200) {
                 var response = JSON.parse(xhr.responseText);
 
+                if (response.name !== t.name) {
+                    // file exists; server renamed us
+                    t.name = response.name;
+                    o('f{0}n'.format(t.n)).textContent = t.name;
+                }
+
                 t.postlist = [];
                 t.wark = response.wark;
                 var missing = response.hash;
@@ -689,6 +759,7 @@ function up2k_init(have_crypto) {
         xhr.send(JSON.stringify({
             "name": t.name,
             "size": t.size,
+            "lmod": t.lmod,
             "hash": t.hash
         }));
     }
@@ -838,4 +909,6 @@ function up2k_init(have_crypto) {
         nodes[a].addEventListener('touchend', nop, false);
 
     bumpthread({ "target": 1 })
+
+    return { "init_deps": init_deps }
 }

copyparty/web/upload.css

@@ -1,19 +1,94 @@
-#bup {
-	padding: .5em .5em .5em .3em;
-	margin: 1em 0 2em 0;
-	background: #2d2d2d;
-	border-radius: 0 1em 1em 0;
+.opview {
+	display: none;
+}
+.opview.act {
+	display: block;
+}
+#ops a {
+	color: #fc5;
+	font-size: 1.5em;
+	padding: 0 .3em;
+	margin: 0;
+	outline: none;
+}
+#ops a.act {
+	text-decoration: underline;
+}
+/*
+#ops a+a:after,
+#ops a:first-child:after {
+	content: 'x';
+	color: #282828;
+	text-shadow: 0 0 .08em #01a7e1;
+	margin-left: .3em;
+	position: relative;
+}
+#ops a+a:before {
+	content: 'x';
+	color: #282828;
+	text-shadow: 0 0 .08em #ff3f1a;
+	margin-right: .3em;
+	margin-left: -.3em;
+}
+#ops a:last-child:after {
+	content: '';
+}
+#ops a.act:before,
+#ops a.act:after {
+	text-decoration: none !important;
+}
+*/
+#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 {
 	border: 1px solid #3a3a3a;
-	border-width: 0 .3em .3em 0;
 	box-shadow: 0 0 1em #222 inset;
+}
+#ops {
+	display: none;
+	background: #333;
+	margin: 1.7em 1.5em 0 1.5em;
+	padding: .3em .6em;
+	border-radius: .3em;
+	border-width: .15em 0;
+}
+.opbox {
+	background: #2d2d2d;
+	margin: 1.5em 0 0 0;
+	padding: .5em;
+	border-radius: 0 1em 1em 0;
+	border-width: .15em .3em .3em 0;
 	max-width: 40em;
 }
-#bup input {
+.opbox input {
 	margin: .5em;
 }
-#up2k {
-	display: none;
-	padding: 0 1em;
+.opbox input[type=text] {
+	color: #fff;
+	background: #383838;
+	border: none;
+	box-shadow: 0 0 .3em #222;
+	border-bottom: 1px solid #fc5;
+	border-radius: .2em;
+	padding: .2em .3em;
+}
+#op_up2k {
+	padding: 0 1em 1em 1em;
 }
 #u2form {
 	position: absolute;
@@ -29,16 +104,6 @@
 	color: #f87;
 	padding: .5em;
 }
-#u2tgl {
-	color: #fc5;
-	font-size: 1.5em;
-	margin: .5em 0 1em 0;
-	display: block;
-}
-#u2body {
-	display: none;
-	padding-bottom: 1em;
-}
 #u2form {
 	width: 2px;
 	height: 2px;

copyparty/web/upload.html

@@ -1,4 +1,11 @@
-    <div id="bup">
+    <div id="ops"><a
+        href="#" data-dest="">---</a><i></i><a
+        href="#" data-dest="up2k">up2k</a><i></i><a
+        href="#" data-dest="bup">bup</a><i></i><a
+        href="#" data-dest="mkdir">mkdir</a><i></i><a
+        href="#" data-dest="new_md">new.md</a></div>
+
+    <div id="op_bup" class="opview opbox act">
         <div id="u2err"></div>
         <form method="post" enctype="multipart/form-data" accept-charset="utf-8" action="/{{ vdir }}">
             <input type="hidden" name="act" value="bput" />
@@ -7,10 +14,24 @@
         </form>
     </div>
 
-    <div id="up2k">
-        <a href="#" id="u2tgl">you can upload here</a>
-        <form id="u2form" method="POST" enctype="multipart/form-data" onsubmit="return false;"></form>
-        <div id="u2body">
+    <div id="op_mkdir" class="opview opbox act">
+        <form method="post" enctype="multipart/form-data" accept-charset="utf-8" action="/{{ vdir }}">
+            <input type="hidden" name="act" value="mkdir" />
+            <input type="text" name="name" size="30">
+            <input type="submit" value="mkdir">
+        </form>
+    </div>
+
+    <div id="op_new_md" class="opview opbox">
+        <form method="post" enctype="multipart/form-data" accept-charset="utf-8" action="/{{ vdir }}">
+            <input type="hidden" name="act" value="new_md" />
+            <input type="text" name="name" size="30">
+            <input type="submit" value="create doc">
+        </form>
+    </div>
+
+    <div id="op_up2k" class="opview">
+        <form id="u2form" method="post" enctype="multipart/form-data" onsubmit="return false;"></form>
 
             <table id="u2conf">
                 <tr>
@@ -45,6 +66,5 @@
             </table>
 
             <p id="u2foot"></p>
-            <p>( if you don't need resumable uploads and progress bars just use the <a href="#" id="u2nope" onclick="javascript:un2k();">basic uploader</a>)</p>
-        </div>
+            <p>( if you don't need lastmod timestamps, resumable uploads or progress bars just use the <a href="#" id="u2nope">basic uploader</a>)</p>
     </div>

scripts/copyparty-android.sh

@@ -5,8 +5,6 @@ _msg() { printf "$2"'\033[1;30m>\033[0;33m>\033[1m>\033[0m %s\n' "$1" >&2; }
 imsg() { _msg "$1" ''; }
 msg() { _msg "$1" \\n; }
 
-mkdir -p ~/src
-
 ##
 ## helper which installs termux packages
 
@@ -24,22 +22,6 @@ addpkg() {
 	apt install -y $1
 }
 
-##
-## ensure git and copyparty is available
-
-[ -e ~/src/copyparty/.ok ] || {
-	command -v git >/dev/null ||
-		addpkg git
-	
-	msg "downloading copyparty from github"
-	(
-		cd ~/src
-		rm -rf copyparty
-		git clone https://github.com/9001/copyparty
-		touch copyparty/.ok
-	)
-}
-
 ##
 ## ensure python is available
 
@@ -49,20 +31,21 @@ command -v python3 >/dev/null ||
 ##
 ## ensure virtualenv and dependencies are available
 
-[ -e ~/src/copyparty/.env/.ok ] || { (
-	cd ~/src/copyparty
-	rm -rf .env
+ve=$HOME/ve.copyparty
+
+[ -e $ve/.ok ] || (
+	rm -rf $ve
 
 	msg "creating python3 virtualenv"
-	python3 -m venv .env
+	python3 -m venv $ve
 
-	msg "installing python dependencies"
-	. .env/bin/activate
-	pip install jinja2
+	msg "installing copyparty"
+	. $ve/bin/activate
+	pip install copyparty
 
 	deactivate
-	touch .env/.ok
-) }
+	touch $ve/.ok
+)
 
 ##
 ## add copyparty alias to bashrc
@@ -75,9 +58,5 @@ grep -qE '^alias copyparty=' ~/.bashrc 2>/dev/null || {
 ##
 ## start copyparty
 
-imsg "activating virtualenv"
-. ~/src/copyparty/.env/bin/activate
-
 imsg "starting copyparty"
-PYTHONPATH=~/src/copyparty python3 -m copyparty "$@"
-
+$ve/bin/python -m copyparty "$@"

scripts/deps-docker/Dockerfile

@@ -1,17 +1,72 @@
-FROM    alpine:3.10
+FROM    alpine:3.11
 WORKDIR /z
 ENV     ver_asmcrypto=2821dd1dedd1196c378f5854037dda5c869313f3 \
-        ver_ogvjs=1.6.1
+        ver_markdownit=10.0.0 \
+        ver_showdown=1.9.1 \
+        ver_marked=1.0.0 \
+        ver_ogvjs=1.6.1 \
+        ver_mde=2.10.1 \
+        ver_codemirror=5.53.2 \
+        ver_fontawesome=5.13.0 \
+        ver_zopfli=1.0.3
+
 
 # download
-RUN     apk add make g++ git bash npm patch wget tar pigz gzip unzip \
-        && wget https://github.com/brion/ogv.js/releases/download/$ver_ogvjs/ogvjs-$ver_ogvjs.zip \
-        && wget https://github.com/asmcrypto/asmcrypto.js/archive/$ver_asmcrypto.tar.gz \
-        && unzip ogvjs-$ver_ogvjs.zip \
-        && tar -xf $ver_asmcrypto.tar.gz \
-        && cd asmcrypto.js-$ver_asmcrypto \
-        && npm install \
-        && mkdir /z/dist
+RUN     apk add cmake make g++ git bash npm patch wget tar pigz brotli gzip unzip python3 python3-dev \
+        && wget https://github.com/brion/ogv.js/releases/download/$ver_ogvjs/ogvjs-$ver_ogvjs.zip -O ogvjs.zip \
+        && wget https://github.com/asmcrypto/asmcrypto.js/archive/$ver_asmcrypto.tar.gz -O asmcrypto.tgz \
+        && wget https://github.com/markedjs/marked/archive/v$ver_marked.tar.gz -O marked.tgz \
+        && wget https://github.com/Ionaru/easy-markdown-editor/archive/$ver_mde.tar.gz -O mde.tgz \
+        && wget https://github.com/codemirror/CodeMirror/archive/$ver_codemirror.tar.gz -O codemirror.tgz \
+        && wget https://github.com/FortAwesome/Font-Awesome/releases/download/$ver_fontawesome/fontawesome-free-$ver_fontawesome-web.zip -O fontawesome.zip \
+        && wget https://github.com/google/zopfli/archive/zopfli-$ver_zopfli.tar.gz -O zopfli.tgz \
+        && unzip ogvjs.zip \
+        && (tar -xf asmcrypto.tgz \
+            && cd asmcrypto.js-$ver_asmcrypto \
+            && npm install ) \
+        && (tar -xf marked.tgz \
+            && cd marked-$ver_marked \
+            && npm install \
+            && npm i grunt uglify-js -g ) \
+        && (tar -xf codemirror.tgz \
+            && cd CodeMirror-$ver_codemirror \
+            && npm install ) \
+        && (tar -xf mde.tgz \
+            && cd easy-markdown-editor* \
+            && npm install \
+            && npm i gulp-cli -g ) \
+        && unzip fontawesome.zip \
+        && tar -xf zopfli.tgz \
+        && mkdir -p /z/dist/no-pk
+
+
+# uncomment if you wanna test the abandoned markdown converters
+#ENV     build_abandoned=1
+
+
+RUN     [ $build_abandoned ] || exit 0; \
+        git clone --depth 1 --branch $ver_showdown https://github.com/showdownjs/showdown/ \
+        && wget https://github.com/markdown-it/markdown-it/archive/$ver_markdownit.tar.gz -O markdownit.tgz \
+        && (cd showdown \
+            && npm install \
+            && npm i grunt -g ) \
+        && (tar -xf markdownit.tgz \
+            && cd markdown-it-$ver_markdownit \
+            && npm install )
+
+
+# build fonttools (which needs zopfli)
+RUN     tar -xf zopfli.tgz \
+        && cd zopfli* \
+        && cmake \
+            -DCMAKE_INSTALL_PREFIX=/usr \
+            -DZOPFLI_BUILD_SHARED=ON \
+            -B build \
+            -S . \
+        && make -C build \
+        && make -C build install \
+        && python3 -m pip install fonttools zopfli
+
 
 # build asmcrypto
 RUN     cd asmcrypto.js-$ver_asmcrypto \
@@ -19,6 +74,7 @@ RUN     cd asmcrypto.js-$ver_asmcrypto \
         && node -r esm build.js \
         && mv asmcrypto.all.es5.js /z/dist/sha512.js
 
+
 # build ogvjs
 RUN     cd ogvjs-$ver_ogvjs \
         && cp -pv \
@@ -39,8 +95,146 @@ RUN     cd ogvjs-$ver_ogvjs \
             dynamicaudio.swf \
             /z/dist
 
+
+# build marked
+RUN     wget https://github.com/markedjs/marked/commit/5c166d4164791f643693478e4ac094d63d6e0c9a.patch -O marked-git-1.patch \
+        && wget https://patch-diff.githubusercontent.com/raw/markedjs/marked/pull/1652.patch -O marked-git-2.patch
+
+COPY    marked.patch /z/
+COPY    marked-ln.patch /z/
+RUN     cd marked-$ver_marked \
+        && patch -p1 < /z/marked-git-1.patch \
+        && patch -p1 < /z/marked-git-2.patch \
+        && patch -p1 < /z/marked-ln.patch \
+        && patch -p1 < /z/marked.patch \
+        && npm run build \
+        && cp -pv marked.min.js /z/dist/marked.js \
+        && cp -pv lib/marked.js /z/dist/marked.full.js \
+        && mkdir -p /z/nodepkgs \
+        && ln -s $(pwd) /z/nodepkgs/marked
+#        && npm run test \
+
+
+# build codemirror
+COPY    codemirror.patch /z/
+RUN     cd CodeMirror-$ver_codemirror \
+        && patch -p1 < /z/codemirror.patch \
+        && sed -ri '/^var urlRE = /d' mode/gfm/gfm.js \
+        && npm run build \
+        && ln -s $(pwd) /z/nodepkgs/codemirror
+
+
+# build easymde
+COPY    easymde.patch /z/
+RUN     cd easy-markdown-editor-$ver_mde \
+        && patch -p1 < /z/easymde.patch \
+        && sed -ri 's`https://registry.npmjs.org/marked/-/marked-0.8.2.tgz`file:/z/nodepkgs/marked`' package-lock.json \
+        && sed -ri 's`("marked": ")[^"]+`\1file:/z/nodepkgs/marked`' ./package.json \
+        && sed -ri 's`("codemirror": ")[^"]+`\1file:/z/nodepkgs/codemirror`' ./package.json \
+        && npm install
+
+COPY    easymde-ln.patch /z/
+RUN     cd easy-markdown-editor-$ver_mde \
+        && patch -p1 < /z/easymde-ln.patch \
+        && gulp \
+        && cp -pv dist/easymde.min.css /z/dist/easymde.css \
+        && cp -pv dist/easymde.min.js /z/dist/easymde.js \
+        && sed -ri '/pipe.terser/d; /cleanCSS/d' gulpfile.js \
+        && gulp \
+        && cp -pv dist/easymde.min.css /z/dist/easymde.full.css \
+        && cp -pv dist/easymde.min.js /z/dist/easymde.full.js
+
+
+# build showdown (abandoned; disabled by default)
+COPY    showdown.patch /z/
+RUN     [ $build_abandoned ] || exit 0; \
+        cd showdown \
+        && rm -rf bin dist \
+#       # remove ellipsis plugin \
+        && rm \
+            src/subParsers/ellipsis.js \
+            test/cases/ellipsis* \
+#       # remove html-to-md converter \
+        && rm \
+            test/node/testsuite.makemd.js \
+            test/node/showdown.Converter.makeMarkdown.js \
+#       # remove emojis \
+        && rm src/subParsers/emoji.js \
+        && awk '/^showdown.helper.emojis/ {o=1} !o; /^\}/ {o=0}' \
+            >f <src/helpers.js \
+        && mv f src/helpers.js \
+        && rm -rf test/features/emojis \
+#       # remove ghmentions \
+        && rm test/features/ghMentions.* \
+#       # remove option descriptions \
+        && sed -ri '/descri(ption|be): /d' src/options.js \
+        && patch -p1 < /z/showdown.patch
+
+RUN     [ $build_abandoned ] || exit 0; \
+        cd showdown \
+        && grunt build \
+        && sed -ri '/sourceMappingURL=showdown.min.js.map/d' dist/showdown.min.js \
+        && mv dist/showdown.min.js /z/dist/showdown.js \
+        && ls -al /z/dist/showdown.js
+
+
+# build markdownit (abandoned; disabled by default)
+COPY    markdown-it.patch /z/
+RUN     [ $build_abandoned ] || exit 0; \
+        cd markdown-it-$ver_markdownit \
+        && patch -p1 < /z/markdown-it.patch \
+        && make browserify \
+        && cp -pv dist/markdown-it.min.js /z/dist/markdown-it.js \
+        && cp -pv dist/markdown-it.js /z/dist/markdown-it-full.js
+
+
+# build fontawesome
+COPY    mini-fa.sh /z
+COPY    mini-fa.css /z
+RUN     /bin/ash /z/mini-fa.sh
+
+
 # compress
 COPY    zopfli.makefile /z/dist/Makefile
 RUN     cd /z/dist \
         && make -j$(nproc) \
-        && rm Makefile
+        && rm Makefile \
+        && mv no-pk/* . \
+        && rmdir no-pk
+
+
+# showdown: abandoned due to code-blocks in lists failing
+# 22770 orig
+# 12154 no-emojis
+# 12134 no-srcmap
+# 11189 no-descriptions
+# 11152 no-ellipsis
+# 10617 no-this.makeMd
+#  9569 no-extensions
+#  9537 no-extensions
+#  9410 no-mentions
+
+
+# markdown-it: abandoned because no header anchors (and too big)
+#       32322 107754 orig (wowee)
+# 19619 21392  71540 less entities
+
+
+# marked:
+# 9253 29773 orig
+# 9159 29633 no copyright (reverted)
+# 9040 29057 no sanitize
+# 8870 28631 no email-mangle
+# so really not worth it, just drop the patch when that stops working
+
+
+# easymde:
+# 91836 orig
+# 88635 no spellcheck
+# 88392 no urlRE
+# 85651 less bidi
+# 82855 less mode meta
+
+
+# d=/home/ed/dev/copyparty/scripts/deps-docker/; tar -cf ../x . && ssh root@$bip "cd $d && tar -xv >&2 && make >&2 && tar -cC ../../copyparty/web deps" <../x | (cd ../../copyparty/web/; cat > the.tgz; tar -xvf the.tgz)
+# gzip -dkf ../dev/copyparty/copyparty/web/deps/deps/marked.full.js.gz && diff -NarU2 ../dev/copyparty/copyparty/web/deps/{,deps/}marked.full.js

scripts/deps-docker/codemirror.patch

@@ -0,0 +1,277 @@
+diff -NarU2 CodeMirror-orig/mode/gfm/gfm.js CodeMirror-edit/mode/gfm/gfm.js
+--- CodeMirror-orig/mode/gfm/gfm.js	2020-04-21 12:47:20.000000000 +0200
++++ CodeMirror-edit/mode/gfm/gfm.js	2020-05-02 02:13:32.142131800 +0200
+@@ -97,5 +97,5 @@
+         }
+       }
+-      if (stream.match(urlRE) &&
++      /*if (stream.match(urlRE) &&
+           stream.string.slice(stream.start - 2, stream.start) != "](" &&
+           (stream.start == 0 || /\W/.test(stream.string.charAt(stream.start - 1)))) {
+@@ -106,5 +106,5 @@
+         state.combineTokens = true;
+         return "link";
+-      }
++      }*/
+       stream.next();
+       return null;
+diff -NarU2 CodeMirror-orig/mode/meta.js CodeMirror-edit/mode/meta.js
+--- CodeMirror-orig/mode/meta.js	2020-04-21 12:47:20.000000000 +0200
++++ CodeMirror-edit/mode/meta.js	2020-05-02 03:56:58.852408400 +0200
+@@ -13,4 +13,5 @@
+ 
+   CodeMirror.modeInfo = [
++    /*
+     {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
+     {name: "PGP", mimes: ["application/pgp", "application/pgp-encrypted", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["asc", "pgp", "sig"]},
+@@ -56,5 +57,7 @@
+     {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
+     {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
++    */
+     {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
++    /*
+     {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
+     {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"], file: /^Jenkinsfile$/},
+@@ -65,5 +68,7 @@
+     {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
+     {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
++    */
+     {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm", "handlebars", "hbs"], alias: ["xhtml"]},
++    /*
+     {name: "HTTP", mime: "message/http", mode: "http"},
+     {name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
+@@ -82,5 +87,7 @@
+     {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
+     {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
++    */
+     {name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
++    /*
+     {name: "mIRC", mime: "text/mirc", mode: "mirc"},
+     {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
+@@ -163,5 +170,7 @@
+     {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
+     {name: "Vue.js Component", mimes: ["script/x-vue", "text/x-vue"], mode: "vue", ext: ["vue"]},
++    */
+     {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd", "svg"], alias: ["rss", "wsdl", "xsd"]},
++    /*
+     {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
+     {name: "Yacas", mime: "text/x-yacas", mode: "yacas", ext: ["ys"]},
+@@ -171,4 +180,5 @@
+     {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
+     {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]}
++    */
+   ];
+   // Ensure all modes have a mime property for backwards compatibility
+diff -NarU2 CodeMirror-orig/src/display/selection.js CodeMirror-edit/src/display/selection.js
+--- CodeMirror-orig/src/display/selection.js	2020-04-21 12:47:20.000000000 +0200
++++ CodeMirror-edit/src/display/selection.js	2020-05-02 03:27:30.144662800 +0200
+@@ -83,29 +83,21 @@
+     let order = getOrder(lineObj, doc.direction)
+     iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir, i) => {
+-      let ltr = dir == "ltr"
+-      let fromPos = coords(from, ltr ? "left" : "right")
+-      let toPos = coords(to - 1, ltr ? "right" : "left")
++      let fromPos = coords(from, "left")
++      let toPos = coords(to - 1, "right")
+ 
+       let openStart = fromArg == null && from == 0, openEnd = toArg == null && to == lineLen
+       let first = i == 0, last = !order || i == order.length - 1
+       if (toPos.top - fromPos.top <= 3) { // Single line
+-        let openLeft = (docLTR ? openStart : openEnd) && first
+-        let openRight = (docLTR ? openEnd : openStart) && last
+-        let left = openLeft ? leftSide : (ltr ? fromPos : toPos).left
+-        let right = openRight ? rightSide : (ltr ? toPos : fromPos).right
++        let openLeft = openStart && first
++        let openRight =  openEnd && last
++        let left = openLeft ? leftSide : fromPos.left
++        let right = openRight ? rightSide : toPos.right
+         add(left, fromPos.top, right - left, fromPos.bottom)
+       } else { // Multiple lines
+         let topLeft, topRight, botLeft, botRight
+-        if (ltr) {
+-          topLeft = docLTR && openStart && first ? leftSide : fromPos.left
+-          topRight = docLTR ? rightSide : wrapX(from, dir, "before")
+-          botLeft = docLTR ? leftSide : wrapX(to, dir, "after")
+-          botRight = docLTR && openEnd && last ? rightSide : toPos.right
+-        } else {
+-          topLeft = !docLTR ? leftSide : wrapX(from, dir, "before")
+-          topRight = !docLTR && openStart && first ? rightSide : fromPos.right
+-          botLeft = !docLTR && openEnd && last ? leftSide : toPos.left
+-          botRight = !docLTR ? rightSide : wrapX(to, dir, "after")
+-        }
++          topLeft = openStart && first ? leftSide : fromPos.left
++          topRight = rightSide
++          botLeft = leftSide
++          botRight = openEnd && last ? rightSide : toPos.right
+         add(topLeft, fromPos.top, topRight - topLeft, fromPos.bottom)
+         if (fromPos.bottom < toPos.top) add(leftSide, fromPos.bottom, null, toPos.top)
+diff -NarU2 CodeMirror-orig/src/input/ContentEditableInput.js CodeMirror-edit/src/input/ContentEditableInput.js
+--- CodeMirror-orig/src/input/ContentEditableInput.js	2020-04-21 12:47:20.000000000 +0200
++++ CodeMirror-edit/src/input/ContentEditableInput.js	2020-05-02 03:33:05.707995500 +0200
+@@ -391,4 +391,5 @@
+   let info = mapFromLineView(view, line, pos.line)
+ 
++  /*
+   let order = getOrder(line, cm.doc.direction), side = "left"
+   if (order) {
+@@ -396,4 +397,5 @@
+     side = partPos % 2 ? "right" : "left"
+   }
++  */
+   let result = nodeAndOffsetInLineMap(info.map, pos.ch, side)
+   result.offset = result.collapse == "right" ? result.end : result.start
+diff -NarU2 CodeMirror-orig/src/input/movement.js CodeMirror-edit/src/input/movement.js
+--- CodeMirror-orig/src/input/movement.js	2020-04-21 12:47:20.000000000 +0200
++++ CodeMirror-edit/src/input/movement.js	2020-05-02 03:31:19.710773500 +0200
+@@ -15,4 +15,5 @@
+ 
+ export function endOfLine(visually, cm, lineObj, lineNo, dir) {
++  /*
+   if (visually) {
+     if (cm.doc.direction == "rtl") dir = -dir
+@@ -39,8 +40,11 @@
+     }
+   }
++  */
+   return new Pos(lineNo, dir < 0 ? lineObj.text.length : 0, dir < 0 ? "before" : "after")
+ }
+ 
+ export function moveVisually(cm, line, start, dir) {
++  return moveLogically(line, start, dir)
++  /*
+   let bidi = getOrder(line, cm.doc.direction)
+   if (!bidi) return moveLogically(line, start, dir)
+@@ -109,3 +113,4 @@
+   // Case 4: Nowhere to move
+   return null
++  */
+ }
+diff -NarU2 CodeMirror-orig/src/line/line_data.js CodeMirror-edit/src/line/line_data.js
+--- CodeMirror-orig/src/line/line_data.js	2020-04-21 12:47:20.000000000 +0200
++++ CodeMirror-edit/src/line/line_data.js	2020-05-02 03:17:02.785065000 +0200
+@@ -79,6 +79,6 @@
+     // Optionally wire in some hacks into the token-rendering
+     // algorithm, to deal with browser quirks.
+-    if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line, cm.doc.direction)))
+-      builder.addToken = buildTokenBadBidi(builder.addToken, order)
++    //if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line, cm.doc.direction)))
++    //  builder.addToken = buildTokenBadBidi(builder.addToken, order)
+     builder.map = []
+     let allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line)
+diff -NarU2 CodeMirror-orig/src/measurement/position_measurement.js CodeMirror-edit/src/measurement/position_measurement.js
+--- CodeMirror-orig/src/measurement/position_measurement.js	2020-04-21 12:47:20.000000000 +0200
++++ CodeMirror-edit/src/measurement/position_measurement.js	2020-05-02 03:35:20.674159600 +0200
+@@ -380,5 +380,6 @@
+     sticky = "after"
+   }
+-  if (!order) return get(sticky == "before" ? ch - 1 : ch, sticky == "before")
++  /*if (!order)*/ return get(sticky == "before" ? ch - 1 : ch, sticky == "before")
++  /*
+ 
+   function getBidi(ch, partPos, invert) {
+@@ -391,4 +392,5 @@
+   if (other != null) val.other = getBidi(ch, other, sticky != "before")
+   return val
++  */
+ }
+ 
+@@ -468,4 +470,5 @@
+   let begin = 0, end = lineObj.text.length, ltr = true
+ 
++  /*
+   let order = getOrder(lineObj, cm.doc.direction)
+   // If the line isn't plain left-to-right text, first figure out
+@@ -482,4 +485,5 @@
+     end = ltr ? part.to : part.from - 1
+   }
++  */
+ 
+   // A binary search to find the first character whose bounding box
+@@ -526,4 +530,5 @@
+ }
+ 
++/*
+ function coordsBidiPart(cm, lineObj, lineNo, preparedMeasure, order, x, y) {
+   // Bidi parts are sorted left-to-right, and in a non-line-wrapping
+@@ -580,4 +585,5 @@
+   return part
+ }
++*/
+ 
+ let measureText
+diff -NarU2 CodeMirror-orig/src/util/bidi.js CodeMirror-edit/src/util/bidi.js
+--- CodeMirror-orig/src/util/bidi.js	2020-04-21 12:47:20.000000000 +0200
++++ CodeMirror-edit/src/util/bidi.js	2020-05-02 03:12:44.418649800 +0200
+@@ -4,5 +4,5 @@
+ 
+ export function iterateBidiSections(order, from, to, f) {
+-  if (!order) return f(from, to, "ltr", 0)
++  /*if (!order)*/ return f(from, to, "ltr", 0) /*
+   let found = false
+   for (let i = 0; i < order.length; ++i) {
+@@ -14,4 +14,5 @@
+   }
+   if (!found) f(from, to, "ltr")
++*/
+ }
+ 
+@@ -32,5 +33,7 @@
+     }
+   }
+-  return found != null ? found : bidiOther
++  var ret = found != null ? found : bidiOther
++  console.log("getBidiPartAt(%s,%s,%s) => [%s]", order, ch, sticky, ret)
++  return ret
+ }
+ 
+@@ -55,4 +58,7 @@
+ // N (ON):  Other Neutrals
+ 
++let bidiOrdering = (function() { return function(str, direction) { return false; }})();
++/*
++
+ // Returns null if characters are ordered as they appear
+ // (left-to-right), or an array of sections ({from, to, level}
+@@ -81,5 +87,5 @@
+   }
+ 
+-  return function(str, direction) {
++  var fun = function(str, direction) {
+     let outerType = direction == "ltr" ? "L" : "R"
+ 
+@@ -204,12 +210,16 @@
+     return direction == "rtl" ? order.reverse() : order
+   }
+-})()
+ 
++  return function(str, direction) {
++    var ret = fun(str, direction);
++    console.log("bidiOrdering inner ([%s], %s) => [%s]", str, direction, ret);
++    return ret;
++  }
++})()
++*/
+ // Get the bidi ordering for the given line (and cache it). Returns
+ // false for lines that are fully left-to-right, and an array of
+ // BidiSpan objects otherwise.
+ export function getOrder(line, direction) {
+-  let order = line.order
+-  if (order == null) order = line.order = bidiOrdering(line.text, direction)
+-  return order
++  return false;
+ }
+diff -NarU2 CodeMirror-orig/src/util/feature_detection.js CodeMirror-edit/src/util/feature_detection.js
+--- CodeMirror-orig/src/util/feature_detection.js	2020-04-21 12:47:20.000000000 +0200
++++ CodeMirror-edit/src/util/feature_detection.js	2020-05-02 03:16:21.085621400 +0200
+@@ -25,4 +25,5 @@
+ }
+ 
++/*
+ // Feature-detect IE's crummy client rect reporting for bidi text
+ let badBidiRects
+@@ -36,4 +37,5 @@
+   return badBidiRects = (r1.right - r0.right < 3)
+ }
++*/
+ 
+ // See if "".split is the broken IE version, if so, provide an

scripts/deps-docker/easymde-ln.patch

@@ -0,0 +1,95 @@
+diff -NarU2 easymde-mod1/src/js/easymde.js easymde-edit/src/js/easymde.js
+--- easymde-mod1/src/js/easymde.js	2020-05-01 14:34:19.878774400 +0200
++++ easymde-edit/src/js/easymde.js	2020-05-01 21:24:44.142611200 +0200
+@@ -2189,4 +2189,5 @@
+ };
+ 
++
+ EasyMDE.prototype.createSideBySide = function () {
+     var cm = this.codemirror;
+@@ -2223,12 +2224,80 @@
+         }
+         pScroll = true;
+-        var height = v.getScrollInfo().height - v.getScrollInfo().clientHeight;
+-        var ratio = parseFloat(v.getScrollInfo().top) / height;
+-        var move = (preview.scrollHeight - preview.clientHeight) * ratio;
+-        preview.scrollTop = move;
++        var md_vp = v.getScrollInfo();
++        // viewport top: top
++        // viewport size: clientHeight
++        // document size: height
++        var md_scroll_y = md_vp.top + md_vp.clientHeight / 2;
++        var md_center_n = cm.lineAtHeight(md_scroll_y, 'local') + 1;
++        var md_next_n = md_center_n;
++        var md_top = cm.heightAtLine(md_center_n - 1, 'local');
++        while (md_next_n < cm.lineCount())
++            if (cm.getLine(md_next_n++).replace(/\s+/g, '').length > 0)
++                break;
++        var md_end = cm.heightAtLine(md_next_n - 1, 'local');
++        var md_frac = (md_scroll_y - md_top) * 1.0 / (md_end - md_top);
++        var get_pre_line = function(line_n, increase) {
++            var end = 0;
++            var step = -1;
++            if (increase) {
++                step = 1;
++                end = line_n + 1000;
++            }
++            // there might be multiple elements in the marked.js output,
++            // take the element with the biggest height
++            var biggest = -1;
++            var line_dom = null;
++            for (; line_n != end; line_n += step) {
++                var hits = document.querySelectorAll('.editor-preview-side *[data-ln=\'' + line_n + '\']');
++                for (var i = 0; i < hits.length; i++) {
++                    var hit_size = hits[i].offsetHeight;
++                    if (biggest < hit_size) {
++                        biggest = hit_size;
++                        line_dom = hits[i];
++                    }
++                }
++                if (line_dom) {
++                    var ret_y = 0;
++                    var el = line_dom;
++                    while (el && (el.getAttribute('class') + '').indexOf('editor-preview-side') < 0) {
++                        ret_y += el.offsetTop;
++                        el = el.offsetParent;
++                    }
++                    return [line_n, line_dom, ret_y];
++                }
++            }
++            return null;
++        };
++        var pre1 = get_pre_line(md_center_n, false);
++        var pre2 = get_pre_line(pre1[0] + 1, true) ||
++            [cm.lineCount(), null, preview.scrollHeight];
++        
++        //console.log('code-center %d, frac %.2f, pre [%d,%d] [%d,%d]',
++        //    md_center_n, md_frac, pre1[0], pre1[2], pre2[0], pre2[2]);
++        
++        // [0] is the markdown line which matches that preview y-pos
++        // and since not all preview lines are tagged with a line-number
++        // take the lineno diff and divide it by the distance
++        var pre_frac = md_frac / ((pre2[0] - pre1[0]) / (md_next_n - md_center_n));
++
++        // then use that fraction for the scroll offset
++        var pre_y = pre1[2] + (pre2[2] - pre1[2]) * pre_frac;
++
++        // unless we couldn't match the markdown line exactly to any preview line
++        if (md_center_n > pre1[0] && md_center_n < pre2[0])
++            pre_y = pre2[2];
++
++        // except jump to the top or bottom if we're close enough
++        if (md_vp.top < 32)
++            pre_y = 0;
++        else if (md_vp.top + 32 >= md_vp.height - md_vp.clientHeight)
++            pre_y = preview.scrollHeight;
++
++        preview.scrollTop = pre_y - preview.clientHeight / 2;
+     });
+ 
+     // Syncs scroll  preview -> editor
+-    preview.onscroll = function () {
++    // disabled since it should be possible to intentionally unsync
++    preview.onscroll_fgsfds = function () {
+         if (pScroll) {
+             pScroll = false;

scripts/deps-docker/easymde.patch

@@ -0,0 +1,52 @@
+diff -NarU2 easymde-orig/gulpfile.js easymde-mod1/gulpfile.js
+--- easymde-orig/gulpfile.js	2020-04-06 14:09:36.000000000 +0200
++++ easymde-mod1/gulpfile.js	2020-05-01 14:33:52.260175200 +0200
+@@ -25,5 +25,4 @@
+     './node_modules/codemirror/lib/codemirror.css',
+     './src/css/*.css',
+-    './node_modules/codemirror-spell-checker/src/css/spell-checker.css',
+ ];
+ 
+diff -NarU2 easymde-orig/package.json easymde-mod1/package.json
+--- easymde-orig/package.json	2020-04-06 14:09:36.000000000 +0200
++++ easymde-mod1/package.json	2020-05-01 14:33:57.189975800 +0200
+@@ -21,5 +21,4 @@
+     "dependencies": {
+         "codemirror": "^5.52.2",
+-        "codemirror-spell-checker": "1.1.2",
+         "marked": "^0.8.2"
+     },
+diff -NarU2 easymde-orig/src/js/easymde.js easymde-mod1/src/js/easymde.js
+--- easymde-orig/src/js/easymde.js	2020-04-06 14:09:36.000000000 +0200
++++ easymde-mod1/src/js/easymde.js	2020-05-01 14:34:19.878774400 +0200
+@@ -11,5 +11,4 @@
+ require('codemirror/mode/gfm/gfm.js');
+ require('codemirror/mode/xml/xml.js');
+-var CodeMirrorSpellChecker = require('codemirror-spell-checker');
+ var marked = require('marked/lib/marked');
+ 
+@@ -1889,18 +1888,7 @@
+ 
+     var mode, backdrop;
+-    if (options.spellChecker !== false) {
+-        mode = 'spell-checker';
+-        backdrop = options.parsingConfig;
+-        backdrop.name = 'gfm';
+-        backdrop.gitHubSpice = false;
+-
+-        CodeMirrorSpellChecker({
+-            codeMirrorInstance: CodeMirror,
+-        });
+-    } else {
+         mode = options.parsingConfig;
+         mode.name = 'gfm';
+         mode.gitHubSpice = false;
+-    }
+ 
+     // eslint-disable-next-line no-unused-vars
+@@ -1927,5 +1915,4 @@
+         configureMouse: configureMouse,
+         inputStyle: (options.inputStyle != undefined) ? options.inputStyle : isMobile() ? 'contenteditable' : 'textarea',
+-        spellcheck: (options.nativeSpellcheck != undefined) ? options.nativeSpellcheck : true,
+     });
+ 

scripts/deps-docker/markdown-it.patch

@@ -0,0 +1,10 @@
+diff -NarU1 markdown-it-10.0.0-orig/lib/common/entities.js markdown-it-10.0.0-edit/lib/common/entities.js
+--- markdown-it-10.0.0-orig/lib/common/entities.js	2019-09-10 21:39:58.000000000 +0000
++++ markdown-it-10.0.0-edit/lib/common/entities.js	2020-04-26 10:24:33.043023331 +0000
+@@ -5,2 +5,5 @@
+ /*eslint quotes:0*/
+-module.exports = require('entities/lib/maps/entities.json');
++//module.exports = require('entities/lib/maps/entities.json');
++module.exports = {
++    "amp": "&", "quot": "\"", "gt": ">", "lt": "<"
++}

scripts/deps-docker/marked-ln.patch

@@ -0,0 +1,298 @@
+diff --git a/src/Lexer.js b/src/Lexer.js
+adds linetracking to marked.js v1.0.0 +git;
+add data-ln="%d" to most tags, %d is the source markdown line
+--- a/src/Lexer.js
++++ b/src/Lexer.js
+@@ -49,4 +49,5 @@ function mangle(text) {
+ module.exports = class Lexer {
+   constructor(options) {
++    this.ln = 1;  // like most editors, start couting from 1
+     this.tokens = [];
+     this.tokens.links = Object.create(null);
+@@ -108,4 +109,15 @@ module.exports = class Lexer {
+   }
+ 
++  set_ln(token, ln = this.ln) {
++    // assigns ln (the current line numer) to the token,
++    // then bump this.ln by the number of newlines in the contents
++    //
++    // if ln is set, also assigns the line counter to a new value
++    // (usually a backup value from before a call into a subparser
++    //  which bumped the linecounter by a subset of the newlines)
++    token.ln = ln;
++    this.ln = ln + (token.raw.match(/\n/g) || []).length;
++  }
++
+   /**
+    * Lexing
+@@ -113,10 +125,15 @@ module.exports = class Lexer {
+   blockTokens(src, tokens = [], top = true) {
+     src = src.replace(/^ +$/gm, '');
+-    let token, i, l, lastToken;
++    let token, i, l, lastToken, ln;
+ 
+     while (src) {
++      // this.ln will be bumped by recursive calls into this func;
++      // reset the count and rely on the outermost token's raw only
++      ln = this.ln;
++      
+       // newline
+       if (token = this.tokenizer.space(src)) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token); // is \n if not type
+         if (token.type) {
+           tokens.push(token);
+@@ -128,4 +145,5 @@ module.exports = class Lexer {
+       if (token = this.tokenizer.code(src, tokens)) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token);
+         if (token.type) {
+           tokens.push(token);
+@@ -141,4 +159,5 @@ module.exports = class Lexer {
+       if (token = this.tokenizer.fences(src)) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token);
+         tokens.push(token);
+         continue;
+@@ -148,4 +167,5 @@ module.exports = class Lexer {
+       if (token = this.tokenizer.heading(src)) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token);
+         tokens.push(token);
+         continue;
+@@ -155,4 +175,5 @@ module.exports = class Lexer {
+       if (token = this.tokenizer.nptable(src)) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token);
+         tokens.push(token);
+         continue;
+@@ -162,4 +183,5 @@ module.exports = class Lexer {
+       if (token = this.tokenizer.hr(src)) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token);
+         tokens.push(token);
+         continue;
+@@ -170,4 +192,7 @@ module.exports = class Lexer {
+         src = src.substring(token.raw.length);
+         token.tokens = this.blockTokens(token.text, [], top);
++        // recursive call to blockTokens probably bumped this.ln,
++        // token.raw is more reliable so reset this.ln and use that
++        this.set_ln(token, ln);
+         tokens.push(token);
+         continue;
+@@ -180,5 +205,9 @@ module.exports = class Lexer {
+         for (i = 0; i < l; i++) {
+           token.items[i].tokens = this.blockTokens(token.items[i].text, [], false);
++          // list entries don't bump the linecounter, so let's
++          this.ln++;
+         }
++        // then reset like blockquote
++        this.set_ln(token, ln);
+         tokens.push(token);
+         continue;
+@@ -188,4 +217,5 @@ module.exports = class Lexer {
+       if (token = this.tokenizer.html(src)) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token);
+         tokens.push(token);
+         continue;
+@@ -195,4 +225,5 @@ module.exports = class Lexer {
+       if (top && (token = this.tokenizer.def(src))) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token);
+         if (!this.tokens.links[token.tag]) {
+           this.tokens.links[token.tag] = {
+@@ -207,4 +238,5 @@ module.exports = class Lexer {
+       if (token = this.tokenizer.table(src)) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token);
+         tokens.push(token);
+         continue;
+@@ -214,4 +246,5 @@ module.exports = class Lexer {
+       if (token = this.tokenizer.lheading(src)) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token);
+         tokens.push(token);
+         continue;
+@@ -221,4 +254,5 @@ module.exports = class Lexer {
+       if (top && (token = this.tokenizer.paragraph(src))) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token);
+         tokens.push(token);
+         continue;
+@@ -228,4 +262,5 @@ module.exports = class Lexer {
+       if (token = this.tokenizer.text(src, tokens)) {
+         src = src.substring(token.raw.length);
++        this.set_ln(token);
+         if (token.type) {
+           tokens.push(token);
+@@ -263,4 +298,7 @@ module.exports = class Lexer {
+     for (i = 0; i < l; i++) {
+       token = tokens[i];
++      // this.ln is at EOF when inline() is invoked;
++      // all this affects <br> tags only so no biggie if it breaks
++      this.ln = token.ln || this.ln;
+       switch (token.type) {
+         case 'paragraph':
+@@ -386,4 +424,6 @@ module.exports = class Lexer {
+       if (token = this.tokenizer.br(src)) {
+         src = src.substring(token.raw.length);
++        // no need to reset (no more blockTokens anyways)
++        token.ln = this.ln++;
+         tokens.push(token);
+         continue;
+diff --git a/src/Parser.js b/src/Parser.js
+--- a/src/Parser.js
++++ b/src/Parser.js
+@@ -18,4 +18,5 @@ module.exports = class Parser {
+     this.textRenderer = new TextRenderer();
+     this.slugger = new Slugger();
++    this.ln = 0; // error indicator; should always be set >=1 from tokens
+   }
+ 
+@@ -55,4 +56,9 @@ module.exports = class Parser {
+     for (i = 0; i < l; i++) {
+       token = tokens[i];
++      // take line-numbers from tokens whenever possible
++      // and update the renderer's html attribute with the new value
++      this.ln = token.ln || this.ln;
++      this.renderer.tag_ln(this.ln);
++
+       switch (token.type) {
+         case 'space': {
+@@ -105,7 +111,10 @@ module.exports = class Parser {
+             }
+ 
+-            body += this.renderer.tablerow(cell);
++            // the +2 is to skip the table header
++            body += this.renderer.tag_ln(token.ln + j + 2).tablerow(cell);
+           }
+-          out += this.renderer.table(header, body);
++          // the html attribute is now at the end of the table,
++          // reset it before writing the <table> tag now
++          out += this.renderer.tag_ln(token.ln).table(header, body);
+           continue;
+         }
+@@ -148,8 +157,12 @@ module.exports = class Parser {
+ 
+             itemBody += this.parse(item.tokens, loose);
+-            body += this.renderer.listitem(itemBody, task, checked);
++            // similar to tables, writing contents before the <ul> tag
++            // so update the tag attribute as we go
++            // (assuming all list entries got tagged with a source-line, probably safe w)
++            body += this.renderer.tag_ln(item.tokens[0].ln).listitem(itemBody, task, checked);
+           }
+ 
+-          out += this.renderer.list(body, ordered, start);
++          // then reset to the <ul>'s correct line number and write it
++          out += this.renderer.tag_ln(token.ln).list(body, ordered, start);
+           continue;
+         }
+@@ -160,5 +173,6 @@ module.exports = class Parser {
+         }
+         case 'paragraph': {
+-          out += this.renderer.paragraph(this.parseInline(token.tokens));
++          let t = this.parseInline(token.tokens);
++          out += this.renderer.tag_ln(token.ln).paragraph(t);
+           continue;
+         }
+@@ -199,4 +213,6 @@ module.exports = class Parser {
+     for (i = 0; i < l; i++) {
+       token = tokens[i];
++      // another thing that only affects <br/> and other inlines
++      this.ln = token.ln || this.ln;
+       switch (token.type) {
+         case 'escape': {
+@@ -229,5 +245,7 @@ module.exports = class Parser {
+         }
+         case 'br': {
+-          out += renderer.br();
++          // update the html attribute before writing each <br/>,
++          // don't care about the others
++          out += renderer.tag_ln(this.ln).br();
+           break;
+         }
+diff --git a/src/Renderer.js b/src/Renderer.js
+--- a/src/Renderer.js
++++ b/src/Renderer.js
+@@ -11,6 +11,12 @@ module.exports = class Renderer {
+   constructor(options) {
+     this.options = options || defaults;
++    this.ln = "";
+   }
+ 
++  tag_ln(n) {
++    this.ln = ' data-ln="' + n + '"';
++    return this;
++  };
++  
+   code(code, infostring, escaped) {
+     const lang = (infostring || '').match(/\S*/)[0];
+@@ -24,10 +30,10 @@ module.exports = class Renderer {
+ 
+     if (!lang) {
+-      return '<pre><code>'
++      return '<pre' + this.ln + '><code>'
+         + (escaped ? code : escape(code, true))
+         + '</code></pre>';
+     }
+ 
+-    return '<pre><code class="'
++    return '<pre' + this.ln + '><code class="'
+       + this.options.langPrefix
+       + escape(lang, true)
+@@ -38,5 +44,5 @@ module.exports = class Renderer {
+ 
+   blockquote(quote) {
+-    return '<blockquote>\n' + quote + '</blockquote>\n';
++    return '<blockquote' + this.ln + '>\n' + quote + '</blockquote>\n';
+   }
+ 
+@@ -49,4 +55,5 @@ module.exports = class Renderer {
+       return '<h'
+         + level
++        + this.ln
+         + ' id="'
+         + this.options.headerPrefix
+@@ -59,5 +66,5 @@ module.exports = class Renderer {
+     }
+     // ignore IDs
+-    return '<h' + level + '>' + text + '</h' + level + '>\n';
++    return '<h' + level + this.ln + '>' + text + '</h' + level + '>\n';
+   }
+ 
+@@ -73,5 +80,5 @@ module.exports = class Renderer {
+ 
+   listitem(text) {
+-    return '<li>' + text + '</li>\n';
++    return '<li' + this.ln + '>' + text + '</li>\n';
+   }
+ 
+@@ -85,5 +92,5 @@ module.exports = class Renderer {
+ 
+   paragraph(text) {
+-    return '<p>' + text + '</p>\n';
++    return '<p' + this.ln + '>' + text + '</p>\n';
+   }
+ 
+@@ -100,5 +107,5 @@ module.exports = class Renderer {
+ 
+   tablerow(content) {
+-    return '<tr>\n' + content + '</tr>\n';
++    return '<tr' + this.ln + '>\n' + content + '</tr>\n';
+   }
+ 
+@@ -125,5 +132,5 @@ module.exports = class Renderer {
+ 
+   br() {
+-    return this.options.xhtml ? '<br/>' : '<br>';
++    return this.options.xhtml ? '<br' + this.ln + '/>' : '<br' + this.ln + '>';
+   }
+ 
+@@ -151,5 +158,5 @@ module.exports = class Renderer {
+     }
+ 
+-    let out = '<img src="' + href + '" alt="' + text + '"';
++    let out = '<img' + this.ln + ' src="' + href + '" alt="' + text + '"';
+     if (title) {
+       out += ' title="' + title + '"';

scripts/deps-docker/marked.patch

@@ -0,0 +1,269 @@
+diff -NarU1 marked-1.0.0-orig/src/defaults.js marked-1.0.0-edit/src/defaults.js
+--- marked-1.0.0-orig/src/defaults.js	2020-04-21 01:03:48.000000000 +0000
++++ marked-1.0.0-edit/src/defaults.js	2020-04-25 19:16:56.124621393 +0000
+@@ -9,10 +9,6 @@
+     langPrefix: 'language-',
+-    mangle: true,
+     pedantic: false,
+     renderer: null,
+-    sanitize: false,
+-    sanitizer: null,
+     silent: false,
+     smartLists: false,
+-    smartypants: false,
+     tokenizer: null,
+diff -NarU1 marked-1.0.0-orig/src/helpers.js marked-1.0.0-edit/src/helpers.js
+--- marked-1.0.0-orig/src/helpers.js	2020-04-21 01:03:48.000000000 +0000
++++ marked-1.0.0-edit/src/helpers.js	2020-04-25 18:58:43.001320210 +0000
+@@ -65,16 +65,3 @@
+ const originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
+-function cleanUrl(sanitize, base, href) {
+-  if (sanitize) {
+-    let prot;
+-    try {
+-      prot = decodeURIComponent(unescape(href))
+-        .replace(nonWordAndColonTest, '')
+-        .toLowerCase();
+-    } catch (e) {
+-      return null;
+-    }
+-    if (prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
+-      return null;
+-    }
+-  }
++function cleanUrl(base, href) {
+   if (base && !originIndependentUrl.test(href)) {
+@@ -224,8 +211,2 @@
+ 
+-function checkSanitizeDeprecation(opt) {
+-  if (opt && opt.sanitize && !opt.silent) {
+-    console.warn('marked(): sanitize and sanitizer parameters are deprecated since version 0.7.0, should not be used and will be removed in the future. Read more here: https://marked.js.org/#/USING_ADVANCED.md#options');
+-  }
+-}
+-
+ module.exports = {
+@@ -240,4 +221,3 @@
+   rtrim,
+-  findClosingBracket,
+-  checkSanitizeDeprecation
++  findClosingBracket
+ };
+diff -NarU1 marked-1.0.0-orig/src/Lexer.js marked-1.0.0-edit/src/Lexer.js
+--- marked-1.0.0-orig/src/Lexer.js	2020-04-21 01:03:48.000000000 +0000
++++ marked-1.0.0-edit/src/Lexer.js	2020-04-25 22:46:54.107584066 +0000
+@@ -6,3 +6,3 @@
+  * smartypants text replacement
+- */
++ *
+ function smartypants(text) {
+@@ -27,3 +27,3 @@
+  * mangle email addresses
+- */
++ *
+ function mangle(text) {
+@@ -388,3 +388,3 @@
+       // autolink
+-      if (token = this.tokenizer.autolink(src, mangle)) {
++      if (token = this.tokenizer.autolink(src)) {
+         src = src.substring(token.raw.length);
+@@ -395,3 +395,3 @@
+       // url (gfm)
+-      if (!inLink && (token = this.tokenizer.url(src, mangle))) {
++      if (!inLink && (token = this.tokenizer.url(src))) {
+         src = src.substring(token.raw.length);
+@@ -402,3 +402,3 @@
+       // text
+-      if (token = this.tokenizer.inlineText(src, inRawBlock, smartypants)) {
++      if (token = this.tokenizer.inlineText(src, inRawBlock)) {
+         src = src.substring(token.raw.length);
+diff -NarU1 marked-1.0.0-orig/src/marked.js marked-1.0.0-edit/src/marked.js
+--- marked-1.0.0-orig/src/marked.js	2020-04-21 01:03:48.000000000 +0000
++++ marked-1.0.0-edit/src/marked.js	2020-04-25 22:42:55.140924439 +0000
+@@ -8,3 +8,2 @@
+   merge,
+-  checkSanitizeDeprecation,
+   escape
+@@ -37,3 +36,2 @@
+     opt = merge({}, marked.defaults, opt || {});
+-    checkSanitizeDeprecation(opt);
+     const highlight = opt.highlight;
+@@ -101,6 +99,5 @@
+     opt = merge({}, marked.defaults, opt || {});
+-    checkSanitizeDeprecation(opt);
+     return Parser.parse(Lexer.lex(src, opt), opt);
+   } catch (e) {
+-    e.message += '\nPlease report this to https://github.com/markedjs/marked.';
++    e.message += '\nmake issue @ https://github.com/9001/copyparty';
+     if ((opt || marked.defaults).silent) {
+diff -NarU1 marked-1.0.0-orig/src/Renderer.js marked-1.0.0-edit/src/Renderer.js
+--- marked-1.0.0-orig/src/Renderer.js	2020-04-21 01:03:48.000000000 +0000
++++ marked-1.0.0-edit/src/Renderer.js	2020-04-25 18:59:15.091319265 +0000
+@@ -134,3 +134,3 @@
+   link(href, title, text) {
+-    href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
++    href = cleanUrl(this.options.baseUrl, href);
+     if (href === null) {
+@@ -147,3 +147,3 @@
+   image(href, title, text) {
+-    href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
++    href = cleanUrl(this.options.baseUrl, href);
+     if (href === null) {
+diff -NarU1 marked-1.0.0-orig/src/Tokenizer.js marked-1.0.0-edit/src/Tokenizer.js
+--- marked-1.0.0-orig/src/Tokenizer.js	2020-04-21 01:03:48.000000000 +0000
++++ marked-1.0.0-edit/src/Tokenizer.js	2020-04-25 22:47:07.610917004 +0000
+@@ -256,9 +256,6 @@
+       return {
+-        type: this.options.sanitize
+-          ? 'paragraph'
+-          : 'html',
+-        raw: cap[0],
+-        pre: !this.options.sanitizer
+-          && (cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style'),
+-        text: this.options.sanitize ? (this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0])) : cap[0]
++        type: 'html',
++        raw: cap[0],
++        pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style',
++        text: cap[0]
+       };
+@@ -382,5 +379,3 @@
+       return {
+-        type: this.options.sanitize
+-          ? 'text'
+-          : 'html',
++        type: 'html',
+         raw: cap[0],
+@@ -388,7 +383,3 @@
+         inRawBlock,
+-        text: this.options.sanitize
+-          ? (this.options.sanitizer
+-            ? this.options.sanitizer(cap[0])
+-            : escape(cap[0]))
+-          : cap[0]
++        text: cap[0]
+       };
+@@ -504,3 +495,3 @@
+ 
+-  autolink(src, mangle) {
++  autolink(src) {
+     const cap = this.rules.inline.autolink.exec(src);
+@@ -509,3 +500,3 @@
+       if (cap[2] === '@') {
+-        text = escape(this.options.mangle ? mangle(cap[1]) : cap[1]);
++        text = escape(cap[1]);
+         href = 'mailto:' + text;
+@@ -532,3 +523,3 @@
+ 
+-  url(src, mangle) {
++  url(src) {
+     let cap;
+@@ -537,3 +528,3 @@
+       if (cap[2] === '@') {
+-        text = escape(this.options.mangle ? mangle(cap[0]) : cap[0]);
++        text = escape(cap[0]);
+         href = 'mailto:' + text;
+@@ -569,3 +560,3 @@
+ 
+-  inlineText(src, inRawBlock, smartypants) {
++  inlineText(src, inRawBlock) {
+     const cap = this.rules.inline.text.exec(src);
+@@ -574,5 +565,5 @@
+       if (inRawBlock) {
+-        text = this.options.sanitize ? (this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0])) : cap[0];
++        text = cap[0];
+       } else {
+-        text = escape(this.options.smartypants ? smartypants(cap[0]) : cap[0]);
++        text = escape(cap[0]);
+       }
+diff -NarU1 marked-1.0.0-orig/test/bench.js marked-1.0.0-edit/test/bench.js
+--- marked-1.0.0-orig/test/bench.js	2020-04-21 01:03:48.000000000 +0000
++++ marked-1.0.0-edit/test/bench.js	2020-04-25 19:02:27.227980287 +0000
+@@ -34,3 +34,2 @@
+     pedantic: false,
+-    sanitize: false,
+     smartLists: false
+@@ -46,3 +45,2 @@
+     pedantic: false,
+-    sanitize: false,
+     smartLists: false
+@@ -59,3 +57,2 @@
+     pedantic: false,
+-    sanitize: false,
+     smartLists: false
+@@ -71,3 +68,2 @@
+     pedantic: false,
+-    sanitize: false,
+     smartLists: false
+@@ -84,3 +80,2 @@
+     pedantic: true,
+-    sanitize: false,
+     smartLists: false
+@@ -96,3 +91,2 @@
+     pedantic: true,
+-    sanitize: false,
+     smartLists: false
+diff -NarU1 marked-1.0.0-orig/test/specs/run-spec.js marked-1.0.0-edit/test/specs/run-spec.js
+--- marked-1.0.0-orig/test/specs/run-spec.js	2020-04-21 01:03:48.000000000 +0000
++++ marked-1.0.0-edit/test/specs/run-spec.js	2020-04-25 19:05:24.321308408 +0000
+@@ -21,6 +21,2 @@
+           }
+-          if (spec.options.sanitizer) {
+-            // eslint-disable-next-line no-eval
+-            spec.options.sanitizer = eval(spec.options.sanitizer);
+-          }
+           (spec.only ? fit : (spec.skip ? xit : it))('should ' + passFail + example, async() => {
+@@ -49,2 +45 @@
+ runSpecs('ReDOS', './redos');
+-runSpecs('Security', './security', false, { silent: true }); // silent - do not show deprecation warning
+diff -NarU1 marked-1.0.0-orig/test/unit/Lexer-spec.js marked-1.0.0-edit/test/unit/Lexer-spec.js
+--- marked-1.0.0-orig/test/unit/Lexer-spec.js	2020-04-21 01:03:48.000000000 +0000
++++ marked-1.0.0-edit/test/unit/Lexer-spec.js	2020-04-25 22:47:27.170916427 +0000
+@@ -464,3 +464,3 @@
+ 
+-    it('sanitize', () => {
++    /*it('sanitize', () => {
+       expectTokens({
+@@ -482,3 +482,3 @@
+       });
+-    });
++    });*/
+   });
+@@ -586,3 +586,3 @@
+ 
+-      it('html sanitize', () => {
++      /*it('html sanitize', () => {
+         expectInlineTokens({
+@@ -596,3 +596,3 @@
+         });
+-      });
++      });*/
+ 
+@@ -825,3 +825,3 @@
+ 
+-        it('autolink mangle email', () => {
++        /*it('autolink mangle email', () => {
+           expectInlineTokens({
+@@ -845,3 +845,3 @@
+           });
+-        });
++        });*/
+ 
+@@ -882,3 +882,3 @@
+ 
+-        it('url mangle email', () => {
++        /*it('url mangle email', () => {
+           expectInlineTokens({
+@@ -902,3 +902,3 @@
+           });
+-        });
++        });*/
+       });
+@@ -918,3 +918,3 @@
+ 
+-      describe('smartypants', () => {
++      /*describe('smartypants', () => {
+         it('single quotes', () => {
+@@ -988,3 +988,3 @@
+         });
+-      });
++      });*/
+     });

scripts/deps-docker/mini-fa.css

@@ -0,0 +1,53 @@
+
+/*
+that was the original copyright ^
+now here's a tiny subset of fontawesome
+*/
+
+@font-face {
+font-family: 'fa';
+font-style: normal;
+font-weight: 400;
+font-display: block;
+src: url("/.cpr/deps/mini-fa.woff") format("woff");
+}
+
+.fa,
+.fas,
+.far,
+.fal,
+.fad,
+.fab {
+-moz-osx-font-smoothing: grayscale;
+-webkit-font-smoothing: antialiased;
+display: inline-block;
+font-style: normal;
+font-variant: normal;
+text-rendering: auto;
+line-height: 1;
+font-family: 'fa';
+font-weight: 400;
+}
+
+:add
+arrows-alt
+bold
+code
+columns
+eraser
+eye
+heading
+image
+italic
+lightbulb
+link
+list-ol
+list-ul
+minus
+question-circle
+quote-left
+redo
+save
+strikethrough
+table
+undo

scripts/deps-docker/mini-fa.sh

@@ -0,0 +1,28 @@
+#!/bin/ash
+set -e
+
+orig_css="$(find /z/fontawesome-fre* -name fontawesome.css | head -n 1)"
+orig_woff="$(find /z/fontawesome-fre* -name fa-solid-900.woff | head -n 1)"
+
+# first grab the copyright meme
+awk '1; / *\*\// {exit}' <"$orig_css" >/z/dist/mini-fa.css
+
+# then add the static part of our css template
+awk '/^:add/ {exit} 1' </z/mini-fa.css >>/z/dist/mini-fa.css
+
+# then take the list of icons to include
+awk 'o; /^:add/ {o=1}' </z/mini-fa.css |
+while IFS= read -r g; do
+    # and grab them from the upstream css
+    awk 'o{gsub(/[ ;]+/,"");print;exit} /^\.fa-'$g':before/ {o=1;printf "%s",$0}' <"$orig_css"
+done >>/z/dist/mini-fa.css
+
+# expecting this input btw:
+# .fa-python:before {
+#  content: "\f3e2"; }
+
+# get the codepoints (should produce lines like "f3e2")
+awk '/:before .content:"\\/ {sub(/[^"]+"./,""); sub(/".*/,""); print}' </z/dist/mini-fa.css >/z/icon.list
+
+# and finally create a woff with just our icons
+pyftsubset "$orig_woff" --unicodes-file=/z/icon.list --no-ignore-missing-unicodes --flavor=woff --with-zopfli --output-file=/z/dist/no-pk/mini-fa.woff --verbose

scripts/deps-docker/showdown.patch

@@ -0,0 +1,214 @@
+diff -NarU1 showdown-orig/Gruntfile.js showdown-mod/Gruntfile.js
+--- showdown-orig/Gruntfile.js	2020-04-23 06:22:01.486676149 +0000
++++ showdown-mod/Gruntfile.js	2020-04-23 08:03:56.700219788 +0000
+@@ -27,3 +27,2 @@
+           'src/subParsers/*.js',
+-          'src/subParsers/makeMarkdown/*.js',
+           'src/loader.js'
+diff -NarU1 showdown-orig/src/converter.js showdown-mod/src/converter.js
+--- showdown-orig/src/converter.js	2020-04-23 06:22:01.496676150 +0000
++++ showdown-mod/src/converter.js	2020-04-23 08:20:11.056920123 +0000
+@@ -84,5 +84,5 @@
+ 
+-    if (options.extensions) {
++    /*if (options.extensions) {
+       showdown.helper.forEach(options.extensions, _parseExtension);
+-    }
++    }*/
+   }
+@@ -95,3 +95,3 @@
+    */
+-  function _parseExtension (ext, name) {
++  /*function _parseExtension (ext, name) {
+ 
+@@ -159,3 +159,3 @@
+    */
+-  function legacyExtensionLoading (ext, name) {
++  /*function legacyExtensionLoading (ext, name) {
+     if (typeof ext === 'function') {
+@@ -351,3 +351,3 @@
+    */
+-  this.makeMarkdown = this.makeMd = function (src, HTMLParser) {
++  /*this.makeMarkdown = this.makeMd = function (src, HTMLParser) {
+ 
+@@ -482,3 +482,3 @@
+    */
+-  this.addExtension = function (extension, name) {
++  /*this.addExtension = function (extension, name) {
+     name = name || null;
+@@ -491,3 +491,3 @@
+    */
+-  this.useExtension = function (extensionName) {
++  /*this.useExtension = function (extensionName) {
+     _parseExtension(extensionName);
+@@ -526,3 +526,3 @@
+    */
+-  this.removeExtension = function (extension) {
++  /*this.removeExtension = function (extension) {
+     if (!showdown.helper.isArray(extension)) {
+@@ -549,3 +549,3 @@
+    */
+-  this.getAllExtensions = function () {
++  /*this.getAllExtensions = function () {
+     return {
+diff -NarU1 showdown-orig/src/options.js showdown-mod/src/options.js
+--- showdown-orig/src/options.js	2020-04-23 06:22:01.496676150 +0000
++++ showdown-mod/src/options.js	2020-04-23 08:24:29.176929018 +0000
+@@ -118,3 +118,3 @@
+     },
+-    ghMentions: {
++    /*ghMentions: {
+       defaultValue: false,
+@@ -127,3 +127,3 @@
+       type: 'string'
+-    },
++    },*/
+     encodeEmails: {
+diff -NarU1 showdown-orig/src/showdown.js showdown-mod/src/showdown.js
+--- showdown-orig/src/showdown.js	2020-04-23 06:22:01.496676150 +0000
++++ showdown-mod/src/showdown.js	2020-04-23 08:25:01.976930148 +0000
+@@ -7,3 +7,2 @@
+     parsers = {},
+-    extensions = {},
+     globalOptions = getDefaultOpts(true),
+@@ -25,5 +24,4 @@
+         ghCompatibleHeaderId:                 true,
+-        ghMentions:                           true,
++        //ghMentions:                           true,
+         backslashEscapesHTMLTags:             true,
+-        emoji:                                true,
+         splitAdjacentBlockquotes:             true
+@@ -48,3 +46,3 @@
+         requireSpaceBeforeHeadingText:        true,
+-        ghMentions:                           false,
++        //ghMentions:                           false,
+         encodeEmails:                         true
+@@ -65,3 +63,2 @@
+  */
+-showdown.extensions = {};
+ 
+@@ -193,3 +190,3 @@
+  */
+-showdown.extension = function (name, ext) {
++/*showdown.extension = function (name, ext) {
+   'use strict';
+@@ -235,3 +232,3 @@
+  */
+-showdown.getAllExtensions = function () {
++/*showdown.getAllExtensions = function () {
+   'use strict';
+@@ -244,3 +241,3 @@
+  */
+-showdown.removeExtension = function (name) {
++/*showdown.removeExtension = function (name) {
+   'use strict';
+@@ -252,3 +249,3 @@
+  */
+-showdown.resetExtensions = function () {
++/*showdown.resetExtensions = function () {
+   'use strict';
+@@ -263,3 +260,3 @@
+  */
+-function validate (extension, name) {
++/*function validate (extension, name) {
+   'use strict';
+@@ -370,3 +367,3 @@
+  */
+-showdown.validateExtension = function (ext) {
++/*showdown.validateExtension = function (ext) {
+   'use strict';
+@@ -380 +377,2 @@
+ };
++*/
+diff -NarU1 showdown-orig/src/subParsers/anchors.js showdown-mod/src/subParsers/anchors.js
+--- showdown-orig/src/subParsers/anchors.js	2020-04-23 06:22:01.496676150 +0000
++++ showdown-mod/src/subParsers/anchors.js	2020-04-23 08:25:26.880264347 +0000
+@@ -76,3 +76,3 @@
+   // Lastly handle GithubMentions if option is enabled
+-  if (options.ghMentions) {
++  /*if (options.ghMentions) {
+     text = text.replace(/(^|\s)(\\)?(@([a-z\d]+(?:[a-z\d.-]+?[a-z\d]+)*))/gmi, function (wm, st, escape, mentions, username) {
+@@ -93,3 +93,3 @@
+     });
+-  }
++  }*/
+ 
+diff -NarU1 showdown-orig/src/subParsers/spanGamut.js showdown-mod/src/subParsers/spanGamut.js
+--- showdown-orig/src/subParsers/spanGamut.js	2020-04-23 06:22:01.496676150 +0000
++++ showdown-mod/src/subParsers/spanGamut.js	2020-04-23 08:07:50.460227880 +0000
+@@ -22,3 +22,2 @@
+   text = showdown.subParser('simplifiedAutoLinks')(text, options, globals);
+-  text = showdown.subParser('emoji')(text, options, globals);
+   text = showdown.subParser('underline')(text, options, globals);
+@@ -26,3 +25,2 @@
+   text = showdown.subParser('strikethrough')(text, options, globals);
+-  text = showdown.subParser('ellipsis')(text, options, globals);
+ 
+diff -NarU1 showdown-orig/test/node/showdown.Converter.js showdown-mod/test/node/showdown.Converter.js
+--- showdown-orig/test/node/showdown.Converter.js	2020-04-23 06:22:01.520009484 +0000
++++ showdown-mod/test/node/showdown.Converter.js	2020-04-23 08:14:58.086909318 +0000
+@@ -29,3 +29,3 @@
+ 
+-  describe('Converter.options extensions', function () {
++  /*describe('Converter.options extensions', function () {
+     var runCount;
+@@ -48,3 +48,3 @@
+     });
+-  });
++  });*/
+ 
+@@ -115,3 +115,3 @@
+ 
+-  describe('extension methods', function () {
++  /*describe('extension methods', function () {
+     var extObjMock = {
+@@ -145,3 +145,3 @@
+     });
+-  });
++  });*/
+ 
+diff -NarU1 showdown-orig/test/node/showdown.js showdown-mod/test/node/showdown.js
+--- showdown-orig/test/node/showdown.js	2020-04-23 06:22:01.523342816 +0000
++++ showdown-mod/test/node/showdown.js	2020-04-23 08:14:31.733575073 +0000
+@@ -25,3 +25,3 @@
+ 
+-describe('showdown.extension()', function () {
++/*describe('showdown.extension()', function () {
+   'use strict';
+@@ -110,3 +110,3 @@
+   });
+-});
++});*/
+ 
+diff -NarU1 showdown-orig/test/node/testsuite.features.js showdown-mod/test/node/testsuite.features.js
+--- showdown-orig/test/node/testsuite.features.js	2020-04-23 06:22:01.523342816 +0000
++++ showdown-mod/test/node/testsuite.features.js	2020-04-23 08:25:48.880265106 +0000
+@@ -13,3 +13,2 @@
+     rawPrefixHeaderIdSuite = bootstrap.getTestSuite('test/features/rawPrefixHeaderId/'),
+-    emojisSuite = bootstrap.getTestSuite('test/features/emojis/'),
+     underlineSuite = bootstrap.getTestSuite('test/features/underline/'),
+@@ -69,4 +68,4 @@
+         converter = new showdown.Converter({ghCompatibleHeaderId: true});
+-      } else if (testsuite[i].name === 'ghMentions') {
+-        converter = new showdown.Converter({ghMentions: true});
++      //} else if (testsuite[i].name === 'ghMentions') {
++      //  converter = new showdown.Converter({ghMentions: true});
+       } else if (testsuite[i].name === 'disable-email-encoding') {
+@@ -185,17 +184,2 @@
+       it(suite[i].name.replace(/-/g, ' '), assertion(suite[i], converter));
+-    }
+-  });
+-
+-  /** test emojis support **/
+-  describe('emojis support', function () {
+-    var converter,
+-        suite = emojisSuite;
+-    for (var i = 0; i < suite.length; ++i) {
+-      if (suite[i].name === 'simplifiedautolinks') {
+-        converter = new showdown.Converter({emoji: true, simplifiedAutoLink: true});
+-      } else {
+-        converter = new showdown.Converter({emoji: true});
+-      }
+-
+-      it(suite[i].name.replace(/-/g, ' '), assertion(suite[i], converter));
+     }

scripts/deps-docker/zopfli.makefile

@@ -1,6 +1,10 @@
 all: $(addsuffix .gz, $(wildcard *.*))
 
 %.gz: %
+	#brotli -q 11 $<
 	pigz -11 -J 34 -I 573 $<
 
 # pigz -11 -J 34 -I 100 -F < $< > $@.first
+
+# disabling brotli after all since the gain is meh
+#   and it bloats sfx and wheels by like 70%

scripts/make-pypi-release.sh

@@ -3,9 +3,13 @@ set -e
 echo
 
 # osx support
-sed=$( which gsed  2>/dev/null || which sed)
-find=$(which gfind 2>/dev/null || which find)
-sort=$(which gsort 2>/dev/null || which sort)
+command -v gtar  >/dev/null &&
+command -v gfind >/dev/null && {
+	tar()  { gtar  "$@"; }
+	sed()  { gsed  "$@"; }
+	find() { gfind "$@"; }
+	sort() { gsort "$@"; }
+}
 
 which md5sum 2>/dev/null >/dev/null &&
 	md5sum=md5sum ||

scripts/make-sfx.sh

@@ -0,0 +1,168 @@
+#!/bin/bash
+set -e
+echo
+
+
+# optional args:
+#
+# `clean` uses files from git (everything except web/deps),
+#   so local changes won't affect the produced sfx
+#
+# `re` does a repack of an sfx which you already executed once
+#   (grabs files from the sfx-created tempdir), overrides `clean`
+#
+# `no-ogv` saves ~500k by removing the opus/vorbis audio codecs
+#   (only affects apple devices; everything else has native support)
+#
+# `no-cm` saves ~90k by removing easymde/codemirror
+#   (the fancy markdown editor)
+
+
+command -v gtar  >/dev/null &&
+command -v gfind >/dev/null && {
+	tar()  { gtar  "$@"; }
+	sed()  { gsed  "$@"; }
+	find() { gfind "$@"; }
+	sort() { gsort "$@"; }
+	unexpand() { gunexpand "$@"; }
+}
+
+[ -e copyparty/__main__.py ] || cd ..
+[ -e copyparty/__main__.py ] ||
+{
+	echo "run me from within the project root folder"
+	echo
+	exit 1
+}
+
+while [ ! -z "$1" ]; do
+	[ "$1" = clean  ] && clean=1  && shift && continue
+	[ "$1" = re     ] && repack=1 && shift && continue
+	[ "$1" = no-ogv ] && no_ogv=1 && shift && continue
+	[ "$1" = no-cm  ] && no_cm=1  && shift && continue
+	break
+done
+
+tmv() {
+	touch -r "$1" t
+	mv t "$1"
+}
+
+rm -rf sfx/*
+mkdir -p sfx build
+cd sfx
+
+[ $repack ] && {
+	old="$(
+		printf '%s\n' "$TMPDIR" /tmp |
+		awk '/./ {print; exit}'
+	)/pe-copyparty"
+
+	echo "repack of files in $old"
+	cp -pR "$old/"*{jinja2,copyparty} .
+	mv {x.,}jinja2 2>/dev/null || true
+}
+
+[ $repack ] || {
+	echo collecting jinja2
+	f="../build/Jinja2-2.6.tar.gz"
+	[ -e "$f" ] ||
+		(url=https://files.pythonhosted.org/packages/25/c8/212b1c2fd6df9eaf536384b6c6619c4e70a3afd2dffdd00e5296ffbae940/Jinja2-2.6.tar.gz;
+		wget -O$f "$url" || curl -L "$url" >$f)
+
+	tar -zxf $f
+	mv Jinja2-*/jinja2 .
+	rm -rf Jinja2-* jinja2/testsuite jinja2/_markupsafe/tests.py jinja2/_stringdefs.py
+	
+	f=jinja2/lexer.py
+	sed -r '/.*föö.*/    raise SyntaxError/' <$f >t
+	tmv $f
+	
+	f=jinja2/_markupsafe/_constants.py
+	awk '!/: [0-9]+,?$/ || /(amp|gt|lt|quot|apos|nbsp).:/' <$f >t
+	tmv $f
+
+	# msys2 tar is bad, make the best of it
+	echo collecting source
+	[ $clean ] && {
+		(cd .. && git archive master >tar) && tar -xf ../tar copyparty
+		(cd .. && tar -cf tar copyparty/web/deps) && tar -xf ../tar
+	}
+	[ $clean ] || {
+		(cd .. && tar -cf tar copyparty) && tar -xf ../tar
+	}
+	rm -f ../tar
+}
+
+ver="$(awk '/^VERSION *= \(/ {
+	gsub(/[^0-9,]/,""); gsub(/,/,"."); print; exit}' < ../copyparty/__version__.py)"
+
+ts=$(date -u +%s)
+hts=$(date -u +%Y-%m%d-%H%M%S) # --date=@$ts (thx osx)
+
+mkdir -p ../dist
+sfx_out=../dist/copyparty-sfx
+
+echo cleanup
+find .. -name '*.pyc' -delete
+find .. -name __pycache__ -delete
+
+# especially prevent osx from leaking your lan ip (wtf apple)
+find .. -type f \( -name .DS_Store -or -name ._.DS_Store \) -delete
+find .. -type f -name ._\* | while IFS= read -r f; do cmp <(printf '\x00\x05\x16') <(head -c 3 -- "$f") && rm -f -- "$f"; done
+
+echo use smol web deps
+rm -f copyparty/web/deps/*.full.*
+
+# it's fine dw
+grep -lE '\.full\.(js|css)' copyparty/web/* |
+while IFS= read -r x; do
+	sed -r 's/\.full\.(js|css)/.\1/g' <"$x" >t
+	tmv "$x"
+done
+
+[ $no_ogv ] &&
+	rm -rf copyparty/web/deps/{dynamicaudio,ogv}*
+
+[ $no_cm ] && {
+	rm -rf copyparty/web/mde.* copyparty/web/deps/easymde*
+	echo h > copyparty/web/mde.html
+	f=copyparty/web/md.html
+	sed -r '/edit2">edit \(fancy/d' <$f >t && tmv "$f"
+}
+
+# up2k goes from 28k to 22k laff
+echo entabbening
+find | grep -E '\.(js|css|html|py)$' | while IFS= read -r f; do
+	unexpand -t 4 --first-only <"$f" >t
+	tmv "$f"
+done
+
+echo creating tar
+args=(--owner=1000 --group=1000)
+[ "$OSTYPE" = msys ] &&
+	args=()
+
+tar -cf tar "${args[@]}" --numeric-owner copyparty jinja2
+
+echo compressing tar
+# detect best level; bzip2 -7 is usually better than -9
+for n in {2..9}; do cp tar t.$n; bzip2 -$n t.$n & done; wait; mv -v $(ls -1S t.*.bz2 | tail -n 1) tar.bz2
+for n in {2..9}; do cp tar t.$n;  xz -ze$n t.$n & done; wait; mv -v $(ls -1S t.*.xz  | tail -n 1) tar.xz
+rm t.*
+
+echo creating unix sfx
+(
+	sed "s/PACK_TS/$ts/; s/PACK_HTS/$hts/; s/CPP_VER/$ver/" <../scripts/sfx.sh |
+	grep -E '^sfx_eof$' -B 9001;
+	cat tar.xz
+) >$sfx_out.sh
+
+echo creating generic sfx
+python ../scripts/sfx.py --sfx-make tar.bz2 $ver $ts
+mv sfx.out $sfx_out.py
+chmod 755 $sfx_out.*
+
+printf "done:\n"
+printf "  %s\n" "$(realpath $sfx_out)."{sh,py}
+# rm -rf *

scripts/make-tgz-release.sh

@@ -2,9 +2,13 @@
 set -e
 echo
 
-sed=$( which gsed  2>/dev/null || which sed)
-find=$(which gfind 2>/dev/null || which find)
-sort=$(which gsort 2>/dev/null || which sort)
+command -v gtar  >/dev/null &&
+command -v gfind >/dev/null && {
+	tar()  { gtar  "$@"; }
+	sed()  { gsed  "$@"; }
+	find() { gfind "$@"; }
+	sort() { gsort "$@"; }
+}
 
 which md5sum 2>/dev/null >/dev/null &&
 	md5sum=md5sum ||
@@ -22,14 +26,14 @@ ver="$1"
 [[ -e copyparty/__main__.py ]] || cd ..
 [[ -e copyparty/__main__.py ]] ||
 {
-	echo "run me from within the copyparty folder"
+	echo "run me from within the project root folder"
 	echo
 	exit 1
 }
 
-out_dir="$(pwd | $sed -r 's@/[^/]+$@@')"
-zip_path="$out_dir/copyparty-$ver.zip"
-tgz_path="$out_dir/copyparty-$ver.tar.gz"
+mkdir -p dist
+zip_path="$(pwd)/dist/copyparty-$ver.zip"
+tgz_path="$(pwd)/dist/copyparty-$ver.tar.gz"
 
 [[ -e "$zip_path" ]] ||
 [[ -e "$tgz_path" ]] &&
@@ -44,23 +48,25 @@ tgz_path="$out_dir/copyparty-$ver.tar.gz"
 rm "$zip_path" 2>/dev/null || true
 rm "$tgz_path" 2>/dev/null || true
 
-#$sed -ri "s/^(ADMIN_PWD *= *u).*/\1'hunter2'/" copyparty/config.py
+#sed -ri "s/^(ADMIN_PWD *= *u).*/\1'hunter2'/" copyparty/config.py
 
 tmp="$(mktemp -d)"
 rls_dir="$tmp/copyparty-$ver"
 mkdir "$rls_dir"
 
-echo ">>> export"
-git archive master |
-tar -x -C "$rls_dir"
+echo ">>> export from git"
+git archive master | tar -xC "$rls_dir"
+
+echo ">>> export untracked deps"
+tar -c copyparty/web/deps | tar -xC "$rls_dir"
 
 cd "$rls_dir"
-$find -type d -exec chmod 755 '{}' \+
-$find -type f -exec chmod 644 '{}' \+
+find -type d -exec chmod 755 '{}' \+
+find -type f -exec chmod 644 '{}' \+
 
 commaver="$(
 	printf '%s\n' "$ver" |
-	sed -r 's/\./,/g'
+	sed -r 's/\./, /g'
 )"
 
 grep -qE "^VERSION *= \(${commaver}\)$" copyparty/__version__.py ||
@@ -85,16 +91,23 @@ rm \
 
 mv LICENSE LICENSE.txt
 
-# messy because osx support
-$find -type f -exec $md5sum '{}' \+ |
-$sed -r 's/(.{32})(.*)/\2\1/' | LC_COLLATE=c $sort |
-$sed -r 's/(.*)(.{32})/\2\1/' |
-$sed -r 's/^(.{32}) \./\1  ./' > ../.sums.md5
+# the regular cleanup memes
+find -name '*.pyc' -delete
+find -name __pycache__ -delete
+find -type f \( -name .DS_Store -or -name ._.DS_Store \) -delete
+find -type f -name ._\* | while IFS= read -r f; do cmp <(printf '\x00\x05\x16') <(head -c 3 -- "$f") && rm -f -- "$f"; done
+
+# also messy because osx support
+find -type f -exec $md5sum '{}' \+ |
+sed -r 's/(.{32})(.*)/\2\1/' | LC_COLLATE=c sort |
+sed -r 's/(.*)(.{32})/\2\1/' |
+sed -r 's/^(.{32}) \./\1  ./' > ../.sums.md5
 mv ../.sums.md5 .
 
 cd ..
-echo ">>> tar"; tar -czf "$tgz_path" "copyparty-$ver"
-echo ">>> zip"; zip -qr  "$zip_path" "copyparty-$ver"
+pwd
+echo ">>> tar"; tar -czf "$tgz_path" --owner=1000 --group=1000 --numeric-owner "copyparty-$ver"
+echo ">>> zip"; zip  -qr "$zip_path" "copyparty-$ver"
 
 rm -rf "$tmp"
 echo
@@ -103,5 +116,5 @@ echo "  $zip_path"
 echo "  $tgz_path"
 echo
 
-# function alr() { ls -alR copyparty-$1 | $sed -r "s/copyparty-$1/copyparty/" | $sed -r 's/[A-Z][a-z]{2} [0-9 ]{2} [0-9]{2}:[0-9]{2}//' > $1; }; for x in master rls src ; do alr $x; done
+# function alr() { ls -alR copyparty-$1 | sed -r "s/copyparty-$1/copyparty/" | sed -r 's/[A-Z][a-z]{2} [0-9 ]{2} [0-9]{2}:[0-9]{2}//' > $1; }; for x in master rls src ; do alr $x; done
 

scripts/sfx.py

@@ -0,0 +1,523 @@
+#!/usr/bin/env python
+# coding: utf-8
+from __future__ import print_function, unicode_literals
+
+import re, os, sys, stat, time, shutil, tarfile, hashlib, platform, tempfile
+import subprocess as sp
+
+"""
+run me with any version of python, i will unpack and run copyparty
+
+(but please don't edit this file with a text editor
+  since that would probably corrupt the binary stuff at the end)
+
+there's zero binaries! just plaintext python scripts all the way down
+  so you can easily unpack the archive and inspect it for shady stuff
+
+the archive data is attached after the b"\n# eof\n" archive marker,
+  b"\n#n" decodes to b"\n"
+  b"\n#r" decodes to b"\r"
+  b"\n# " decodes to b""
+"""
+
+# set by make-sfx.sh
+VER = None
+SIZE = None
+CKSUM = None
+STAMP = None
+
+PY2 = sys.version_info[0] == 2
+sys.dont_write_bytecode = True
+me = os.path.abspath(os.path.realpath(__file__))
+
+
+def eprint(*args, **kwargs):
+    kwargs["file"] = sys.stderr
+    print(*args, **kwargs)
+
+
+def msg(*args, **kwargs):
+    if args:
+        args = ["[SFX]", args[0]] + list(args[1:])
+
+    eprint(*args, **kwargs)
+
+
+# skip 1
+
+
+def testptn1():
+    """test: creates a test-pattern for encode()"""
+    import struct
+
+    buf = b""
+    for c in range(256):
+        buf += struct.pack("B", c)
+
+    yield buf
+
+
+def testptn2():
+    import struct
+
+    for a in range(256):
+        if a % 16 == 0:
+            msg(a)
+
+        for b in range(256):
+            buf = b""
+            for c in range(256):
+                buf += struct.pack("BBBB", a, b, c, b)
+            yield buf
+
+
+def testptn3():
+    with open("C:/Users/ed/Downloads/python-3.8.1-amd64.exe", "rb", 512 * 1024) as f:
+        while True:
+            buf = f.read(512 * 1024)
+            if not buf:
+                break
+
+            yield buf
+
+
+testptn = testptn2
+
+
+def testchk(cdata):
+    """test: verifies that `data` yields testptn"""
+    import struct
+
+    cbuf = b""
+    mbuf = b""
+    checked = 0
+    t0 = time.time()
+    mdata = testptn()
+    while True:
+        if not mbuf:
+            try:
+                mbuf += next(mdata)
+            except:
+                break
+
+        if not cbuf:
+            try:
+                cbuf += next(cdata)
+            except:
+                expect = mbuf[:8]
+                expect = "".join(
+                    " {:02x}".format(x)
+                    for x in struct.unpack("B" * len(expect), expect)
+                )
+                raise Exception(
+                    "truncated at {}, expected{}".format(checked + len(cbuf), expect)
+                )
+
+        ncmp = min(len(cbuf), len(mbuf))
+        # msg("checking {:x}H bytes, {:x}H ok so far".format(ncmp, checked))
+        for n in range(ncmp):
+            checked += 1
+            if cbuf[n] != mbuf[n]:
+                expect = mbuf[n : n + 8]
+                expect = "".join(
+                    " {:02x}".format(x)
+                    for x in struct.unpack("B" * len(expect), expect)
+                )
+                cc = struct.unpack(b"B", cbuf[n : n + 1])[0]
+                raise Exception(
+                    "byte {:x}H bad, got {:02x}, expected{}".format(checked, cc, expect)
+                )
+
+        cbuf = cbuf[ncmp:]
+        mbuf = mbuf[ncmp:]
+
+    td = time.time() - t0
+    txt = "all {}d bytes OK in {:.3f} sec, {:.3f} MB/s".format(
+        checked, td, (checked / (1024 * 1024.0)) / td
+    )
+    msg(txt)
+
+
+def encode(data, size, cksum, ver, ts):
+    """creates a new sfx; `data` should yield bufs to attach"""
+    nin = 0
+    nout = 0
+    skip = False
+    with open(me, "rb") as fi:
+        unpk = ""
+        src = fi.read().replace(b"\r", b"").rstrip(b"\n").decode("utf-8")
+        for ln in src.split("\n"):
+            if ln.endswith("# skip 0"):
+                skip = False
+                continue
+
+            if ln.endswith("# skip 1") or skip:
+                skip = True
+                continue
+
+            unpk += ln + "\n"
+
+        for k, v in [
+            ["VER", '"' + ver + '"'],
+            ["SIZE", size],
+            ["CKSUM", '"' + cksum + '"'],
+            ["STAMP", ts],
+        ]:
+            v1 = "\n{} = None\n".format(k)
+            v2 = "\n{} = {}\n".format(k, v)
+            unpk = unpk.replace(v1, v2)
+
+        unpk = unpk.replace("\n    ", "\n\t")
+        for _ in range(16):
+            unpk = unpk.replace("\t    ", "\t\t")
+
+    with open("sfx.out", "wb") as f:
+        f.write(unpk.encode("utf-8") + b"\n\n# eof\n# ")
+        for buf in data:
+            ebuf = buf.replace(b"\n", b"\n#n").replace(b"\r", b"\n#r")
+            f.write(ebuf)
+            nin += len(buf)
+            nout += len(ebuf)
+
+    msg("wrote {:x}H bytes ({:x}H after encode)".format(nin, nout))
+
+
+def makesfx(tar_src, ver, ts):
+    sz = os.path.getsize(tar_src)
+    cksum = hashfile(tar_src)
+    encode(yieldfile(tar_src), sz, cksum, ver, ts)
+
+
+# skip 0
+
+
+def get_py_win(ret):
+    tops = []
+    p = str(os.getenv("LocalAppdata"))
+    if p:
+        tops.append(os.path.join(p, "Programs", "Python"))
+
+    progfiles = {}
+    for p in ["ProgramFiles", "ProgramFiles(x86)"]:
+        p = str(os.getenv(p))
+        if p:
+            progfiles[p] = 1
+            # 32bit apps get x86 for both
+            if p.endswith(" (x86)"):
+                progfiles[p[:-6]] = 1
+
+    tops += list(progfiles.keys())
+
+    for sysroot in [me, sys.executable]:
+        sysroot = sysroot[:3].upper()
+        if sysroot[1] == ":" and sysroot not in tops:
+            tops.append(sysroot)
+
+    # $WIRESHARK_SLOGAN
+    for top in tops:
+        try:
+            for name1 in sorted(os.listdir(top), reverse=True):
+                if name1.lower().startswith("python"):
+                    path1 = os.path.join(top, name1)
+                    try:
+                        for name2 in os.listdir(path1):
+                            if name2.lower() == "python.exe":
+                                path2 = os.path.join(path1, name2)
+                                ret[path2.lower()] = path2
+                    except:
+                        pass
+        except:
+            pass
+
+
+def get_py_nix(ret):
+    ptn = re.compile(r"^(python|pypy)[0-9\.-]*$")
+    for bindir in os.getenv("PATH").split(":"):
+        if not bindir:
+            next
+
+        try:
+            for fn in os.listdir(bindir):
+                if ptn.match(fn):
+                    fn = os.path.join(bindir, fn)
+                    ret[fn.lower()] = fn
+        except:
+            pass
+
+
+def read_py(binp):
+    cmd = [
+        binp,
+        "-c",
+        "import sys; sys.stdout.write(' '.join(str(x) for x in sys.version_info)); import jinja2",
+    ]
+    p = sp.Popen(cmd, stdout=sp.PIPE, stderr=sp.PIPE)
+    ver, _ = p.communicate()
+    ver = ver.decode("utf-8").split(" ")[:3]
+    ver = [int(x) if x.isdigit() else 0 for x in ver]
+    return ver, p.returncode == 0
+
+
+def get_pys():
+    ver, chk = read_py(sys.executable)
+    if chk or PY2:
+        return [[chk, ver, sys.executable]]
+
+    hits = {sys.executable.lower(): sys.executable}
+    if platform.system() == "Windows":
+        get_py_win(hits)
+    else:
+        get_py_nix(hits)
+
+    ret = []
+    for binp in hits.values():
+        ver, chk = read_py(binp)
+        ret.append([chk, ver, binp])
+        msg("\t".join(str(x) for x in ret[-1]))
+
+    return ret
+
+
+def yieldfile(fn):
+    with open(fn, "rb") as f:
+        for block in iter(lambda: f.read(64 * 1024), b""):
+            yield block
+
+
+def hashfile(fn):
+    hasher = hashlib.md5()
+    for block in yieldfile(fn):
+        hasher.update(block)
+
+    return hasher.hexdigest()
+
+
+def unpack():
+    """unpacks the tar yielded by `data`"""
+    name = "pe-copyparty"
+    withpid = "{}.{}".format(name, os.getpid())
+    top = tempfile.gettempdir()
+    final = os.path.join(top, name)
+    mine = os.path.join(top, withpid)
+    tar = os.path.join(mine, "tar")
+    tag_mine = os.path.join(mine, "v" + str(STAMP))
+    tag_final = os.path.join(final, "v" + str(STAMP))
+
+    if os.path.exists(tag_final):
+        msg("found early")
+        return final
+
+    nwrite = 0
+    os.mkdir(mine)
+    with open(tar, "wb") as f:
+        for buf in get_payload():
+            nwrite += len(buf)
+            f.write(buf)
+
+    if nwrite != SIZE:
+        t = "\n\n  bad file:\n    expected {} bytes, got {}\n".format(SIZE, nwrite)
+        raise Exception(t)
+
+    cksum = hashfile(tar)
+    if cksum != CKSUM:
+        t = "\n\n  bad file:\n    {} expected,\n    {} obtained\n".format(CKSUM, cksum)
+        raise Exception(t)
+
+    with tarfile.open(tar, "r:bz2") as tf:
+        tf.extractall(mine)
+
+    os.remove(tar)
+
+    with open(tag_mine, "wb") as f:
+        f.write(b"h\n")
+
+    if os.path.exists(tag_final):
+        msg("found late")
+        return final
+
+    try:
+        if os.path.islink(final):
+            os.remove(final)
+        else:
+            shutil.rmtree(final)
+    except:
+        pass
+
+    try:
+        os.symlink(mine, final)
+    except:
+        try:
+            os.rename(mine, final)
+        except:
+            msg("reloc fail,", mine)
+            return mine
+
+    for fn in os.listdir(top):
+        if fn.startswith(name) and fn not in [name, withpid]:
+            try:
+                old = os.path.join(top, fn)
+                if time.time() - os.path.getmtime(old) > 10:
+                    shutil.rmtree(old)
+            except:
+                pass
+
+    return final
+
+
+def get_payload():
+    """yields the binary data attached to script"""
+    with open(me, "rb") as f:
+        ptn = b"\n# eof\n# "
+        buf = b""
+        for n in range(64):
+            buf += f.read(4096)
+            ofs = buf.find(ptn)
+            if ofs >= 0:
+                break
+
+        if ofs < 0:
+            raise Exception("could not find archive marker")
+
+        # start reading from the final b"\n"
+        fpos = ofs + len(ptn) - 3
+        # msg("tar found at", fpos)
+        f.seek(fpos)
+        dpos = 0
+        leftovers = b""
+        while True:
+            rbuf = f.read(1024 * 32)
+            if rbuf:
+                buf = leftovers + rbuf
+                ofs = buf.rfind(b"\n")
+                if len(buf) <= 4:
+                    leftovers = buf
+                    continue
+
+                if ofs >= len(buf) - 4:
+                    leftovers = buf[ofs:]
+                    buf = buf[:ofs]
+                else:
+                    leftovers = b"\n# "
+            else:
+                buf = leftovers
+
+            fpos += len(buf) + 1
+            buf = (
+                buf.replace(b"\n# ", b"")
+                .replace(b"\n#r", b"\r")
+                .replace(b"\n#n", b"\n")
+            )
+            dpos += len(buf) - 1
+
+            yield buf
+
+            if not rbuf:
+                break
+
+
+def confirm():
+    msg()
+    msg("*** hit enter to exit ***")
+    raw_input() if PY2 else input()
+
+
+def run(tmp, py):
+    msg("OK")
+    msg("will use:", py)
+    msg("bound to:", tmp)
+
+    fp_py = os.path.join(tmp, "py")
+    with open(fp_py, "wb") as f:
+        f.write(py.encode("utf-8") + b"\n")
+
+    # avoid loading ./copyparty.py
+    cmd = [
+        py,
+        "-c",
+        'import sys, runpy; sys.path.insert(0, r"'
+        + tmp
+        + '"); runpy.run_module("copyparty", run_name="__main__")',
+    ] + list(sys.argv[1:])
+
+    msg("\n", cmd, "\n")
+    p = sp.Popen(str(x) for x in cmd)
+    try:
+        p.wait()
+    except:
+        p.wait()
+
+    if p.returncode != 0:
+        confirm()
+
+    sys.exit(p.returncode)
+
+
+def main():
+    sysver = str(sys.version).replace("\n", "\n" + " " * 18)
+    pktime = time.strftime("%Y-%m-%d, %H:%M:%S", time.gmtime(STAMP))
+    os.system("")
+    msg()
+    msg("   this is: copyparty", VER)
+    msg(" packed at:", pktime, "UTC,", STAMP)
+    msg("archive is:", me)
+    msg("python bin:", sys.executable)
+    msg("python ver:", platform.python_implementation(), sysver)
+    msg()
+
+    arg = ""
+    try:
+        arg = sys.argv[1]
+    except:
+        pass
+
+    # skip 1
+
+    if arg == "--sfx-testgen":
+        return encode(testptn(), 1, "x", "x", 1)
+
+    if arg == "--sfx-testchk":
+        return testchk(get_payload())
+
+    if arg == "--sfx-make":
+        tar, ver, ts = sys.argv[2:]
+        return makesfx(tar, ver, ts)
+
+    # skip 0
+
+    tmp = unpack()
+    fp_py = os.path.join(tmp, "py")
+    if os.path.exists(fp_py):
+        with open(fp_py, "rb") as f:
+            py = f.read().decode("utf-8").rstrip()
+
+        return run(tmp, py)
+
+    pys = get_pys()
+    pys.sort(reverse=True)
+    j2, ver, py = pys[0]
+    if j2:
+        try:
+            os.rename(os.path.join(tmp, "jinja2"), os.path.join(tmp, "x.jinja2"))
+        except:
+            pass
+
+        return run(tmp, py)
+
+    msg("\n  could not find jinja2; will use py2 + the bundled version\n")
+    for _, ver, py in pys:
+        if ver > [2, 7] and ver < [3, 0]:
+            return run(tmp, py)
+
+    m = "\033[1;31m\n\n\ncould not find a python with jinja2 installed; please do one of these:\n\n  pip install --user jinja2\n\n  install python2\n\n\033[0m"
+    msg(m)
+    confirm()
+    sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
+
+
+# skip 1
+# python sfx.py --sfx-testgen && python test.py --sfx-testchk
+# c:\Python27\python.exe sfx.py --sfx-testgen && c:\Python27\python.exe test.py --sfx-testchk

scripts/sfx.sh

@@ -0,0 +1,72 @@
+# use current/default shell
+set -e
+
+dir="$(
+	printf '%s\n' "$TMPDIR" /tmp |
+	awk '/./ {print; exit}'
+)/pe-copyparty"
+
+[ -e "$dir/vPACK_TS" ] || (
+	printf '\033[36munpacking copyparty vCPP_VER (sfx-PACK_HTS)\033[1;30m\n\n'
+	mkdir -p "$dir.$$"
+	ofs=$(awk '$0=="sfx_eof" {print NR+1; exit}' < "$0")
+	
+	[ -z "$ofs" ] && {
+		printf '\033[31mabort: could not find SFX boundary\033[0m\n'
+		exit 1
+	}
+	tail -n +$ofs "$0" | tar -JxC "$dir.$$"
+	ln -nsf "$dir.$$" "$dir"
+	printf '\033[0m'
+	
+	now=$(date -u +%s)
+	for d in "$dir".*; do
+		ts=$(stat -c%Y -- "$d" 2>/dev/null) ||
+		ts=$(stat -f %m%n -- "$d" 2>/dev/null)
+
+		[ $((now-ts)) -gt 300 ] &&
+			rm -rf "$d"
+	done
+	echo h > "$dir/vPACK_TS"
+) >&2 || exit 1
+
+# detect available pythons
+(IFS=:; for d in $PATH; do
+	printf '%s\n' "$d"/python* "$d"/pypy* | tac;
+done) | grep -E '(python|pypy)[0-9\.-]*$' > $dir/pys || true
+
+# see if we made a choice before
+[ -z "$pybin" ] && pybin="$(cat $dir/py 2>/dev/null || true)"
+
+# otherwise find a python with jinja2
+[ -z "$pybin" ] && pybin="$(cat $dir/pys | while IFS= read -r _py; do
+	printf '\033[1;30mlooking for jinja2 in [%s]\033[0m\n' "$_py" >&2
+	$_py -c 'import jinja2' 2>/dev/null || continue
+	printf '%s\n' "$_py"
+	mv $dir/{,x.}jinja2
+	break
+done)"
+
+# otherwise find python2 (bundled jinja2 is way old)
+[ -z "$pybin" ] && {
+	printf '\033[0;33mcould not find jinja2; will use py2 + the bundled version\033[0m\n' >&2
+	pybin="$(cat $dir/pys | while IFS= read -r _py; do
+		printf '\033[1;30mtesting if py2 [%s]\033[0m\n' "$_py" >&2
+		_ver=$($_py -c 'import sys; sys.stdout.write(str(sys.version_info[0]))' 2>/dev/null) || continue
+		[ $_ver = 2 ] || continue
+		printf '%s\n' "$_py"
+		break
+	done)"
+}
+
+[ -z "$pybin" ] && {
+	printf '\033[1;31m\ncould not find a python with jinja2 installed; please do one of these:\n\n  pip install --user jinja2\n\n  install python2\033[0m\n\n' >&2
+	exit 1
+}
+
+printf '\033[1;30musing [%s]. you can reset with this:\n  rm -rf %s*\033[0m\n\n' "$pybin" "$dir"
+printf '%s\n' "$pybin" > $dir/py
+
+PYTHONPATH=$dir exec "$pybin" -m copyparty "$@"
+
+sfx_eof

setup.py

@@ -137,16 +137,14 @@ if setuptools_available:
             "entry_points": {
                 "console_scripts": ["copyparty = copyparty.__main__:main"]
             },
-            "scripts": [
-                "bin/copyparty-fuse.py"
-            ]
+            "scripts": ["bin/copyparty-fuse.py"],
         }
     )
 else:
     args.update(
         {
             "packages": ["copyparty", "copyparty.stolen"],
-            "scripts": ["bin/copyparty", "bin/copyparty-fuse.py"]
+            "scripts": ["bin/copyparty-fuse.py"],
         }
     )
 

srv/ceditable.html

@@ -0,0 +1,84 @@
+<!DOCTYPE html><html><head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=0.8">
+<style>
+
+* {
+    margin: 0;
+    padding: 0;
+    outline: 0;
+    border: none;
+    font-size: 1em;
+    line-height: 1em;
+    font-family: monospace, monospace;
+    color: #333;
+}
+html, body {
+    width: 100%;
+    height: 100%;
+    background: #ddd;
+}
+html {
+    font-size: 1.3em;
+}
+li, #edit {
+    list-style-type: none;
+    white-space: pre-wrap;
+    word-break: break-all;
+    overflow-wrap: break-word;
+    word-wrap: break-word; /*ie*/
+}
+li:nth-child(even) {
+    background: #ddd;
+}
+#edit, #html, #txt1, #txt2 {
+    background: #eee;
+    position: fixed;
+    width: calc(50% - .8em);
+    height: calc(50% - .8em);
+}
+#txt1 { top: .5em; left: .5em }
+#edit { top: .5em; right: .5em }
+#html { bottom: .5em; left: .5em }
+#txt2 { bottom: .5em; right: .5em }
+
+</style></head><body>
+<pre id="edit" contenteditable="true"></pre>
+<textarea id="html"></textarea>
+<ul id="txt1"></ul>
+<ul id="txt2"></ul>
+<script>
+
+var edit = document.getElementById('edit'),
+    html = document.getElementById('html'),
+    txt1 = document.getElementById('txt1'),
+    txt2 = document.getElementById('txt2');
+
+var oh = null;
+function fun() {
+    var h = edit.innerHTML;
+    if (oh != h) {
+        oh = h;
+        html.value = h;
+        var t = edit.innerText;
+        if (h.indexOf('<div><br></div>') >= 0)
+            t = t.replace(/\n\n/g, "\n");
+        
+        t = '<li>' + t.
+            replace(/&/g, "&amp;").
+            replace(/</g, "&lt;").
+            replace(/>/g, "&gt;").
+            split('\n').join('</li>\n<li>') + '</li>';
+        
+        t = t.replace(/<li><\/li>/g, '<li> </li>');
+        txt1.innerHTML = t;
+        txt2.innerHTML = t;
+    }
+    setTimeout(fun, 100);
+}
+fun();
+
+</script>
+</body>
+</html>

srv/test.md

@@ -0,0 +1,203 @@
+### hello world
+
+```
+[72....................................................................]
+[80............................................................................]
+```
+
+* foo
+  ```
+  [72....................................................................]
+  [80............................................................................]
+  ```
+
+  * bar
+    ```
+    [72....................................................................]
+    [80............................................................................]
+    ```
+
+a123456789b123456789c123456789d123456789e123456789f123456789g123456789h123456789i123456789j123456789k123456789l123456789m123456789n123456789o123456789p123456789q123456789r123456789s123456789t123456789u123456789v123456789w123456789x123456789y123456789z123456789
+
+<foo> &nbsp; bar &amp; <span>baz</span>
+<a href="?foo=bar&baz=qwe&amp;rty">?foo=bar&baz=qwe&amp;rty</a>
+<!-- hidden -->
+```
+<foo> &nbsp; bar &amp; <span>baz</span>
+<a href="?foo=bar&baz=qwe&amp;rty">?foo=bar&baz=qwe&amp;rty</a>
+<!-- visible -->
+```
+
+*fails marked/showdown/tui/simplemde (just italics), **OK: markdown-it/simplemde:***  
+testing just google.com and underscored _google.com_ also with _google.com,_ trailing comma and _google.com_, comma after
+
+*fails tui (just italics), **OK: marked/showdown/markdown-it/simplemde:***  
+testing just https://google.com and underscored _https://google.com_ links like that
+
+*fails marked (no markup) and showdown/tui/simplemde (no links at all), **OK: markdown-it:***  
+let's try <google.com> bracketed and _<google.com>_ underscored bracketed
+
+*fails marked (literal underscore), **OK: showdown/markdown-it/simplemde:***  
+let's try <https://google.com> bracketed and _<https://google.com>_ underscored bracketed
+
+*fails none:*  
+and then [google](google.com) verbose and _[google](google.com)_ underscored  
+
+*fails none:*  
+and then [google](https://google.com/) verbose and _[google](https://google.com/)_ underscored
+
+*all behave similarly (only verbose ones):*  
+and then <local> or maybe <./local> fsgfds </absolute> fsgfds  
+and then [local] or maybe [./local] fsgfds [/absolute] fsgfds  
+and then (local) or maybe (./local) fsgfds (/absolute) fsgfds  
+and then [](local) or maybe [](./local) fsgfds [](/absolute) fsgfds  
+and then [.](local) or maybe [.](./local) fsgfds [.](/absolute) fsgfds  
+and then [asdf](local) or maybe [asdf](./local) fsgfds [asdf](/absolute) fsgfds
+
+*`ng/OK/OK/OK markdown-it`  
+`ng/OK/ng/OK marked`  
+`ng/OK/OK/OK showdown`
+`OK/OK/OK/OK simplemde`*  
+[with spaces](/with spaces) plain, [with spaces](/with%20spaces) %20, [with spaces](</with spaces>) brackets, [with spaces](/with%20spaces) %20
+
+*this fails marked, **OK: markdown-it, simplemde:***
+
+* testing a list with:
+  `some code after a newline`
+
+* testing a list with:
+  just a newline
+
+and here is really just
+a newline toplevel
+
+*this fails showdown/hypermd, **OK: marked/markdown-it/simplemde:***
+
+* testing a list with
+
+      code here
+      and a newline
+        this should have two leading spaces
+
+  * second list level
+
+        more code here
+        and a newline
+          this should have two leading spaces
+
+.
+
+* testing a list with
+
+      code here
+      and a newline
+        this should have two leading spaces
+
+    * second list level
+
+          more code here
+          and a newline
+            this should have two leading spaces
+
+*this fails stackedit, **OK: showdown/marked/markdown-it/simplemde:***
+
+|||
+|--|--|
+| a table | with no header |
+| second row | foo bar |
+
+*this fails showdown/stackedit, **OK: marked/markdown-it/simplemde:***
+
+|||
+|--|--:|
+| a table | on the right |
+| second row | foo bar |
+
+* list entry
+* [x] yes
+* [ ] no
+* another entry
+
+# s1
+## ep1
+## ep2
+# s2
+## ep1
+## ep2
+# s3
+## ep1
+## ep2
+
+
+
+#######################################################################
+
+
+
+marked:
+  works in last ff/chrome for xp
+  bug: config{breaks:true} does nothing in 1.0
+  use whitespace, no tabs
+
+showdown:
+  ie6 and ie8 broken, works in last ff/chrome for xp
+
+markdown-it:
+  works in last ff/chrome for xp
+  use whitespace, no tabs
+  no header anchors
+
+tui wysiwyg:
+  requires links to be <http://> or [title](location)
+
+
+
+links:
+  http://demo.showdownjs.com/
+  https://marked.js.org/demo/
+  https://markdown-it.github.io/
+  https://simplemde.com/
+
+
+
+all-pass:
+
+https://github.com/joemccann/dillinger
+  https://dillinger.io/
+  uses markdown-it
+
+https://github.com/markdown-it/markdown-it
+  https://markdown-it.github.io/
+
+
+
+almost-all-pass:
+
+https://github.com/Ionaru/easy-markdown-editor
+  https://easymde.tk/
+  simplemde fork (the most active)
+
+https://github.com/Inscryb/inscryb-markdown-editor
+  simplemde fork
+
+other simplemde forks:
+  pulkitmittal
+
+https://simplemde.com/
+  (dead)
+
+https://github.com/nhn/tui.editor
+  https://nhn.github.io/tui.editor/latest/tutorial-example01-editor-basic
+  ie10 and up
+
+
+
+unrelated neat stuff:
+  https://github.com/gnab/remark
+
+
+
+```sh
+awk '/./ {printf "%s %d\n", $0, NR; next} 1' <test.md >ln.md
+gawk '{print gensub(/([a-zA-Z\.])/,NR" \\1","1")}' <test.md >ln.md
+```

tests/test_vfs.py

@@ -64,6 +64,9 @@ class TestVFS(unittest.TestCase):
 
         raise Exception("TODO support windows")
 
+    def log(self, src, msg):
+        pass
+
     def test(self):
         td = self.get_ramdisk() + "/vfs"
         try:
@@ -85,7 +88,7 @@ class TestVFS(unittest.TestCase):
                             f.write(fn)
 
         # defaults
-        vfs = AuthSrv(Namespace(c=None, a=[], v=[]), None).vfs
+        vfs = AuthSrv(Namespace(c=None, a=[], v=[]), self.log).vfs
         self.assertEqual(vfs.nodes, {})
         self.assertEqual(vfs.vpath, "")
         self.assertEqual(vfs.realpath, td)
@@ -93,7 +96,7 @@ class TestVFS(unittest.TestCase):
         self.assertEqual(vfs.uwrite, ["*"])
 
         # single read-only rootfs (relative path)
-        vfs = AuthSrv(Namespace(c=None, a=[], v=["a/ab/::r"]), None).vfs
+        vfs = AuthSrv(Namespace(c=None, a=[], v=["a/ab/::r"]), self.log).vfs
         self.assertEqual(vfs.nodes, {})
         self.assertEqual(vfs.vpath, "")
         self.assertEqual(vfs.realpath, td + "/a/ab")
@@ -101,7 +104,9 @@ class TestVFS(unittest.TestCase):
         self.assertEqual(vfs.uwrite, [])
 
         # single read-only rootfs (absolute path)
-        vfs = AuthSrv(Namespace(c=None, a=[], v=[td + "//a/ac/../aa//::r"]), None).vfs
+        vfs = AuthSrv(
+            Namespace(c=None, a=[], v=[td + "//a/ac/../aa//::r"]), self.log
+        ).vfs
         self.assertEqual(vfs.nodes, {})
         self.assertEqual(vfs.vpath, "")
         self.assertEqual(vfs.realpath, td + "/a/aa")
@@ -110,7 +115,8 @@ class TestVFS(unittest.TestCase):
 
         # read-only rootfs with write-only subdirectory (read-write for k)
         vfs = AuthSrv(
-            Namespace(c=None, a=["k:k"], v=[".::r:ak", "a/ac/acb:a/ac/acb:w:ak"]), None
+            Namespace(c=None, a=["k:k"], v=[".::r:ak", "a/ac/acb:a/ac/acb:w:ak"]),
+            self.log,
         ).vfs
         self.assertEqual(len(vfs.nodes), 1)
         self.assertEqual(vfs.vpath, "")
@@ -139,34 +145,34 @@ class TestVFS(unittest.TestCase):
         fsdir, real, virt = self.ls(vfs, "/", "*")
         self.assertEqual(fsdir, td)
         self.assertEqual(real, ["b", "c"])
-        self.assertEqual(virt, ["a"])
+        self.assertEqual(list(virt), ["a"])
 
         fsdir, real, virt = self.ls(vfs, "a", "*")
         self.assertEqual(fsdir, td + "/a")
         self.assertEqual(real, ["aa", "ab"])
-        self.assertEqual(virt, ["ac"])
+        self.assertEqual(list(virt), ["ac"])
 
         fsdir, real, virt = self.ls(vfs, "a/ab", "*")
         self.assertEqual(fsdir, td + "/a/ab")
         self.assertEqual(real, ["aba", "abb", "abc"])
-        self.assertEqual(virt, [])
+        self.assertEqual(list(virt), [])
 
         fsdir, real, virt = self.ls(vfs, "a/ac", "*")
         self.assertEqual(fsdir, td + "/a/ac")
         self.assertEqual(real, ["aca", "acc"])
-        self.assertEqual(virt, [])
+        self.assertEqual(list(virt), [])
 
         fsdir, real, virt = self.ls(vfs, "a/ac", "k")
         self.assertEqual(fsdir, td + "/a/ac")
         self.assertEqual(real, ["aca", "acc"])
-        self.assertEqual(virt, ["acb"])
+        self.assertEqual(list(virt), ["acb"])
 
         self.assertRaises(util.Pebkac, vfs.get, "a/ac/acb", "*", True, False)
 
         fsdir, real, virt = self.ls(vfs, "a/ac/acb", "k")
         self.assertEqual(fsdir, td + "/a/ac/acb")
         self.assertEqual(real, ["acba", "acbb", "acbc"])
-        self.assertEqual(virt, [])
+        self.assertEqual(list(virt), [])
 
         # breadth-first construction
         vfs = AuthSrv(
@@ -181,7 +187,7 @@ class TestVFS(unittest.TestCase):
                     "a/ac:a/ac:w",
                 ],
             ),
-            None,
+            self.log,
         ).vfs
 
         # sanitizing relative paths
@@ -193,17 +199,17 @@ class TestVFS(unittest.TestCase):
         self.undot(vfs, "./.././foo/..", "")
 
         # shadowing
-        vfs = AuthSrv(Namespace(c=None, a=[], v=[".::r", "b:a/ac:r"]), None).vfs
+        vfs = AuthSrv(Namespace(c=None, a=[], v=[".::r", "b:a/ac:r"]), self.log).vfs
 
         fsp, r1, v1 = self.ls(vfs, "", "*")
         self.assertEqual(fsp, td)
         self.assertEqual(r1, ["b", "c"])
-        self.assertEqual(v1, ["a"])
+        self.assertEqual(list(v1), ["a"])
 
         fsp, r1, v1 = self.ls(vfs, "a", "*")
         self.assertEqual(fsp, td + "/a")
         self.assertEqual(r1, ["aa", "ab"])
-        self.assertEqual(v1, ["ac"])
+        self.assertEqual(list(v1), ["ac"])
 
         fsp1, r1, v1 = self.ls(vfs, "a/ac", "*")
         fsp2, r2, v2 = self.ls(vfs, "b", "*")
@@ -211,7 +217,7 @@ class TestVFS(unittest.TestCase):
         self.assertEqual(fsp2, td + "/b")
         self.assertEqual(r1, ["ba", "bb", "bc"])
         self.assertEqual(r1, r2)
-        self.assertEqual(v1, v2)
+        self.assertEqual(list(v1), list(v2))
 
         # config file parser
         cfg_path = self.get_ramdisk() + "/test.cfg"
@@ -230,7 +236,7 @@ class TestVFS(unittest.TestCase):
                 ).encode("utf-8")
             )
 
-        au = AuthSrv(Namespace(c=[cfg_path], a=[], v=[]), None)
+        au = AuthSrv(Namespace(c=[cfg_path], a=[], v=[]), self.log)
         self.assertEqual(au.user["a"], "123")
         self.assertEqual(au.user["asd"], "fgh:jkl")
         n = au.vfs