From 96e12f6fe88bc8b4c65f8dd5f7a26a6e72018884 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Thu, 18 Aug 2022 11:18:40 +0000 Subject: [PATCH] extr/coll,media/youtube: Move setting URLs to media extractor --- .../entertainment_decider/extractors/collection/youtube.py | 5 ----- server/entertainment_decider/extractors/media/youtube.py | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/entertainment_decider/extractors/collection/youtube.py b/server/entertainment_decider/extractors/collection/youtube.py index e20a4a5..4692c1a 100644 --- a/server/entertainment_decider/extractors/collection/youtube.py +++ b/server/entertainment_decider/extractors/collection/youtube.py @@ -100,15 +100,10 @@ class YouTubeCollectionExtractor(CollectionExtractor[Dict]): video_list = reversed(video_list) for index, video in enumerate(video_list): video_url = f"https://www.youtube.com/watch?v={video['id']}" - other_urls = [ - f"https://youtube.com/watch?v={video['id']}", - f"https://youtu.be/{video['id']}", - ] element = self._add_episode( collection=object, uri=video_url, episode=index + 1, ) if element: - element.add_uris(other_urls) orm.commit() # so progress is stored diff --git a/server/entertainment_decider/extractors/media/youtube.py b/server/entertainment_decider/extractors/media/youtube.py index 99a0904..94ea031 100644 --- a/server/entertainment_decider/extractors/media/youtube.py +++ b/server/entertainment_decider/extractors/media/youtube.py @@ -112,3 +112,10 @@ class YoutubeMediaExtractor(MediaExtractor[YoutubeVideoData]): data.get("uploadDate") or data["publishDate"], "%Y-%m-%d" ) object.length = int(data["duration"]["secondsText"]) + object.uri = f"https://www.youtube.com/watch?v={data['id']}" + object.add_uris( + ( + f"https://youtu.be/{data['id']}", + f"https://youtube.com/watch?v={data['id']}", + ) + )