From 39b3ac278b7ed175c667a3823efc987a39b68e9c Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sat, 5 Nov 2022 14:55:05 +0100 Subject: [PATCH] extractors: Add & Fix return types tt_rss's _update_object_raw should have never returned a str --- .../entertainment_decider/extractors/collection/__init__.py | 5 ++++- server/entertainment_decider/extractors/collection/base.py | 4 ++-- server/entertainment_decider/extractors/collection/tt_rss.py | 2 +- .../entertainment_decider/extractors/collection/youtube.py | 4 ++-- server/entertainment_decider/extractors/media/__init__.py | 2 +- server/entertainment_decider/extractors/media/youtube.py | 4 ++-- server/entertainment_decider/extractors/media/ytdl.py | 4 ++-- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/server/entertainment_decider/extractors/collection/__init__.py b/server/entertainment_decider/extractors/collection/__init__.py index 0892a18..ef4d255 100644 --- a/server/entertainment_decider/extractors/collection/__init__.py +++ b/server/entertainment_decider/extractors/collection/__init__.py @@ -27,7 +27,10 @@ def collection_expect_extractor(uri: str) -> CollectionExtractor: ) -def collection_update(collection: MediaCollection, check_cache_expired: bool = True): +def collection_update( + collection: MediaCollection, + check_cache_expired: bool = True, +) -> None: ex = collection_expect_extractor(collection.uri) ex.update_object( object=collection, diff --git a/server/entertainment_decider/extractors/collection/base.py b/server/entertainment_decider/extractors/collection/base.py index 9c7226d..e9547e6 100644 --- a/server/entertainment_decider/extractors/collection/base.py +++ b/server/entertainment_decider/extractors/collection/base.py @@ -83,7 +83,7 @@ class CollectionExtractor(GeneralExtractor[MediaCollection, T]): ) return element - def _sort_episodes(self, coll: MediaCollection): + def _sort_episodes(self, coll: MediaCollection) -> None: sorting_methods: Mapping[int, Callable[[MediaCollectionLink], Any]] = { 1: lambda l: l.element.release_date, } @@ -97,5 +97,5 @@ class CollectionExtractor(GeneralExtractor[MediaCollection, T]): link.season = 0 link.episode = index + 1 - def _update_hook(self, object: MediaCollection, data: ExtractedData[T]): + def _update_hook(self, object: MediaCollection, data: ExtractedData[T]) -> None: self._sort_episodes(object) diff --git a/server/entertainment_decider/extractors/collection/tt_rss.py b/server/entertainment_decider/extractors/collection/tt_rss.py index 46cd187..108e215 100644 --- a/server/entertainment_decider/extractors/collection/tt_rss.py +++ b/server/entertainment_decider/extractors/collection/tt_rss.py @@ -66,7 +66,7 @@ class TtRssCollectionExtractor(CollectionExtractor[HeadlineList]): data=data, ) - def _update_object_raw(self, object: MediaCollection, data: HeadlineList) -> str: + def _update_object_raw(self, object: MediaCollection, data: HeadlineList) -> None: if not object.title: object.title = object.uri logging.debug(f"Got {len(data)} headlines") diff --git a/server/entertainment_decider/extractors/collection/youtube.py b/server/entertainment_decider/extractors/collection/youtube.py index 417a394..fddb307 100644 --- a/server/entertainment_decider/extractors/collection/youtube.py +++ b/server/entertainment_decider/extractors/collection/youtube.py @@ -44,7 +44,7 @@ class YouTubeCollectionExtractor(CollectionExtractor[Dict]): return cls.__convert_channel_id(collection_id) return collection_id - def __init__(self): + def __init__(self) -> None: super().__init__("youtube") def uri_suitable(self, uri: str) -> SuitableLevel: @@ -87,7 +87,7 @@ class YouTubeCollectionExtractor(CollectionExtractor[Dict]): }, ) - def _update_object_raw(self, object: MediaCollection, data: Dict): + def _update_object_raw(self, object: MediaCollection, data: Dict) -> None: info = data["info"] is_channel = self.__is_channel_id(info["id"]) object.title = ( diff --git a/server/entertainment_decider/extractors/media/__init__.py b/server/entertainment_decider/extractors/media/__init__.py index f05c76a..122e264 100644 --- a/server/entertainment_decider/extractors/media/__init__.py +++ b/server/entertainment_decider/extractors/media/__init__.py @@ -23,7 +23,7 @@ def media_expect_extractor(uri: str) -> MediaExtractor: ) -def media_update(element: MediaElement, check_cache_expired: bool = True): +def media_update(element: MediaElement, check_cache_expired: bool = True) -> None: ex = media_expect_extractor(element.uri) ex.update_object( object=element, diff --git a/server/entertainment_decider/extractors/media/youtube.py b/server/entertainment_decider/extractors/media/youtube.py index 46559f2..3fcd140 100644 --- a/server/entertainment_decider/extractors/media/youtube.py +++ b/server/entertainment_decider/extractors/media/youtube.py @@ -77,7 +77,7 @@ class YoutubeMediaExtractor(MediaExtractor[YoutubeVideoData]): re.VERBOSE, ) - def __init__(self): + def __init__(self) -> None: super().__init__("youtube") def uri_suitable(self, uri: str) -> SuitableLevel: @@ -113,7 +113,7 @@ class YoutubeMediaExtractor(MediaExtractor[YoutubeVideoData]): data=vid_data, ) - def _update_object_raw(self, object: MediaElement, data: YoutubeVideoData): + def _update_object_raw(self, object: MediaElement, data: YoutubeVideoData) -> None: object.title = f"{data['title']} - {data['channel']['name']}" object.description = data.get("description") if data.get("thumbnails"): diff --git a/server/entertainment_decider/extractors/media/ytdl.py b/server/entertainment_decider/extractors/media/ytdl.py index 0d8bb37..669332e 100644 --- a/server/entertainment_decider/extractors/media/ytdl.py +++ b/server/entertainment_decider/extractors/media/ytdl.py @@ -25,7 +25,7 @@ class YtdlMediaExtractor(MediaExtractor[Dict]): re.VERBOSE, ) - def __init__(self): + def __init__(self) -> None: super().__init__("ytdl") def uri_suitable(self, uri: str) -> SuitableLevel: @@ -65,7 +65,7 @@ class YtdlMediaExtractor(MediaExtractor[Dict]): data=vid_data, ) - def _update_object_raw(self, object: MediaElement, data: Dict): + def _update_object_raw(self, object: MediaElement, data: Dict) -> None: object.title = ( f"{data['title']} - {data['uploader']}" if "uploader" in data