From 95db60c94743f46e0cddc1a89be7aa7855b22400 Mon Sep 17 00:00:00 2001
From: Brian Pepple <bdpepple@gmail.com>
Date: Sun, 1 Dec 2024 11:06:55 -0500
Subject: [PATCH] Refactor `_get_id_from_comic_info`  (#164)

* Refactor the code getting the issue id from a CI note.
* Bump min version of darkseid
---
 metrontagger/talker.py | 31 +++++++++++--------------------
 poetry.lock            | 14 +++++++-------
 pyproject.toml         |  2 +-
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/metrontagger/talker.py b/metrontagger/talker.py
index ed44a3d..0f801d6 100644
--- a/metrontagger/talker.py
+++ b/metrontagger/talker.py
@@ -33,6 +33,7 @@
     Role,
     Series,
 )
+from darkseid.utils import get_issue_id_from_note
 from imagehash import ImageHash, hex_to_hash, phash
 from mokkari.exceptions import ApiError
 from PIL import Image
@@ -233,36 +234,26 @@ def _get_id_from_metron_info(md: Metadata) -> None | tuple[InfoSource, int]:
 
     @staticmethod
     def _get_id_from_comic_info(md: Metadata) -> None | tuple[InfoSource, int]:
-        def _extract_id_str(notes: str, keyword: str) -> str:
-            return notes.split(keyword)[1].split("]")[0].strip()
+        if md.notes is None or not md.notes.comic_rack:
+            return None
 
-        # If `Notes` element doesn't exist let's bail.
-        if md.notes is None:
+        res = get_issue_id_from_note(md.notes.comic_rack)
+        if res is None:
             return None
 
-        lower_notes = md.notes.comic_rack.lower()
-
-        if "metrontagger" in lower_notes:
-            source = InfoSource.metron
-            id_str = _extract_id_str(md.notes.comic_rack, "issue_id:")
-        elif "comictagger" in lower_notes:
-            if "metron" in lower_notes:
-                source = InfoSource.metron
-            elif "comic vine" in lower_notes:
-                source = InfoSource.comic_vine
-            else:
-                source = InfoSource.unknown
-            id_str = _extract_id_str(md.notes.comic_rack, "Issue ID")
-        else:
+        source_map = {"Metron": InfoSource.metron, "Comic Vine": InfoSource.comic_vine}
+
+        src = source_map.get(res["source"])
+        if src is None:
             return None
 
         try:
-            id_ = int(id_str)
+            id_ = int(res["id"])
         except ValueError:
             LOGGER.exception("Comic has invalid id: %s #%s", md.series.name, md.issue)
             return None
 
-        return source, id_
+        return src, id_
 
     def _process_file(self: Talker, fn: Path, interactive: bool) -> tuple[int | None, bool]:  # noqa: PLR0912 PLR0911
         """Process a comic file for metadata.
diff --git a/poetry.lock b/poetry.lock
index 9018f7a..fd553d5 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -287,13 +287,13 @@ toml = ["tomli"]
 
 [[package]]
 name = "darkseid"
-version = "5.1.0"
+version = "5.1.1"
 description = "A library to interact with comic archives"
 optional = false
 python-versions = "<4.0,>=3.10"
 files = [
-    {file = "darkseid-5.1.0-py3-none-any.whl", hash = "sha256:642c749cc705f7259c59b92f016b109c1ced3695c2e39e36e386c158efa4e16f"},
-    {file = "darkseid-5.1.0.tar.gz", hash = "sha256:28a158345f639f64ce6781ec649e4a6fbd63f07b8ecd78bbcfc7bc754c86d38d"},
+    {file = "darkseid-5.1.1-py3-none-any.whl", hash = "sha256:fd4194911c7b22d9c53a79429494e5e62a635ccb440e076fd4be4fea5b0019a1"},
+    {file = "darkseid-5.1.1.tar.gz", hash = "sha256:191f6cdae2055caf21eb227e44c67d611411d78ddcdc72ca11eaed1fd9d0f184"},
 ]
 
 [package.dependencies]
@@ -990,13 +990,13 @@ nodejs = ["nodejs-wheel-binaries"]
 
 [[package]]
 name = "pytest"
-version = "8.3.3"
+version = "8.3.4"
 description = "pytest: simple powerful testing with Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pytest-8.3.3-py3-none-any.whl", hash = "sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2"},
-    {file = "pytest-8.3.3.tar.gz", hash = "sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181"},
+    {file = "pytest-8.3.4-py3-none-any.whl", hash = "sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6"},
+    {file = "pytest-8.3.4.tar.gz", hash = "sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761"},
 ]
 
 [package.dependencies]
@@ -1562,4 +1562,4 @@ docs = ["Sphinx", "elementpath (>=4.4.0,<5.0.0)", "jinja2", "sphinx-rtd-theme"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "f9fa0457eacd780b5fe5faad8e7dc2f122e917ae4baac1156d6827c508cbbb09"
+content-hash = "c01088378ff2b27750f7c57609823780aa217e81e0a6d568328a3bf7037cad43"
diff --git a/pyproject.toml b/pyproject.toml
index f44f98f..9d708ea 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -45,7 +45,7 @@ imagehash = "^4.3.1"
 pandas = "^2.2.1"
 comicfn2dict = "^0.2.4"
 tqdm = "^4.66.4"
-darkseid = "^5.1.0"
+darkseid = "^5.1.1"
 
 [tool.poetry.group.dev.dependencies]
 pre-commit = "^3.6.2"