From a56de2818d976bf1c57eabccb832d80644da11a0 Mon Sep 17 00:00:00 2001 From: simon Date: Sat, 4 Mar 2023 11:33:22 +0700 Subject: [PATCH] consolidate yt-dlp obs --- tubearchivist/home/src/download/queue.py | 4 ---- tubearchivist/home/src/download/yt_dlp_base.py | 3 ++- tubearchivist/home/src/download/yt_dlp_handler.py | 5 ----- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/tubearchivist/home/src/download/queue.py b/tubearchivist/home/src/download/queue.py index cd20c9b6..89a46d0b 100644 --- a/tubearchivist/home/src/download/queue.py +++ b/tubearchivist/home/src/download/queue.py @@ -148,13 +148,9 @@ class PendingList(PendingIndex): """manage the pending videos list""" yt_obs = { - "default_search": "ytsearch", - "quiet": True, - "check_formats": "selected", "noplaylist": True, "writethumbnail": True, "simulate": True, - "socket_timeout": 3, } def __init__(self, youtube_ids=False): diff --git a/tubearchivist/home/src/download/yt_dlp_base.py b/tubearchivist/home/src/download/yt_dlp_base.py index fd59a9dc..5cecc35a 100644 --- a/tubearchivist/home/src/download/yt_dlp_base.py +++ b/tubearchivist/home/src/download/yt_dlp_base.py @@ -20,8 +20,9 @@ class YtWrap: "default_search": "ytsearch", "quiet": True, "check_formats": "selected", - "socket_timeout": 3, + "socket_timeout": 10, "extractor_retries": 3, + "retries": 10, } def __init__(self, obs_request, config=False): diff --git a/tubearchivist/home/src/download/yt_dlp_handler.py b/tubearchivist/home/src/download/yt_dlp_handler.py index 34855484..4f1fbced 100644 --- a/tubearchivist/home/src/download/yt_dlp_handler.py +++ b/tubearchivist/home/src/download/yt_dlp_handler.py @@ -318,7 +318,6 @@ class VideoDownloader: def _build_obs_basic(self): """initial obs""" self.obs = { - "default_search": "ytsearch", "merge_output_format": "mp4", "outtmpl": ( self.config["application"]["cache_dir"] @@ -326,13 +325,9 @@ class VideoDownloader: ), "progress_hooks": [self._progress_hook], "noprogress": True, - "quiet": True, "continuedl": True, - "retries": 3, "writethumbnail": False, "noplaylist": True, - "check_formats": "selected", - "socket_timeout": 3, } def _build_obs_user(self):