From 9dc6a264725438c68de5277edcd7fb5d17995f85 Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 20 Feb 2023 21:00:04 +0000 Subject: [PATCH] webdav.bat and readme tweaks --- README.md | 15 +++++++++------ contrib/webdav-cfg.bat | 34 ++++++++++++++-------------------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 887d4f02..c5e03b10 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ try the **[read-only demo server](https://a.ocv.me/pub/demo/)** 👀 running fro ## readme toc * top - * [quickstart](#quickstart) - download **[copyparty-sfx.py](https://github.com/9001/copyparty/releases/latest/download/copyparty-sfx.py)** and you're all set! + * [quickstart](#quickstart) - just run **[copyparty-sfx.py](https://github.com/9001/copyparty/releases/latest/download/copyparty-sfx.py)** -- that's it! 🎉 * [on servers](#on-servers) - you may also want these, especially on servers * [features](#features) * [testimonials](#testimonials) - small collection of user feedback @@ -104,13 +104,14 @@ try the **[read-only demo server](https://a.ocv.me/pub/demo/)** 👀 running fro ## quickstart -download **[copyparty-sfx.py](https://github.com/9001/copyparty/releases/latest/download/copyparty-sfx.py)** and you're all set! +just run **[copyparty-sfx.py](https://github.com/9001/copyparty/releases/latest/download/copyparty-sfx.py)** -- that's it! 🎉 * or install through pypi (python3 only): `python3 -m pip install --user -U copyparty` * or if you cannot install python, you can use [copyparty.exe](#copypartyexe) instead * or if you prefer to [use docker](./scripts/docker/) 🐋 you can do that too + * docker has all deps built-in, so skip this step: -enable thumbnails (images/audio/video), media indexing, and audio transcoding by installing recommended dependencies: +enable thumbnails (images/audio/video), media indexing, and audio transcoding by installing some recommended deps: * **Alpine:** `apk add py3-pillow ffmpeg` * **Debian:** `apt install python3-pil ffmpeg` @@ -120,15 +121,17 @@ enable thumbnails (images/audio/video), media indexing, and audio transcoding by * **MacOS** (alternative): `brew install pillow ffmpeg` * **Windows:** `python -m pip install --user -U Pillow` * install python and ffmpeg manually; do not use `winget` or `Microsoft Store` (it breaks $PATH) + * copyparty.exe comes with `Pillow` and only needs `ffmpeg` +* see [optional dependencies](#optional-dependencies) to enable even more features -running the sfx without arguments (for example doubleclicking it on Windows) will give everyone read/write access to the current folder; you may want [accounts and volumes](#accounts-and-volumes) +running copyparty without arguments (for example doubleclicking it on Windows) will give everyone read/write access to the current folder; you may want [accounts and volumes](#accounts-and-volumes) some recommended options: * `-e2dsa` enables general [file indexing](#file-indexing) -* `-e2ts` enables audio metadata indexing (needs either FFprobe or Mutagen), see [optional dependencies](#optional-dependencies) to enable thumbnails and more +* `-e2ts` enables audio metadata indexing (needs either FFprobe or Mutagen) * `-v /mnt/music:/music:r:rw,foo -a foo:bar` shares `/mnt/music` as `/music`, `r`eadable by anyone, and read-write for user `foo`, password `bar` * replace `:r:rw,foo` with `:r,foo` to only make the folder readable by `foo` and nobody else - * see [accounts and volumes](#accounts-and-volumes) for the syntax and other permissions (`r`ead, `w`rite, `m`ove, `d`elete, `g`et, up`G`et) + * see [accounts and volumes](#accounts-and-volumes) (or `--help-accounts`) for the syntax and other permissions ### on servers diff --git a/contrib/webdav-cfg.bat b/contrib/webdav-cfg.bat index 52db6c14..5128c036 100644 --- a/contrib/webdav-cfg.bat +++ b/contrib/webdav-cfg.bat @@ -3,8 +3,6 @@ rem removes the 47.6 MiB filesize limit when downloading from webdav rem + optionally allows/enables password-auth over plaintext http rem + optionally helps disable wpad, removing the 10sec latency -setlocal enabledelayedexpansion - net session >nul 2>&1 if %errorlevel% neq 0 ( echo sorry, you must run this as administrator @@ -20,30 +18,26 @@ echo OK; echo allow webdav basic-auth over plaintext http? echo Y: login works, but the password will be visible in wireshark etc echo N: login will NOT work unless you use https and valid certificates -set c=. -set /p "c=(Y/N): " -echo( -if /i not "!c!"=="y" goto :g1 -reg add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\WebClient\Parameters /v BasicAuthLevel /t REG_DWORD /d 0x2 /f -rem default is 1 (require tls) +choice +if %errorlevel% equ 1 ( + reg add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\WebClient\Parameters /v BasicAuthLevel /t REG_DWORD /d 0x2 /f + rem default is 1 (require tls) +) -:g1 echo( echo OK; echo do you want to disable wpad? echo can give a HUGE speed boost depending on network settings -set c=. -set /p "c=(Y/N): " -echo( -if /i not "!c!"=="y" goto :g2 -echo( -echo i'm about to open the [Connections] tab in [Internet Properties] for you; -echo please click [LAN settings] and disable [Automatically detect settings] -echo( -pause -control inetcpl.cpl,,4 +choice +if %errorlevel% equ 1 ( + echo( + echo i'm about to open the [Connections] tab in [Internet Properties] for you; + echo please click [LAN settings] and disable [Automatically detect settings] + echo( + pause + control inetcpl.cpl,,4 +) -:g2 net stop webclient net start webclient echo(