diff --git a/.gitignore b/.gitignore index be25b99f..c5705a4d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,7 @@ sfx/ # derived copyparty/web/deps/ srv/ + +# state/logs +up.*.txt +.hist/ \ No newline at end of file diff --git a/bin/up2k.py b/bin/up2k.py index f75ef72d..51f3480c 100755 --- a/bin/up2k.py +++ b/bin/up2k.py @@ -3,11 +3,11 @@ from __future__ import print_function, unicode_literals """ up2k.py: upload to copyparty -2021-09-30, v0.6, ed , MIT-Licensed +2021-10-04, v0.7, ed , MIT-Licensed https://github.com/9001/copyparty/blob/hovudstraum/bin/up2k.py - dependencies: requests -- supports python 2.7 and 3.3 through 3.10 +- supports python 2.6, 2.7, and 3.3 through 3.10 - almost zero error-handling - but if something breaks just try again and it'll autoresume diff --git a/copyparty/__version__.py b/copyparty/__version__.py index 4b78e166..2d8e7b59 100644 --- a/copyparty/__version__.py +++ b/copyparty/__version__.py @@ -1,8 +1,8 @@ # coding: utf-8 -VERSION = (1, 0, 7) +VERSION = (1, 0, 8) CODENAME = "sufficient" -BUILD_DT = (2021, 9, 26) +BUILD_DT = (2021, 10, 4) S_VERSION = ".".join(map(str, VERSION)) S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT) diff --git a/copyparty/web/util.js b/copyparty/web/util.js index 90af1717..831dadf9 100644 --- a/copyparty/web/util.js +++ b/copyparty/web/util.js @@ -247,7 +247,9 @@ function import_js(url, cb) { script.src = url; script.onload = cb; script.onerror = function () { - toast.err(0, 'Failed to load module:\n' + url); + var m = 'Failed to load module:\n' + url; + console.log(m); + toast.err(0, m); }; head.appendChild(script); } diff --git a/docs/notes.sh b/docs/notes.sh index aa3df7c2..4e6a715a 100644 --- a/docs/notes.sh +++ b/docs/notes.sh @@ -162,7 +162,7 @@ brew install python@2 pip install virtualenv # readme toc -cat README.md | awk 'function pr() { if (!h) {return}; if (/^ *[*!#]/||!s) {printf "%s\n",h;h=0;return}; if (/.../) {printf "%s - %s\n",h,$0;h=0}; }; /^#/{s=1;pr()} /^#* *(file indexing|install on android|dev env setup|just the sfx|complete release|optional gpl stuff)|`$/{s=0} /^#/{lv=length($1);sub(/[^ ]+ /,"");bab=$0;gsub(/ /,"-",bab); h=sprintf("%" ((lv-1)*4+1) "s [%s](#%s)", "*",$0,bab);next} !h{next} {sub(/ .*/,"");sub(/[:,]$/,"")} {pr()}' > toc; grep -E '^## readme toc' -B1000 -A2 p1; grep -E '^## quickstart' -B2 -A999999 p2; (cat p1; grep quickstart -A1000 README.md +cat README.md | awk 'function pr() { if (!h) {return}; if (/^ *[*!#]/||!s) {printf "%s\n",h;h=0;return}; if (/.../) {printf "%s - %s\n",h,$0;h=0}; }; /^#/{s=1;pr()} /^#* *(file indexing|install on android|dev env setup|just the sfx|complete release|optional gpl stuff)|`$/{s=0} /^#/{lv=length($1);sub(/[^ ]+ /,"");bab=$0;gsub(/ /,"-",bab); h=sprintf("%" ((lv-1)*4+1) "s [%s](#%s)", "*",$0,bab);next} !h{next} {sub(/ .*/,"");sub(/[:,]$/,"")} {pr()}' > toc; grep -E '^## readme toc' -B1000 -A2 p1; grep -E '^## quickstart' -B2 -A999999 p2; (cat p1; grep quickstart -A1000 README.md; rm p1 p2 toc # fix firefox phantom breakpoints, # suggestions from bugtracker, doesnt work (debugger is not attachable) diff --git a/setup.py b/setup.py index 5e703d5e..bb18ab5c 100755 --- a/setup.py +++ b/setup.py @@ -114,7 +114,7 @@ args = { "install_requires": ["jinja2"], "extras_require": {"thumbnails": ["Pillow"], "audiotags": ["mutagen"]}, "entry_points": {"console_scripts": ["copyparty = copyparty.__main__:main"]}, - "scripts": ["bin/copyparty-fuse.py"], + "scripts": ["bin/copyparty-fuse.py", "bin/up2k.py"], "cmdclass": {"clean2": clean2}, }