mirror of
https://github.com/calibrain/shelfmark.git
synced 2026-11-10 12:28:27 +00:00
## Add Soulseek (slskd) as a release source, building on #1335 This is @dskvr's work from #1335 rebased onto current `main`, with my changes on top. #1335 has been quiet since 2026-09-13 and I needed the changes below, so I carried it forward instead of starting over. Their two commits are the first two in this branch with their authorship intact, and the source plugin, handler, API client, settings tab, tests, `ReleaseProtocol.SOULSEEK`, test client compose file and frontend bits are all theirs. I haven't changed how a search turns into releases beyond what is listed here. If @dskvr would rather keep #1335 alive and take these as commits on their branch, I can do that instead and close this. ### What I changed **Downloads survive other apps using the same slskd.** The handler found its files by listing slskd's downloads, and another app on the same instance (SoulSync here) sends `DELETE /transfers/downloads/all/completed` after each of its batches. Once that ran, a finished download no longer appeared in the list and the task never saw it complete, even though the files were on disk. With the new `SLSKD_ISOLATE_DOWNLOADS` setting (on by default) each task: - enqueues one batch (`POST /transfers/downloads/batches`) into its own folder, `<SLSKD_DESTINATION_PREFIX>/<task id>` - polls each transfer by id, which slskd still answers after the list has been cleared - decides it is done from the files on disk (sizes, not names), with the `/events` log as a fallback when the transfers are gone and the files aren't visible yet - copies out of that folder, and removes it only if `SLSKD_KEEP_COMPLETED` is off and the import worked With isolation off the handler behaves as it did in #1335. If the batch endpoint isn't there (404/405) it falls back to the original per-file enqueue. **Source changes.** m4b/m4a files are their own release next to loose chapter files, so auto-download can prefer one file over a chapter set. Results from the query variants are merged per peer. The folder text is exposed as `extra["author"]` and `extra["title_raw"]`, which is what auto-download's strict match and pack detection read. `is_available()` also needs an API key now. **Smaller fixes.** Cancelling while files are still being located now removes the transfer records it created. In the settings tab, a cleared form field is no longer replaced by the saved value when testing the connection. The new settings are in `docs/environment-variables.md`. ### Testing `tests/slskd` has 192 passing and 6 live tests that skip without an instance. I wrote the new tests first and checked the handler and source rules by breaking them and confirming a test failed. Ruff is clean. On the whole suite the only failures are 4 in `tests/download` that import `seleniumbase`, which isn't installed in my environment, and they fail the same on `main`. I've been running this on my own deployment against slskd 0.26.0 behind a VPN, with SoulSync active on a second instance. A search returned a couple hundred results from about 70 peers, an epub came down and was imported, and auto-download fetched five audiobooks as single m4b files. That is a day of use, so I don't know how it behaves on other slskd versions or on Windows path mappings. --------- Co-authored-by: sandwich <dskvr@users.noreply.github.com> Co-authored-by: sandwich <299465+dskvr@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
190 lines
6.9 KiB
Python
190 lines
6.9 KiB
Python
"""Tests for the slskd settings tab and its Test Connection action."""
|
|
|
|
from shelfmark.core.settings_registry import (
|
|
ActionButton,
|
|
CheckboxField,
|
|
NumberField,
|
|
PasswordField,
|
|
TextField,
|
|
)
|
|
from shelfmark.release_sources.slskd.settings import (
|
|
_test_slskd_connection,
|
|
slskd_config_settings,
|
|
)
|
|
|
|
|
|
def _field(key: str):
|
|
return next(f for f in slskd_config_settings() if getattr(f, "key", None) == key)
|
|
|
|
|
|
def test_settings_expose_expected_fields():
|
|
assert isinstance(_field("SLSKD_ENABLED"), CheckboxField)
|
|
assert isinstance(_field("SLSKD_URL"), TextField)
|
|
assert isinstance(_field("SLSKD_API_KEY"), PasswordField)
|
|
assert isinstance(_field("test_slskd"), ActionButton)
|
|
assert isinstance(_field("SLSKD_DOWNLOAD_PATH"), TextField)
|
|
assert isinstance(_field("SLSKD_SEARCH_TIMEOUT"), NumberField)
|
|
assert isinstance(_field("SLSKD_RESPONSE_LIMIT"), NumberField)
|
|
assert isinstance(_field("SLSKD_QUEUE_TIMEOUT_MINUTES"), NumberField)
|
|
assert isinstance(_field("SLSKD_REMOVE_COMPLETED"), CheckboxField)
|
|
|
|
|
|
def test_dependent_fields_hide_until_enabled():
|
|
for key in ("SLSKD_URL", "SLSKD_API_KEY", "test_slskd", "SLSKD_DOWNLOAD_PATH"):
|
|
assert _field(key).show_when == {"field": "SLSKD_ENABLED", "value": True}
|
|
|
|
|
|
def test_defaults():
|
|
assert _field("SLSKD_ENABLED").default is False
|
|
assert _field("SLSKD_SEARCH_TIMEOUT").default == 15
|
|
assert _field("SLSKD_RESPONSE_LIMIT").default == 100
|
|
assert _field("SLSKD_QUEUE_TIMEOUT_MINUTES").default == 60
|
|
assert _field("SLSKD_REMOVE_COMPLETED").default is True
|
|
|
|
|
|
def test_connection_action_uses_form_values(monkeypatch):
|
|
import shelfmark.release_sources.slskd.api as api_module
|
|
|
|
created: list[tuple[str, str]] = []
|
|
|
|
class FakeClient:
|
|
def __init__(self, url, api_key):
|
|
created.append((url, api_key))
|
|
|
|
def test_connection(self):
|
|
return True, "Connected to slskd 0.26.0 (logged in to Soulseek)"
|
|
|
|
monkeypatch.setattr(api_module, "SlskdClient", FakeClient)
|
|
|
|
result = _test_slskd_connection({"SLSKD_URL": "slskd:5030/", "SLSKD_API_KEY": " key "})
|
|
|
|
assert result == {
|
|
"success": True,
|
|
"message": "Connected to slskd 0.26.0 (logged in to Soulseek)",
|
|
}
|
|
assert created == [("http://slskd:5030", "key")]
|
|
|
|
|
|
def test_connection_action_requires_url(monkeypatch):
|
|
import shelfmark.release_sources.slskd.settings as mod
|
|
|
|
monkeypatch.setattr(mod, "normalize_http_url", lambda url: url)
|
|
from shelfmark.core.config import config
|
|
|
|
monkeypatch.setattr(config, "get", lambda k, d=None: d)
|
|
result = _test_slskd_connection({"SLSKD_URL": "", "SLSKD_API_KEY": "k"})
|
|
assert result == {"success": False, "message": "slskd URL is required"}
|
|
|
|
|
|
def test_connection_action_requires_api_key(monkeypatch):
|
|
from shelfmark.core.config import config
|
|
|
|
monkeypatch.setattr(config, "get", lambda k, d=None: d)
|
|
result = _test_slskd_connection({"SLSKD_URL": "http://slskd:5030", "SLSKD_API_KEY": ""})
|
|
assert result == {"success": False, "message": "slskd API key is required"}
|
|
|
|
|
|
def test_connection_action_reports_failure(monkeypatch):
|
|
import shelfmark.release_sources.slskd.api as api_module
|
|
|
|
class FakeClient:
|
|
def __init__(self, url, api_key):
|
|
pass
|
|
|
|
def test_connection(self):
|
|
return False, "Invalid API key"
|
|
|
|
monkeypatch.setattr(api_module, "SlskdClient", FakeClient)
|
|
result = _test_slskd_connection({"SLSKD_URL": "http://slskd:5030", "SLSKD_API_KEY": "bad"})
|
|
assert result == {"success": False, "message": "Invalid API key"}
|
|
|
|
|
|
def test_connection_action_wraps_unexpected_errors(monkeypatch):
|
|
import shelfmark.release_sources.slskd.api as api_module
|
|
|
|
class FakeClient:
|
|
def __init__(self, url, api_key):
|
|
raise RuntimeError("kaboom")
|
|
|
|
monkeypatch.setattr(api_module, "SlskdClient", FakeClient)
|
|
result = _test_slskd_connection({"SLSKD_URL": "http://slskd:5030", "SLSKD_API_KEY": "k"})
|
|
assert result["success"] is False
|
|
assert "kaboom" in result["message"]
|
|
|
|
|
|
def test_remote_path_mapping_offers_slskd_host():
|
|
from shelfmark.config.settings import advanced_settings
|
|
|
|
table = next(
|
|
f for f in advanced_settings() if getattr(f, "key", None) == "PROWLARR_REMOTE_PATH_MAPPINGS"
|
|
)
|
|
host_column = next(c for c in table.columns if c["key"] == "host")
|
|
assert {"value": "slskd", "label": "slskd"} in host_column["options"]
|
|
|
|
|
|
class TestIsolatedDownloadSettings:
|
|
"""The options for isolated downloads (fork additions)."""
|
|
|
|
def _fields(self):
|
|
from shelfmark.core.settings_registry import get_settings_field_map
|
|
from shelfmark.release_sources.slskd import settings as _settings # noqa: F401
|
|
|
|
return get_settings_field_map("slskd_config")
|
|
|
|
def test_isolation_is_on_by_default_with_its_own_folder_prefix(self):
|
|
fields = self._fields()
|
|
|
|
isolate, _ = fields["SLSKD_ISOLATE_DOWNLOADS"]
|
|
prefix, _ = fields["SLSKD_DESTINATION_PREFIX"]
|
|
keep, _ = fields["SLSKD_KEEP_COMPLETED"]
|
|
assert isolate.default is True
|
|
assert prefix.default == "shelfmark"
|
|
assert keep.default is True
|
|
|
|
def test_the_options_that_only_matter_when_isolated_are_hidden_otherwise(self):
|
|
fields = self._fields()
|
|
|
|
for key in ("SLSKD_DESTINATION_PREFIX", "SLSKD_KEEP_COMPLETED"):
|
|
assert fields[key][0].show_when == {"field": "SLSKD_ISOLATE_DOWNLOADS", "value": True}
|
|
# the original "remove completed" option is the one for the non-isolated path
|
|
assert fields["SLSKD_REMOVE_COMPLETED"][0].show_when == {
|
|
"field": "SLSKD_ISOLATE_DOWNLOADS",
|
|
"value": False,
|
|
}
|
|
|
|
def test_a_cleared_url_in_the_form_is_not_replaced_by_the_saved_one(self, monkeypatch):
|
|
from shelfmark.core import config as core_config
|
|
from shelfmark.release_sources.slskd.settings import _test_slskd_connection
|
|
|
|
monkeypatch.setattr(
|
|
core_config.config,
|
|
"get",
|
|
lambda key, default=None: {
|
|
"SLSKD_URL": "http://saved:5030",
|
|
"SLSKD_API_KEY": "saved",
|
|
}.get(key, default),
|
|
)
|
|
|
|
result = _test_slskd_connection({"SLSKD_URL": "", "SLSKD_API_KEY": "typed"})
|
|
|
|
assert result["success"] is False
|
|
assert "URL is required" in result["message"]
|
|
|
|
def test_a_cleared_key_in_the_form_is_not_replaced_by_the_saved_one(self, monkeypatch):
|
|
from shelfmark.core import config as core_config
|
|
from shelfmark.release_sources.slskd.settings import _test_slskd_connection
|
|
|
|
monkeypatch.setattr(
|
|
core_config.config,
|
|
"get",
|
|
lambda key, default=None: {
|
|
"SLSKD_URL": "http://saved:5030",
|
|
"SLSKD_API_KEY": "saved",
|
|
}.get(key, default),
|
|
)
|
|
|
|
result = _test_slskd_connection({"SLSKD_URL": "http://typed:5030", "SLSKD_API_KEY": ""})
|
|
|
|
assert result["success"] is False
|
|
assert "API key is required" in result["message"]
|