comicbox 5.1.2__tar.gz → 5.2.0__tar.gz

{comicbox-5.1.2 → comicbox-5.2.0}/.gitignore

@@ -113,6 +113,7 @@ share/python-wheels
 share/python-wheels/
 target
 target/
+tasks/
 test-results
 TODO.md
 var

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

@@ -1,5 +1,33 @@
 # 📰 News
 
+## v5.2.0
+
+- Features
+    - `comicbox.predict.predict_write_destination()` reports where a write would
+      land, and whether that path is taken, before anything is written.
+    - A destination collision raises `DestinationOccupiedError`, which names the
+      occupied path and says which kind of collision it was.
+    - Match candidates carry a full-size cover url alongside the thumbnail.
+    - `OnlineSession.close()` releases the pooled Metron connections; the CLI
+      does this at the end of every run.
+
+- Fixes
+    - `bulk_write` checks every destination before doing any work, so a batch
+      fails fast instead of repacking an archive and refusing it at the end.
+      `preflight=False` restores the old behavior.
+    - Two archives in one batch that convert to the same name now lose
+      deterministically, by submission order, instead of by thread race.
+    - A kept-original CBR whose CBZ twin already exists is refused before its
+      metadata is read, on the command line as well as the API.
+
+- Performance
+    - Metron requests reuse one pooled connection per run instead of a new TLS
+      handshake each (mokkari 4.8.0).
+
+- Dependencies
+    - Requires mokkari 4.8.0. Metron pacing now registers through mokkari's
+      `rate_limiter` hook instead of overriding a private method.
+
 ## v5.1.2
 
 - Features

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comicbox
-Version: 5.1.2
+Version: 5.2.0
 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
@@ -23,7 +23,7 @@ Requires-Dist: keyring~=25.6
 Requires-Dist: loguru~=0.7
 Requires-Dist: marshmallow-union>=0.1.15.post1
 Requires-Dist: marshmallow~=4.3
-Requires-Dist: mokkari>=4.5.0,<5
+Requires-Dist: mokkari>=4.8.0,<5
 Requires-Dist: nh3>=0.3.5
 Requires-Dist: pillow>=12.2.0
 Requires-Dist: platformdirs>=4.9.6
@@ -314,12 +314,23 @@ result = write_metadata(
 print(result.written)
 ```
 
+`comicbox.predict.predict_write_destination` reports where a write would land —
+in place, or the CBZ an unwritable archive repacks to — and whether that path is
+already taken, without opening the archive or reading any metadata:
+
+```python
+from comicbox.predict import predict_write_destination
+
+dest = predict_write_destination("comic.cbr")
+print(dest.destination, dest.converts, dest.occupied)
+```
+
 Every operational error these APIs raise derives from
 `comicbox.exceptions.ComicboxError` — `ArchiveError`, `ArchiveWriteError`,
-`MetadataError`, `ExportError`, `WriteValidationError`,
-`OnlineConfigurationError`, `OnlineLookupAbortedError`, and
-`UnsupportedArchiveTypeError` — so consumers can `except ComicboxError` without
-swallowing unrelated programming errors.
+`DestinationOccupiedError`, `MetadataError`, `ExportError`,
+`WriteValidationError`, `OnlineConfigurationError`, `OnlineLookupAbortedError`,
+and `UnsupportedArchiveTypeError` — so consumers can `except ComicboxError`
+without swallowing unrelated programming errors.
 
 ## ⚙️ Configuration
 

{comicbox-5.1.2 → comicbox-5.2.0}/README.md

@@ -262,12 +262,23 @@ result = write_metadata(
 print(result.written)
 ```
 
+`comicbox.predict.predict_write_destination` reports where a write would land —
+in place, or the CBZ an unwritable archive repacks to — and whether that path is
+already taken, without opening the archive or reading any metadata:
+
+```python
+from comicbox.predict import predict_write_destination
+
+dest = predict_write_destination("comic.cbr")
+print(dest.destination, dest.converts, dest.occupied)
+```
+
 Every operational error these APIs raise derives from
 `comicbox.exceptions.ComicboxError` — `ArchiveError`, `ArchiveWriteError`,
-`MetadataError`, `ExportError`, `WriteValidationError`,
-`OnlineConfigurationError`, `OnlineLookupAbortedError`, and
-`UnsupportedArchiveTypeError` — so consumers can `except ComicboxError` without
-swallowing unrelated programming errors.
+`DestinationOccupiedError`, `MetadataError`, `ExportError`,
+`WriteValidationError`, `OnlineConfigurationError`, `OnlineLookupAbortedError`,
+and `UnsupportedArchiveTypeError` — so consumers can `except ComicboxError`
+without swallowing unrelated programming errors.
 
 ## ⚙️ Configuration
 

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

@@ -10,7 +10,7 @@
         "@fsouza/prettierd": "^0.29.0",
         "@prettier/plugin-xml": "^3.4.2",
         "@stylistic/eslint-plugin": "^5.10.0",
-        "eslint": "^10.10.0",
+        "eslint": "^10.11.0",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-array-func": "^5.1.1",
         "eslint-plugin-compat": "^7.0.2",
@@ -23,11 +23,11 @@
         "eslint-plugin-no-secrets": "^2.3.3",
         "eslint-plugin-no-unsanitized": "^4.1.5",
         "eslint-plugin-no-use-extend-native": "^0.7.3",
-        "eslint-plugin-package-json": "^1.8.1",
+        "eslint-plugin-package-json": "^1.9.0",
         "eslint-plugin-perfectionist": "^5.11.1",
         "eslint-plugin-prettier": "^5.5.6",
         "eslint-plugin-promise": "^7.3.0",
-        "eslint-plugin-regexp": "^3.3.0",
+        "eslint-plugin-regexp": "^3.3.1",
         "eslint-plugin-security": "^4.0.1",
         "eslint-plugin-sonarjs": "^4.2.1",
         "eslint-plugin-toml": "^1.5.0",
@@ -52,13 +52,13 @@
 
     "@babel/code-frame": ["@babel/code-frame@7.29.7", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw=="],
 
-    "@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="],
+    "@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.6", "", {}, "sha512-+6HYEBnsDRZHJtUTAEfMQd0zMDqdFHS7C+5vAsEZqBUr3vEMWOWlHJ0Jz1gS8jJIlCvLsuA6ivmeoqzH936YcA=="],
 
