From aafa99cbf75519f5780727cfa02d5610209ab519 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Fri, 15 Oct 2021 11:04:30 +0200 Subject: [PATCH] extractor/collection/{tt_rss,youtube}: Fix extracting media uri's --- server/entertainment_decider/extractors/collection/tt_rss.py | 3 ++- server/entertainment_decider/extractors/collection/youtube.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/entertainment_decider/extractors/collection/tt_rss.py b/server/entertainment_decider/extractors/collection/tt_rss.py index a184d52..292c683 100644 --- a/server/entertainment_decider/extractors/collection/tt_rss.py +++ b/server/entertainment_decider/extractors/collection/tt_rss.py @@ -9,6 +9,7 @@ from pony import orm # TODO remove from ...models import MediaCollection from ..all.tt_rss import HeadlineList, TtRssConnectionParameter, TtRssUri from ..generic import ExtractedData, ExtractionError, SuitableLevel +from ..media import media_extract_uri from .base import CollectionExtractor @@ -78,7 +79,7 @@ class TtRssCollectionExtractor(CollectionExtractor[HeadlineList]): for headline in data: logging.debug(f"Add to collection {headline.url!r}") try: - object.add_episode(media_extract_uri("ytdl", headline.url)) + object.add_episode(media_extract_uri(headline.url)) orm.commit() except ExtractionError: logging.warning(f"Failed while extracting media {headline.url!r}", exc_info=True) diff --git a/server/entertainment_decider/extractors/collection/youtube.py b/server/entertainment_decider/extractors/collection/youtube.py index 15e6bce..24a4611 100644 --- a/server/entertainment_decider/extractors/collection/youtube.py +++ b/server/entertainment_decider/extractors/collection/youtube.py @@ -10,6 +10,7 @@ import youtubesearchpython from ...models import MediaCollection from ..generic import ExtractedData, ExtractionError, SuitableLevel +from ..media import media_extract_uri from .base import CollectionExtractor @@ -99,7 +100,7 @@ class YouTubeCollectionExtractor(CollectionExtractor[Dict]): ] logging.debug(f"[youtube] Add to collection {object.title!r} video {video_url!r} ({index+1} of {len_video_list})") try: - element = media_extract_uri("ytdl", video_url) + element = media_extract_uri(video_url) element.add_uris(other_urls) object.add_episode(element, episode=index+1) orm.commit() # so progress is stored