extractors: Add & Fix return types

tt_rss's _update_object_raw should have never returned a str
master
Felix Stupp 3 years ago
parent 7c5d8e7748
commit 39b3ac278b
Signed by: zocker
GPG Key ID: 93E1BD26F6B02FB7

@ -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 = collection_expect_extractor(collection.uri)
ex.update_object( ex.update_object(
object=collection, object=collection,

@ -83,7 +83,7 @@ class CollectionExtractor(GeneralExtractor[MediaCollection, T]):
) )
return element return element
def _sort_episodes(self, coll: MediaCollection): def _sort_episodes(self, coll: MediaCollection) -> None:
sorting_methods: Mapping[int, Callable[[MediaCollectionLink], Any]] = { sorting_methods: Mapping[int, Callable[[MediaCollectionLink], Any]] = {
1: lambda l: l.element.release_date, 1: lambda l: l.element.release_date,
} }
@ -97,5 +97,5 @@ class CollectionExtractor(GeneralExtractor[MediaCollection, T]):
link.season = 0 link.season = 0
link.episode = index + 1 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) self._sort_episodes(object)

@ -66,7 +66,7 @@ class TtRssCollectionExtractor(CollectionExtractor[HeadlineList]):
data=data, 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: if not object.title:
object.title = object.uri object.title = object.uri
logging.debug(f"Got {len(data)} headlines") logging.debug(f"Got {len(data)} headlines")

@ -44,7 +44,7 @@ class YouTubeCollectionExtractor(CollectionExtractor[Dict]):
return cls.__convert_channel_id(collection_id) return cls.__convert_channel_id(collection_id)
return collection_id return collection_id
def __init__(self): def __init__(self) -> None:
super().__init__("youtube") super().__init__("youtube")
def uri_suitable(self, uri: str) -> SuitableLevel: 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"] info = data["info"]
is_channel = self.__is_channel_id(info["id"]) is_channel = self.__is_channel_id(info["id"])
object.title = ( object.title = (

@ -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 = media_expect_extractor(element.uri)
ex.update_object( ex.update_object(
object=element, object=element,

@ -77,7 +77,7 @@ class YoutubeMediaExtractor(MediaExtractor[YoutubeVideoData]):
re.VERBOSE, re.VERBOSE,
) )
def __init__(self): def __init__(self) -> None:
super().__init__("youtube") super().__init__("youtube")
def uri_suitable(self, uri: str) -> SuitableLevel: def uri_suitable(self, uri: str) -> SuitableLevel:
@ -113,7 +113,7 @@ class YoutubeMediaExtractor(MediaExtractor[YoutubeVideoData]):
data=vid_data, 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.title = f"{data['title']} - {data['channel']['name']}"
object.description = data.get("description") object.description = data.get("description")
if data.get("thumbnails"): if data.get("thumbnails"):

@ -25,7 +25,7 @@ class YtdlMediaExtractor(MediaExtractor[Dict]):
re.VERBOSE, re.VERBOSE,
) )
def __init__(self): def __init__(self) -> None:
super().__init__("ytdl") super().__init__("ytdl")
def uri_suitable(self, uri: str) -> SuitableLevel: def uri_suitable(self, uri: str) -> SuitableLevel:
@ -65,7 +65,7 @@ class YtdlMediaExtractor(MediaExtractor[Dict]):
data=vid_data, data=vid_data,
) )
def _update_object_raw(self, object: MediaElement, data: Dict): def _update_object_raw(self, object: MediaElement, data: Dict) -> None:
object.title = ( object.title = (
f"{data['title']} - {data['uploader']}" f"{data['title']} - {data['uploader']}"
if "uploader" in data if "uploader" in data

Loading…
Cancel
Save