-    "@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.4", "", {}, "sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg=="],
+    "@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.6", "", {}, "sha512-HYx0YmuchRxRSpnjvcNffnPS8DCauKNmnumIuHG3jnQAVewRA7kfJGwF13ayEpSZs7s4R/oBH4eppuXcAQd5JQ=="],
 
-    "@babel/parser": ["@babel/parser@8.0.5", "", { "dependencies": { "@babel/types": "^8.0.5" }, "bin": "./bin/babel-parser.js" }, "sha512-51RXvQNFakaS0bTpYiGkxNbUVwkPO4kONv6EVLorZABxsx+KZ6Z7uSYvi/wmKS/+X+rfj9RvOw0/ZNh+cmI0Rw=="],
+    "@babel/parser": ["@babel/parser@8.0.6", "", { "dependencies": { "@babel/types": "^8.0.6" }, "bin": "./bin/babel-parser.js" }, "sha512-LpGDIYJAzc3Y3PT9x+FxBrGYu2PlWxLmyN7SwPTzaX0LSwEmFJBsRnPBqmaXF2r1v+Zhz6lNiEJ+7yKtM5+Ugg=="],
 
-    "@babel/types": ["@babel/types@8.0.5", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.4" } }, "sha512-eVdMqi3ej5aHhyQ2Si6yD2cAWeV8FJK9UrhK5aL0Sd8hu5GhT+YswhVNbVheOGVYMg8kuGuMaUpkB3stjj4z8A=="],
+    "@babel/types": ["@babel/types@8.0.6", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.6", "@babel/helper-validator-identifier": "^8.0.6" } }, "sha512-c+xgSWboV2pdwXP67BUWDVRHi2BO5Q3KwxyFVs7taVTY+fsK47/L51ZXQoV9rozHJDNHvJ4v4WEsI/IlxV2l2A=="],
 
     "@cacheable/memory": ["@cacheable/memory@2.2.0", "", { "dependencies": { "@cacheable/utils": "^2.5.0", "@keyv/bigmap": "^1.3.1", "hookified": "^1.15.1", "keyv": "^5.6.0" } }, "sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ=="],
 
@@ -166,7 +166,7 @@
 
     "@types/ms": ["@types/ms@2.1.0", "", {}, "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA=="],
 
-    "@types/node": ["@types/node@26.6.1", "", { "dependencies": { "undici-types": "~8.9.0" } }, "sha512-VqGJBMCtdhqkBUCcBLvywI0NJ+KLuVzgNnlBUNFOQjqVxzo2lxLUNg1DSey8+u2u6ktswSAxg+s68QLzWHNOuA=="],
+    "@types/node": ["@types/node@26.6.2", "", { "dependencies": { "undici-types": "~8.9.0" } }, "sha512-X1P21scMv4zGKLYqjdGjaKa7COa0RKVYYZZN/NfvLQ1JegxFhdhpZG/Lyn8AXx6CDUavKAd11v6BvfpkDByK8g=="],
 
     "@types/supports-color": ["@types/supports-color@8.1.3", "", {}, "sha512-Hy6UMpxhE3j1tLpl27exp1XqHD7n8chAiNPzWfz16LPZoMMoSc4dzLl6w9qijkEb/r5O1ozdu1CWGA2L83ZeZg=="],
 
@@ -338,11 +338,11 @@
 
     "eastasianwidth": ["eastasianwidth@0.2.0", "", {}, "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="],
 
-    "electron-to-chromium": ["electron-to-chromium@1.5.430", "", {}, "sha512-e1QEj72Y4zd8RlNZVmoTg+iCOSVwpk05IOiiQwdrkwCSVlZfPthevErhE+nckGd2YbsXfp1SkisznhGVIXP2NQ=="],
+    "electron-to-chromium": ["electron-to-chromium@1.5.433", "", {}, "sha512-5lCAbyZBjtmUt/RAGHRqrL2q0oEFRThDAsZHHDn9XHa89Qw7gMYOeSicBTy+AHfvo0r6vwsZvqNJTQIQy1BLzA=="],
 
     "emoji-regex": ["emoji-regex@10.6.0", "", {}, "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A=="],
 
-    "empathic": ["empathic@2.0.1", "", {}, "sha512-YGRs8knHhKHVShLkFET/rWAU8kmHbOV5LwN938RHI0pljAJ1Gf6SzXsSmRaEzcXTtOOmVqJ5+WtQPL5uigY50Q=="],
+    "empathic": ["empathic@2.1.0", "", {}, "sha512-AnfC1ATldl49/cvZdLPDjBfrRNwbDO05aibiOtzQu3qtlbJtomNLhF30HEtn/7iBz50dlMECqATo3fG0LrdEgw=="],
 
     "entities": ["entities@8.1.0", "", {}, "sha512-kxL7msIffSuh9aaFAMD7rxAIuTRMAHMeBtgHW2yUdWw732ZNh4MehkF2gdjvtdmikkaIP9bFDDJOPlsvm7avrA=="],
 
@@ -354,11 +354,11 @@
 
     "escape-string-regexp": ["escape-string-regexp@4.0.0", "", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="],
 
-    "eslint": ["eslint@10.10.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.2", "@eslint/config-array": "^0.23.5", "@eslint/config-helpers": "^0.7.0", "@eslint/core": "^1.2.1", "@eslint/plugin-kit": "^0.7.3", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "ajv": "^6.14.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^9.1.2", "eslint-visitor-keys": "^5.0.1", "espree": "^11.2.0", "esquery": "^1.7.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "11.1.5 || >11.1.6 <12", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "minimatch": "^10.2.5", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-NPXn6r5zl4uET1DAVPaOwzX3rut4c0wcmw3dWJAfOsTM5+TogXo0DDjz8pwm/hL8cyVNpHqeK4JpN0NjnyFFNw=="],
+    "eslint": ["eslint@10.11.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.2", "@eslint/config-array": "^0.23.5", "@eslint/config-helpers": "^0.7.0", "@eslint/core": "^1.2.1", "@eslint/plugin-kit": "^0.7.3", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "ajv": "^6.14.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^9.1.2", "eslint-visitor-keys": "^5.0.1", "espree": "^11.2.0", "esquery": "^1.7.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "11.1.5 || >11.1.6 <12", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "minimatch": "^10.2.5", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-P7a6UEEqb9G95MYAtqkmsTbVXIYyzIfl6NGOIJk162PaahFxFyeGcrlXYFSiagECg4sEm8IseJdZBKR3rx6MsQ=="],
 
     "eslint-config-prettier": ["eslint-config-prettier@10.1.8", "", { "peerDependencies": { "eslint": ">=7.0.0" }, "bin": "bin/cli.js" }, "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w=="],
 
-    "eslint-fix-utils": ["eslint-fix-utils@0.4.3", "", { "peerDependencies": { "@types/estree": ">=1", "eslint": ">=8" }, "optionalPeers": ["@types/estree"] }, "sha512-EKzNhsNavV5DdkHVltHBM9TqfsonCmiUhOm1Ra97zo03M9IAx3wtM1eC27eWGMj/D3LrALmHHNe1QlQH1P7Nxw=="],
+    "eslint-fix-utils": ["eslint-fix-utils@0.4.4", "", { "peerDependencies": { "@types/estree": ">=1", "eslint": ">=8" }, "optionalPeers": ["@types/estree"] }, "sha512-9reP0fw++eZv0qs0ji8U1G9a+j8yWQW1RT8Wrlw32JlhQJDiweVX98kyDrJq6G7jdOLgKwmj0nPghyMadsOgHQ=="],
 
     "eslint-import-context": ["eslint-import-context@0.1.9", "", { "dependencies": { "get-tsconfig": "^4.10.1", "stable-hash-x": "^0.2.0" }, "peerDependencies": { "unrs-resolver": "^1.0.0" } }, "sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg=="],
 
@@ -388,7 +388,7 @@
 
     "eslint-plugin-no-use-extend-native": ["eslint-plugin-no-use-extend-native@0.7.3", "", { "dependencies": { "is-get-set-prop": "^2.0.0", "is-js-type": "^3.0.0", "is-obj-prop": "^2.0.0", "is-proto-prop": "^3.0.1" }, "peerDependencies": { "eslint": "^9.3.0 || ^10.0.0" } }, "sha512-kYJhgZkiZIavu/wIwrO+n4GemQcMX53kWCNZNr7nGMkRD1aBFLkDpBivEYP7nIJINCo9fzPbFjrpeX5kr2Qbww=="],
 
-    "eslint-plugin-package-json": ["eslint-plugin-package-json@1.8.1", "", { "dependencies": { "@altano/repository-tools": "^2.0.1", "@types/estree": "^1.0.0", "change-case": "^5.4.4", "detect-indent": "^7.0.2", "detect-newline": "^4.0.1", "eslint-fix-utils": "~0.4.3", "eslint-json-compat-utils": "^0.2.3", "jsonc-eslint-parser": "^3.1.0", "package-json-validator": "^1.6.0", "semver": "^7.7.3", "sort-object-keys": "^2.0.0", "sort-package-json": "^4.0.0" }, "peerDependencies": { "@eslint/json": ">=1.0.0", "eslint": ">=9.0.0" }, "optionalPeers": ["@eslint/json"] }, "sha512-/Adb7EHfwIM2t13zdBuB6IjIsNSDkbPT+T9ZlIK0N6aAnj9hiekqFlFbUpEIsiQX4Zv7bASBDP2C3hu362e2kw=="],
+    "eslint-plugin-package-json": ["eslint-plugin-package-json@1.9.0", "", { "dependencies": { "@altano/repository-tools": "^2.0.1", "@types/estree": "^1.0.0", "change-case": "^5.4.4", "detect-indent": "^7.0.2", "detect-newline": "^4.0.1", "eslint-fix-utils": "~0.4.3", "eslint-json-compat-utils": "^0.2.3", "jsonc-eslint-parser": "^3.1.0", "package-json-validator": "^1.6.0", "semver": "^7.7.3", "sort-object-keys": "^2.0.0", "sort-package-json": "^4.0.0" }, "peerDependencies": { "@eslint/json": ">=1.0.0", "eslint": ">=9.0.0" }, "optionalPeers": ["@eslint/json"] }, "sha512-Q18c0/YIAYhtlLoBzqA6qNO2dJmNHARlIARPROH9MZ/l0B1u/JafEtc0XNcuTXgYdvFUrhv649Z3sd5T4mO9ww=="],
 
     "eslint-plugin-perfectionist": ["eslint-plugin-perfectionist@5.11.1", "", { "dependencies": { "@typescript-eslint/utils": "^8.70.0", "natural-orderby": "^5.0.0" }, "peerDependencies": { "eslint": "^8.45.0 || ^9.0.0 || ^10.0.0" } }, "sha512-xloHScnOpin9Jy3CegfzoBeY33ASk0spLyM2sJs0LyNHQjv9m0osUD2PYNT7NrJieZbUR2Ebn4A5Q0+0dOcv+A=="],
 
@@ -396,7 +396,7 @@
 
     "eslint-plugin-promise": ["eslint-plugin-promise@7.3.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.4.0" }, "peerDependencies": { "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0" } }, "sha512-6uGiOR0INuujr6PEQmeSSP7GbIMJ/ebEXXiEzb/nOj68LknH5Pxzb/AbZivmr6VE6TkTE8rTjRK9zhKpK6HsRA=="],
 
-    "eslint-plugin-regexp": ["eslint-plugin-regexp@3.3.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.11.0", "comment-parser": "^1.4.0", "jsdoc-type-pratt-parser": "^9.0.0", "refa": "^0.12.1", "regexp-ast-analysis": "^0.7.1", "scslre": "^0.3.0" }, "peerDependencies": { "eslint": ">=9.38.0" } }, "sha512-TT0JTQbW7CRKohntpGAsMdQ1K3MsmJK4gdAhKJtIwlJ0JvuYxauymFgJdvqxIY4lqNj0EuRZWVrymQtEdJYEFg=="],
+    "eslint-plugin-regexp": ["eslint-plugin-regexp@3.3.1", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.11.0", "comment-parser": "^1.4.0", "jsdoc-type-pratt-parser": "^9.0.0", "refa": "^0.12.1", "regexp-ast-analysis": "^0.7.1", "scslre": "^0.3.0" }, "peerDependencies": { "eslint": ">=9.38.0" } }, "sha512-58bGUci/AaWAo1ETj6Lsnmy6QXwnSyVONRA805828nnqp7vrTwdaQMc02vtowmYB3A5OB3SLr3r5HgmfxX4dLg=="],
 
     "eslint-plugin-security": ["eslint-plugin-security@4.0.1", "", { "dependencies": { "safe-regex": "^2.1.1" } }, "sha512-/lZCkOxPOWaf1jXAqgICrS8St3BMBccIPvhOSUYuV6VCr1o5nFVG998FnTLt6w2Nxb8Uo0nM8fzmnhp+GY/aEg=="],
 
@@ -404,7 +404,7 @@
 
     "eslint-plugin-toml": ["eslint-plugin-toml@1.5.0", "", { "dependencies": { "@eslint/core": "^1.0.1", "@eslint/plugin-kit": "^0.7.0", "@ota-meshi/ast-token-store": "^0.3.0", "debug": "^4.1.1", "toml-eslint-parser": "^1.0.1" }, "peerDependencies": { "eslint": ">=9.38.0" } }, "sha512-qBjRywEkKxO2uYOjus//6GVF1r+Hg5QDkRO8RTY6XcaXgWfBU0DhwpFmJa2Ljf0Sz49r7DdZlpKwwHmJ4nmH1Q=="],
 
-    "eslint-plugin-unicorn": ["eslint-plugin-unicorn@75.0.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.10.1", "@eslint/css-tree": "^4.0.5", "browserslist": "^4.28.8", "change-case": "^5.4.4", "ci-info": "^4.4.0", "core-js-compat": "^3.50.0", "detect-indent": "^7.0.2", "entities": "^8.0.0", "find-up-simple": "^1.0.1", "globals": "^17.11.0", "identifier-regex": "^1.1.0", "indent-string": "^5.0.0", "is-builtin-module": "^5.0.0", "pluralize": "^8.0.0", "quote-js-string": "^0.1.0", "regjsparser": "^0.13.2", "reserved-identifiers": "^1.2.0", "semver": "^7.8.5", "strip-indent": "^4.1.1", "yaml": "^2.9.0" }, "peerDependencies": { "eslint": ">=10.4" } }, "sha512-72I7eSn+/z5CpgValFBl9mp2JE5UPD+nUUyB/VIGUMF1rCP1i37mA05zfIAVIU312A+qCZ38T8tSZr3oaMv4Mw=="],
+    "eslint-plugin-unicorn": ["eslint-plugin-unicorn@76.0.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.10.1", "@eslint/css-tree": "^4.0.5", "browserslist": "^4.28.8", "change-case": "^5.4.4", "ci-info": "^4.4.0", "core-js-compat": "^3.50.0", "detect-indent": "^7.0.2", "entities": "^8.0.0", "find-up-simple": "^1.0.1", "globals": "^17.11.0", "identifier-regex": "^1.1.0", "indent-string": "^5.0.0", "is-builtin-module": "^5.0.0", "pluralize": "^8.0.0", "quote-js-string": "^0.1.0", "regjsparser": "^0.13.2", "reserved-identifiers": "^1.2.0", "semver": "^7.8.5", "strip-indent": "^4.1.1", "yaml": "^2.9.0" }, "peerDependencies": { "eslint": ">=10.4" } }, "sha512-3ywJrCMHKYhcBP5yFzGaOOX3dY7+iR3hvpuoS/0EnhRFgVWLejly+t4fOdJvWQxJdHZl1C+QBW7hybXPDld4Pw=="],
 
     "eslint-plugin-yml": ["eslint-plugin-yml@3.8.1", "", { "dependencies": { "@eslint/core": "^1.0.1", "@eslint/plugin-kit": "^0.7.0", "@ota-meshi/ast-token-store": "^0.3.0", "diff-sequences": "^29.0.0", "escape-string-regexp": "5.0.0", "natural-compare": "^1.4.0", "yaml-eslint-parser": "^2.0.0" }, "peerDependencies": { "eslint": ">=9.38.0" } }, "sha512-E/70psRwxz5EJ8dBtzrFfqSiiInuSytbdtFCjueb/GcKjsWzPBfxfhtQePImMAPjHwMA/VDurO7DJwStDJ4wWg=="],
 
@@ -572,7 +572,7 @@
 
     "lowercase-keys": ["lowercase-keys@3.0.0", "", {}, "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ=="],
 
-    "lru-cache": ["lru-cache@11.5.2", "", {}, "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g=="],
+    "lru-cache": ["lru-cache@11.5.3", "", {}, "sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg=="],
 
     "markdown-extensions": ["markdown-extensions@2.0.0", "", {}, "sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q=="],
 
@@ -788,7 +788,7 @@
 
     "regexp-tree": ["regexp-tree@0.1.27", "", { "bin": "bin/regexp-tree" }, "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA=="],
 
-    "regjsparser": ["regjsparser@0.13.2", "", { "dependencies": { "jsesc": "~3.1.0" }, "bin": { "regjsparser": "bin/parser" } }, "sha512-NgRBy2Nx/bE+9F27nVHnqcN5HjyLmecqsqx2PJHu3/IEtADD4WuxuXIVExD5PoSDFVrl78dOonfcOe5O+5nbzQ=="],
+    "regjsparser": ["regjsparser@0.13.3", "", { "dependencies": { "jsesc": "~3.1.0" }, "bin": { "regjsparser": "bin/parser" } }, "sha512-ycwFAS14Jw4mppvmK4GR/J6u3WpWpjkEApehuHtLc/8VpPNpDMbQ4WjqwplXifGeyKOzHSFLmSPqzksDQE2Sfg=="],
 
     "remark": ["remark@15.0.1", "", { "dependencies": { "@types/mdast": "^4.0.0", "remark-parse": "^11.0.0", "remark-stringify": "^11.0.0", "unified": "^11.0.0" } }, "sha512-Eht5w30ruCXgFmxVUSlNWQ9iiimq07URKeFS3hNc8cUWy1llX4KDWfyEDZRycMc+znsN9Ux5/tJ/BFdgdOwA3A=="],
 
