From ca001c8504b97bb5e77e37069400860670471d18 Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 12 Aug 2024 18:51:52 +0000 Subject: [PATCH] update deps (pyftpdlib, win10-python) --- README.md | 2 +- scripts/make-sfx.sh | 10 +++++----- scripts/pyinstaller/deps.sha512 | 2 +- scripts/pyinstaller/notes.txt | 2 +- scripts/test/tftp.sh | 25 +++++++++++++++---------- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 1a00bc35..9e4d3f94 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ turn almost any device into a file server with resumable uploads/downloads using just run **[copyparty-sfx.py](https://github.com/9001/copyparty/releases/latest/download/copyparty-sfx.py)** -- that's it! 🎉 -* or install through pypi: `python3 -m pip install --user -U copyparty` +* or install through [pypi](https://pypi.org/project/copyparty/): `python3 -m pip install --user -U copyparty` * or if you cannot install python, you can use [copyparty.exe](#copypartyexe) instead * or install [on arch](#arch-package) ╱ [on NixOS](#nixos-module) ╱ [through nix](#nix-package) * or if you are on android, [install copyparty in termux](#install-on-android) diff --git a/scripts/make-sfx.sh b/scripts/make-sfx.sh index 798683fa..7b79573a 100755 --- a/scripts/make-sfx.sh +++ b/scripts/make-sfx.sh @@ -202,14 +202,14 @@ necho() { mv {markupsafe,jinja2} j2/ necho collecting pyftpdlib - f="../build/pyftpdlib-1.5.9.tar.gz" + f="../build/pyftpdlib-1.5.10.tar.gz" [ -e "$f" ] || - (url=https://github.com/giampaolo/pyftpdlib/archive/refs/tags/release-1.5.9.tar.gz; + (url=https://files.pythonhosted.org/packages/cf/31/8d910cf40317dd0db74ba0b8558d0dee23c8b002468c14d3a5dec0e6e9fd/pyftpdlib-1.5.10.tar.gz; wget -O$f "$url" || curl -L "$url" >$f) tar -zxf $f - mv pyftpdlib-release-*/pyftpdlib . - rm -rf pyftpdlib-release-* pyftpdlib/test + mv pyftpdlib-*/pyftpdlib . + rm -rf pyftpdlib-* pyftpdlib/test for f in pyftpdlib/_async{hat,ore}.py; do [ -e "$f" ] || continue; iawk 'NR<4||NR>27||!/^#/;NR==4{print"# license: https://opensource.org/licenses/ISC\n"}' $f @@ -413,7 +413,7 @@ rm have ised /fork_process/d ftp/pyftpdlib/servers.py iawk '/^class _Base/{s=1}!s' ftp/pyftpdlib/authorizers.py -iawk '/^ {0,4}[^ ]/{s=0}/^ {4}def (serve_forever|_loop)/{s=1}!s' ftp/pyftpdlib/servers.py +iawk '/^ {0,4}[a-zA-Z]/{s=0}/^ {4}def (serve_forever|_loop)/{s=1}!s' ftp/pyftpdlib/servers.py rm -f ftp/pyftpdlib/{__main__,prefork}.py [ $no_ftp ] && diff --git a/scripts/pyinstaller/deps.sha512 b/scripts/pyinstaller/deps.sha512 index 2eec5949..2a94b545 100644 --- a/scripts/pyinstaller/deps.sha512 +++ b/scripts/pyinstaller/deps.sha512 @@ -36,4 +36,4 @@ d1420c8417fad7888766dd26b9706a87c63e8f33dceeb8e26d0056d5127b0b3ed9272e44b4b76113 2be320b4191f208cdd6af183c77ba2cf460ea52164ee45ac3ff17d6dfa57acd9deff016636c2dd42a21f4f6af977d5f72df7dacf599bebcf41757272354d14c1 pillow-10.4.0-cp312-cp312-win_amd64.whl 776378f5414efd26ec8a1cb3228a7b5fdf6afca3fa335a0e9b071266d55d9d9e66ee157c25a468a05bfa70ccd33c48b101998523fc6ff6bcf5e82a1d81ed0af8 pyinstaller-6.9.0-py3-none-win_amd64.whl c0af77d2a57cb063ab038dc986ed3582bc5acc8c8bd91d726101935d6388f50854ddbca26bc846ed5d1022cdee4d96242938c66f0ddc4565c36b60d691064db8 pyinstaller_hooks_contrib-2024.7-py2.py3-none-any.whl -2f9a11ffae6d9f1ed76bf816f28812fcba71f87080b0c92e52bfccb46243118c5803a7e25dd78003ca7d66501bfcdce8ff7c691c63c0038b0d409ca3842dcc89 python-3.12.4-amd64.exe +0572c6345f6a4f7f3e5c2ff858e3ca7ca54ae4478f3d59d8e18cb0f596e61dcf12aef579db229e83d63b30f15d6684ee6bb3feaea9413e5e636a503933057678 python-3.12.5-amd64.exe diff --git a/scripts/pyinstaller/notes.txt b/scripts/pyinstaller/notes.txt index c5249903..92569474 100644 --- a/scripts/pyinstaller/notes.txt +++ b/scripts/pyinstaller/notes.txt @@ -41,7 +41,7 @@ fns=( pillow-10.4.0-cp312-cp312-win_amd64.whl pyinstaller-6.9.0-py3-none-win_amd64.whl pyinstaller_hooks_contrib-2024.7-py2.py3-none-any.whl - python-3.12.4-amd64.exe + python-3.12.5-amd64.exe ) [ $w7 ] && fns+=( # u2c stuff certifi-2024.2.2-py3-none-any.whl diff --git a/scripts/test/tftp.sh b/scripts/test/tftp.sh index b52accb1..a499b4f7 100755 --- a/scripts/test/tftp.sh +++ b/scripts/test/tftp.sh @@ -3,34 +3,39 @@ set -ex # PYTHONPATH=.:~/dev/partftpy/ taskset -c 0 python3 -m copyparty -v srv::r -v srv/junk:junk:A --tftp 3969 -get_src=~/dev/copyparty/srv/palette.flac -get_fn=${get_src##*/} +get_src=~/dev/copyparty/srv/ro/palette.flac +get_fp=ro/${get_src##*/} # server url +get_fn=${get_fp##*/} # just filename put_src=~/Downloads/102.zip put_dst=~/dev/copyparty/srv/junk/102.zip +export PATH="$PATH:$HOME/src/atftp-0.8.0" + cd /dev/shm -echo curl get 1428 v4; curl --tftp-blksize 1428 tftp://127.0.0.1:3969/$get_fn | cmp $get_src || exit 1 -echo curl get 1428 v6; curl --tftp-blksize 1428 tftp://[::1]:3969/$get_fn | cmp $get_src || exit 1 +echo curl get 1428 v4; curl --tftp-blksize 1428 tftp://127.0.0.1:3969/$get_fp | cmp $get_src || exit 1 +echo curl get 1428 v6; curl --tftp-blksize 1428 tftp://[::1]:3969/$get_fp | cmp $get_src || exit 1 echo curl put 1428 v4; rm -f $put_dst && curl --tftp-blksize 1428 -T $put_src tftp://127.0.0.1:3969/junk/ && cmp $put_src $put_dst || exit 1 echo curl put 1428 v6; rm -f $put_dst && curl --tftp-blksize 1428 -T $put_src tftp://[::1]:3969/junk/ && cmp $put_src $put_dst || exit 1 -echo atftp get 1428; rm -f $get_fn && ~/src/atftp/atftp --option "blksize 1428" -g -r $get_fn 127.0.0.1 3969 && cmp $get_fn $get_src || exit 1 +echo atftp get 1428; rm -f $get_fn && atftp --option "blksize 1428" -g -r $get_fp -l $get_fn 127.0.0.1 3969 && cmp $get_fn $get_src || exit 1 -echo atftp put 1428; rm -f $put_dst && ~/src/atftp/atftp --option "blksize 1428" 127.0.0.1 3969 -p -l $put_src -r junk/102.zip && cmp $put_src $put_dst || exit 1 +echo atftp put 1428; rm -f $put_dst && atftp --option "blksize 1428" 127.0.0.1 3969 -p -l $put_src -r junk/102.zip && cmp $put_src $put_dst || exit 1 -echo tftp-hpa get; rm -f $put_dst && tftp -v -m binary 127.0.0.1 3969 -c get $get_fn && cmp $get_src $get_fn || exit 1 +echo tftp-hpa get; rm -f $get_fn && tftp -v -m binary 127.0.0.1 3969 -c get $get_fp && cmp $get_src $get_fn || exit 1 echo tftp-hpa put; rm -f $put_dst && tftp -v -m binary 127.0.0.1 3969 -c put $put_src junk/102.zip && cmp $put_src $put_dst || exit 1 -echo curl get 512; curl tftp://127.0.0.1:3969/$get_fn | cmp $get_src || exit 1 +echo curl get 512; curl tftp://127.0.0.1:3969/$get_fp | cmp $get_src || exit 1 echo curl put 512; rm -f $put_dst && curl -T $put_src tftp://127.0.0.1:3969/junk/ && cmp $put_src $put_dst || exit 1 -echo atftp get 512; rm -f $get_fn && ~/src/atftp/atftp -g -r $get_fn 127.0.0.1 3969 && cmp $get_fn $get_src || exit 1 +echo atftp get 512; rm -f $get_fn && atftp -g -r $get_fp -l $get_fn 127.0.0.1 3969 && cmp $get_fn $get_src || exit 1 -echo atftp put 512; rm -f $put_dst && ~/src/atftp/atftp 127.0.0.1 3969 -p -l $put_src -r junk/102.zip && cmp $put_src $put_dst || exit 1 +echo atftp put 512; rm -f $put_dst && atftp 127.0.0.1 3969 -p -l $put_src -r junk/102.zip && cmp $put_src $put_dst || exit 1 echo nice + +rm -f $get_fn