Allow for a non '-' seperator

Author: Buried-In-Code

perdoo/metadata/_base.py

@@ -4,6 +4,7 @@
 import re
 from collections.abc import Callable
 from pathlib import Path
+from typing import Literal
 
 from pydantic.alias_generators import to_pascal
 from pydantic_xml import BaseXmlModel
@@ -20,13 +21,13 @@
 LOGGER = logging.getLogger(__name__)
 
 
-def sanitize(value: str | None) -> str | None:
+def sanitize(value: str | None, seperator: Literal["-", "_", ".", " "]) -> str | None:
     if not value:
         return value
     value = str(value)
-    value = re.sub(r"[^0-9a-zA-Z&! ]+", "", value.replace("-", " "))
+    value = re.sub(r"[^0-9a-zA-Z&! ]+", "", value.replace(seperator, " "))
     value = " ".join(value.split())
-    return value.replace(" ", "-")
+    return value.replace(" ", seperator)
 
 
 class PascalModel(
@@ -61,7 +62,12 @@ def display(self) -> None:
 
         CONSOLE.print(Panel.fit("\n".join(content_vals), title=type(self).__name__))
 
-    def evaluate_pattern(self, pattern_map: dict[str, Callable[[Self], str]], pattern: str) -> str:
+    def evaluate_pattern(
+        self,
+        pattern_map: dict[str, Callable[[Self], str]],
+        pattern: str,
+        seperator: Literal["-", "_", ".", " "],
+    ) -> str:
         def replace_match(match: re.Match) -> str:
             key = match.group("key")
             padding = match.group("padding")
@@ -73,7 +79,7 @@ def replace_match(match: re.Match) -> str:
 
             if padding and (isinstance(value, int) or (isinstance(value, str) and value.isdigit())):
                 return f"{int(value):0{padding}}"
-            return sanitize(value=value) or ""
+            return sanitize(value=value, seperator=seperator) or ""
 
         pattern_regex = re.compile(r"{(?P<key>[a-zA-Z-]+)(?::(?P<padding>\d+))?}")
         return pattern_regex.sub(replace_match, pattern)

perdoo/metadata/comic_info.py

@@ -322,6 +322,7 @@ def get_filename(self, settings: Naming) -> str:
                 Format.SINGLE_ISSUE.value: settings.single_issue or settings.default,
                 Format.TRADE_PAPERBACK.value: settings.trade_paperback or settings.default,
             }.get(self.format, settings.default),
+            seperator=settings.seperator,
         )
 
 

perdoo/metadata/metron_info.py

@@ -386,6 +386,7 @@ def get_filename(self, settings: Naming) -> str:
                 Format.SINGLE_ISSUE: settings.single_issue or settings.default,
                 Format.TRADE_PAPERBACK: settings.trade_paperback or settings.default,
             }.get(self.series.format, settings.default),
+            seperator=settings.seperator,
         )
 
 

perdoo/settings.py

@@ -47,6 +47,7 @@ class MetronInfo(SettingsModel):
 
 
 class Naming(SettingsModel):
+    seperator: Literal["-", "_", ".", " "] = "-"
     default: str = "{publisher-name}/{series-name}-v{volume}/{series-name}-v{volume}_#{number:3}"
     annual: Annotated[str | None, BeforeValidator(blank_is_none)] = (
         "{publisher-name}/{series-name}-v{volume}/{series-name}-v{volume}_Annual_#{number:2}"