From 49cff6f3004926cfb7c27ebbfc3dfffd8f9bb1d9 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sat, 5 Nov 2022 13:29:28 +0100 Subject: [PATCH] uri_suitable: Explicitly check for "is not None" & use helper methods - helper for convertion from boolean to SuitableLevel --- server/entertainment_decider/extractors/collection/youtube.py | 2 +- server/entertainment_decider/extractors/media/youtube.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/entertainment_decider/extractors/collection/youtube.py b/server/entertainment_decider/extractors/collection/youtube.py index f2cd3d4..fb4b04f 100644 --- a/server/entertainment_decider/extractors/collection/youtube.py +++ b/server/entertainment_decider/extractors/collection/youtube.py @@ -48,7 +48,7 @@ class YouTubeCollectionExtractor(CollectionExtractor[Dict]): super().__init__("youtube") def uri_suitable(self, uri: str) -> SuitableLevel: - return SuitableLevel.ALWAYS if self.__uri_regex.match(uri) else SuitableLevel.NO + return SuitableLevel.always_or_no(self.__uri_regex.match(uri) is not None) def can_extract_offline(self, uri: str) -> bool: return True diff --git a/server/entertainment_decider/extractors/media/youtube.py b/server/entertainment_decider/extractors/media/youtube.py index b1a6e64..46559f2 100644 --- a/server/entertainment_decider/extractors/media/youtube.py +++ b/server/entertainment_decider/extractors/media/youtube.py @@ -81,7 +81,7 @@ class YoutubeMediaExtractor(MediaExtractor[YoutubeVideoData]): super().__init__("youtube") def uri_suitable(self, uri: str) -> SuitableLevel: - return SuitableLevel.always_or_no(self.__uri_regex.match(uri)) + return SuitableLevel.always_or_no(self.__uri_regex.match(uri) is not None) def _get_author_data(self, data: YoutubeVideoData) -> Optional[AuthorExtractedData]: return AuthorExtractedData(