Use enums with a default (unknown or other) instead of ValueError

Use Self

Author: Buried-In-Code

perdoo/metadata/comic_info.py

@@ -1,10 +1,10 @@
 __all__ = ["AgeRating", "ComicInfo", "Manga", "Page", "PageType", "YesNo"]
 
+import logging
 from collections.abc import Callable
 from datetime import date
 from enum import Enum
 from pathlib import Path
-from typing import Optional
 
 from natsort import humansorted, ns
 from PIL import Image
@@ -14,6 +14,14 @@
 from perdoo.metadata._base import PascalModel
 from perdoo.settings import Naming
 
+try:
+    from typing import Self  # Python >= 3.11
+except ImportError:
+    from typing_extensions import Self  # Python < 3.11
+
+
+LOGGER = logging.getLogger(__name__)
+
 
 def str_to_list(value: str | None) -> list[str]:
     if not value:
@@ -33,11 +41,12 @@ class YesNo(Enum):
     YES = "Yes"
 
     @staticmethod
-    def load(value: str) -> "YesNo":
+    def load(value: str) -> Self:
         for entry in YesNo:
             if entry.value.replace(" ", "").casefold() == value.replace(" ", "").casefold():
                 return entry
-        raise ValueError(f"'{value}' isn't a valid YesNo")
+        LOGGER.warning("'%s' isn't a valid YesNo", value)
+        return YesNo.UNKNOWN
 
     def __str__(self) -> str:
         return self.value
@@ -50,11 +59,12 @@ class Manga(Enum):
     YES_AND_RIGHT_TO_LEFT = "YesAndRightToLeft"
 
     @staticmethod
-    def load(value: str) -> "Manga":
+    def load(value: str) -> Self:
         for entry in Manga:
             if entry.value.replace(" ", "").casefold() == value.replace(" ", "").casefold():
                 return entry
-        raise ValueError(f"'{value}' isn't a valid Manga")
+        LOGGER.warning("'%s' isn't a valid Manga", value)
+        return Manga.UNKNOWN
 
     def __str__(self) -> str:
         return self.value
@@ -78,11 +88,12 @@ class AgeRating(Enum):
     X18 = "X18+"
 
     @staticmethod
-    def load(value: str) -> "AgeRating":
+    def load(value: str) -> Self:
         for entry in AgeRating:
             if entry.value.replace(" ", "").casefold() == value.replace(" ", "").casefold():
                 return entry
-        raise ValueError(f"'{value}' isn't a valid AgeRating")
+        LOGGER.warning("'%s' isn't a valid AgeRating", value)
+        return AgeRating.UNKNOWN
 
     def __str__(self) -> str:
         return self.value
@@ -102,11 +113,12 @@ class PageType(Enum):
     DELETED = "Deleted"
 
     @staticmethod
-    def load(value: str) -> "PageType":
+    def load(value: str) -> Self:
         for entry in PageType:
             if entry.value.replace(" ", "").casefold() == value.replace(" ", "").casefold():
                 return entry
-        raise ValueError(f"'{value}' isn't a valid PageType")
+        LOGGER.warning("'%s' isn't a valid PageType", value)
+        return PageType.OTHER
 
     def __str__(self) -> str:
         return self.value
@@ -136,7 +148,7 @@ def __hash__(self) -> int:
         return hash((type(self), self.image))
 
     @staticmethod
-    def from_path(file: Path, index: int, is_final_page: bool, page: Optional["Page"]) -> "Page":
+    def from_path(file: Path, index: int, is_final_page: bool, page: Self | None) -> Self:
         if page:
             page_type = page.type
         elif index == 0:

perdoo/metadata/metron_info.py

@@ -17,6 +17,7 @@
     "Url",
 ]
 
+import logging
 from collections.abc import Callable
 from datetime import date, datetime
 from decimal import Decimal
@@ -29,6 +30,12 @@
 from perdoo.metadata._base import PascalModel
 from perdoo.settings import Naming
 
+try:
+    from typing import Self  # Python >= 3.11
+except ImportError:
+    from typing_extensions import Self  # Python < 3.11
+
+LOGGER = logging.getLogger(__name__)
 T = TypeVar("T")
 
 
@@ -42,11 +49,12 @@ class AgeRating(Enum):
     ADULT = "Adult"
 
     @staticmethod
-    def load(value: str) -> "AgeRating":
+    def load(value: str) -> Self:
         for entry in AgeRating:
             if entry.value.replace(" ", "").casefold() == value.replace(" ", "").casefold():
                 return entry
-        raise ValueError(f"'{value}' isn't a valid AgeRating")
+        LOGGER.warning("'%s' isn't a valid AgeRating", value)
+        return AgeRating.UNKNOWN
 
     def __str__(self) -> str:
         return self.value
@@ -134,11 +142,12 @@ class Role(Enum):
     OTHER = "Other"
 
     @staticmethod
-    def load(value: str) -> "Role":
+    def load(value: str) -> Self:
         for entry in Role:
             if entry.value.replace(" ", "").casefold() == value.replace(" ", "").casefold():
                 return entry
-        raise ValueError(f"'{value}' isn't a valid Role")
+        LOGGER.warning("'%s' isn't a valid Role", value)
+        return Role.OTHER
 
     def __str__(self) -> str:
         return self.value
@@ -182,7 +191,7 @@ class InformationSource(Enum):
     LEAGUE_OF_COMIC_GEEKS = "League of Comic Geeks"
 
     @staticmethod
-    def load(value: str) -> "InformationSource":
+    def load(value: str) -> Self:
         for entry in InformationSource:
             if entry.value.replace(" ", "").casefold() == value.replace(" ", "").casefold():
                 return entry

perdoo/settings.py

@@ -24,6 +24,11 @@
 from perdoo.console import CONSOLE
 from perdoo.utils import blank_is_none, flatten_dict
 
+try:
+    from typing import Self  # Python >= 3.11
+except ImportError:
+    from typing_extensions import Self  # Python < 3.11
+
 try:
     import tomllib as tomlreader  # Python >= 3.11
 except ModuleNotFoundError:
@@ -140,7 +145,7 @@ class Settings(SettingsModel):
     services: Services = Services()
 
     @classmethod
-    def load(cls) -> "Settings":
+    def load(cls) -> Self:
         if not cls._file.exists():
             cls().save()
         with cls._file.open("rb") as stream: