diff --git a/copyparty/__init__.py b/copyparty/__init__.py index 86b7fe1e..d1630ba0 100644 --- a/copyparty/__init__.py +++ b/copyparty/__init__.py @@ -63,10 +63,6 @@ web/browser.js web/browser2.html web/cf.html web/copyparty.gif -web/dd/2.png -web/dd/3.png -web/dd/4.png -web/dd/5.png web/deps/busy.mp3 web/deps/easymde.css web/deps/easymde.js diff --git a/copyparty/__main__.py b/copyparty/__main__.py index 9db3a4f5..9e406bea 100644 --- a/copyparty/__main__.py +++ b/copyparty/__main__.py @@ -1567,7 +1567,7 @@ def add_ui(ap, retry): ap2.add_argument("--unlist", metavar="REGEX", type=u, default="", help="don't show files/folders matching \033[33mREGEX\033[0m in file list. WARNING: Purely cosmetic! Does not affect API calls, just the browser. Example: [\033[32m\\.(js|css)$\033[0m] (volflag=unlist)") ap2.add_argument("--favico", metavar="TXT", type=u, default="c 000 none" if retry else "🎉 000 none", help="\033[33mfavicon-text\033[0m [ \033[33mforeground\033[0m [ \033[33mbackground\033[0m ] ], set blank to disable") ap2.add_argument("--ext-th", metavar="E=VP", type=u, action="append", help="use thumbnail-image \033[33mVP\033[0m for file-extension \033[33mE\033[0m, example: [\033[32mexe=/.res/exe.png\033[0m] (volflag=ext_th)") - ap2.add_argument("--mpmc", metavar="URL", type=u, default="", help="change the mediaplayer-toggle mouse cursor; URL to a folder with {2..5}.png inside (or disable with [\033[32m.\033[0m])") + ap2.add_argument("--mpmc", type=u, default="", help=argparse.SUPPRESS) ap2.add_argument("--spinner", metavar="TXT", type=u, default="🌲", help="\033[33memoji\033[0m or \033[33memoji,css\033[0m Example: [\033[32m🥖,padding:0\033[0m]") ap2.add_argument("--css-browser", metavar="L", type=u, default="", help="URL to additional CSS to include in the filebrowser html") ap2.add_argument("--js-browser", metavar="L", type=u, default="", help="URL to additional JS to include in the filebrowser html") diff --git a/copyparty/httpcli.py b/copyparty/httpcli.py index db1cbcb8..44087e1f 100644 --- a/copyparty/httpcli.py +++ b/copyparty/httpcli.py @@ -1196,15 +1196,6 @@ class HttpCli(object): self.reply(b"ssdp is disabled in server config", 404) return False - if self.vpath.startswith(".cpr/dd/") and self.args.mpmc: - if self.args.mpmc == ".": - raise Pebkac(404) - - loc = self.args.mpmc.rstrip("/") + self.vpath[self.vpath.rfind("/") :] - h = {"Location": loc, "Cache-Control": "max-age=39"} - self.reply(b"", 301, headers=h) - return True - if self.vpath == ".cpr/metrics": return self.conn.hsrv.metrics.tx(self) diff --git a/copyparty/web/browser.css b/copyparty/web/browser.css index 35dbeeac..1f5a7da6 100644 --- a/copyparty/web/browser.css +++ b/copyparty/web/browser.css @@ -1113,18 +1113,7 @@ html.y #widget.open { top: -.12em; } #wtico { - cursor: url(dd/4.png), pointer; - animation: cursor 500ms; -} -#wtico:hover { - animation: cursor 500ms infinite; -} -@keyframes cursor { - 0% {cursor: url(dd/2.png), pointer} - 30% {cursor: url(dd/3.png), pointer} - 50% {cursor: url(dd/4.png), pointer} - 75% {cursor: url(dd/5.png), pointer} - 85% {cursor: url(dd/4.png), pointer} + cursor: pointer; } @keyframes spin { 100% {transform: rotate(360deg)} diff --git a/copyparty/web/dd/2.png b/copyparty/web/dd/2.png deleted file mode 100644 index 5f750958..00000000 Binary files a/copyparty/web/dd/2.png and /dev/null differ diff --git a/copyparty/web/dd/3.png b/copyparty/web/dd/3.png deleted file mode 100644 index 524facc3..00000000 Binary files a/copyparty/web/dd/3.png and /dev/null differ diff --git a/copyparty/web/dd/4.png b/copyparty/web/dd/4.png deleted file mode 100644 index 64261e2b..00000000 Binary files a/copyparty/web/dd/4.png and /dev/null differ diff --git a/copyparty/web/dd/5.png b/copyparty/web/dd/5.png deleted file mode 100644 index 3d1d181e..00000000 Binary files a/copyparty/web/dd/5.png and /dev/null differ diff --git a/copyparty/web/dd/__init__.py b/copyparty/web/dd/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/docs/devnotes.md b/docs/devnotes.md index 229cb398..9fbb29df 100644 --- a/docs/devnotes.md +++ b/docs/devnotes.md @@ -330,7 +330,6 @@ the features you can opt to drop are * `cm`/easymde, the "fancy" markdown editor, saves ~89k * `hl`, prism, the syntax hilighter, saves ~41k * `fnt`, source-code-pro, the monospace font, saves ~9k -* `dd`, the custom mouse cursor for the media player tray tab, saves ~2k for the `re`pack to work, first run one of the sfx'es once to unpack it diff --git a/pyproject.toml b/pyproject.toml index e16ed9e1..d1f59351 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -86,7 +86,6 @@ copyparty = [ "web/*.css", "web/*.html", "web/a/*.bat", - "web/dd/*.png", "web/deps/*.gz", "web/deps/*.woff*", ] diff --git a/scripts/copyparty-repack.sh b/scripts/copyparty-repack.sh index bfe18cea..c4de5d23 100755 --- a/scripts/copyparty-repack.sh +++ b/scripts/copyparty-repack.sh @@ -137,10 +137,10 @@ repack() { } repack sfx-full "re gz" -repack sfx-ent "re no-dd" -repack sfx-ent "re no-dd gz" -repack sfx-lite "re no-dd no-cm no-hl" -repack sfx-lite "re no-dd no-cm no-hl gz" +repack sfx-ent "re" +repack sfx-ent "re gz" +repack sfx-lite "re no-cm no-hl" +repack sfx-lite "re no-cm no-hl gz" # move fuse and up2k clients into copyparty-extras/, diff --git a/scripts/make-sfx.sh b/scripts/make-sfx.sh index 1ef87943..deb7bee0 100755 --- a/scripts/make-sfx.sh +++ b/scripts/make-sfx.sh @@ -46,8 +46,6 @@ help() { exec cat <<'EOF' # `no-fnt` saves ~9k by removing the source-code-pro font # (browsers will try to use 'Consolas' instead) # -# `no-dd` saves ~2k by removing the mouse cursor -# # _____________________________________________________________________ # build behavior: # @@ -61,8 +59,8 @@ help() { exec cat <<'EOF' # # _____________________________________________________________________ # some usage examples: -# ./scripts/make-sfx.sh lang eng no-cm no-hl no-dd no-fnt no-smb no-pf -# ./scripts/rls.sh sfx lang eng no-cm no-hl no-dd no-fnt no-smb no-pf +# ./scripts/make-sfx.sh lang eng no-cm no-hl no-fnt no-smb no-pf +# ./scripts/rls.sh sfx lang eng no-cm no-hl no-fnt no-smb no-pf # (reduces v1.14.2 from 700k to 495k) EOF @@ -123,7 +121,6 @@ while [ ! -z "$1" ]; do no-pf) no_pf=1 ; ;; no-fnt) no_fnt=1 ; ;; no-hl) no_hl=1 ; ;; - no-dd) no_dd=1 ; ;; no-cm) no_cm=1 ; ;; dl-wd) dl_wd=1 ; ;; ign-wd) ign_wd=1 ; ;; @@ -456,13 +453,6 @@ rm -f ftp/pyftpdlib/{__main__,prefork}.py ised "s/src:.*scp.*\)/src:local('Consolas')/" $f } -[ $no_dd ] && { - rm -rf copyparty/web/dd - f=copyparty/web/browser.css - gzip -d "$f.gz" || true - ised 's/(cursor: ?)url\([^)]+\), ?(pointer)/\1\2/; s/[0-9]+% \{cursor:[^}]+\}//; s/animation: ?cursor[^};]+//' $f -} - [ $langs ] && { echo $langs | grep -q eng || { langs="eng|$langs" diff --git a/scripts/sfx.ls b/scripts/sfx.ls index 1a56e3c4..a7c8e774 100644 --- a/scripts/sfx.ls +++ b/scripts/sfx.ls @@ -73,12 +73,6 @@ copyparty/web/browser.js, copyparty/web/browser2.html, copyparty/web/cf.html, copyparty/web/copyparty.gif, -copyparty/web/dd, -copyparty/web/dd/2.png, -copyparty/web/dd/3.png, -copyparty/web/dd/4.png, -copyparty/web/dd/5.png, -copyparty/web/dd/__init__.py, copyparty/web/deps, copyparty/web/deps/__init__.py, copyparty/web/deps/busy.mp3, diff --git a/setup.py b/setup.py index 12b2aa48..b7554e2f 100755 --- a/setup.py +++ b/setup.py @@ -132,7 +132,6 @@ args = { "copyparty.stolen.ifaddr", "copyparty.web", "copyparty.web.a", - "copyparty.web.dd", "copyparty.web.deps", ], "install_requires": ["jinja2"],