Switch from custom menu, to questionary

Author: Buried-In-Code

.github/workflows/publishing.yaml

@@ -10,28 +10,44 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.13'
-      - name: Install pypa/build
-        run: pip install build
-      - name: Build a binary wheel and a source tarball
-        run: python -m build
+      - uses: actions/checkout@v5
+      - uses: astral-sh/setup-uv@v5
+      - name: Setup Python
+        run: uv python install 3.13
+      - name: Build wheel and source tarball
+        run: uv build
       - uses: actions/upload-artifact@v4
         with:
           name: python-package-distributions
           path: dist/
 
-  publish-to-pypi:
-    if: startsWith(github.ref, 'refs/tags/')
+  validate:
+    name: Validate dist
     needs:
       - build
+    permissions: {}
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/download-artifact@v5
+        with:
+          name: python-package-distributions
+          path: dist/
+      - uses: astral-sh/setup-uv@v5
+      - name: Setup Python
+        run: uv python install 3.13
+      - name: Validate dist
+        run: uv run --with twine twine check dist/*
 
+  publish:
     environment:
       name: pypi
       url: https://pypi.org/p/perdoo
+    if: startsWith(github.ref, 'refs/tags/')
     name: Publish to PyPI
+    needs:
+      - build
+      - validate
     permissions:
       id-token: write
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.4
+    rev: v0.13.1
     hooks:
       - id: ruff-format
       - id: ruff-check
@@ -16,19 +16,27 @@ repos:
           - --wrap=keep
         exclude: ".github\/ISSUE_TEMPLATE\/.*.md"
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
+      - id: check-added-large-files
       - id: check-ast
       - id: check-builtin-literals
       - id: check-case-conflict
       - id: check-docstring-first
+#      - id: check-executables-have-shebangs
+      - id: check-illegal-windows-names
+#      - id: check-json
       - id: check-merge-conflict
         args:
           - --assume-in-merge
+      - id: check-shebang-scripts-are-executable
       - id: check-toml
+      - id: check-vcs-permalinks
+      - id: check-xml
       - id: check-yaml
         args:
           - --allow-multiple-documents
+      - id: debug-statements
       - id: end-of-file-fixer
         exclude_types:
           - json
@@ -39,17 +47,17 @@ repos:
         args:
           - --fix=auto
       - id: name-tests-test
-      - id: pretty-format-json
-        args:
-          - --autofix
-          - --indent=2
+#      - id: pretty-format-json
+#        args:
+#          - --autofix
+#          - --indent=2
       - id: trailing-whitespace
         args:
           - --markdown-linebreak-ext=md
         exclude_types:
           - svg
   - repo: https://github.com/pappasam/toml-sort
-    rev: v0.24.2
+    rev: v0.24.3
     hooks:
       - id: toml-sort
         args:

perdoo/__main__.py

@@ -265,9 +265,9 @@ def run(
         if not skip_clean:
             with CONSOLE.status("Cleaning Archive", spinner="simpleDotsScrolling"):
                 entry.clean_archive()
-        if settings.output.metron_info.create:
+        if settings.output.metron_info.create and metadata[0]:
             entry.write_metadata(metadata=metadata[0])
-        if settings.output.comic_info.create:
+        if settings.output.comic_info.create and metadata[1]:
             metadata[1].pages = (
                 load_page_info(entry=entry, comic_info=metadata[1])
                 if settings.output.comic_info.handle_pages

perdoo/cli/archive.py

@@ -27,6 +27,12 @@ def view(
     comic = Comic(file=target)
     CONSOLE.print(f"Archive format: '{comic.path.suffix}'")
     if not hide_metron_info:
-        comic.metron_info.display()
+        if not comic.metron_info:
+            CONSOLE.print("No MetronInfo found")
+        else:
+            comic.metron_info.display()
     if not hide_comic_info:
-        comic.comic_info.display()
+        if not comic.comic_info:
+            CONSOLE.print("No ComicInfo found")
+        else:
+            comic.comic_info.display()

perdoo/console.py

@@ -1,10 +1,8 @@
-__all__ = ["CONSOLE", "create_menu"]
+__all__ = ["CONSOLE"]
 
 import logging
 
 from rich.console import Console
-from rich.panel import Panel
-from rich.prompt import IntPrompt
 from rich.theme import Theme
 
 LOGGER = logging.getLogger(__name__)
@@ -26,42 +24,3 @@
         }
     )
 )
-
-
-def create_menu(
-    options: list[str],
-    title: str | None = None,
-    subtitle: str | None = None,
-    prompt: str = "Select",
-    default: str | None = None,
-) -> int | None:
-    if not options:
-        return 0
-    panel_text = []
-    padding = len(str(len(options)))
-    for index, item in enumerate(options):
-        panel_text.append(
-            f"[markdown.item.number]{index + 1:>{padding}}.[/] [prompt.choices]{item}[/]"
-        )
-    if default:
-        panel_text.append(f"[markdown.item.number]{0:>{padding}}.[/] [prompt.default]{default}[/]")
-    CONSOLE.print(
-        Panel(
-            "\n".join(panel_text),
-            title=f"[title]{title}[/]" if title else None,
-            subtitle=f"[subtitle]{subtitle}[/]" if subtitle else None,
-            border_style="prompt.border",
-        )
-    )
-    selected = IntPrompt.ask(prompt=prompt, default=0 if default else None, console=CONSOLE)
-    if (
-        selected is None
-        or selected < 0
-        or selected > len(options)
-        or (selected == 0 and not default)
-    ):
-        LOGGER.warning("Invalid Option: %s", selected)
-        return create_menu(
-            options=options, title=title, subtitle=subtitle, prompt=prompt, default=default
-        )
-    return selected

perdoo/services/comicvine.py

@@ -5,6 +5,8 @@
 from datetime import datetime
 
 from natsort import humansorted, ns
+from prompt_toolkit.styles import Style
+from questionary import Choice, select
 from requests.exceptions import JSONDecodeError
 from rich.prompt import Confirm, Prompt
 from simyan.comicvine import Comicvine as Simyan
@@ -14,14 +16,15 @@
 from simyan.sqlite_cache import SQLiteCache
 
 from perdoo import get_cache_root
-from perdoo.console import CONSOLE, create_menu
+from perdoo.console import CONSOLE
 from perdoo.metadata import ComicInfo, MetronInfo
 from perdoo.metadata.metron_info import InformationSource
 from perdoo.services._base import BaseService
 from perdoo.settings import Comicvine as ComicvineSettings
 from perdoo.utils import IssueSearch, Search, SeriesSearch
 
 LOGGER = logging.getLogger(__name__)
+DEFAULT_CHOICE = Choice(title="None of the Above", value=None)
 
 
 class Comicvine(BaseService[Volume, Issue]):
@@ -42,27 +45,39 @@ def _search_series(self, name: str | None, volume: int | None, year: int | None)
             )
             if year:
                 options = [x for x in options if x.start_year == year]
-            if not options:
+            if options:
+                search = name
+                if volume:
+                    search += f" v{volume}"
+                if year:
+                    search += f" ({year})"
+                choices = [
+                    Choice(
+                        title=[
+                            (
+                                "class:dim",
+                                f"{x.id} | {x.publisher.name if x.publisher and x.publisher.name else ''} | ",  # noqa: E501
+                            ),
+                            ("class:title", f"{x.name} ({x.start_year})"),
+                        ],
+                        description=f"https://comicvine.gamespot.com/volumes/4050-{x.id}",
+                        value=x,
+                    )
+                    for x in options
+                ]
+                choices.append(DEFAULT_CHOICE)
+                selected = select(
+                    f"Searching for Comicvine Volume '{search}'",
+                    default=DEFAULT_CHOICE,
+                    choices=choices,
+                    style=Style([("dim", "dim")]),
+                ).ask()
+                if selected and selected != DEFAULT_CHOICE.title:
+                    return selected.id
+            else:
                 LOGGER.warning(
                     "Unable to find any Volumes with the Name and StartYear: '%s %s'", name, year
                 )
-            search = name
-            if volume:
-                search += f" v{volume}"
-            if year:
-                search += f" ({year})"
-            index = create_menu(
-                options=[
-                    f"{x.id} | {x.publisher.name if x.publisher and x.publisher.name else ''}"
-                    f" | {x.name} ({x.start_year})"
-                    for x in options
-                ],
-                title="Comicvine Volume",
-                subtitle=f"Searching for Volume '{search}'",
-                default="None of the Above",
-            )
-            if index != 0:
-                return options[index - 1].id
             if year:
                 LOGGER.info("Searching again without the StartYear")
                 return self._search_series(name=name, volume=volume, year=None)
@@ -111,14 +126,33 @@ def _search_issue(self, series_id: int, number: str | None) -> int | None:
                     series_id,
                     number,
                 )
-            index = create_menu(
-                options=[f"{x.id} | {x.number} - {x.name or ''}" for x in options],
-                title="Comicvine Issue",
-                subtitle=f"Searching for Issue #{number}" if number else "",
-                default="None of the Above",
-            )
-            if index != 0:
-                return options[index - 1].id
+            if options:
+                choices = [
+                    Choice(
+                        title=[
+                            ("class:dim", f"{x.id} | "),
+                            ("class:title", f"{x.number} - {x.name or ''}"),
+                        ],
+                        description=f"https://comicvine.gamespot.com/issues/4000-{x.id}",
+                        value=x,
+                    )
+                    for x in options
+                ]
+                choices.append(DEFAULT_CHOICE)
+                selected = select(
+                    f"Searching for Comicvine Issue #{number}",
+                    default=DEFAULT_CHOICE,
+                    choices=choices,
+                    style=Style([("dim", "dim")]),
+                ).ask()
+                if selected and selected != DEFAULT_CHOICE.title:
+                    return selected.id
+            else:
+                LOGGER.warning(
+                    "Unable to find any Issues with the Volume and IssueNumber: '%s %s'",
+                    series_id,
+                    number,
+                )
             if number:
                 LOGGER.info("Searching again without the IssueNumber")
                 return self._search_issue(series_id=series_id, number=None)