From 8af7a3caf4f9a735c9aac958d3099dbba210acd2 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 2 Oct 2023 09:09:58 +0700 Subject: [PATCH 1/3] better playlist extract error message --- tubearchivist/home/src/download/queue.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tubearchivist/home/src/download/queue.py b/tubearchivist/home/src/download/queue.py index 0f92bd4..3c733ca 100644 --- a/tubearchivist/home/src/download/queue.py +++ b/tubearchivist/home/src/download/queue.py @@ -228,6 +228,11 @@ class PendingList(PendingIndex): """add all videos of playlist to list""" playlist = YoutubePlaylist(url) playlist.build_json() + if not playlist.json_data: + message = f"{playlist.youtube_id}: failed to extract metadata" + print(message) + raise ValueError(message) + video_results = playlist.json_data.get("playlist_entries") youtube_ids = [i["youtube_id"] for i in video_results] for video_id in youtube_ids: From e9eddf06fbf488e80096cc22e00c184c1fad68b2 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 3 Oct 2023 19:57:12 +0700 Subject: [PATCH 2/3] error handling for playlist sub --- tubearchivist/home/src/download/subscriptions.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tubearchivist/home/src/download/subscriptions.py b/tubearchivist/home/src/download/subscriptions.py index fee3fb6..c6d85a9 100644 --- a/tubearchivist/home/src/download/subscriptions.py +++ b/tubearchivist/home/src/download/subscriptions.py @@ -187,6 +187,11 @@ class PlaylistSubscription: playlist_h = YoutubePlaylist(playlist_id) playlist_h.all_youtube_ids = all_youtube_ids playlist_h.build_json() + if not playlist_h.json_data: + message = f"{playlist_h.youtube_id}: failed to extract data" + print(message) + raise ValueError(message) + playlist_h.json_data["playlist_subscribed"] = subscribed playlist_h.upload_to_es() playlist_h.add_vids_to_playlist() From 88f230c3f4d89f5824a23528c0587ceb995142b5 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 3 Oct 2023 20:49:57 +0700 Subject: [PATCH 3/3] build yt-dlp from commit --- Dockerfile | 2 +- tubearchivist/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 195c66c..f60e9e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM python:3.11.3-slim-bullseye AS builder ARG TARGETPLATFORM RUN apt-get update && apt-get install -y --no-install-recommends \ - build-essential gcc libldap2-dev libsasl2-dev libssl-dev + build-essential gcc libldap2-dev libsasl2-dev libssl-dev git # install requirements COPY ./tubearchivist/requirements.txt /requirements.txt diff --git a/tubearchivist/requirements.txt b/tubearchivist/requirements.txt index 08e4e86..b513611 100644 --- a/tubearchivist/requirements.txt +++ b/tubearchivist/requirements.txt @@ -10,4 +10,4 @@ requests==2.31.0 ryd-client==0.0.6 uWSGI==2.0.22 whitenoise==6.5.0 -yt_dlp==2023.9.24 +yt-dlp @ git+https://github.com/yt-dlp/yt-dlp@cc8d8441524ec3442d7c0d3f8f33f15b66aa06f3 \ No newline at end of file