Remove Marvel/Esak

Author: Buried-In-Code

.pre-commit-config.yaml

@@ -1,16 +1,16 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.4
+    rev: v0.14.5
     hooks:
       - id: ruff-format
       - id: ruff-check
-  - repo: https://github.com/executablebooks/mdformat
+  - repo: https://github.com/hukkin/mdformat
     rev: 1.0.0
     hooks:
       - id: mdformat
         additional_dependencies:
           - mdformat-gfm
-          - mdformat-tables
+          - mdformat-ruff
         args:
           - --number
           - --wrap=keep

README.md

@@ -84,7 +84,6 @@ Unlike other tagging tools, Perdoo employs a manual approach when metadata files
 ## Services
 
 - [Comicvine](https://comicvine.gamespot.com) using the [Simyan](https://github.com/Metron-Project/Simyan) library.
-- [Marvel](https://www.marvel.com/comics) using the [Esak](https://github.com/Metron-Project/Esak) library.
 - [Metron](https://metron.cloud) using the [Mokkari](https://github.com/Metron-Project/Mokkari) library.
 
 ## File Renaming and Organization
@@ -168,15 +167,11 @@ single_issue = ""
 trade_paperback = ""
 
 [services]
-order = ["Metron", "Marvel", "Comicvine"]
+order = ["Metron", "Comicvine"]
 
 [services.comicvine]
 api_key = "<Comicvine API Key>"
 
-[services.marvel]
-public_key = "<Marvel Public Key>"
-private_key = "<Marvel Private Key>"
-
 [services.metron]
 username = "<Metron Username>"
 password = "<Metron Password>"
@@ -219,7 +214,7 @@ password = "<Metron Password>"
   The order in which the services will be used for metadata retrieval.
   Metadata will be fetched from the first service that returns a result.
   Don't include the service name in the list if you don't want to use it.
-  Defaults to `["Metron", "Marvel", "Comicvine"]`, options are `Metron`, `Marvel` and `Comicvine`.
+  Defaults to `["Metron", "Comicvine"]`, options are `Metron` and `Comicvine`.
 
 ## Socials
 

perdoo/__main__.py

@@ -15,7 +15,7 @@
 from perdoo.metadata import ComicInfo, MetronInfo
 from perdoo.metadata.comic_info import Page
 from perdoo.metadata.metron_info import Id, InformationSource
-from perdoo.services import BaseService, Comicvine, Marvel, Metron
+from perdoo.services import BaseService, Comicvine, Metron
 from perdoo.settings import Service, Services, Settings
 from perdoo.utils import (
     IssueSearch,
@@ -63,8 +63,6 @@ def get_services(settings: Services) -> dict[Service, BaseService]:
     output = {}
     if settings.comicvine.api_key:
         output[Service.COMICVINE] = Comicvine(settings.comicvine)
-    if settings.marvel.public_key and settings.marvel.private_key:
-        output[Service.MARVEL] = Marvel(settings.marvel)
     if settings.metron.username and settings.metron.password:
         output[Service.METRON] = Metron(settings.metron)
     return output
@@ -94,13 +92,11 @@ def _create_search_from_metron(metron_info: MetronInfo) -> Search:
             volume=metron_info.series.volume,
             year=metron_info.series.start_year,
             comicvine=series_id if source == InformationSource.COMIC_VINE else None,
-            marvel=series_id if source == InformationSource.MARVEL else None,
             metron=series_id if source == InformationSource.METRON else None,
         ),
         issue=IssueSearch(
             number=metron_info.number,
             comicvine=_get_id_value(metron_info.ids, InformationSource.COMIC_VINE),
-            marvel=_get_id_value(metron_info.ids, InformationSource.MARVEL),
             metron=_get_id_value(metron_info.ids, InformationSource.METRON),
         ),
     )

perdoo/services/__init__.py

@@ -1,6 +1,5 @@
-__all__ = ["BaseService", "Comicvine", "Marvel", "Metron"]
+__all__ = ["BaseService", "Comicvine", "Metron"]
 
 from perdoo.services._base import BaseService
 from perdoo.services.comicvine import Comicvine
-from perdoo.services.marvel import Marvel
 from perdoo.services.metron import Metron