From c7253148d1cf15c8b153ec76611b9b277a84c5d9 Mon Sep 17 00:00:00 2001 From: Tristan Lee Date: Sun, 3 Apr 2022 19:31:32 -0500 Subject: [PATCH 1/2] added 'retries' argument to youtube-dl options, and made options consistent across youtube-dl instances. --- cisticola/scraper/base.py | 7 ++++--- cisticola/scraper/youtube.py | 12 +++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cisticola/scraper/base.py b/cisticola/scraper/base.py index 0762c16..d2180b0 100644 --- a/cisticola/scraper/base.py +++ b/cisticola/scraper/base.py @@ -18,7 +18,7 @@ class Scraper: from a given channel on that specific platform. """ - __version__ = "Scraper 0.0.0" + __version__ = "Scraper 0.0.1" def __init__(self): @@ -184,8 +184,9 @@ class Scraper: "merge_output_format": "mp4", "outtmpl": f"{temp_dir}/%(id)s.%(ext)s", "noplaylist": True, - 'quiet': True, - "verbose": False,} + "quiet": True, + "verbose": False, + "retries": 5} ydl = yt_dlp.YoutubeDL(ydl_opts) try: diff --git a/cisticola/scraper/youtube.py b/cisticola/scraper/youtube.py index 6b14d98..c1bd717 100644 --- a/cisticola/scraper/youtube.py +++ b/cisticola/scraper/youtube.py @@ -13,7 +13,7 @@ from cisticola.scraper import Scraper class YoutubeScraper(Scraper): """An implementation of a Scraper for Youtube, using youtube-dl""" - __version__ = "YoutubeScraper 0.0.1" + __version__ = "YoutubeScraper 0.0.2" @logger.catch def get_posts(self, channel: Channel, since: ScraperResult = None, archive_media: bool = True) -> Generator[ScraperResult, None, None]: @@ -35,7 +35,10 @@ class YoutubeScraper(Scraper): "format": "bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best", "merge_output_format": "mp4", "outtmpl": f"{temp_dir}/%(id)s.%(ext)s", - "daterange" : daterange} + "daterange" : daterange, + "quiet": True, + "verbose": False, + "retries": 5} ydl = yt_dlp.YoutubeDL(ydl_opts) @@ -94,7 +97,10 @@ class YoutubeScraper(Scraper): ydl_opts = { "format": "bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best", "merge_output_format": "mp4", - "outtmpl": f"{temp_dir}/%(id)s.%(ext)s"} + "outtmpl": f"{temp_dir}/%(id)s.%(ext)s", + "quiet": True, + "verbose": False, + "retries": 5} ydl = yt_dlp.YoutubeDL(ydl_opts) From a204041480a6aa023453bb83382126f92e41911b Mon Sep 17 00:00:00 2001 From: Tristan Lee Date: Tue, 5 Apr 2022 17:03:45 -0500 Subject: [PATCH 2/2] made requested changes to scraper version numbers --- cisticola/scraper/base.py | 2 +- cisticola/scraper/youtube.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cisticola/scraper/base.py b/cisticola/scraper/base.py index 02f5593..93974e8 100644 --- a/cisticola/scraper/base.py +++ b/cisticola/scraper/base.py @@ -20,7 +20,7 @@ class Scraper: from a given channel on that specific platform. """ - __version__ = "Scraper 0.0.1" + __version__ = "Scraper 0.0.0" def __init__(self): diff --git a/cisticola/scraper/youtube.py b/cisticola/scraper/youtube.py index ac9f5f3..468104d 100644 --- a/cisticola/scraper/youtube.py +++ b/cisticola/scraper/youtube.py @@ -13,7 +13,7 @@ from cisticola.scraper import Scraper class YoutubeScraper(Scraper): """An implementation of a Scraper for Youtube, using youtube-dl""" - __version__ = "YoutubeScraper 0.0.2" + __version__ = "YoutubeScraper 0.0.0" @logger.catch def get_posts(self, channel: Channel, since: ScraperResult = None, archive_media: bool = True) -> Generator[ScraperResult, None, None]: