comicbox 5.2.0__tar.gz → 5.2.1__tar.gz

{comicbox-5.2.0 → comicbox-5.2.1}/NEWS.md

@@ -1,5 +1,11 @@
 # 📰 News
 
+## v5.2.1
+
+- Fixes
+    - `OnlineSession.close()` releases Comic Vine's connections and sqlite
+      handles too, not just Metron's.
+
 ## v5.2.0
 
 - Features

{comicbox-5.2.0 → comicbox-5.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comicbox
-Version: 5.2.0
+Version: 5.2.1
 Summary: Comic book archive multi format metadata read/write/transform tool and image extractor.
 Keywords: cb7,cbr,cbt,cbz,comet,comic,comicbookinfo,comicinfo,metroninfo,pdf
 Author: AJ Slater

{comicbox-5.2.0 → comicbox-5.2.1}/bun.lock

@@ -14,7 +14,7 @@
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-array-func": "^5.1.1",
         "eslint-plugin-compat": "^7.0.2",
-        "eslint-plugin-de-morgan": "^2.1.3",
+        "eslint-plugin-de-morgan": "^2.2.0",
         "eslint-plugin-depend": "^1.5.0",
         "eslint-plugin-html": "^8.2.0",
         "eslint-plugin-import-x": "^4.17.1",
@@ -174,19 +174,19 @@
 
     "@types/unist": ["@types/unist@3.0.3", "", {}, "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q=="],
 
-    "@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.70.0", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.70.0", "@typescript-eslint/types": "^8.70.0", "debug": "^4.4.3" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-hFHbTNqhU9G+2eKFXCBVb1tjFT/LceiJ4+HfLO4pTpDI0KHi6iajpcFFkaSQ9gXmCh7n82A0PthaayEdN6mspQ=="],
+    "@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.70.1", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.70.1", "@typescript-eslint/types": "^8.70.1", "debug": "^4.4.3" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-62xOgboPfwc3/IgPSX/W6oQR3ZbF04194FPGUGH8HL8iLFHbt/456/8Ph1wLNUgVF+s94FlHoipBsz+v7+LMnA=="],
 
-    "@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.70.0", "", { "dependencies": { "@typescript-eslint/types": "8.70.0", "@typescript-eslint/visitor-keys": "8.70.0" } }, "sha512-8nP3Kwh5hlgZ4FicGvmznAmJe8UL4sdU8tLukrPaMuQmDuk4Y8xYfzu/aYZW4xT2JCgc7H/TpDI5cGlxcWJSqQ=="],
+    "@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.70.1", "", { "dependencies": { "@typescript-eslint/types": "8.70.1", "@typescript-eslint/visitor-keys": "8.70.1" } }, "sha512-Pa0EeSeAusQc1WbjQMac+YfenewYTBu0KjgYvkUKwhXaHUKbFog23Dm/rp0DX/6tyYOQ3Xl1a+3EcFNZynGHCw=="],
 
-    "@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.70.0", "", { "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-adnkeeNq9Sq1sUf4+FRVc0KdgYghzsgFpZSQVZVvY0LCuUuN0FnQgyGzCJeC4fW1cdXseBAjU2EOqUIjbNcZUw=="],
+    "@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.70.1", "", { "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-jumze1fPI+sDOaM2TWGQdn39PDxTr7TZGeuyLkAbNyx2vtMT3uRnVKChN0hfht5V2TugphJzF6bYXvBcE09qqg=="],
 
-    "@typescript-eslint/types": ["@typescript-eslint/types@8.70.0", "", {}, "sha512-asTOIYhDg4zdzOScCyaytrsV3cR6B4ecPQlXw/dJIm7J/MZTtCtfVII9JD8Geh4jTCrK/Xe6cg5UevoleMcoJQ=="],
+    "@typescript-eslint/types": ["@typescript-eslint/types@8.70.1", "", {}, "sha512-Dm1ypdhhrGCTyyehxElhgJ6kgk8MVCv5qXdoOVqPr1uqk42jX8KjrZqhROvdShczA8qrDoYiOWn1ykWlx2k81Q=="],
 
-    "@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.70.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.70.0", "@typescript-eslint/tsconfig-utils": "8.70.0", "@typescript-eslint/types": "8.70.0", "@typescript-eslint/visitor-keys": "8.70.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-d9NmHMPEKQ7QCLLm1jI3zmoQBwT5KwFYjXBJ9ymZfKCUU+5rmTRykKAFvH5Qn/ZCds3CEAFS9OC9M/jkl0X2bA=="],
+    "@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.70.1", "", { "dependencies": { "@typescript-eslint/project-service": "8.70.1", "@typescript-eslint/tsconfig-utils": "8.70.1", "@typescript-eslint/types": "8.70.1", "@typescript-eslint/visitor-keys": "8.70.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-TU8PwyGN0PQJUcE96mw8eCQ44SmxGdQlJmlWakHaHQ15eIuuvye5yNtmh/i6oS88jzXVQB71xdNkbkB/fMwL0g=="],
 
-    "@typescript-eslint/utils": ["@typescript-eslint/utils@8.70.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "@typescript-eslint/scope-manager": "8.70.0", "@typescript-eslint/types": "8.70.0", "@typescript-eslint/typescript-estree": "8.70.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-oZmtKJz/4fufZ2p3+Cn3ijEojcdfR+1zYDH2xKYrEly0dR/Q/1xUPRCOlKGxod78nWlU2UnDe09GZ3TaknBFGA=="],
+    "@typescript-eslint/utils": ["@typescript-eslint/utils@8.70.1", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "@typescript-eslint/scope-manager": "8.70.1", "@typescript-eslint/types": "8.70.1", "@typescript-eslint/typescript-estree": "8.70.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-Esgul8MsnKnRLdYU2Eb2cRV9bS5HJYtKj1ByJnOzzG2M58DGdSUQ1jUuILxipqcpB2h9WLrbD5GijIWUjX/Tqw=="],
 
-    "@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.70.0", "", { "dependencies": { "@typescript-eslint/types": "8.70.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-BoC8PiO4Hkdo0TVJh9Ntxr5MxPDI7/oFsrygN5ADelFSeXG/qgNuucIGA+L5Z6JpPTE/uRfcTWtscjbUaufepQ=="],
+    "@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.70.1", "", { "dependencies": { "@typescript-eslint/types": "8.70.1", "eslint-visitor-keys": "^5.0.0" } }, "sha512-Vwj9lUIW5Xq3wQ9w6gv3R86g1hMK8f2zNOdGTAgeXUMMXFK78G9ruCjjqutHMNJc0+CH7LYRnHeUB9IT8wFmcw=="],
 
     "@unrs/resolver-binding-android-arm-eabi": ["@unrs/resolver-binding-android-arm-eabi@1.12.2", "", { "os": "android", "cpu": "arm" }, "sha512-g5T90pqg1bo/7mytQx6F4iBNC0Wsh9cu+z9veDbFjc7HjpesJFWD7QMS0NGStXM075+7dJPPVvBbpZlnrdpi/w=="],
 
@@ -370,7 +370,7 @@
 
     "eslint-plugin-compat": ["eslint-plugin-compat@7.0.2", "", { "dependencies": { "@mdn/browser-compat-data": "^6.1.1", "ast-metadata-inferer": "^0.8.1", "browserslist": "^4.25.2", "find-up": "^5.0.0", "globals": "^15.7.0", "lodash.memoize": "^4.1.2", "semver": "^7.6.2" }, "peerDependencies": { "eslint": "^9.0.0 || ^10.0.0" } }, "sha512-gN8hF+4NzMsHUbr4m/TYZK0FtW3DcV4g8rXpTsY2EV5xiRD8jsilUlB9lNSkGGX0veDCxMhKSWbSd+faJByQDA=="],
 
-    "eslint-plugin-de-morgan": ["eslint-plugin-de-morgan@2.1.3", "", { "peerDependencies": { "eslint": "^8.45.0 || ^9.0.0 || ^10.0.0" } }, "sha512-vuU/AIPvzsRhCyAfgaWwRVy0QUGvtv2pCn3N6tV4LZRFRNKPuV+Md1mYLvLuM9tORKLe8plzx5DqS9/II/3dew=="],
+    "eslint-plugin-de-morgan": ["eslint-plugin-de-morgan@2.2.0", "", { "peerDependencies": { "eslint": "^8.45.0 || ^9.0.0 || ^10.0.0" } }, "sha512-bHg8e68rQTJ01av4sxhgNWQeoSzPWDjb6MqeKgmgRGaCzq83Ou6/g5S1ZssvFdHHS4BsblkJkagoioUmSEHPMg=="],
 
     "eslint-plugin-depend": ["eslint-plugin-depend@1.5.0", "", { "dependencies": { "empathic": "^2.0.0", "module-replacements": "^2.10.1", "semver": "^7.6.3" }, "peerDependencies": { "eslint": ">=8.40.0" } }, "sha512-i3UeLYmclf1Icp35+6W7CR4Bp2PIpDgBuf/mpmXK5UeLkZlvYJ21VuQKKHHAIBKRTPivPGX/gZl5JGno1o9Y0A=="],
 

{comicbox-5.2.0 → comicbox-5.2.1}/comicbox/formats/comicvine_api/online_source.py

@@ -126,6 +126,76 @@ def reset_shared_sessions() -> None:
         _session_cache.clear()
 
 
+def close_shared_sessions() -> None:
+    """
+    Release the connections and sqlite handles every shared client holds.
+
+    Optional, and not a cancel: a closed client stays usable, at the cost
+    of reopening what it needs on its next request. The response cache
+    reopens lazily and the hourly budget lives in the rate-limit bucket
+    *file* rather than in the bucket object, so nothing a run has spent
+    is forgotten by closing. Mirrors `metron_api`'s `close_shared_sessions`.
+    """
+    with _session_cache_lock:
+        entries = list(_session_cache.values())
+    for client, _signature in entries:
+        close_client(client)
+
+
+def close_client(client: Any) -> None:
+    """
+    Close one simyan client: the session first, then what that leaves open.
+
+    A `Comicvine` exposes no `close` of its own, so this goes through
+    `_session` -- private simyan surface, as in `_maintain_cache`.
+    Closing it releases the pooled sockets and the response cache's
+    sqlite connection and stops pyrate-limiter's leaker thread, but
+    leaves the rate-limit buckets holding theirs (`_close_limiter_buckets`).
+    """
+    # Tests seed fakes that are neither `Comicvine`s nor real sessions.
+    session = getattr(client, "_session", client)
+    close = getattr(session, "close", None)
+    if close is not None:
+        close()
+    _close_limiter_buckets(session)
+
+
+def _close_limiter_buckets(session: Any) -> None:
+    """
+    Close the rate-limit buckets the session's own close leaves open.
+
+    requests-ratelimiter's `close` does ask pyrate-limiter to close them,
+    but `BucketFactory.close()` drops its leaker before iterating
+    `get_buckets()`, which reads that leaker -- so the loop sees nothing
+    and every `SQLiteBucket` keeps its sqlite connection (pyrate-limiter
+    4.5.0). There is one bucket per endpoint pool, so closing only the
+    session trades a silent leak for a `ResourceWarning` apiece once the
+    buckets are finally collected: worse than not closing at all.
+
+    The factory would hand a closed bucket straight back out, and a
+    request holding one dies on its `None` connection, so the registry is
+    emptied first -- a racing lookup then builds a fresh bucket over the
+    same file instead of finding the one being closed. Each bucket's own
+    lock covers the rest: `close` waits behind an in-flight acquire.
+    """
+    factory = getattr(getattr(session, "limiter", None), "bucket_factory", None)
+    registry = getattr(factory, "buckets", None)
+    if not isinstance(registry, dict):
+        # The limiter stack is upstream's to rearrange; a run that cannot
+        # find the buckets has still closed the session above.
+        logger.debug("online comicvine: no rate-limit buckets to close")
+        return
+    buckets = list(registry.values())
+    registry.clear()
+    for bucket in buckets:
+        try:
+            bucket.close()
+        # Broad on purpose: one bucket backend that will not close must
+        # not cost the others their close, nor fail the caller's teardown.
+        except Exception as exc:
+            logger.debug(f"online comicvine: rate-limit bucket close skipped: {exc}")
+
+
 def _bucket_window(conn: sqlite3.Connection, table: str, now_ms: int) -> dict[str, Any]:
     """Summarize one bucket table as a `limit`/`remaining`/`reset_epoch` window."""
     window_start = now_ms - _RATE_LIMIT_WINDOW_MS

{comicbox-5.2.0 → comicbox-5.2.1}/comicbox/online_session.py

@@ -422,18 +422,30 @@ class OnlineSession:
 
     def close(self) -> None:
         """
-        Release the pooled Metron HTTP connections.
+        Release the pooled connections and cache handles both sources hold.
 
         Optional, and not a cancel: the session stays usable afterwards,
-        at the cost of a reconnect on its next request. The mokkari
-        session is process-wide per credential set, so closing while
-        another `OnlineSession` in the same process is mid-run costs that
-        run a reconnect too. Acceptable, and the alternative -- leaving
-        the sockets to be finalized -- is what emits `ResourceWarning`.
+        at the cost of reopening what it needs on its next request. The
+        upstream clients are process-wide per credential set, so closing
+        while another `OnlineSession` in the same process is mid-run
+        costs that run the same reopen. Acceptable, and the alternative
+        -- leaving the sockets and sqlite handles to be finalized -- is
+        what emits `ResourceWarning`.
+
+        Comic Vine is the one sharp edge: its rate-limit buckets are
+        closed with the session, so a lookup already holding one can fail
+        outright rather than merely reconnect. Close between files, not
+        under one.
         """
-        from comicbox.formats.metron_api.online_source import close_shared_sessions
+        from comicbox.formats.comicvine_api.online_source import (
+            close_shared_sessions as close_comicvine,
+        )
+        from comicbox.formats.metron_api.online_source import (
+            close_shared_sessions as close_metron,
+        )
 
-        close_shared_sessions()
+        close_metron()
+        close_comicvine()
 
     def __enter__(self) -> Self:
         """Enter the context manager, returning this session."""

{comicbox-5.2.0 → comicbox-5.2.1}/comicbox/run.py

@@ -37,6 +37,13 @@ if TYPE_CHECKING:
 #: log one line. Anything else is a bug and earns the stack.
 _EXPECTED_FILE_ERRORS = (UnsupportedArchiveTypeError,)
 
+#: The online sources that hold process-wide clients to release at the
+#: end of a run. Named, not imported: see `_close_shared_online_sessions`.
+_ONLINE_SOURCE_MODULES = (
+    "comicbox.formats.metron_api.online_source",
+    "comicbox.formats.comicvine_api.online_source",
+)
+
 
 def _leaders_first(clustered: list[Path]) -> list[Path]:
     """
@@ -55,15 +62,17 @@ def _leaders_first(clustered: list[Path]) -> list[Path]:
 
 def _close_shared_online_sessions() -> None:
     """
-    Release the pooled Metron connections a run opened, if it opened any.
+    Release the connections and handles a run opened, if it opened any.
 
     Read out of ``sys.modules`` rather than imported: an offline run
     never loads the online packages, and importing one here just to call
-    a no-op would put mokkari's import cost back on every run.
+    a no-op would put mokkari's and simyan's import cost back on every
+    run.
     """
-    metron = sys.modules.get("comicbox.formats.metron_api.online_source")
-    if metron is not None:
-        metron.close_shared_sessions()
+    for name in _ONLINE_SOURCE_MODULES:
+        module = sys.modules.get(name)
+        if module is not None:
+            module.close_shared_sessions()
 
 
 class Runner:

{comicbox-5.2.0 → comicbox-5.2.1}/docs/NEWS.md

@@ -1,5 +1,11 @@
 # 📰 News
 
+## v5.2.1
+
+- Fixes
+    - `OnlineSession.close()` releases Comic Vine's connections and sqlite
+      handles too, not just Metron's.
+
 ## v5.2.0
 
 - Features

{comicbox-5.2.0 → comicbox-5.2.1}/package.json

@@ -77,7 +77,7 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-array-func": "^5.1.1",
     "eslint-plugin-compat": "^7.0.2",
-    "eslint-plugin-de-morgan": "^2.1.3",
+    "eslint-plugin-de-morgan": "^2.2.0",
     "eslint-plugin-depend": "^1.5.0",
     "eslint-plugin-html": "^8.2.0",
     "eslint-plugin-import-x": "^4.17.1",

{comicbox-5.2.0 → comicbox-5.2.1}/pyproject.toml

@@ -56,7 +56,7 @@ readme = "README.md"
 requires-python = ">=3.10"
 license = "LGPL-3.0-only"
 name = "comicbox"
-version = "5.2.0"
+version = "5.2.1"
 
 [[project.authors]]
 name = "AJ Slater"

{comicbox-5.2.0 → comicbox-5.2.1}/pyproject.toml.orig

@@ -56,7 +56,7 @@ readme = "README.md"
 requires-python = ">=3.10"
 license = "LGPL-3.0-only"
 name = "comicbox"
-version = "5.2.0"
+version = "5.2.1"
 [[project.authors]]
 name = "AJ Slater"
 email = "aj@slater.net"

comicbox-5.2.1/tests/unit/test_comicvine_session_lifecycle.py

@@ -0,0 +1,273 @@
+"""
+Lifecycle of the shared simyan client.
+
+A `Comicvine` holds more than sockets: the response cache's sqlite
+connection, one rate-limit bucket connection per endpoint pool, and
+pyrate-limiter's leaker thread. Closing the session releases the first
+and stops the last but leaves every bucket open -- and, by dropping the
+references that had kept them alive, turns a silent leak into a
+`ResourceWarning` apiece. These tests pin the whole close.
+"""
+
+from __future__ import annotations
+
+import gc
+import warnings
+from argparse import Namespace
+from typing import TYPE_CHECKING, Any
+
+import pytest
+from typing_extensions import override
+
+from comicbox.config.online.settings import OnlineCacheSettings, OnlineSettings
+from comicbox.formats.base.online.rate_limits import COMICVINE_DEFAULT_PER_HOUR
+from comicbox.formats.comicvine_api import online_source as comicvine
+from tests.util.online_client import build_comicvine_client, spend
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+class _FakeBucket:
+    """A bucket double that records the registry's state when it was closed."""
+
+    def __init__(self) -> None:
+        self.closed = 0
+        self.registry: dict[str, Any] = {}
+        self.registry_was_empty: bool | None = None
+
+    def close(self) -> None:
+        self.closed += 1
+        self.registry_was_empty = not self.registry
+
+
+class _StuckBucket(_FakeBucket):
+    """A bucket double whose close fails, as a rearranged upstream might."""
+
+    @override
+    def close(self) -> None:
+        super().close()
+        msg = "no connection"
+        raise RuntimeError(msg)
+
+
+class _FakeSession:
+    """A `CachedLimiterSession` double, down to `limiter.bucket_factory`."""
+
+    def __init__(self, *buckets: _FakeBucket) -> None:
+        self.closed = 0
+        registry = {f"pool{i}": bucket for i, bucket in enumerate(buckets)}
+        for bucket in buckets:
+            bucket.registry = registry
+        self.limiter = Namespace(bucket_factory=Namespace(buckets=registry))
+
+    @property
+    def registry(self) -> dict[str, Any]:
+        """The bucket registry the factory serves lookups from."""
+        return self.limiter.bucket_factory.buckets
+
+    def close(self) -> None:
+        self.closed += 1
+
+
+class _FakeClient:
+    """A `Comicvine` double: the session hangs off the same private name."""
+
+    def __init__(self, session: _FakeSession) -> None:
+        self._session = session
+
+
+class _Unclosable:
+    """A client double with neither a session nor a close, as fakes have."""
+
+
+@pytest.fixture(autouse=True)
+def _clear_cache(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Every test gets its own empty shared-client cache."""
+    monkeypatch.setattr(comicvine, "_session_cache", {})
+
+
+def _seed(client: Any, key: tuple[str, str] = ("key", "")) -> None:
+    comicvine._session_cache[key] = (client, ())
+
+
+def _buckets(client: Any) -> list[Any]:
+    return list(client._session.limiter.bucket_factory.buckets.values())
+
+
+def test_close_closes_every_shared_client() -> None:
+    """One run, one close per credential set."""
+    first = _FakeSession()
+    second = _FakeSession()
+    _seed(_FakeClient(first), ("key", ""))
+    _seed(_FakeClient(second), ("other", "https://cv.example/api"))
+
+    comicvine.close_shared_sessions()
+
+    assert first.closed == 1
+    assert second.closed == 1
+
+
+def test_close_keeps_the_cache_entries() -> None:
+    """
+    A closed simyan client is still the right one to reuse.
+
+    It reopens its response cache on demand and rebuilds a rate-limit
+    bucket over the same file, so the credential set keeps its client.
+    """
+    _seed(_FakeClient(_FakeSession()))
+
+    comicvine.close_shared_sessions()
+
+    assert comicvine._session_cache
+
+
+def test_close_tolerates_a_client_without_a_session() -> None:
+    """Tests seed doubles; a missing `_session` must not break teardown."""
+    _seed(_Unclosable())
+
+    comicvine.close_shared_sessions()  # must not raise
+
+
+def test_close_empties_the_registry_before_closing_the_buckets() -> None:
+    """
+    A closed bucket must never be handed back out.
+
+    The factory serves its registry without checking, and a request that
+    gets a closed bucket dies on its `None` connection, so the registry
+    is emptied first: a racing lookup then builds a fresh bucket instead
+    of finding this one mid-close.
+    """
+    bucket = _FakeBucket()
+    session = _FakeSession(bucket)
+    _seed(_FakeClient(session))
+
+    comicvine.close_shared_sessions()
+
+    assert bucket.closed == 1
+    assert bucket.registry_was_empty is True
+    assert not session.registry
+
+
+def test_close_survives_a_bucket_that_will_not_close() -> None:
+    """One bad bucket must not stop the rest, nor fail the caller."""
+    stuck = _StuckBucket()
+    fine = _FakeBucket()
+    session = _FakeSession(stuck, fine)
+    _seed(_FakeClient(session))
+
+    comicvine.close_shared_sessions()
+
+    assert stuck.closed == 1
+    assert fine.closed == 1
+    assert session.closed == 1
+
+
+def test_a_closed_client_releases_every_sqlite_handle(tmp_path: Path) -> None:
+    """
+    The response cache's connection, and one per rate-limit pool.
+
+    `session.close()` alone gets the first; the buckets are
+    pyrate-limiter's and have to be closed by name (see
+    `_close_limiter_buckets`).
+    """
+    client = build_comicvine_client(tmp_path)
+    spend(client, "issues", 2)
+    spend(client, "search", 1)
+    buckets = _buckets(client)
+    assert len(buckets) == 2
+    assert all(bucket.conn is not None for bucket in buckets)
+
+    comicvine.close_client(client)
+
+    assert all(bucket.conn is None for bucket in buckets)
+    assert client._session.cache.responses._connection is None
+
+
+def test_a_closed_client_emits_no_resource_warning(tmp_path: Path) -> None:
+    """The symptom that asked for this: unclosed sqlite handles."""
+    with warnings.catch_warnings(record=True) as caught:
+        warnings.simplefilter("always")
+        client = build_comicvine_client(tmp_path)
+        spend(client, "issues", 1)
+        spend(client, "search", 1)
+
+        comicvine.close_client(client)
+
+        del client
+        gc.collect()
+
+    leaked = [
+        str(warning.message)
+        for warning in caught
+        if issubclass(warning.category, ResourceWarning)
+    ]
+    assert not leaked
+
+
+def test_a_closed_client_is_still_usable(tmp_path: Path) -> None:
+    """
+    Not a cancel: the client works after a close, and remembers.
+
+    The hourly budget lives in the bucket file, so the rebuilt bucket
+    picks up where the closed one left off.
+    """
+    client = build_comicvine_client(tmp_path)
+    spend(client, "issues", 3)
+
+    comicvine.close_client(client)
+    spend(client, "issues", 1)
+
+    status = comicvine.shared_client_rate_limit_status(
+        OnlineSettings(cache=OnlineCacheSettings(dir=tmp_path))
+    )
+    assert status["issues"]["remaining"] == COMICVINE_DEFAULT_PER_HOUR - 4
+    comicvine.close_client(client)
+
+
+def test_close_is_safe_to_repeat(tmp_path: Path) -> None:
+    """A second close finds nothing to do rather than raising."""
+    client = build_comicvine_client(tmp_path)
+    spend(client, "issues", 1)
+
+    comicvine.close_client(client)
+    comicvine.close_client(client)  # must not raise
+
+
+def test_the_runner_closes_shared_clients(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """A finished run releases what its Comic Vine lookups opened."""
+    from comicbox.run import Runner
+
+    calls: list[int] = []
+    monkeypatch.setattr(comicvine, "close_shared_sessions", lambda: calls.append(1))
+    comic = tmp_path / "file_0.cbz"
+    comic.write_bytes(b"")  # zero-byte cbz; Comicbox will fail to open it
+    runner = Runner(
+        Namespace(comicbox=Namespace(paths=[str(comic)], print=Namespace(phases="p")))
+    )
+
+    runner.run()
+
+    assert calls == [1]
+
+
+def test_online_session_close_releases_both_sources(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """`OnlineSession.close()` is not a Metron-only release."""
+    from comicbox.formats.metron_api import online_source as metron
+    from comicbox.online_session import OnlineCredentials, OnlineSession
+
+    calls: list[str] = []
+    monkeypatch.setattr(
+        comicvine, "close_shared_sessions", lambda: calls.append("comicvine")
+    )
+    monkeypatch.setattr(metron, "close_shared_sessions", lambda: calls.append("metron"))
+    credentials = OnlineCredentials(comicvine_key="k")
+
+    with OnlineSession(sources={"comicvine"}, credentials=credentials):
+        pass
+
+    assert calls == ["metron", "comicvine"]

{comicbox-5.2.0 → comicbox-5.2.1}/tests/util/online_client.py

@@ -14,24 +14,17 @@ def close_comicvine_client(client: Any) -> None:
     """
     Release every sqlite connection a simyan `Comicvine` opened.
 
-    `session.close()` alone leaves the rate-limit buckets open:
-    requests-ratelimiter's `HostBucketFactory` keeps its buckets in its
-    own `buckets` dict, which pyrate-limiter's `BucketFactory.close()`
-    does not iterate, so it closes the leaker but not the bucket
-    connections. Closing them here keeps tests from leaking sqlite
-    handles and emitting ResourceWarnings.
+    Delegates to the production close rather than keeping a second copy
+    of the bucket dance it has to do.
     """
-    session = client._session
-    factory = session.limiter.bucket_factory
-    session.close()
-    for bucket in list(getattr(factory, "buckets", {}).values()):
-        bucket.close()
+    from comicbox.formats.comicvine_api.online_source import close_client
 
+    close_client(client)
 
-@contextmanager
-def comicvine_client(cache_dir: Path, api_key: str = "k") -> Generator[Any]:
+
+def build_comicvine_client(cache_dir: Path, api_key: str = "k") -> Any:
     """
-    Yield a real `Comicvine` pointed at `cache_dir`, fully closed on exit.
+    Build a real `Comicvine` pointed at `cache_dir`.
 
     Its file names match what `ComicVineOnlineSource` would choose, so a
     status read against the same directory finds them.
@@ -39,11 +32,17 @@ def comicvine_client(cache_dir: Path, api_key: str = "k") -> Generator[Any]:
     from simyan.comicvine import Comicvine
 
     cache_dir.mkdir(parents=True, exist_ok=True)
-    client = Comicvine(
+    return Comicvine(
         api_key=api_key,
         cache_path=cache_dir / "comicvine_cache.sqlite",
         ratelimit_path=cache_dir / "comicvine_rate_limit.sqlite",
     )
+
+
+@contextmanager
+def comicvine_client(cache_dir: Path, api_key: str = "k") -> Generator[Any]:
+    """Yield a real `Comicvine` pointed at `cache_dir`, fully closed on exit."""
+    client = build_comicvine_client(cache_dir, api_key)
     try:
         yield client
     finally:

{comicbox-5.2.0 → comicbox-5.2.1}/uv.lock

@@ -876,7 +876,7 @@ wheels = [
 
 [[package]]
 name = "comicbox"
-version = "5.2.0"
+version = "5.2.1"
 source = { editable = "." }
 dependencies = [
     { name = "bidict", version = "0.23.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },