fix(downloads): skip torrent/usenet in hybrid chain for album batches
When a user picks Hybrid mode AND downloads an album, the per-track
search loop fires once per track. Torrent / usenet are release-level
sources — Prowlarr returns album torrents, none of which score
meaningfully against an individual track title. Without filtering,
every track triggered a redundant Prowlarr search, qBit rejected
duplicate hashes after the first, and the run only worked at all
because Auto-Import swept Staging behind the scenes. Confusing
logs, wasted searches, brittle timing.
Fix: thread an optional ``exclude_sources`` parameter through
``DownloadOrchestrator.search``. When the per-track worker detects
that the active batch is an album AND mode is hybrid, it passes
``['torrent', 'usenet']`` so the hybrid chain skips them and falls
through to per-track-compatible sources (Soulseek / streaming).
Gate is narrow on purpose:
- Hybrid + album → skip torrent / usenet (THIS fix)
- Single-source torrent / usenet + album → album-bundle flow on
the master worker (already shipped)
- Hybrid + single-track batch (basic search / wishlist / playlist
of singles) → torrent / usenet still tried, validation.py's
album-name fallback gives them a shot
Excluded list logged at INFO when applied so the behavior is
visible in logs ("Hybrid search: excluding ['torrent', 'usenet']
for this query"). Default ``exclude_sources=None`` keeps every
non-task-worker caller (basic search, stream search, search-and-
download-best, automation handlers) on the original code path.
This commit is contained in:
Broque Thomas
parent
daaed373e7
commit
8975031e3a
3 changed files with 53 additions and 3 deletions
|
|
@ -286,11 +286,25 @@ class DownloadOrchestrator:
|
|||
chain = ['soulseek']
|
||||
return chain
|
||||
|
||||
async def search(self, query: str, timeout: int = None, progress_callback=None) -> Tuple[List[TrackResult], List[AlbumResult]]:
|
||||
async def search(self, query: str, timeout: int = None, progress_callback=None,
|
||||
exclude_sources=None) -> Tuple[List[TrackResult], List[AlbumResult]]:
|
||||
"""Search for tracks using configured source(s). Single-source
|
||||
modes route directly; hybrid mode delegates to
|
||||
``engine.search_with_fallback`` which tries the chain in order."""
|
||||
``engine.search_with_fallback`` which tries the chain in order.
|
||||
|
||||
``exclude_sources`` (optional) is an iterable of source names
|
||||
the caller wants filtered out of the hybrid chain. Used by the
|
||||
per-track download worker to skip torrent / usenet for album-
|
||||
context batches — those sources are release-level and don't
|
||||
score meaningfully on per-track titles; the album-bundle flow
|
||||
on the master worker handles them separately when they're the
|
||||
single active source."""
|
||||
if self.mode != 'hybrid':
|
||||
# Single-source mode is opt-in; honour the user's choice even
|
||||
# if it's torrent/usenet on an album batch (the master worker
|
||||
# routes those through the album-bundle flow before per-track
|
||||
# tasks ever fire, so search() being called here would be a
|
||||
# non-album / wishlist / basic-search use case).
|
||||
client = self._client(self.mode)
|
||||
if not client:
|
||||
logger.error(f"{self.registry.display_name(self.mode)} client not available (failed to initialize)")
|
||||
|
|
@ -299,6 +313,19 @@ class DownloadOrchestrator:
|
|||
return await client.search(query, timeout, progress_callback)
|
||||
|
||||
chain = self._resolve_source_chain()
|
||||
if exclude_sources:
|
||||
blocked = {s.lower() for s in exclude_sources if s}
|
||||
filtered = [s for s in chain if s.lower() not in blocked]
|
||||
if filtered != chain:
|
||||
logger.info(
|
||||
"Hybrid search: excluding %s for this query (chain %s -> %s)",
|
||||
sorted(blocked & {s.lower() for s in chain}),
|
||||
" → ".join(chain), " → ".join(filtered) if filtered else "(empty)",
|
||||
)
|
||||
chain = filtered
|
||||
if not chain:
|
||||
logger.warning("Hybrid search exhausted: no eligible sources after exclusion filter")
|
||||
return [], []
|
||||
logger.info(f"Hybrid search ({' → '.join(chain)}): {query}")
|
||||
return await self.engine.search_with_fallback(query, chain, timeout, progress_callback)
|
||||
|
||||
|
|
|
|||
|
|
@ -209,8 +209,30 @@ def download_track_worker(task_id: str, batch_id: Optional[str], deps: TaskWorke
|
|||
logger.debug(f"About to call soulseek search for task {task_id}")
|
||||
|
||||
try:
|
||||
# Hybrid + album-context batches must skip torrent / usenet during
|
||||
# the per-track loop — they're release-level sources, can't match
|
||||
# individual tracks meaningfully, and album-bundle handling only
|
||||
# fires in single-source mode (see core/downloads/master.py). The
|
||||
# exclusion lets the hybrid chain fall through to per-track-
|
||||
# compatible sources (soulseek / streaming) instead of attempting
|
||||
# N redundant Prowlarr searches that all download the same album
|
||||
# torrent and rely on the auto-import sweep to clean up.
|
||||
_exclude_for_hybrid_album = None
|
||||
try:
|
||||
_batch_is_album = False
|
||||
if batch_id:
|
||||
from core.runtime_state import download_batches as _db
|
||||
_b = _db.get(batch_id)
|
||||
if isinstance(_b, dict):
|
||||
_batch_is_album = bool(_b.get('is_album_download'))
|
||||
if _batch_is_album and getattr(deps.download_orchestrator, 'mode', '') == 'hybrid':
|
||||
_exclude_for_hybrid_album = ['torrent', 'usenet']
|
||||
except Exception as _exc_filter_err:
|
||||
logger.debug("[Modal Worker] album-source-exclusion check failed: %s", _exc_filter_err)
|
||||
# Perform search with timeout
|
||||
tracks_result, _ = deps.run_async(deps.download_orchestrator.search(query, timeout=30))
|
||||
tracks_result, _ = deps.run_async(deps.download_orchestrator.search(
|
||||
query, timeout=30, exclude_sources=_exclude_for_hybrid_album,
|
||||
))
|
||||
logger.debug(f"Search completed for task {task_id}, got {len(tracks_result) if tracks_result else 0} results")
|
||||
|
||||
# CRITICAL: Check cancellation immediately after search returns
|
||||
|
|
|
|||
|
|
@ -3415,6 +3415,7 @@ function closeHelperSearch() {
|
|||
const WHATS_NEW = {
|
||||
'2.6.0': [
|
||||
{ unreleased: true },
|
||||
{ title: 'Hybrid mode skips torrent / usenet on album batches', desc: 'follow-up to the album-bundle flow. When download mode is set to Hybrid AND the batch is an album, the per-track search loop now silently strips torrent and usenet from the source chain — they\'re release-level sources that can\'t match per-track meaningfully, and the album-bundle handling only fires in single-source mode. Without the skip, hybrid + torrent-first would fire N redundant Prowlarr searches per album and rely on Auto-Import sweeping Staging to recover. Cleaner now: hybrid falls straight through to per-track-compatible sources (Soulseek / streaming) for albums, and torrent / usenet still get a shot for single-track / wishlist / basic-search use cases where per-track makes sense.' },
|
||||
{ title: 'Album-bundle flow for torrent / usenet downloads', desc: 'fixes the core architectural problem with indexer-based sources. Prowlarr returns release-level torrents — searching per-track for "Luther (with SZA)" against the GNX album torrent scores near-zero and the orchestrator rejects every candidate. New gated flow: when downloading an album AND torrent or usenet is the single active source (not hybrid), SoulSync now does ONE Prowlarr search for the whole release, picks the best torrent (prefers FLAC, high seeders, reasonable size — drops single-track torrents that snuck in), hands it to your torrent / usenet client, walks the resulting audio files (extracting .zip/.rar/.tar if needed), and drops them all into the staging folder. The existing per-track staging matcher then imports each one to the library by fuzzy title match — same path as the Auto-Import flow. Gate is strictly opt-in: per-track flow is completely untouched for hybrid mode, non-album downloads, and every other source. 5 new tests cover the album picker (seeded-FLAC preference, size floor for single-track torrents, fallback when all candidates are small) and the staging path collision handler.' },
|
||||
{ title: 'Filesystem-access heads-up for torrent / usenet sources', desc: 'new advisory card on the Indexers & Downloaders tab explaining the cleanest setup: point ALL your downloaders (Soulseek, qBittorrent, SABnzbd / NZBGet) at the same download folder. One folder, one mount, everything just works. Bare-metal needs no change; Docker users can reuse the existing ./downloads mount and just configure each client to write there. docker-compose.yml updated to call this out as the easiest path, with optional commented placeholders for users who prefer separate folders per protocol.' },
|
||||
{ title: 'Torrent and Usenet downloads', desc: 'two new download sources live in the Download Source dropdown: <strong>Torrent Only (via Prowlarr)</strong> and <strong>Usenet Only (via Prowlarr)</strong>. they reuse the Prowlarr + torrent client + usenet client you set up on the Indexers & Downloaders tab. searches go through Prowlarr filtered by protocol, picked releases get handed to your torrent client or usenet client, and the resulting files get walked through archive_pipeline (extracts .zip / .rar / .tar when the client didn\'t already do it) and handed to the matching pipeline. both sources are also available in hybrid mode alongside soulseek / youtube / tidal / etc. one caveat: SoulSync needs read access to the torrent / usenet client\'s save_path — works out of the box for everything-on-one-box setups, but remote downloader hosts will need a future sync step.' },
|
||||
|
|
|
|||
Loading…
Reference in a new issue