fix(web): align CrossSeedDialog indexers with search flows (#619)

s0up4200 · web-flow · commit b83aebe98f59 · 2025-11-20T21:33:18.000+01:00
diff --git a/web/src/components/torrents/CrossSeedDialog.tsx b/web/src/components/torrents/CrossSeedDialog.tsx
@@ -30,15 +30,14 @@ import {
 } from "@/components/ui/dropdown-menu"
 import { Input } from "@/components/ui/input"
 import { Switch } from "@/components/ui/switch"
-import { formatBytes } from "@/lib/utils"
+import { formatBytes, formatRelativeTime } from "@/lib/utils"
 import type {
   CrossSeedApplyResponse,
   CrossSeedTorrentSearchResponse,
   Torrent
 } from "@/types"
 import { ChevronDown, ChevronRight, Loader2, RefreshCw, SlidersHorizontal } from "lucide-react"
 import { memo, useCallback, useMemo, useState } from "react"
-import { formatRelativeTime } from "@/lib/utils"
 
 type CrossSeedSearchResult = CrossSeedTorrentSearchResponse["results"][number]
 type CrossSeedIndexerOption = {
@@ -138,6 +137,22 @@ const CrossSeedDialogComponent = ({
       .sort((a, b) => a.name.localeCompare(b.name))
   }, [indexerNameMap, sourceTorrent?.excludedIndexers])
 
+  const capabilityFilteredIndexerEntries = useMemo(() => {
+    const available = sourceTorrent?.availableIndexers
+    if (!available || available.length === 0) {
+      return []
+    }
+    const supported = new Set(available)
+    return Object.keys(indexerNameMap)
+      .map(id => Number(id))
+      .filter(id => !Number.isNaN(id) && !supported.has(id))
+      .map(id => ({
+        id,
+        name: indexerNameMap[id] ?? `Indexer ${id}`,
+      }))
+      .sort((a, b) => a.name.localeCompare(b.name))
+  }, [indexerNameMap, sourceTorrent?.availableIndexers])
+
   const [excludedOpen, setExcludedOpen] = useState(false)
   const [applyResultOpen, setApplyResultOpen] = useState(true)
 
@@ -209,13 +224,25 @@ const CrossSeedDialogComponent = ({
                 onScopeSearch={onScopeSearch}
                 isSearching={isLoading}
               />
-            ) : sourceTorrent && (
+            ) : (
               <div className="space-y-1.5 text-sm text-muted-foreground">
-                <p className="font-medium">No compatible indexers found</p>
+                <p className="font-medium">No Torznab indexers available</p>
                 <p className="text-xs">
-                  None of your enabled indexers support the required capabilities ({sourceTorrent.requiredCaps?.join(", ")})
-                  or categories ({sourceTorrent.searchCategories?.join(", ")}) for this {sourceTorrent.contentType} content.
+                  Add or enable Torznab indexers in Settings to search for cross-seeds.
+                </p>
+              </div>
+            )}
+            {(capabilityFilteredIndexerEntries.length > 0 && indexerOptions.length > 0) && (
+              <div className="mt-2 rounded-md border border-dashed border-border/60 bg-muted/30 p-2 text-xs text-muted-foreground">
+                <p className="font-medium text-[11px] text-foreground">Capability note</p>
+                <p>
+                  These indexers lack the required capabilities/categories for this torrent and will be skipped by the server:
                 </p>
+                <ul className="mt-1.5 ml-4 space-y-0.5">
+                  {capabilityFilteredIndexerEntries.map(entry => (
+                    <li key={entry.id} className="break-words">• {entry.name}</li>
+                  ))}
+                </ul>
               </div>
             )}
           </div>
@@ -308,7 +335,7 @@ const CrossSeedDialogComponent = ({
             <>
               {results.length === 0 ? (
                 <div className="rounded-md border border-dashed p-4 text-center text-sm text-muted-foreground">
-                  No matches found across the enabled indexers.
+                  No matches found in your search.
                 </div>
               ) : (
                 <>
@@ -506,6 +533,7 @@ const IndexerCheckboxItem = memo(({
       key={option.id}
       checked={isChecked}
       onCheckedChange={handleChange}
+      onSelect={(event) => event.preventDefault()} // keep menu open for multi-select
     >
       {option.name}
     </DropdownMenuCheckboxItem>
@@ -536,17 +564,15 @@ const CrossSeedScopeSelector = memo(({
   // Calculate the actual count of indexers that will be used for search
   const searchIndexerCount = useMemo(() => {
     if (indexerMode === "all") {
-      return Math.max(0, total - excludedCount)
+      return total
     }
-    // For custom mode, exclude any selected indexers that are also excluded
-    const availableSelected = selectedIndexerIds.filter(id => !excludedIndexerIds.includes(id))
-    return availableSelected.length
-  }, [indexerMode, total, excludedCount, selectedIndexerIds, excludedIndexerIds])
+    return selectedCount
+  }, [indexerMode, total, selectedCount])
 
   const statusText = useMemo(() => {
     const suffix = total === 1 ? "indexer" : "indexers"
     if (indexerMode === "all") {
-      return `${total} compatible ${suffix}`
+      return `${total} enabled ${suffix}`
     }
     if (selectedCount === 0) {
       return "None selected"
@@ -613,7 +639,7 @@ const CrossSeedScopeSelector = memo(({
             disabled={isSearching}
             className="h-7 flex-1 sm:flex-initial text-xs"
           >
-            All Compatible
+            All indexers
           </Button>
           <Button
             size="sm"
@@ -646,8 +672,20 @@ const CrossSeedScopeSelector = memo(({
                 <DropdownMenuSeparator />
                 {indexerItems}
                 <DropdownMenuSeparator />
-                <DropdownMenuItem onClick={onSelectAllIndexers} className="text-xs">Select all</DropdownMenuItem>
-                <DropdownMenuItem onClick={onClearIndexerSelection} className="text-xs">Clear selection</DropdownMenuItem>
+                <DropdownMenuItem
+                  onSelect={(event) => event.preventDefault()}
+                  onClick={onSelectAllIndexers}
+                  className="text-xs"
+                >
+                  Select all
+                </DropdownMenuItem>
+                <DropdownMenuItem
+                  onSelect={(event) => event.preventDefault()}
+                  onClick={onClearIndexerSelection}
+                  className="text-xs"
+                >
+                  Clear selection
+                </DropdownMenuItem>
               </DropdownMenuContent>
             </DropdownMenu>
           )}
diff --git a/web/src/hooks/useCrossSeedSearch.tsx b/web/src/hooks/useCrossSeedSearch.tsx
@@ -55,7 +55,6 @@ export function useCrossSeedSearch(instanceId: number) {
   const [crossSeedIndexerSelection, setCrossSeedIndexerSelection] = useState<number[]>([])
   const [crossSeedHasSearched, setCrossSeedHasSearched] = useState(false)
   const [crossSeedRefreshCooldownUntil, setCrossSeedRefreshCooldownUntil] = useState(0)
-  const [lastSourceTorrent, setLastSourceTorrent] = useState<CrossSeedTorrentSearchResponse["sourceTorrent"] | null>(null)
 
   const crossSeedPollingRef = useRef<ReturnType<typeof setInterval> | null>(null)
   const crossSeedPollingInFlightRef = useRef(false)
@@ -66,53 +65,35 @@ export function useCrossSeedSearch(instanceId: number) {
     staleTime: 5 * 60 * 1000,
   })
 
-  useEffect(() => {
-    if (crossSeedSearchResponse?.sourceTorrent) {
-      setLastSourceTorrent(crossSeedSearchResponse.sourceTorrent)
-    }
-  }, [crossSeedSearchResponse?.sourceTorrent])
-
   const crossSeedIndexerOptions = useMemo(() => {
-    const sourceTorrent = crossSeedSearchResponse?.sourceTorrent ?? lastSourceTorrent
-    if (!sourceTorrent) {
-      return sortedEnabledIndexers.map(indexer => ({ id: indexer.id, name: indexer.name }))
+    const allowedIds = crossSeedSearchResponse?.sourceTorrent?.availableIndexers
+    const filteredIds = crossSeedSearchResponse?.sourceTorrent?.filteredIndexers
+    const excludedIds = crossSeedSearchResponse?.sourceTorrent?.excludedIndexers
+
+    let candidateIds: Set<number> | null = null
+    if (allowedIds && allowedIds.length > 0) {
+      candidateIds = new Set(allowedIds)
+    } else if (filteredIds && filteredIds.length > 0) {
+      candidateIds = new Set(filteredIds)
     }
 
-    if (sourceTorrent.availableIndexers && sourceTorrent.filteredIndexers) {
-      const targetIndexerIds = crossSeedHasSearched ? sourceTorrent.filteredIndexers : sourceTorrent.availableIndexers
-      const filteredIds = new Set(targetIndexerIds)
-      return sortedEnabledIndexers
-        .filter(indexer => filteredIds.has(indexer.id))
-        .map(indexer => ({ id: indexer.id, name: indexer.name }))
-    }
-
-    if (sourceTorrent.filteredIndexers && sourceTorrent.filteredIndexers.length > 0) {
-      const filteredIds = new Set(sourceTorrent.filteredIndexers)
-      return sortedEnabledIndexers
-        .filter(indexer => filteredIds.has(indexer.id))
-        .map(indexer => ({ id: indexer.id, name: indexer.name }))
-    }
-
-    const requiredCaps = sourceTorrent.requiredCaps ?? []
-    const requiredCategories = sourceTorrent.searchCategories ?? []
-
-    const filteredIndexers = sortedEnabledIndexers.filter(indexer => {
-      if (requiredCaps.length === 0 && requiredCategories.length === 0) {
-        return true
-      }
-
-      const indexerCaps = indexer.capabilities ?? []
-      const hasRequiredCaps = requiredCaps.length === 0 || requiredCaps.every(cap => indexerCaps.includes(cap))
-
-      const indexerCategoryIds = (indexer.categories ?? []).map(cat => cat.category_id)
-      const hasRequiredCategories = requiredCategories.length === 0 ||
-        requiredCategories.some(catId => indexerCategoryIds.includes(catId))
-
-      return hasRequiredCaps && hasRequiredCategories
-    })
-
-    return filteredIndexers.map(indexer => ({ id: indexer.id, name: indexer.name }))
-  }, [sortedEnabledIndexers, crossSeedSearchResponse, lastSourceTorrent, crossSeedHasSearched])
+    const excludedIdSet = excludedIds
+      ? new Set(
+          Object.keys(excludedIds)
+            .map(id => Number(id))
+            .filter(id => !Number.isNaN(id))
+        )
+      : null
+
+    return sortedEnabledIndexers
+      .filter(indexer => (!candidateIds || candidateIds.has(indexer.id)) && (!excludedIdSet || !excludedIdSet.has(indexer.id)))
+      .map(indexer => ({ id: indexer.id, name: indexer.name }))
+  }, [
+    crossSeedSearchResponse?.sourceTorrent?.availableIndexers,
+    crossSeedSearchResponse?.sourceTorrent?.filteredIndexers,
+    crossSeedSearchResponse?.sourceTorrent?.excludedIndexers,
+    sortedEnabledIndexers,
+  ])
 
   const crossSeedIndexerNameMap = useMemo(() => {
     const map: Record<number, string> = {}
@@ -122,6 +103,14 @@ export function useCrossSeedSearch(instanceId: number) {
     return map
   }, [sortedEnabledIndexers])
 
+  const excludedIndexerIds = useMemo(
+    () =>
+      Object.keys(crossSeedSearchResponse?.sourceTorrent?.excludedIndexers ?? {})
+        .map(id => Number(id))
+        .filter(id => !Number.isNaN(id)),
+    [crossSeedSearchResponse?.sourceTorrent?.excludedIndexers]
+  )
+
   const getCrossSeedResultKey = useCallback(
     (result: CrossSeedTorrentSearchResponse["results"][number], index: number) =>
       result.guid || result.downloadUrl || `${result.indexer}-${index}`,
@@ -142,7 +131,6 @@ export function useCrossSeedSearch(instanceId: number) {
     setCrossSeedApplyResult(null)
     setCrossSeedIndexerMode("all")
     setCrossSeedIndexerSelection([])
-    setLastSourceTorrent(null)
     setCrossSeedHasSearched(false)
   }, [])
 
@@ -176,11 +164,17 @@ export function useCrossSeedSearch(instanceId: number) {
         return
       }
 
-      let resolvedIndexerIds: number[] | undefined
+      let resolvedIndexerIds: number[] | null | undefined
       if (indexerOverride !== undefined) {
-        resolvedIndexerIds = indexerOverride ?? undefined
-      } else if (crossSeedIndexerMode === "custom" && crossSeedIndexerSelection.length > 0) {
+        resolvedIndexerIds = indexerOverride
+      } else if (crossSeedIndexerMode === "custom") {
         resolvedIndexerIds = crossSeedIndexerSelection
+      } else {
+        resolvedIndexerIds = sortedEnabledIndexers.map(indexer => indexer.id)
+      }
+
+      if (Array.isArray(resolvedIndexerIds) && excludedIndexerIds.length > 0) {
+        resolvedIndexerIds = resolvedIndexerIds.filter(id => !excludedIndexerIds.includes(id))
       }
 
       setCrossSeedSearchLoading(true)
@@ -192,7 +186,7 @@ export function useCrossSeedSearch(instanceId: number) {
       void api
         .searchCrossSeedTorrent(instanceId, torrent.hash, {
           findIndividualEpisodes: crossSeedSettings?.findIndividualEpisodes ?? false,
-          indexerIds: resolvedIndexerIds && resolvedIndexerIds.length > 0 ? resolvedIndexerIds : undefined,
+          indexerIds: Array.isArray(resolvedIndexerIds) && resolvedIndexerIds.length > 0 ? resolvedIndexerIds : undefined,
           cacheMode: options?.bypassCache ? "bypass" : undefined,
         })
         .then(response => {
@@ -235,6 +229,8 @@ export function useCrossSeedSearch(instanceId: number) {
       crossSeedIndexerSelection,
       crossSeedSettings?.findIndividualEpisodes,
       getCrossSeedResultKey,
+      excludedIndexerIds,
+      sortedEnabledIndexers,
       instanceId,
     ]
   )
