Backport bug fixes from NemesisHubris/litfinder (addresses #999, #956, #1010, #1021, #1025, #1040) (#1066)

## Backport bug fixes from `NemesisHubris/litfinder`

Forwards a curated set of bug fixes from
[NemesisHubris/litfinder](https://github.com/NemesisHubris/litfinder) —
a community fork of this project — that address open issues here. All
commits preserve original authorship via `git cherry-pick`; this PR is a
backport rather than original work. Each fix has been reviewed locally,
lint/format-cleaned to match this repo's existing ruff config, and
verified with the test suite. Rebrand strings, license switches, and
features have been deliberately excluded.

### Upstream issues addressed

- **#999** — Mirror URLs with query params no longer break search
requests (strip query string/fragment in `normalize_http_url`)
- **#956** — Apprise notifications now respect the configured proxy
(proxy env vars injected before dispatch)
- **#1025** — rTorrent: separate `RTORRENT_AUDIOBOOK_LABEL` setting,
falls back to book label if unset
- **#1010** — Stop button in Activity no longer makes the panel
disappear (snapshot refresh on cancel)
- **#1021** — Anna's Archive slow-download countdown now caps retries
instead of looping forever
- **#1040** — Empty destination directory cleaned up when write probe
fails
- **PR #1031** — Language detection from Anna's Archive distant path
when listing metadata is missing

### Additional fixes (no open issue but clear bugs)

- **fix: Python 2 `except` syntax across 27 files** — `except X, Y:` is
a SyntaxError in Python 3 and prevents affected modules from importing
at runtime. Mechanical sweep to `except (X, Y):`.
- **fix(abb): info hash validation with magnet fallback** — adds
SHA-1/SHA-256 hex validation on extracted info hashes; falls back to
scanning the full page for a magnet link (e.g. posted in comments) when
the table value is malformed. Also extends the exact-phrase fallback to
manual queries and defaults the ABB listing language to `en` when
missing, preventing valid results from being hidden by the language
filter. Includes a small test-fixture fix (`test(abb): use valid hex
info hashes in scraper test fixtures`) since the existing fixtures used
non-hex placeholders that the new validation correctly rejects.
- **fix: Anna's Archive title parser** — handles nested edition spans
and filters `lgli` catalog descriptor entries (e.g. "Book/Online Audio")
that were polluting search results.

### Deliberately not included

- LitFinder rebranding (UI strings, Apprise app ID, logo). The `fix:
three upstream bugs` commit (#999/#956/#1025) was cherry-picked with
Apprise app-id, description, and logo-URL strings reverted from
"LitFinder" back to "Shelfmark"; noted in the commit body.
- Features from the LitFinder fork (multi-variant title search,
multi-book flat-folder grouping, fuzzy text matching, "Leave in Place"
output handler, admin display name, custom-source plugin system). These
are larger behavior changes that each warrant their own focused review —
happy to send any of them separately if of interest.
- LitFinder-specific test environment and CI infrastructure.

### Verification

- Backend: **1879 passed**, 96 skipped (1 preexisting failure on
`seleniumbase`-dependent test in local venv; runs fine in the standard
Docker image with the `browser` extra)
- Lint, format, dead-code: all clean against this repo's existing
ruff/vulture config
- One follow-up cleanup commit (`style: ruff lint and format fixes for
ported commits`) brings the cherry-picked code into compliance with this
repo's ruff settings — no behavior changes there

### Etiquette / credit

Per-commit authorship preserved by cherry-pick. The only edits to the
original commits are:
- `fix: three upstream bugs` — Apprise rebrand strings reverted to
"Shelfmark" (noted in commit body, original author retained as
`Co-Authored-By` via cherry-pick)
- One follow-up `style:` commit for ruff config alignment

Big thanks to [@NemesisHubris](https://github.com/NemesisHubris) for the
original work in LitFinder; this PR exists to make sure these fixes
reach Shelfmark's wider user base. Happy to revise scope, split into
smaller PRs, or split off the Py2 cleanup separately if that's
preferable.

---------

Co-authored-by: NemesisHubris <155838970+NemesisHubris@users.noreply.github.com>
Co-authored-by: CaliBrain <calibrain@l4n.xyz>

tests/core/test_notifications.py

@@ -597,3 +597,72 @@ def test_resolve_user_routes_expands_multiselect_event_rows(monkeypatch):
         {"event": "request_fulfilled", "url": "ntfys://ntfy.sh/user-main"},
         {"event": "all", "url": "ntfys://ntfy.sh/user-all"},
     ]
+
+
+class TestAppriseProxyEnv:
+    """Regression tests for issue #956 — proxy settings ignored for notifications."""
+
+    def _patch_config(self, monkeypatch, values):
+        from shelfmark.core import config as config_module
+
+        def _fake_get(key, default="", **_kwargs):
+            return values.get(key, default)
+
+        monkeypatch.setattr(config_module.config, "get", _fake_get)
+
+    def test_http_proxy_mode_injects_proxy_env(self, monkeypatch):
+        self._patch_config(
+            monkeypatch,
+            {
+                "PROXY_MODE": "http",
+                "HTTP_PROXY": "http://proxy.example.com:8080",
+                "HTTPS_PROXY": "",
+                "NO_PROXY": "",
+            },
+        )
+        monkeypatch.delenv("HTTP_PROXY", raising=False)
+        monkeypatch.delenv("HTTPS_PROXY", raising=False)
+
+        result = notifications_module._apprise_proxy_env()
+
+        assert result["HTTP_PROXY"] == "http://proxy.example.com:8080"
+        assert result["HTTPS_PROXY"] == "http://proxy.example.com:8080"
+
+    def test_socks5_proxy_mode_injects_socks_env(self, monkeypatch):
+        self._patch_config(
+            monkeypatch,
+            {
+                "PROXY_MODE": "socks5",
+                "SOCKS5_PROXY": "socks5://proxy.example.com:1080",
+                "NO_PROXY": "",
+            },
+        )
+        monkeypatch.delenv("HTTP_PROXY", raising=False)
+        monkeypatch.delenv("HTTPS_PROXY", raising=False)
+
+        result = notifications_module._apprise_proxy_env()
+
+        assert result["HTTP_PROXY"] == "socks5://proxy.example.com:1080"
+        assert result["HTTPS_PROXY"] == "socks5://proxy.example.com:1080"
+
+    def test_no_proxy_mode_returns_empty_dict(self, monkeypatch):
+        self._patch_config(monkeypatch, {"PROXY_MODE": ""})
+
+        result = notifications_module._apprise_proxy_env()
+
+        assert result == {}
+
+    def test_does_not_override_already_set_env_vars(self, monkeypatch):
+        self._patch_config(
+            monkeypatch,
+            {
+                "PROXY_MODE": "http",
+                "HTTP_PROXY": "http://new-proxy.example.com:8080",
+                "NO_PROXY": "",
+            },
+        )
+        monkeypatch.setenv("HTTP_PROXY", "http://existing-proxy.example.com:3128")
+
+        result = notifications_module._apprise_proxy_env()
+
+        assert "HTTP_PROXY" not in result

tests/core/test_utils.py

@@ -5,6 +5,31 @@ import types
 import xmlrpc.client as stdlib_xmlrpc_client
 
 from shelfmark.core import utils
+from shelfmark.core.utils import normalize_http_url
+
+
+class TestNormalizeHttpUrlQueryStripping:
+    """Regression tests for issue #999 — mirror URLs with query params/fragments."""
+
+    def test_strips_query_string_from_configured_url(self) -> None:
+        result = normalize_http_url("http://mirror.example.com/search?token=abc123")
+        assert result == "http://mirror.example.com/search"
+
+    def test_strips_fragment_from_configured_url(self) -> None:
+        result = normalize_http_url("http://mirror.example.com/search#section")
+        assert result == "http://mirror.example.com/search"
+
+    def test_strips_both_query_and_fragment(self) -> None:
+        result = normalize_http_url("https://mirror.example.com/path?key=val&x=1#top")
+        assert result == "https://mirror.example.com/path"
+
+    def test_plain_url_unchanged(self) -> None:
+        result = normalize_http_url("http://mirror.example.com/search")
+        assert result == "http://mirror.example.com/search"
+
+    def test_trailing_slash_still_stripped_after_query_removal(self) -> None:
+        result = normalize_http_url("http://mirror.example.com/?token=x")
+        assert result == "http://mirror.example.com"
 
 
 def test_get_hardened_xmlrpc_client_tolerates_patch_runtime_error(monkeypatch) -> None: