Add missing Optional on _load_object & use explcit is None checks

master
Felix Stupp 2 years ago
parent 2214df4561
commit 51c1ee5c08
Signed by: zocker
GPG Key ID: 93E1BD26F6B02FB7

@ -53,9 +53,9 @@ class CollectionExtractor(GeneralExtractor[MediaCollection, T]):
self.__configure_collection(collection)
return collection
def _load_object(self, data: ExtractedData[T]) -> MediaCollection:
def _load_object(self, data: ExtractedData[T]) -> Optional[MediaCollection]:
collection = data.load_collection()
if collection:
if collection is not None:
self.__configure_collection(collection)
return collection

@ -114,7 +114,7 @@ class GeneralExtractor(Generic[E, T]):
def _create_object(self, data: ExtractedData[T]) -> E:
raise NotImplementedError()
def _load_object(self, data: ExtractedData[T]) -> E:
def _load_object(self, data: ExtractedData[T]) -> Optional[E]:
raise NotImplementedError()
# abstract (for specific extractor classes)
@ -178,14 +178,14 @@ class GeneralExtractor(Generic[E, T]):
def inject_object(self, data: ExtractedData[T]) -> E:
object = self._load_object(data)
data = self._extract_required(data)
if not object:
if object is None:
logging.debug(f"Store info for object: {data!r}")
object = self._create_object(data)
return self._update_object(object, data)
def store_object(self, data: ExtractedData[T]) -> E:
object = self._load_object(data)
if object:
if object is not None:
logging.debug(f"Found object already in database: {data!r}")
return object
data = self._extract_required(data)

@ -38,7 +38,7 @@ class MediaExtractor(GeneralExtractor[MediaElement, T]):
def _create_object(self, data: ExtractedData[T]) -> MediaElement:
return data.create_media()
def _load_object(self, data: ExtractedData[T]) -> MediaElement:
def _load_object(self, data: ExtractedData[T]) -> Optional[MediaElement]:
return data.load_media()
def __create_author_collection(

Loading…
Cancel
Save