From dc71d079e65d50be908f0ad673344ef005bf6034 Mon Sep 17 00:00:00 2001 From: SpAwMking24 Date: Mon, 16 Nov 2026 01:17:28 +0000 Subject: [PATCH] Fix acquisition recovery and source resolution --- apps/web/src/api/schema.d.ts | 24 +++- apps/web/src/components/CollectionReview.tsx | 65 +++++++-- .../src/components/SourceReleaseDetails.tsx | 1 + .../src/components/SourceReleaseDownload.tsx | 59 +++++++- apps/web/src/pages/BookSources.tsx | 1 + apps/web/src/pages/PreferenceFields.tsx | 24 ++++ apps/web/src/pages/ProwlarrSources.tsx | 49 ++++++- apps/web/src/sources.css | 11 ++ docs/openapi.json | 47 +++++++ services/app/adapters/prowlarr.py | 31 +++- services/app/adapters/slskd.py | 25 ++++ services/app/api/book_sources.py | 10 +- services/app/api/prowlarr.py | 26 +++- services/app/domain/automatic_eligibility.py | 10 +- services/app/domain/automatic_selection.py | 48 ++++++- services/app/domain/download_attempts.py | 16 ++- services/app/domain/download_recovery.py | 48 ++++++- services/app/domain/indexer_labels.py | 2 +- services/app/domain/prowlarr_resolution.py | 72 ++++++++++ services/app/domain/release_profiles.py | 26 +++- services/app/domain/title_matching.py | 28 ++++ services/app/importing/catalog_resolution.py | 15 +- tests/integration/test_automatic_selection.py | 2 +- tests/integration/test_book_sources.py | 3 +- .../test_failed_shared_download.py | 83 +++++++++++ tests/integration/test_prowlarr_sources.py | 9 +- tests/integration/test_slskd_selection.py | 110 +++++++++++++++ tests/unit/test_abb_eligibility.py | 15 ++ tests/unit/test_automatic_eligibility.py | 29 ++++ .../unit/test_automatic_selection_recovery.py | 23 +++ tests/unit/test_catalog_resolution.py | 122 ++++++++++++++++ tests/unit/test_download_recovery.py | 9 ++ tests/unit/test_prowlarr.py | 42 +++++- tests/unit/test_prowlarr_resolution.py | 132 ++++++++++++++++++ tests/unit/test_release_profiles.py | 112 +++++++++++++++ tests/unit/test_slskd.py | 71 ++++++++++ tests/unit/test_title_matching.py | 23 ++- 37 files changed, 1355 insertions(+), 68 deletions(-) create mode 100644 services/app/domain/prowlarr_resolution.py create mode 100644 tests/unit/test_automatic_selection_recovery.py create mode 100644 tests/unit/test_catalog_resolution.py create mode 100644 tests/unit/test_prowlarr_resolution.py diff --git a/apps/web/src/api/schema.d.ts b/apps/web/src/api/schema.d.ts index 9976eab3..8987bb32 100644 --- a/apps/web/src/api/schema.d.ts +++ b/apps/web/src/api/schema.d.ts @@ -11706,6 +11706,8 @@ export interface components { * @description Legacy compatibility value; transfer sizes are not capped */ maximum_bytes?: number | null; + /** Allow Incomplete Release Metadata */ + allow_incomplete_release_metadata?: boolean; }; /** PresetInfo */ PresetInfo: { @@ -12788,6 +12790,11 @@ export interface components { * @default false */ allow_unknown_seeders: boolean; + /** + * Allow Incomplete Release Metadata + * @default false + */ + allow_incomplete_release_metadata: boolean; /** * Search Series * @default true @@ -15205,6 +15212,11 @@ export interface components { /** Name */ name?: string | null; }; + /** ProwlarrArtifactInput */ + ProwlarrArtifactInput: { + /** Downloader Id */ + downloader_id?: string | null; + }; }; responses: never; parameters: never; @@ -25217,7 +25229,11 @@ export interface operations { }; cookie?: never; }; - requestBody?: never; + requestBody?: { + content: { + "application/json": components["schemas"]["ProwlarrArtifactInput"]; + }; + }; responses: { /** @description Successful Response */ 200: { @@ -25876,7 +25892,11 @@ export interface operations { }; cookie?: never; }; - requestBody?: never; + requestBody?: { + content: { + "application/json": components["schemas"]["ProwlarrArtifactInput"]; + }; + }; responses: { /** @description Successful Response */ 200: { diff --git a/apps/web/src/components/CollectionReview.tsx b/apps/web/src/components/CollectionReview.tsx index 0e1a97c8..980e3162 100644 --- a/apps/web/src/components/CollectionReview.tsx +++ b/apps/web/src/components/CollectionReview.tsx @@ -29,10 +29,12 @@ const filesFor = (entry: Entry, recording: string) => { export default function CollectionReview({ searchId, resultId, + source, close, }: { searchId: string; resultId: string; + source?: string; close: () => void; }) { const cache = useQueryClient(); @@ -42,6 +44,15 @@ export default function CollectionReview({ const key = useRef(randomUUID()); const [recordings, setRecordings] = useState>({}); const [artifactId, setArtifactId] = useState(); + const [metadataDownloader, setMetadataDownloader] = useState(""); + const metadataClients = useQuery({ + queryKey: ["downloaders"], + enabled: source === "prowlarr", + queryFn: async () => result(await api.GET("/api/downloaders")), + }); + const metadataDownloaders = (metadataClients.data || []).filter( + (client) => client.enabled && client.kind === "qbittorrent", + ); const [choices, setChoices] = useState>({}); const [catalogChoices, setCatalogChoices] = useState>( {}, @@ -51,11 +62,19 @@ export default function CollectionReview({ result( await api.POST( "/api/source-searches/{search_id}/results/{result_id}/artifact", - { params: { path: { search_id: searchId, result_id: resultId } } }, + { + params: { path: { search_id: searchId, result_id: resultId } }, + body: metadataDownloader + ? { downloader_id: metadataDownloader } + : undefined, + }, ), ), onSuccess: (artifact) => setArtifactId(artifact.id), }); + const needsMagnetResolver = + source === "prowlarr" && + !!inspect.error?.message.includes("redirects to a magnet"); const started = useRef(false); useEffect(() => { if (!started.current) { @@ -423,13 +442,43 @@ export default function CollectionReview({ {!data ? (
{inspect.isError || preview.isError ? ( - + <> + {needsMagnetResolver && ( +
+ + {!metadataDownloaders.length && ( +

+ Enable a qBittorrent connection in{" "} + Download settings. +

+ )} +
+ )} + + ) : ( <> diff --git a/apps/web/src/components/SourceReleaseDetails.tsx b/apps/web/src/components/SourceReleaseDetails.tsx index 74f16d08..93545a76 100644 --- a/apps/web/src/components/SourceReleaseDetails.tsx +++ b/apps/web/src/components/SourceReleaseDetails.tsx @@ -111,6 +111,7 @@ export default function SourceReleaseDetails({ reviewContext={reviewContext} searchId={searchId} resultId={item.id} + source={original.source} title={release.title} disabled={disabled} download={item.download} diff --git a/apps/web/src/components/SourceReleaseDownload.tsx b/apps/web/src/components/SourceReleaseDownload.tsx index 39914831..cc72a5ee 100644 --- a/apps/web/src/components/SourceReleaseDownload.tsx +++ b/apps/web/src/components/SourceReleaseDownload.tsx @@ -24,6 +24,7 @@ const labels: Record = { export default function SourceReleaseDownload({ searchId, resultId, + source, title, disabled, disabledReason, @@ -36,6 +37,7 @@ export default function SourceReleaseDownload({ }: { searchId: string; resultId: string; + source?: string; title: string; disabled: boolean; disabledReason?: string; @@ -57,6 +59,15 @@ export default function SourceReleaseDownload({ }); const [operationId, setOperationId] = useState(); const [useWedge, setUseWedge] = useState(false); + const [metadataDownloader, setMetadataDownloader] = useState(""); + const metadataClients = useQuery({ + queryKey: ["downloaders"], + enabled: source === "prowlarr", + queryFn: async () => result(await api.GET("/api/downloaders")), + }); + const metadataDownloaders = (metadataClients.data || []).filter( + (client) => client.enabled && client.kind === "qbittorrent", + ); const inspect = useMutation({ mutationFn: async () => result( @@ -67,6 +78,9 @@ export default function SourceReleaseDownload({ path: { search_id: searchId, result_id: resultId }, query: offerWedge && useWedge ? { use_wedge: true } : {}, }, + body: metadataDownloader + ? { downloader_id: metadataDownloader } + : undefined, }, ), ), @@ -83,6 +97,9 @@ export default function SourceReleaseDownload({ }); }, }); + const needsMagnetResolver = + source === "prowlarr" && + !!inspect.error?.message.includes("redirects to a magnet"); const start = useMutation({ mutationFn: async (spendWedge: boolean) => result( @@ -275,6 +292,7 @@ export default function SourceReleaseDownload({ setReviewCollection(false)} /> @@ -320,9 +338,44 @@ export default function SourceReleaseDownload({

)} {inspect.error && ( -

- {inspect.error.message} -

+
+

+ {inspect.error.message} +

+ {needsMagnetResolver && ( + <> + + + {!metadataDownloaders.length && ( +

+ Enable a qBittorrent connection in{" "} + Download settings. +

+ )} + + )} +
)} ); diff --git a/apps/web/src/pages/BookSources.tsx b/apps/web/src/pages/BookSources.tsx index da649d1b..613ce39a 100644 --- a/apps/web/src/pages/BookSources.tsx +++ b/apps/web/src/pages/BookSources.tsx @@ -732,6 +732,7 @@ function Results({ key={item.download?.operation_id || "unselected"} searchId={data.id} resultId={item.id} + source={item.release.source} title={item.release.title} download={item.download} offerWedge={ diff --git a/apps/web/src/pages/PreferenceFields.tsx b/apps/web/src/pages/PreferenceFields.tsx index b53cd818..0903124d 100644 --- a/apps/web/src/pages/PreferenceFields.tsx +++ b/apps/web/src/pages/PreferenceFields.tsx @@ -153,6 +153,30 @@ export default function PreferenceFields({
{origin("allow_unknown_seeders")} +
+ +
+ + Off by default. When enabled, releases with incomplete title, + author or medium details can proceed to the existing file and + import checks. Known mismatches, unsupported formats and partial + content remain blocked. + +
+ {origin("allow_incomplete_release_metadata")} +