@@ -1140,7 +1140,7 @@
 
     "toml-eslint-parser/eslint-visitor-keys": ["eslint-visitor-keys@5.0.1", "", {}, "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA=="],
 
-    "unified-engine/@types/node": ["@types/node@22.20.3", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-DZmzkmwHzXrLPAXPyKNDzlIwMMUZCVacoD25ywdy5YTKGbOx/2ld+Q38Im2zJ0vBuZP5Prd3VZutKZyXwkOS8A=="],
+    "unified-engine/@types/node": ["@types/node@22.20.4", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-zJRE40jpHtKqE/C4fgHrAKQLJuSpzEnP9ff9Y7YtoR3Wd2pwqzlekDeEuUQXjRd+QCYnVnNwuJYmhdk9XV8gvA=="],
 
     "unified-engine/ignore": ["ignore@6.0.2", "", {}, "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A=="],
 

{comicbox-5.1.2 → comicbox-5.2.0}/comicbox/box/archive/write.py

@@ -10,7 +10,7 @@ from zipremove import ZIP_DEFLATED, ZIP_STORED, ZipFile
 from comicbox._pdf import PAGE_FORMAT_PIXMAP_JPEG
 from comicbox.box.archive.archiveinfo import ArchiveInfo, InfoType
 from comicbox.box.archive.read import ComicboxArchiveRead
-from comicbox.exceptions import ArchiveWriteError
+from comicbox.exceptions import ArchiveWriteError, DestinationOccupiedError
 from comicbox.formats.sources import MetadataSources
 
 _RECOMPRESS_SUFFIX = ".comicbox_tmp_zip"
@@ -26,13 +26,12 @@ _INFLIGHT_DESTINATIONS: set[Path] = set()
 _INFLIGHT_GUARD = Lock()
 
 
-def _claim_destination(path: Path) -> None:
+def _claim_destination(destination: Path, source: Path) -> None:
     """Take a conversion destination, refusing one already in flight."""
     with _INFLIGHT_GUARD:
-        if path in _INFLIGHT_DESTINATIONS:
-            reason = f"{path} is already being written by another archive."
-            raise ArchiveWriteError(reason)
-        _INFLIGHT_DESTINATIONS.add(path)
+        if destination in _INFLIGHT_DESTINATIONS:
+            raise DestinationOccupiedError(source, destination, "inflight")
+        _INFLIGHT_DESTINATIONS.add(destination)
 
 
 def _release_destination(path: Path) -> None:
@@ -53,15 +52,36 @@ _ALL_ARCHIVE_METADATA_FILENAMES = frozenset(
 class ComicboxArchiveWrite(ComicboxArchiveRead):
     """Comicboxs methods for writing to the archive."""
 
-    def _get_new_archive_path(self) -> Path:
+    def get_write_destination(self) -> Path:
+        """
+        Where a write of this archive lands: in place, or the CBZ it repacks to.
+
+        Decided from the sniffed archive type (``_archive_cls`` /
+        ``_archive_is_pdf``) and ``convert.cbz`` -- never from the suffix. A
+        zip is rewritten in place whatever it is called; a PDF is updated in
+        place unless ``convert.cbz`` asks for a repack; everything else
+        (CBR/CBT/CB7) is unwritable and repacks to ``<stem>.cbz``.
+        """
         if not self._path:
-            reason = "Cannot write zipfile metadata without a path."
-            raise ArchiveWriteError(reason)
-        new_path = self._path.with_suffix(_CBZ_SUFFIX)
-        if new_path.is_file() and new_path != self._path:
-            reason = f"{new_path} already exists."
+            reason = "Cannot write archive metadata without a path."
             raise ArchiveWriteError(reason)
-        return new_path
+        is_zip = self._archive_cls == ZipFile
+        is_pdf_in_place = self._archive_is_pdf and not self._config.convert.cbz
+        if is_zip or is_pdf_in_place:
+            return self._path
+        return self._path.with_suffix(_CBZ_SUFFIX)
+
+    def _get_new_archive_path(self) -> Path:
+        """Return the conversion destination, refusing one already on disk."""
+        destination = self.get_write_destination()
+        if destination != self._path and destination.is_file():
+            # self._path is non-None: get_write_destination raised otherwise.
+            raise DestinationOccupiedError(
+                self._path,  # pyright: ignore[reportArgumentType], # ty: ignore[invalid-argument-type]
+                destination,
+                "convert",
+            )
+        return destination
 
     def _cleanup_tmp_archive(self, tmp_path: Path, new_path: Path) -> None:
         if not self._archive_cls or not self._path:
@@ -234,26 +254,20 @@ class ComicboxArchiveWrite(ComicboxArchiveRead):
 
         Every write claims its destination, not just the conversions. An
         in-place rewrite is as destructive as a conversion when two writers
-        overlap on it -- ``bulk_write`` does not deduplicate paths, so one
-        archive named twice in a batch used to be repacked by both threads
-        at once -- and the finished-file check cannot see a write that is
-        still in flight.
+        overlap on it -- ``bulk_write``'s preflight refuses a path named
+        twice; the claim is the backstop for concurrent callers -- and the
+        finished-file check cannot see a write that is still in flight.
         """
         if not self._path:
             reason = "Cannot write archive metadata without a path."
             raise ArchiveWriteError(reason)
+        destination = self.get_write_destination()
         is_zip = self._archive_cls == ZipFile
-        is_pdf_in_place = self._archive_is_pdf and not self._config.convert.cbz
-        destination = (
-            self._path
-            if is_zip or is_pdf_in_place
-            else self._path.with_suffix(_CBZ_SUFFIX)
-        )
-        _claim_destination(destination)
+        _claim_destination(destination, self._path)
         try:
             if is_zip:
                 self._patch_zipfile(files, comment)
-            elif is_pdf_in_place:
+            elif destination == self._path:
                 self._update_pdffile(files, mupdf_metadata)
             else:
                 self._create_zipfile(files, comment)

{comicbox-5.1.2 → comicbox-5.2.0}/comicbox/box/dump.py

@@ -146,16 +146,31 @@ class ComicboxDump(ComicboxPages):
         }
         self._reset_archive(None, None, keep_sources)
 
+    def _is_write_disabled(self) -> bool:
+        """Return whether the config asks for no write at all."""
+        write = self._config.write
+        return self._config.general.dry_run or not (
+            write.formats or self._config.convert.cbz or write.delete_all_tags
+        )
+
     def dump(self, formats: frozenset[MetadataFormats] | None = None) -> None:
         """Write metadata according to config.write settings."""
         write = self._config.write
         convert = self._config.convert
-        if self._config.general.dry_run or not (
-            write.formats or convert.cbz or write.delete_all_tags
-        ):
+        if self._is_write_disabled():
             logger.info(f"Not writing metadata for: {self._path}")
             return None
 
+        if self._path:
+            # Refuse an occupied conversion destination before any metadata
+            # is read. _get_dump_formats() below loads and merges every
+            # source, which is the expensive part of a write that was only
+            # ever going to be refused -- a kept-original CBR whose CBZ twin
+            # already exists is the common case, and it reaches here from
+            # the CLI as well as the API. _create_zipfile repeats the check
+            # (it is idempotent) so direct callers stay guarded.
+            self._get_new_archive_path()
+
         # Must get metadata *before* get write formats
         if formats is None:
             formats = self._get_dump_formats()

{comicbox-5.1.2 → comicbox-5.2.0}/comicbox/box/dump_files.py

@@ -7,7 +7,11 @@ from loguru import logger
 
 from comicbox.box.archive.write import _claim_destination, _release_destination
 from comicbox.box.dump import ComicboxDump
-from comicbox.exceptions import ArchiveWriteError, ExportError
+from comicbox.exceptions import (
+    ArchiveWriteError,
+    DestinationOccupiedError,
+    ExportError,
+)
 from comicbox.formats import MetadataFormats
 
 
@@ -96,11 +100,10 @@ class ComicboxDumpToFiles(ComicboxDump):
         """
         if self._is_same_file(old_path, new_path):
             return
-        _claim_destination(new_path)
+        _claim_destination(new_path, old_path)
         try:
             if new_path.exists():
-                reason = f"{new_path} already exists."
-                raise ArchiveWriteError(reason)
+                raise DestinationOccupiedError(old_path, new_path, "rename")
             old_path.rename(new_path)
         finally:
             _release_destination(new_path)

{comicbox-5.1.2 → comicbox-5.2.0}/comicbox/config/online/settings.py

@@ -168,10 +168,13 @@ class OnlineSourceLimits:
     ``comicbox.formats.base.online.rate_limits`` for citation / audit.
     """
 
-    # Historical Metron overrides. mokkari>=4.0.1 tracks Metron's actual
-    # per-user limits from `X-RateLimit-*` response headers instead of a
-    # fixed local bucket, with no injection point for a custom one; these
-    # are accepted but ignored with a warning at client build.
+    # Metron overrides. mokkari tracks Metron's actual per-user limits
+    # from `X-RateLimit-*` response headers rather than a fixed local
+    # bucket. `per_minute` has been comicbox's `RateGate` ceiling since
+    # 5.1.0 -- it can lower the server-reported burst limit, never raise
+    # it, which is how several processes on one token split the window.
+    # `per_day` is still accepted and ignored with a warning at client
+    # build (see `_warn_ignored_rate_limit_overrides`).
     per_minute: int | None = None
     per_day: int | None = None
     # Historical ComicVine overrides. simyan builds its rate limiter

comicbox-5.2.0/comicbox/exceptions.py

@@ -0,0 +1,102 @@
+"""
+Exceptions for comicbox.
+
+Every operational error comicbox raises on a public path derives from
+:class:`ComicboxError`, so library consumers can write ``except
+ComicboxError`` without also swallowing unrelated programming errors
+(``ValueError``, ``KeyError``, …) from their own code.
+
+This module is a leaf: it must not import anything from comicbox, so any
+module (including the format packages and the box mixins) can import it
+without load-order concerns. The write/online modules re-export their
+exceptions from here under their historical import paths.
+"""
+
+from pathlib import Path
+from typing import Literal
+
+from typing_extensions import override
+
+DestinationKind = Literal["convert", "rename", "inflight"]
+
+
+class ComicboxError(Exception):
+    """Base class for all operational errors comicbox raises."""
+
+
+class UnsupportedArchiveTypeError(ComicboxError):
+    """Unsupported Archive Type."""
+
+
+class ArchiveError(ComicboxError):
+    """An archive could not be opened or read."""
+
+
+class ArchiveWriteError(ArchiveError):
+    """An archive could not be written, repacked, or renamed."""
+
+
+class DestinationOccupiedError(ArchiveWriteError):
+    """
+    A write's destination path is held by another file or writer.
+
+    ``kind`` says which collision: ``"convert"`` -- the CBZ this archive
+    would repack to already exists (or another archive in the same batch
+    claims it, in which case ``occupant`` names it); ``"rename"`` -- the
+    predicted filename is taken; ``"inflight"`` -- another writer in this
+    process holds the destination right now (transient; retry later).
+    """
+
+    def __init__(
+        self,
+        source: Path,
+        destination: Path,
+        kind: DestinationKind,
+        occupant: Path | None = None,
+    ) -> None:
+        """Record the two paths, the collision kind, and any rival source."""
+        self.source = source
+        self.destination = destination
+        self.kind = kind
+        self.occupant = occupant
+        super().__init__(self._message())
+
+    def _message(self) -> str:
+        """Render the frozen message text for this collision kind."""
+        if self.kind == "inflight":
+            return f"{self.destination} is already being written by another archive."
+        if self.occupant is not None:
+            return f"{self.destination} is also the destination of {self.occupant}."
+        return f"{self.destination} already exists."
+
+    @override
+    def __reduce__(self) -> tuple:
+        """
+        Rebuild with the real signature when crossing a process boundary.
+
+        Python unpickles an exception as ``cls(*self.args)``, which here
+        is ``cls(message)`` -- a TypeError that would replace the real
+        error with a bogus one on the far side. WriteResult.error is a
+        public field, so keep it picklable.
+        """
+        return (type(self), (self.source, self.destination, self.kind, self.occupant))
+
+
+class MetadataError(ComicboxError):
+    """Metadata could not be loaded or routed through the source pipeline."""
+
+
+class ExportError(ComicboxError):
+    """A metadata file export failed its preconditions."""
+
+
+class WriteValidationError(ComicboxError):
+    """Raised when write_metadata inputs are inconsistent or invalid."""
+
+
+class OnlineConfigurationError(ComicboxError):
+    """Raised when OnlineSession inputs are inconsistent or incomplete."""
+
+
+class OnlineLookupAbortedError(ComicboxError):
+    """Raised when the selector callback returns ('abort', None)."""

{comicbox-5.1.2 → comicbox-5.2.0}/comicbox/formats/base/online/outcome_stats.py

@@ -32,9 +32,11 @@ class _ApiCounts:
 
     Distinct from ``OnlineSource.api_call_counts``, which counts calls at
     comicbox's wrapper level: that number includes response-cache hits and
-    counts a paginated result as one. These are real HTTP sends, recorded
-    at the one place a request actually leaves the process, so the number
-    a user pastes into a bug report lines up with the server's own logs.
+    counts a paginated result as one. ``requests`` counts responses
+    RECEIVED, per endpoint, recorded where the raw response arrives, so
+    the number a user pastes into a bug report lines up with the server's
+    own logs. A send that never answered is counted only in
+    ``connection_failures``.
     """
 
     requests: dict[str, int] = field(default_factory=dict)
@@ -138,14 +140,16 @@ class _OutcomeStats:
             self._per_source_api[source_name] = bucket
         return bucket
 
-    def record_http_request(
-        self, source_name: str, endpoint: str, blocked_seconds: float = 0.0
-    ) -> None:
-        """Record one real HTTP send and what it waited at the rate gate."""
+    def record_http_request(self, source_name: str, endpoint: str) -> None:
+        """Record one response received, by endpoint."""
         with self._lock:
             bucket = self._api_bucket_for(source_name)
             bucket.requests[endpoint] = bucket.requests.get(endpoint, 0) + 1
-            bucket.blocked_seconds += blocked_seconds
+
+    def record_gate_wait(self, source_name: str, seconds: float) -> None:
+        """Record what one send waited at the rate gate before going out."""
+        with self._lock:
+            self._api_bucket_for(source_name).blocked_seconds += seconds
 
     def record_rate_limit_rejection(self, source_name: str) -> None:
         """Record one server rate-limit rejection (a 429 we still paid for)."""
@@ -379,6 +383,7 @@ record_skip = _STATS.record_skip
 record_no_match = _STATS.record_no_match
 record_explicit_id = _STATS.record_explicit_id
 record_http_request = _STATS.record_http_request
+record_gate_wait = _STATS.record_gate_wait
 record_rate_limit_rejection = _STATS.record_rate_limit_rejection
 record_unthrottled_response = _STATS.record_unthrottled_response
 record_connection_failure = _STATS.record_connection_failure

{comicbox-5.1.2 → comicbox-5.2.0}/comicbox/formats/base/online/profile.py

@@ -65,6 +65,14 @@ class CandidateSummary:
     # to reproduce client-side the precedence its old six-call cascade
     # got from the order it made the calls in.
     volume: int | None = None
+    # A genuinely larger image of the same cover, for a frontend that
+    # wants a hover or lightbox next to the thumbnail. Display only: the
+    # matcher keeps hashing `cover_url`, because hashing a larger image
+    # moves every score and would need a fresh calibration run (see
+    # `matcher.py`'s audit note). None means this record carries no
+    # larger tier than `cover_url` already is, which is what a frontend
+    # keys "no hover" on.
+    cover_url_full: str | None = None
 
 
 @dataclass(frozen=True, slots=True)

{comicbox-5.1.2 → comicbox-5.2.0}/comicbox/formats/base/online/rate_limits.py

@@ -1,9 +1,11 @@
 """
 Rate limits for online sources, for citation / audit.
 
-Neither upstream library takes a local override: mokkari reads Metron's
-per-user limits off the `X-RateLimit-*` response headers, and simyan
-builds its ComicVine limiter internally with no injection point at all.
+mokkari reads Metron's per-user limits off the `X-RateLimit-*` response
+headers; since 4.8.0 it also takes an injectable `rate_limiter`, which
+is where comicbox plugs its `RateGate` in (see
+`comicbox/formats/metron_api/paced_session.py`). simyan builds its
+ComicVine limiter internally with no injection point at all.
 This module exists so the numbers are visible in our codebase (rather
 than hidden in transitive dependencies) and can be cited / audited, and
 so the consumers below have a stable constant to work from.