diff --git a/README.md b/README.md index 9a2b8ee..7369f1e 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ A tool to download and remove DRM from streaming services. Modified to remove Pl The name `VineTrimmer` comes from `Vine` as in `WideVine` and `Trimmer` as in remove. -## This project is under active development. Occasionaly expect bugs and errors. +## This project is under active development. Expect bugs and errors. ## Disclaimer!!! This project is ONLY for educational/archival/personal purposes. I do not condone piracy in any form. By using this project you agree that: -`The developer shall not be held responsible for any account suspensions, terminations, or penalties imposed by third-party platforms. The User acknowledges and agrees that they are solely responsible for complying with all terms, policies, and guidelines of any such platforms.` +`The developer shall not be held responsible for any account suspensions, terminations, penalties or legal action taken/imposed by third-party platforms. The User acknowledges and agrees that they are solely responsible for complying with all terms, policies, copyright and guidelines of any such platforms.` I AM NOT taking credit for the entirety of this project. This project is based on a version of an old fork of [devine](https://github.com/devine-dl/devine) that was found floating around online. I AM taking credit for about 20% of the additional stuff that I personally worked on. @@ -21,7 +21,7 @@ I AM NOT taking credit for the entirety of this project. This project is based o ## Features - Progress Bars for decryption ([mp4decrypt](https://github.com/chu23465/bentoOldFork), Shaka) - Refresh Token fixed for Amazon service - - Reprovision .prd after 2 days + - Reprovision .prd automatically after 2 days - ISM manifest support (Microsoft Smooth Streaming) (WIP/Experimental) - N_m3u8DL-RE downloader support - Atmos audio with ISM manifest (Amazon) is Fixed @@ -129,7 +129,6 @@ COMMAND :- | Alaias | Command | Service Link | |--------|---------------|--------------------------------------------| | AMZN | Amazon | https://amazon.com, https://primevideo.com | -| ATVP | AppleTVPlus | https://tv.apple.com | | DSNP | DisneyPlus | https://disneyplus.com/ | | HS | Hotstar | https://www.hotstar.com/ | | MAX | Max | https://max.com | @@ -171,10 +170,10 @@ Usage: vt.cmd AMZN [OPTIONS] [TITLE] Use 'Amazon Video ASIN Display' for Tampermonkey addon for ASIN https://greasyfork.org/en/scripts/496577-amazon-video-asin-display - vt dl --list -z uk -q 1080 Amazon B09SLGYLK8 - Below flags to be passed after the `AMZN` or `Amazon` keyword in command. +ARGS: + | Command Line Switch | Description | |-------------------------------------|-----------------------------------------------------------------------------------------------------| | -b, --bitrate | Video Bitrate Mode to download in. CVBR=Constrained Variable Bitrate, CBR=Constant Bitrate. (CVBR or CBR or CVBR+CBR) | @@ -194,11 +193,11 @@ https://www.primevideo.com/region/eu/ontv/code?ref_=atv_auth_red_aft Login and get to the code pair page. Extract cookies from that page using [Open Cookies.txt](https://chromewebstore.google.com/detail/open-cookiestxt/gdocmgbfkjnnpapoeobnolbbkoibbcif). -Save it to the path `vinetrimmer/Cookies/Amazon/default.txt`. Pay attention to path if you are on Linux. Path is case sensitive and needs the capital `C` for `Cookies` and capital `A` for `Amazon`. +Save it to the path `vinetrimmer/Cookies/Amazon/default.txt`. Pay attention to path if you are on Linux. Path is case sensitive. When caching cookies, use a profile without PIN. Otherwise it may cause errors. -If you are facing 403 or 400 errors even after saving fresh cookies and clearing `Cache` Folder, try logging out of your Amazon account in the browser and logging back in. Then save cookies. +If you are facing 403 or 400 errors even after saving fresh cookies and clearing `Cache` folder, try logging out of your Amazon account in the browser and logging back in. Then save cookies. Some titles say `UHD/2160p` is available and if VT is saying `no 2160p track available`, then `UHD/2160p` is only available via renting. @@ -218,15 +217,10 @@ Some titles say `UHD/2160p` is available and if VT is saying `no 2160p track ava ### DisneyPlus -Needs only credentials added to `vinetrimmer.yml`. - -Requires you to use `-m` or `--movie` flag if you are downloading a movie. Append flag to end of your command. - -From my testing, when using with VPN, it causes lots of issues, mainly needing to clear `Cache` folder and login repeatedly. Use residential proxies if available. - -If you are getting `No 2160p track found` error for a title you know has 4k, then try passing `-r DV` or `-r HDR`. - -Make sure your account can access highest qualities. + - Needs only credentials added to `vinetrimmer.yml`. + - Requires you to use `-m` or `--movie` flag if you are downloading a movie. Append flag to end of your command. + - From my testing, when using with VPN, it causes lots of issues, mainly needing to clear `Cache` folder and login repeatedly. Use residential proxies if available. Don't hammer service. Try waiting a minute or two before logging in again. + - If you are getting `No 2160p track found` error for a title you know has 4k, then try passing `-r DV` or `-r HDR`. Make sure your account can access highest qualities. ### Example Command @@ -289,7 +283,7 @@ Above command: ## Proxy I recommend [Windscribe](https://windscribe.com/). You can sign up, getting 10 GB of traffic credit every month for free. We use the VPN for everything except downloading video/audio. -Tested so far on Amazon, AppleTVPlus, Max. +Tested so far on Amazon, AppleTVPlus, Max, and DisneyPlus. ### Steps: 1. For each service, within get_tracks() function we do this below. Below is only when you are integrating a new service yourself. Set needs_proxy to True if your service needs proxy to get manifest (Ex - Netflix, Hotstar). @@ -354,7 +348,7 @@ Tested so far on Amazon, AppleTVPlus, Max. ## Broken / To-Do (Descending order of priority) - [ ] First stable release - - [ ] Shaka with progress bar repo + - [ ] Shaka with progress bar repository - [ ] Fix cdm type errors. - [ ] Insert command to start of log in vt - [ ] Linux support - Debian/Ubuntu/Mint + Fix service config load for Linux. @@ -371,7 +365,6 @@ Tested so far on Amazon, AppleTVPlus, Max. - [ ] Modify aria2c to include a progress bar ? - [ ] Github Actions Python script that builds and publishes release for every commit to not readme.md - [ ] MAX - Fix HDR10/DV --list - - [ ] ATVP service is currently broken in dev branch - [ ] Fix original language (Was removed as workaround for a bug) - [ ] Fix `-sl all` and `-al all` - [ ] Make a windscribe.py for proxies modelled after nordvpn.py. Refer to the chrome extension for the code. @@ -379,7 +372,7 @@ Tested so far on Amazon, AppleTVPlus, Max. - [ ] Netflix service is currently broken (will probably be fixed Soon™) - [ ] Integrate [subby](https://github.com/vevv/subby) - [ ] Licensing before download (?) - - [ ] Add MoviesAnywhere service. + - [ ] Test and fix MoviesAnywhere, ParamountPlus, AppleTVPlus, Hulu services. - [ ] Guide for writing a service + debugging - [ ] Implement a scan/hammer/cache keys for each service - pass string of zeros as title id. Then copy and rework dl.py to iterate over returned list of titles from scan function @@ -407,7 +400,7 @@ My discord is `@crapola` [@rlaphoenix](https://github.com/rlaphoenix) for [pywidevine](https://github.com/devine-dl/pywidevine) -[@rlaphoenix](https://github.com/rlaphoenix) again as he was the original developer behind the `VineTrimmer` (later version renamed to `devine`) base `Widevine` version. +[@rlaphoenix](https://github.com/rlaphoenix) again as he was the original developer behind the `VineTrimmer` base (later renamed to `devine`) `Widevine` version. [@DevLARLEY](https://github.com/DevLARLEY) for [pyplayready](https://git.gay/ready-dl/pyplayready)