Recover blocked searches, fall through to the next peer, rebuild the UI

Measured against a live instance: 47 failed jobs against 33 imported. Three
independent causes, all of which ended the request.

The Soulseek server filters some artist names. "Michael Jackson Billie Jean"
and bare "Michael Jackson" both return zero responses; "Billie Jean" returns
1083 files. The Weeknd, Kanye West and Frank Ocean behave the same way. Since
pick_and_enqueue sent exactly one query of `artist title`, every request for a
filtered artist failed reporting "searched 0 files" -- 28 of 29 occurrences.
search_queries() now walks a ladder, loosest last, ending at the bare title,
and escalates only when a search underdelivers so the common case still costs
one search. Dropping the artist from the query does not mean ignoring it:
match_ratio() looks for it in the folder path, where an organised share puts it.

A rejected transfer ended the request. pick_and_enqueue kept a running maximum
and discarded every runner-up, so "Transfer rejected: File not shared." -- a
per-file condition where candidate two almost always works -- was terminal, as
were timeouts and slskd's 500 on an unreachable peer. The ranked list is now
persisted on the job row, ordered to put a different peer next, and
try_next_candidate() advances through it. A job fails only once the list is
exhausted, and then reports every peer it tried and what each one said.

norm() destroyed every non-ASCII character, so "Beyonce" never matched
Beyonce, nor Bjork Bjork, nor Dont Don't. It now folds accents and drops
apostrophes while leaving & as a separator.

Also: availability outranks format in score(), because a FLAC behind 5000
queued users used to beat an immediately available MP3; transfers that stall or
that slskd forgets are abandoned instead of sitting in `downloading` forever;
searches are deleted only once finished, since deleting one mid-flight makes
slskd throw an optimistic-concurrency error and lose the record; a failed
search POST is retried rather than failing the job on one blip.

The UI moves to a sidebar shell -- rail at tablet, bottom bar on phones -- with
neutral chrome and the sampled artwork colour confined to hero areas rather
than repainting the whole interface. Adds URL routing, a primitive set under
components/ui, and a request sheet showing the attempt ladder. Fixes
hover:bg-glass-hi, which was never a valid class, so track rows and the search
field had no hover or focus state at all; a reduced-motion path that could
strand elements at opacity 0; the login page's hardcoded palette; and the
missing 404 and error boundaries.

tests/test_acquisition.py covers this path against a faked slskd. It had none.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Aryan SinghandClaude Opus 5 committed 2026-09-02 11:33:52 -05:00
1 parent 0dca779f59
commit e1b7b69261
47 files changed
+2939 -805

No files matched your search

+70 -16
View File
@@ -2,43 +2,97 @@
import * as React from "react";
import { AnimatePresence, motion } from "framer-motion";
import { AlertCircle, CheckCircle2, X } from "lucide-react";
import { cn } from "@/lib/utils";
import { useMotionOK, spring } from "@/lib/motion";
type Toast = { id: number; msg: string; err?: boolean };
type Ctx = (msg: string, err?: boolean) => void;
type Toast = { id: number; msg: string; err?: boolean; action?: Action };
type Action = { label: string; run: () => void };
type Ctx = (msg: string, err?: boolean, action?: Action) => void;
const ToastCtx = React.createContext<Ctx>(() => {});
export const useToast = () => React.useContext(ToastCtx);
/** An error you cannot read in time is the same as no error at all. */
const DWELL_OK = 3400;
const DWELL_ERR = 7000;
/** Beyond this the stack is a wall, and the oldest is the least relevant. */
const MAX = 3;
export function ToastProvider({ children }: { children: React.ReactNode }) {
const [items, setItems] = React.useState<Toast[]>([]);
const ok = useMotionOK();
const push = React.useCallback<Ctx>((msg, err) => {
const id = Date.now() + Math.random();
setItems((x) => [...x, { id, msg, err }]);
setTimeout(() => setItems((x) => x.filter((t) => t.id !== id)), 3400);
}, []);
const drop = React.useCallback(
(id: number) => setItems((x) => x.filter((t) => t.id !== id)),
[],
);
const push = React.useCallback<Ctx>(
(msg, err, action) => {
const id = Date.now() + Math.random();
setItems((x) => [...x, { id, msg, err, action }].slice(-MAX));
setTimeout(() => drop(id), err ? DWELL_ERR : DWELL_OK);
},
[drop],
);
return (
<ToastCtx.Provider value={push}>
{children}
<div className="fixed bottom-24 left-1/2 -translate-x-1/2 z-90 flex flex-col items-center gap-2 pointer-events-none">
{/*
aria-live so a screen reader hears "Queued" or a failure at all — these
were previously silent, which made the only confirmation that a request
had been accepted a purely visual one.
*/}
<div
role="status"
aria-live="polite"
aria-atomic="false"
className="pointer-events-none fixed inset-x-0 bottom-24 z-[110] flex flex-col
items-center gap-2 px-4 md:bottom-8"
>
<AnimatePresence>
{items.map((t) => (
<motion.div
key={t.id}
layout
initial={{ opacity: 0, y: 18, scale: 0.94 }}
layout={ok}
initial={ok ? { opacity: 0, y: 18, scale: 0.94 } : false}
animate={{ opacity: 1, y: 0, scale: 1 }}
exit={{ opacity: 0, y: 10, scale: 0.96 }}
transition={{ type: "spring", stiffness: 420, damping: 30 }}
exit={ok ? { opacity: 0, y: 10, scale: 0.96 } : { opacity: 0 }}
transition={spring}
className={cn(
"sheet rounded-full px-5 py-2.5 text-callout font-medium text-center",
"max-w-[calc(100vw-32px)]",
t.err && "border-err/50 text-err",
"sheet pointer-events-auto flex max-w-[min(30rem,100%)] items-center gap-2.5",
"rounded-pill py-2 pl-3.5 pr-2 text-callout font-medium",
t.err && "border-err/45",
)}
>
{t.msg}
{t.err ? (
<AlertCircle className="h-4 w-4 shrink-0 text-err" />
) : (
<CheckCircle2 className="h-4 w-4 shrink-0 text-ok" />
)}
<span className={cn("min-w-0 flex-1", t.err && "text-err")}>{t.msg}</span>
{t.action && (
<button
onClick={() => {
t.action!.run();
drop(t.id);
}}
className="focus-ring shrink-0 rounded-pill px-2.5 py-0.5 text-callout
font-semibold text-accent transition-colors hover:bg-accent-soft"
>
{t.action.label}
</button>
)}
<button
onClick={() => drop(t.id)}
aria-label="Dismiss"
className="focus-ring grid h-6 w-6 shrink-0 place-items-center rounded-full
text-mute transition-colors hover:bg-[var(--faint)] hover:text-ink"
>
<X className="h-3.5 w-3.5" />
</button>
</motion.div>
))}
</AnimatePresence>