From 9c7fd0d4cd7baa325c07d314ae41a9b8f02afa24 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sat, 5 Nov 2022 23:52:54 +0100 Subject: [PATCH] Extract media_extract_uri_new from media_extract_uri --- .../extractors/media/__init__.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/server/entertainment_decider/extractors/media/__init__.py b/server/entertainment_decider/extractors/media/__init__.py index 122e264..6e25c45 100644 --- a/server/entertainment_decider/extractors/media/__init__.py +++ b/server/entertainment_decider/extractors/media/__init__.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Dict +from typing import Dict, Tuple from ...models import MediaElement @@ -31,9 +31,14 @@ def media_update(element: MediaElement, check_cache_expired: bool = True) -> Non ) -def media_extract_uri(uri: str) -> MediaElement: - elem: MediaElement = MediaExtractor.check_uri(uri) +def media_extract_uri_new(uri: str) -> Tuple[bool, MediaElement]: + elem = MediaExtractor.check_uri(uri) if not elem: - ex = media_expect_extractor(uri) - elem = ex.extract_and_store(uri) + return True, media_expect_extractor(uri).extract_and_store(uri) + return False, elem + + +# exists to mirror collection_extract_uri +def media_extract_uri(uri: str) -> MediaElement: + _, elem = media_extract_uri_new(uri) return elem