diff --git a/README.md b/README.md index 176d084f..b21ce514 100644 --- a/README.md +++ b/README.md @@ -616,7 +616,7 @@ but instead of using `-mte`, `-mth` is a better way to hide tags in the browser: tags that start with a `.` such as `.bpm` and `.dur`(ation) indicate numeric value -see the beautiful mess of a dictionary in [mtag.py](https://github.com/9001/copyparty/blob/master/copyparty/mtag.py) for the default mappings (should cover mp3,opus,flac,m4a,wav,aif,) +see the beautiful mess of a dictionary in [mtag.py](https://github.com/9001/copyparty/blob/hovudstraum/copyparty/mtag.py) for the default mappings (should cover mp3,opus,flac,m4a,wav,aif,) `--no-mutagen` disables Mutagen and uses FFprobe instead, which... * is about 20x slower than Mutagen diff --git a/bin/copyparty-fuse.py b/bin/copyparty-fuse.py index c05b90ee..e3ffe1bd 100755 --- a/bin/copyparty-fuse.py +++ b/bin/copyparty-fuse.py @@ -22,7 +22,7 @@ dependencies: note: you probably want to run this on windows clients: - https://github.com/9001/copyparty/blob/master/contrib/explorer-nothumbs-nofoldertypes.reg + https://github.com/9001/copyparty/blob/hovudstraum/contrib/explorer-nothumbs-nofoldertypes.reg get server cert: awk '/-BEGIN CERTIFICATE-/ {a=1} a; /-END CERTIFICATE-/{exit}' <(openssl s_client -connect 127.0.0.1:3923 /dev/null) >cert.pem diff --git a/copyparty/__version__.py b/copyparty/__version__.py index b994e258..d52120a1 100644 --- a/copyparty/__version__.py +++ b/copyparty/__version__.py @@ -1,8 +1,8 @@ # coding: utf-8 -VERSION = (0, 13, 14) -CODENAME = "future-proof" -BUILD_DT = (2021, 9, 6) +VERSION = (1, 0, 0) +CODENAME = "sufficient" +BUILD_DT = (2021, 9, 7) S_VERSION = ".".join(map(str, VERSION)) S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT) diff --git a/scripts/make-sfx.sh b/scripts/make-sfx.sh index d9654a2e..bcaff171 100755 --- a/scripts/make-sfx.sh +++ b/scripts/make-sfx.sh @@ -67,6 +67,7 @@ pybin=$(command -v python3 || command -v python) || { use_gz= do_sh=1 do_py=1 +zopf=2560 while [ ! -z "$1" ]; do case $1 in clean) clean=1 ; ;; @@ -78,6 +79,7 @@ while [ ! -z "$1" ]; do no-cm) no_cm=1 ; ;; no-sh) do_sh= ; ;; no-py) do_py= ; ;; + fast) zopf=100 ; ;; *) help ; ;; esac shift @@ -136,7 +138,7 @@ tmpdir="$( # msys2 tar is bad, make the best of it echo collecting source [ $clean ] && { - (cd .. && git archive master >tar) && tar -xf ../tar copyparty + (cd .. && git archive hovudstraum >tar) && tar -xf ../tar copyparty (cd .. && tar -cf tar copyparty/web/deps) && tar -xf ../tar } [ $clean ] || { @@ -271,7 +273,7 @@ done gzres() { command -v pigz && - pk='pigz -11 -I 2560' || + pk="pigz -11 -I $zopf" || pk='gzip' np=$(nproc) diff --git a/scripts/make-tgz-release.sh b/scripts/make-tgz-release.sh index c3047c01..ea465d6e 100755 --- a/scripts/make-tgz-release.sh +++ b/scripts/make-tgz-release.sh @@ -61,7 +61,7 @@ rls_dir="$tmp/copyparty-$ver" mkdir "$rls_dir" echo ">>> export from git" -git archive master | tar -xC "$rls_dir" +git archive hovudstraum | tar -xC "$rls_dir" echo ">>> export untracked deps" tar -c copyparty/web/deps | tar -xC "$rls_dir" @@ -122,5 +122,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 hovudstraum rls src ; do alr $x; done diff --git a/setup.py b/setup.py index d9241000..40adf2c5 100755 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ class clean2(Command): pass nuke = [] - for (dirpath, dirnames, filenames) in os.walk("."): + for (dirpath, _, filenames) in os.walk("."): for fn in filenames: if ( fn.startswith("MANIFEST") @@ -86,7 +86,7 @@ args = { "url": "https://github.com/9001/copyparty", "license": "MIT", "classifiers": [ - "Development Status :: 4 - Beta", + "Development Status :: 5 - Production/Stable", "License :: OSI Approved :: MIT License", "Programming Language :: Python", "Programming Language :: Python :: 2", @@ -101,6 +101,7 @@ args = { "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: Jython", "Programming Language :: Python :: Implementation :: PyPy", "Environment :: Console", "Environment :: No Input/Output (Daemon)",