From 161b8326befebed4562c9215aa660b5ea4ec0be9 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 4 Nov 2021 11:44:41 +0700 Subject: [PATCH] switch to yt_dlp --- README.md | 8 ++++---- config.sample.json | 1 - requirements.txt | 2 +- src/trailers.py | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f53bf03..172a626 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,9 @@ These are the none standard Python libraries in use in this project: * [trash-cli](https://pypi.org/project/trash-cli/) * Install on Arch: `sudo pacman -S trash-cli` * Install with pip: `pip install trash-cli` -* [youtube-dl](https://pypi.org/project/youtube_dl/) - * Install on Arch: `sudo pacman -S youtube-dl` - * Install with pip: `pip install youtube_dl` +* [yt-dlp](https://pypi.org/project/yt-dlp/) + * Install on Arch: `sudo pacman -S yt-dlp` + * Install with pip: `pip install yt-dlp` * curses * Is already installed on most linux based systems. * On Windows: `pip install windows-curses` @@ -77,7 +77,7 @@ Duplicate the config.sample.json file to a file named *config.json* and set the #### ydl_opts *Trailer download:* *optional:* remove the 'ydl_opts' key from config.json to disable the trailer download functionality. -Arguments under the [ydl_opts] section will get passed in to youtube-dl for *trailers*. Check out the documentation for details. +Arguments under the [ydl_opts] section will get passed in to yt-dlp for *trailers*. Check out the documentation for details. ## Known limitations: Most likely *media_organizer* will fail if there are any files like Outtakes, Extras, Feauturettes, etc in the folder. For these cases, moove/delete them first before running *media_organizer*. \ No newline at end of file diff --git a/config.sample.json b/config.sample.json index 701acf5..ce749b4 100644 --- a/config.sample.json +++ b/config.sample.json @@ -18,7 +18,6 @@ "ydl_opts": { "format": "bestvideo[height<=1080]+bestaudio/best[height<=1080]", "merge_output_format": "mkv", - "external_downloader": "aria2c", "geo_bypass": true } } \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index cb8f841..652b7fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ request trash-cli -youtube_dl +yt_dlp diff --git a/src/trailers.py b/src/trailers.py index 82e58d4..135d5ce 100644 --- a/src/trailers.py +++ b/src/trailers.py @@ -6,7 +6,7 @@ import re from time import sleep import requests -import youtube_dl +import yt_dlp as youtube_dl from src.config import get_config