From 15e966cd950f49f5bf00972acc8d4e8ed7b506a5 Mon Sep 17 00:00:00 2001 From: stabbedbybrick <125766685+stabbedbybrick@users.noreply.github.com> Date: Wed, 3 Jan 2024 15:46:03 +0100 Subject: [PATCH] README, documenation, cleanup, version --- README.md | 4 +++- utils/__init__.py | 2 +- utils/commands.py | 2 +- utils/docs/documentation.py | 18 ++++++++++++++---- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index cb0852c..c6c9d1b 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,7 @@ Available arguments: ``` + --proxy TEXT Request or specify a proxy server --threads TEXT Concurrent download fragments --format TEXT Specify file format --muxer TEXT Select muxer @@ -64,6 +65,7 @@ Available arguments: --sub-no-fix Leave subtitles untouched --use-shaka-packager Use shaka-packager to decrypt --add-command TEXT Add extra command to N_m3u8DL-RE + -fn, --force-numbering Force add numbering to episodes -e, --episode TEXT Download episode(s) -s, --season TEXT Download complete season -c, --complete Download complete series @@ -72,9 +74,9 @@ Available arguments: -i, --info Print title info -sv, --select-video TEXT Select video stream -sa, --select-audio TEXT Select audio stream - -ss, --select-subtitle TEXT Select subtitle -dv, --drop-video TEXT Drop video stream -da, --drop-audio TEXT Drop audio stream + -ss, --select-subtitle TEXT Select subtitle -ds, --drop-subtitle TEXT Drop subtitle ``` Examples: diff --git a/utils/__init__.py b/utils/__init__.py index 2f0abb8..8b0487e 100644 --- a/utils/__init__.py +++ b/utils/__init__.py @@ -1 +1 @@ -__version__ = "v1.1.0" +__version__ = "v1.1.1" diff --git a/utils/commands.py b/utils/commands.py index c2a13c4..eb0886e 100644 --- a/utils/commands.py +++ b/utils/commands.py @@ -30,7 +30,7 @@ def cli(debug: bool): logging.getLogger("requests").setLevel(logging.WARNING) logging.getLogger("httpx").setLevel(logging.WARNING) - click.echo(f"\nāÆ_ š•—š•£š•–š•–š•§š•šš•Ÿš•– {__version__}\n") + click.echo(f"\nāÆ_freevine {__version__}\n") check_version(__version__) diff --git a/utils/docs/documentation.py b/utils/docs/documentation.py index 7d7cb2f..24cabaf 100644 --- a/utils/docs/documentation.py +++ b/utils/docs/documentation.py @@ -14,6 +14,7 @@ main_help = f""" mkvmerge mp4decrypt shaka-packager + hola-proxy (optional) \b Installation: 1. Install Python (check 'Add to PATH' if on Windows) @@ -105,6 +106,18 @@ main_help = f""" You can search one or multiple services at the same time The results should produce usable URL to series or movie Some services have geo block even for searching + \b + Proxy (beta): + You can request or specify a proxy server to be used for API and license requests: + \b + freevine.py --proxy US + freevine.py --proxy "01.234.56.789:10" + \b + NOTES: + Requesting a proxy by country code requires https://github.com/Snawoot/hola-proxy + Make sure to re-name the executable to "hola-proxy" in order to work properly + \b + The proxy currently only affects API and license requests, not downloads \b Service information: (Premium content on any service is not supported) @@ -113,7 +126,7 @@ main_help = f""" CTV: 1080p, DD5.1 CBC GEM: 1080p, DD5.1 iView: 1080p, AAC2.0 - ALL4: 1080p, AAC2.0 * + ALL4: 1080p, AAC2.0 MY5: 1080p, AAC2.0 iPLAYER: 1080p, AAC2.0 UKTVPLAY: 1080p, AAC2.0 @@ -123,9 +136,6 @@ main_help = f""" ITV: 720p, AAC2.0 TUBI: 720p, AAC2.0 PLUTO: 720p, AAC2.0 - \b - *ALL4 offer different quality streams on different API endpoints - You can switch between them in /services/channel4/api.yaml by using "android" or "web" as client \b Final notes: \b