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>
106 lines
3.4 KiB
TypeScript
106 lines
3.4 KiB
TypeScript
"use client";
|
|
|
|
import * as React from "react";
|
|
import { motion } from "framer-motion";
|
|
import { Search } from "lucide-react";
|
|
import type { Job } from "@/lib/api";
|
|
import { item, useMotionOK } from "@/lib/motion";
|
|
|
|
const EXAMPLES = [
|
|
"Radiohead Creep",
|
|
"Kendrick Lamar Money Trees",
|
|
"Fleetwood Mac Dreams",
|
|
"Tame Impala The Less I Know The Better",
|
|
"Frank Ocean Ivy",
|
|
];
|
|
|
|
/**
|
|
* The first screen.
|
|
*
|
|
* It used to be a floating disc, a heading, and five hardcoded example chips —
|
|
* a decorated placeholder that said nothing about this install. Leading with
|
|
* the artwork of what has actually been imported makes the empty state a
|
|
* library view instead, and falls back to the examples only when there is
|
|
* genuinely nothing to show.
|
|
*/
|
|
export function Welcome({
|
|
onPick,
|
|
recent,
|
|
}: {
|
|
onPick: (q: string) => void;
|
|
recent: Job[];
|
|
}) {
|
|
const ok = useMotionOK();
|
|
const seen = new Set<string>();
|
|
const imported = recent
|
|
.filter((j) => j.state === "imported" && j.cover)
|
|
.filter((j) => {
|
|
const k = `${j.artist}|${j.album ?? j.title}`;
|
|
if (seen.has(k)) return false;
|
|
seen.add(k);
|
|
return true;
|
|
})
|
|
.slice(0, 12);
|
|
|
|
return (
|
|
<div className="py-2">
|
|
<div className="mb-8 max-w-[52ch] pt-6">
|
|
<h1 className="text-hero">Find anything.</h1>
|
|
<p className="mt-2.5 text-body text-dim">
|
|
Search a song, preview it, and press Get. It arrives in your library correctly
|
|
tagged — right artist, right album, right track number.
|
|
</p>
|
|
</div>
|
|
|
|
{imported.length > 0 ? (
|
|
<section aria-labelledby="recent-h">
|
|
<h2 id="recent-h" className="mb-3 text-headline">
|
|
Recently added
|
|
</h2>
|
|
<div className="grid grid-cols-[repeat(auto-fill,minmax(132px,1fr))] gap-4">
|
|
{imported.map((j, i) => (
|
|
<motion.button
|
|
key={j.id}
|
|
{...item(i, ok)}
|
|
onClick={() => onPick(`${j.artist} ${j.title}`)}
|
|
className="focus-ring group text-left"
|
|
>
|
|
{/* eslint-disable-next-line @next/next/no-img-element */}
|
|
<img
|
|
src={j.cover!}
|
|
alt=""
|
|
loading="lazy"
|
|
className="lift mb-2 aspect-square w-full rounded-panel border border-edge
|
|
object-cover shadow-[var(--e1)]"
|
|
/>
|
|
<div className="text-callout font-medium clamp1">{j.title}</div>
|
|
<div className="text-caption text-dim clamp1">{j.artist}</div>
|
|
</motion.button>
|
|
))}
|
|
</div>
|
|
</section>
|
|
) : (
|
|
<section aria-labelledby="try-h">
|
|
<h2 id="try-h" className="mb-3 flex items-center gap-2 text-headline">
|
|
<Search className="h-4 w-4 text-mute" /> Try one of these
|
|
</h2>
|
|
<div className="flex flex-wrap gap-2">
|
|
{EXAMPLES.map((e, i) => (
|
|
<motion.button
|
|
key={e}
|
|
{...item(i, ok)}
|
|
onClick={() => onPick(e)}
|
|
className="focus-ring rounded-pill border border-edge bg-[var(--surface)] px-3.5
|
|
py-1.5 text-callout text-dim transition-colors hover:border-accent-line
|
|
hover:bg-accent-soft hover:text-accent"
|
|
>
|
|
{e}
|
|
</motion.button>
|
|
))}
|
|
</div>
|
|
</section>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|