KeelrLeek
a667b4b28e
The previous .git directory was found gutted (only info/ remained), so history is unrecoverable locally. This commit restores version control with the tree exactly as it stands: the working app, the preview-tracks launcher on the artist hero, the scrollable-track-previews design bundle (docs + approved mockups), and the Phase 0 validation artifacts.
599 lines
18 KiB
Svelte
599 lines
18 KiB
Svelte
<script>
|
|
import {
|
|
app,
|
|
ui,
|
|
downloads,
|
|
catalogGo,
|
|
openCatalogArtist,
|
|
warmCatalogArtist,
|
|
cancelCatalogArtistWarmup,
|
|
streamSong,
|
|
streamCatalogAlbum,
|
|
} from "../lib/state.svelte.js";
|
|
import * as api from "../lib/api.js";
|
|
import Icon from "./Icon.svelte";
|
|
|
|
let maximized = $state(false);
|
|
let searchText = $state("");
|
|
|
|
// ---- download status ring (aggregate progress + active count) ----
|
|
const DL_ACTIVE = new Set(["connecting", "requested", "queued", "transferring"]);
|
|
const RING_C = 2 * Math.PI * 9; // circumference of the r=9 progress circle
|
|
|
|
// The ring aggregates over the whole download burst, not just the
|
|
// currently-active transfers — otherwise each finished file drops out
|
|
// of the fraction and the ring jumps backward instead of filling.
|
|
// A burst spans from the first active download (ids are monotonic, so
|
|
// members are `id >= session start`) until the queue drains.
|
|
let dlSession = $state({ min: null });
|
|
|
|
const dl = $derived.by(() => {
|
|
let active = 0;
|
|
let received = 0;
|
|
let total = 0;
|
|
for (const d of Object.values(downloads.items)) {
|
|
const isActive = DL_ACTIVE.has(d.state);
|
|
if (isActive) active += 1;
|
|
if (!d.total) continue;
|
|
if (isActive) {
|
|
received += d.received;
|
|
total += d.total;
|
|
} else if (
|
|
d.state === "complete" &&
|
|
dlSession.min != null &&
|
|
d.id >= dlSession.min
|
|
) {
|
|
received += d.total;
|
|
total += d.total;
|
|
}
|
|
}
|
|
return { active, frac: total > 0 ? Math.min(1, received / total) : 0 };
|
|
});
|
|
|
|
// When the queue drains, flash a full ring + check before hiding, then
|
|
// close out the burst.
|
|
let dlFlash = $state(false);
|
|
let dlHadActive = false;
|
|
$effect(() => {
|
|
if (dl.active > 0) {
|
|
dlHadActive = true;
|
|
dlFlash = false;
|
|
if (dlSession.min == null) {
|
|
let min = Infinity;
|
|
for (const d of Object.values(downloads.items)) {
|
|
if (DL_ACTIVE.has(d.state)) min = Math.min(min, d.id);
|
|
}
|
|
if (min < Infinity) dlSession.min = min;
|
|
}
|
|
} else if (dlHadActive) {
|
|
dlHadActive = false;
|
|
dlFlash = true;
|
|
const t = setTimeout(() => {
|
|
dlFlash = false;
|
|
dlSession.min = null;
|
|
}, 2500);
|
|
return () => clearTimeout(t);
|
|
}
|
|
});
|
|
|
|
// ---- live search suggestions (Spotify-style dropdown) ----
|
|
let sugg = $state(null); // last catalogSearch results for the dropdown
|
|
let suggOpen = $state(false);
|
|
let hi = $state(-1); // highlighted row index, -1 = none
|
|
let suggSeq = 0;
|
|
let debounceTimer = null;
|
|
|
|
const suggRows = $derived.by(() => {
|
|
if (!sugg) return [];
|
|
const rows = [];
|
|
for (const a of sugg.artists.slice(0, 2)) {
|
|
rows.push({ kind: "artist", label: a.name, sub: "Artist", img: a.picture, round: true, data: a });
|
|
}
|
|
for (const al of sugg.albums.slice(0, 3)) {
|
|
const year = al.release_date ? ` · ${al.release_date.slice(0, 4)}` : "";
|
|
rows.push({ kind: "album", label: al.title, sub: `Album · ${al.artist}${year}`, img: al.cover, round: false, data: al });
|
|
}
|
|
for (const t of sugg.tracks.slice(0, 4)) {
|
|
rows.push({ kind: "track", label: t.title, sub: `Song · ${t.artist}`, img: t.cover, round: false, data: t });
|
|
}
|
|
return rows;
|
|
});
|
|
|
|
function onSearchInput() {
|
|
clearTimeout(debounceTimer);
|
|
cancelCatalogArtistWarmup();
|
|
const q = searchText.trim();
|
|
if (q.length < 2) {
|
|
suggOpen = false;
|
|
sugg = null;
|
|
return;
|
|
}
|
|
debounceTimer = setTimeout(async () => {
|
|
const seq = ++suggSeq;
|
|
try {
|
|
const res = await api.catalogSearch(q);
|
|
// Ignore stale responses and results for superseded queries.
|
|
if (seq !== suggSeq || searchText.trim() !== q) return;
|
|
sugg = res;
|
|
hi = -1;
|
|
suggOpen = true;
|
|
// The first artist is overwhelmingly the next click. Warm its
|
|
// one-round-trip overview and art resolver while the user is
|
|
// still reading the dropdown; keyed caches share the work.
|
|
if (res.artists?.[0]) warmCatalogArtist(res.artists[0]);
|
|
} catch {
|
|
// backend unavailable — no suggestions
|
|
}
|
|
}, 250);
|
|
}
|
|
|
|
function closeSuggest() {
|
|
suggOpen = false;
|
|
hi = -1;
|
|
}
|
|
|
|
function pickRow(row) {
|
|
closeSuggest();
|
|
cancelCatalogArtistWarmup();
|
|
if (row.kind === "artist") openCatalogArtist(row.data.id, row.data);
|
|
else if (row.kind === "album") streamCatalogAlbum(row.data);
|
|
else {
|
|
const t = row.data;
|
|
streamSong(t.artist, t.title, {
|
|
cover: t.cover,
|
|
trackId: t.id,
|
|
albumId: t.album_id,
|
|
album: t.album || null,
|
|
expectSecs: t.duration_secs ?? null,
|
|
});
|
|
}
|
|
}
|
|
|
|
function searchKeydown(e) {
|
|
if (!suggOpen || suggRows.length === 0) {
|
|
if (e.key === "Escape") closeSuggest();
|
|
return;
|
|
}
|
|
if (e.key === "ArrowDown") {
|
|
e.preventDefault();
|
|
hi = (hi + 1) % suggRows.length;
|
|
} else if (e.key === "ArrowUp") {
|
|
e.preventDefault();
|
|
hi = hi <= 0 ? suggRows.length - 1 : hi - 1;
|
|
} else if (e.key === "Enter" && hi >= 0) {
|
|
e.preventDefault();
|
|
pickRow(suggRows[hi]);
|
|
} else if (e.key === "Escape") {
|
|
closeSuggest();
|
|
}
|
|
}
|
|
|
|
function searchFocusOut(e) {
|
|
// Keep the panel open while focus moves within the search form.
|
|
if (!e.currentTarget.contains(e.relatedTarget)) closeSuggest();
|
|
}
|
|
|
|
function submitSearch(e) {
|
|
e.preventDefault();
|
|
clearTimeout(debounceTimer);
|
|
suggSeq += 1; // cancel any in-flight suggestion fetch
|
|
closeSuggest();
|
|
catalogGo(searchText);
|
|
}
|
|
|
|
async function syncMaximized() {
|
|
try {
|
|
maximized = await api.win.isMaximized();
|
|
} catch {
|
|
// not running inside Tauri (browser preview)
|
|
}
|
|
}
|
|
|
|
$effect(() => {
|
|
let unlisten = null;
|
|
syncMaximized();
|
|
api.win
|
|
.onResized(syncMaximized)
|
|
.then((f) => (unlisten = f))
|
|
.catch(() => {});
|
|
return () => unlisten?.();
|
|
});
|
|
|
|
function statusClick() {
|
|
if (app.connection === "online") {
|
|
api.disconnect();
|
|
app.connection = "offline";
|
|
} else if (app.connection === "offline") {
|
|
app.showLogin = true;
|
|
}
|
|
}
|
|
</script>
|
|
|
|
<header class="titlebar" data-tauri-drag-region>
|
|
<div class="brand">
|
|
<img class="logo" src="/logo.png" alt="" draggable="false" />
|
|
<span class="name">SoulStream</span>
|
|
</div>
|
|
<button
|
|
class="status {app.connection}"
|
|
onclick={statusClick}
|
|
title={app.connection === "online" ? "Click to disconnect" : "Click to connect"}
|
|
>
|
|
● {app.connection === "online" ? app.username : app.connection}
|
|
</button>
|
|
<form class="bar-search" onsubmit={submitSearch} onfocusout={searchFocusOut}>
|
|
<Icon name="search" size={13} />
|
|
<input
|
|
type="text"
|
|
placeholder="Search artists, albums, songs…"
|
|
bind:value={searchText}
|
|
oninput={onSearchInput}
|
|
onkeydown={searchKeydown}
|
|
onfocus={() => { if (sugg && searchText.trim().length >= 2) suggOpen = true; }}
|
|
spellcheck="false"
|
|
/>
|
|
{#if suggOpen && suggRows.length > 0}
|
|
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
|
<div class="suggest" onmousedown={(e) => e.preventDefault()}>
|
|
{#each suggRows as row, i (row.kind + row.data.id)}
|
|
<button
|
|
type="button"
|
|
class="sugg-row"
|
|
class:active={i === hi}
|
|
onmouseenter={() => (hi = i)}
|
|
onclick={() => pickRow(row)}
|
|
>
|
|
{#if row.img}
|
|
<img class="sugg-img" class:round={row.round} src={row.img} alt="" draggable="false" />
|
|
{:else}
|
|
<div class="sugg-img placeholder" class:round={row.round}>
|
|
<Icon name="music" size={13} />
|
|
</div>
|
|
{/if}
|
|
<span class="sugg-text">
|
|
<span class="sugg-label">{row.label}</span>
|
|
<span class="sugg-sub">{row.sub}</span>
|
|
</span>
|
|
{#if row.kind !== "artist"}
|
|
<span class="sugg-play"><Icon name="play" size={12} /></span>
|
|
{/if}
|
|
</button>
|
|
{/each}
|
|
<button type="button" class="sugg-row all" class:active={hi === -1} onclick={submitSearch}>
|
|
<span class="sugg-all-icon"><Icon name="search" size={13} /></span>
|
|
<span class="sugg-text">
|
|
<span class="sugg-label">See all results for “{searchText.trim()}”</span>
|
|
<span class="sugg-sub">Enter</span>
|
|
</span>
|
|
</button>
|
|
</div>
|
|
{/if}
|
|
</form>
|
|
<div class="controls">
|
|
{#if dl.active > 0 || dlFlash}
|
|
<button
|
|
class="dl-ring"
|
|
title={dlFlash
|
|
? "Downloads finished"
|
|
: `${dl.active} downloading — open Downloads`}
|
|
onclick={() => (ui.view = "downloads")}
|
|
>
|
|
<svg width="26" height="26" viewBox="0 0 26 26">
|
|
<circle class="track" cx="13" cy="13" r="9" />
|
|
<circle
|
|
class="prog"
|
|
cx="13"
|
|
cy="13"
|
|
r="9"
|
|
stroke-dasharray={RING_C}
|
|
stroke-dashoffset={dlFlash ? 0 : RING_C * (1 - dl.frac)}
|
|
transform="rotate(-90 13 13)"
|
|
/>
|
|
{#if dlFlash}
|
|
<path class="tick" d="M9 13.4l2.7 2.7 5.2-5.6" />
|
|
{:else}
|
|
<text x="13" y="16.5" text-anchor="middle">
|
|
{dl.active > 9 ? "9+" : dl.active}
|
|
</text>
|
|
{/if}
|
|
</svg>
|
|
</button>
|
|
{/if}
|
|
<button class="win-btn" title="Minimize" onclick={() => api.win.minimize()}>
|
|
<Icon name="minus" size={16} />
|
|
</button>
|
|
<button
|
|
class="win-btn"
|
|
title={maximized ? "Restore" : "Maximize"}
|
|
onclick={() => api.win.toggleMaximize().then(syncMaximized)}
|
|
>
|
|
<Icon name={maximized ? "restore" : "square"} size={13} />
|
|
</button>
|
|
<button class="win-btn close" title="Close" onclick={() => api.win.close()}>
|
|
<Icon name="x" size={16} />
|
|
</button>
|
|
</div>
|
|
</header>
|
|
|
|
<style>
|
|
/* Lines the brand up with the sidebar's content column below: the bar
|
|
already sits inside the 8px window frame, so 20px more reaches the
|
|
8px sidebar padding + 12px item padding. */
|
|
.titlebar {
|
|
grid-area: titlebar;
|
|
position: relative;
|
|
/* Above the sibling content panels, so the search suggestions
|
|
dropdown paints over album grids instead of interleaving. */
|
|
z-index: 100;
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 10px;
|
|
padding-left: 20px;
|
|
user-select: none;
|
|
-webkit-user-select: none;
|
|
}
|
|
|
|
/* The visible strip above the panels is the 30px bar row plus the 8px
|
|
grid gap; nudge the left cluster down so it centers optically in that
|
|
full strip. The window controls stay flush with the top edge. */
|
|
.brand,
|
|
.status {
|
|
position: relative;
|
|
top: 4px;
|
|
}
|
|
|
|
/* Decorative: let mouse events fall through to the drag region. */
|
|
.brand {
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 10px;
|
|
pointer-events: none;
|
|
}
|
|
|
|
.logo {
|
|
width: 20px;
|
|
height: 20px;
|
|
border-radius: 5px;
|
|
}
|
|
|
|
.name {
|
|
font-weight: 700;
|
|
font-size: 13px;
|
|
}
|
|
|
|
.status {
|
|
font-size: 12px;
|
|
color: var(--text-muted);
|
|
padding: 3px 9px;
|
|
border-radius: 10px;
|
|
}
|
|
|
|
.status:hover {
|
|
background: var(--bg-highlight);
|
|
color: var(--text-secondary);
|
|
}
|
|
|
|
.status.online {
|
|
color: var(--accent-hover);
|
|
}
|
|
|
|
.status.connecting {
|
|
color: #e8a33d;
|
|
}
|
|
|
|
/* Centered on the window regardless of the left cluster's width; the
|
|
same +4px optical nudge as the brand. Dragging still works on the
|
|
uncovered bar either side. */
|
|
.bar-search {
|
|
position: absolute;
|
|
left: 50%;
|
|
top: 7px;
|
|
transform: translateX(-50%);
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 8px;
|
|
width: min(360px, 30vw);
|
|
height: 24px;
|
|
padding: 0 12px;
|
|
border-radius: 12px;
|
|
background: var(--bg-elevated);
|
|
color: var(--text-muted);
|
|
}
|
|
|
|
.bar-search:focus-within {
|
|
outline: 1px solid var(--text-muted);
|
|
color: var(--text-secondary);
|
|
}
|
|
|
|
.bar-search input {
|
|
flex: 1;
|
|
min-width: 0;
|
|
background: none;
|
|
border: none;
|
|
outline: none;
|
|
color: var(--text-primary);
|
|
font-size: 12px;
|
|
}
|
|
|
|
.bar-search input::placeholder {
|
|
color: var(--text-muted);
|
|
}
|
|
|
|
/* ---- live suggestions dropdown ---- */
|
|
.suggest {
|
|
position: absolute;
|
|
top: 30px;
|
|
left: -8px;
|
|
right: -8px;
|
|
display: flex;
|
|
flex-direction: column;
|
|
padding: 6px;
|
|
border-radius: 10px;
|
|
background: var(--bg-elevated);
|
|
box-shadow: 0 10px 32px rgba(0, 0, 0, 0.55);
|
|
z-index: 50;
|
|
}
|
|
|
|
.sugg-row {
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 10px;
|
|
width: 100%;
|
|
padding: 5px 8px;
|
|
border-radius: 7px;
|
|
text-align: left;
|
|
color: var(--text-primary);
|
|
}
|
|
|
|
.sugg-row.active {
|
|
background: var(--bg-highlight);
|
|
}
|
|
|
|
.sugg-img {
|
|
width: 30px;
|
|
height: 30px;
|
|
border-radius: 4px;
|
|
object-fit: cover;
|
|
flex-shrink: 0;
|
|
background: var(--bg-highlight);
|
|
}
|
|
|
|
.sugg-img.round {
|
|
border-radius: 50%;
|
|
}
|
|
|
|
.sugg-img.placeholder {
|
|
display: grid;
|
|
place-items: center;
|
|
color: var(--text-muted);
|
|
}
|
|
|
|
.sugg-text {
|
|
display: flex;
|
|
flex-direction: column;
|
|
min-width: 0;
|
|
flex: 1;
|
|
}
|
|
|
|
.sugg-label {
|
|
font-size: 12px;
|
|
white-space: nowrap;
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
}
|
|
|
|
.sugg-sub {
|
|
font-size: 11px;
|
|
color: var(--text-muted);
|
|
white-space: nowrap;
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
}
|
|
|
|
.sugg-play {
|
|
display: grid;
|
|
place-items: center;
|
|
width: 22px;
|
|
height: 22px;
|
|
border-radius: 50%;
|
|
color: var(--text-muted);
|
|
opacity: 0;
|
|
flex-shrink: 0;
|
|
}
|
|
|
|
.sugg-row:hover .sugg-play,
|
|
.sugg-row.active .sugg-play {
|
|
opacity: 1;
|
|
color: var(--text-primary);
|
|
}
|
|
|
|
.sugg-row.all {
|
|
margin-top: 2px;
|
|
border-top: 1px solid var(--bg-highlight);
|
|
border-radius: 0 0 7px 7px;
|
|
color: var(--text-secondary);
|
|
}
|
|
|
|
.sugg-row.all.active,
|
|
.sugg-row.all:hover {
|
|
background: var(--bg-highlight);
|
|
color: var(--text-primary);
|
|
}
|
|
|
|
.sugg-all-icon {
|
|
display: grid;
|
|
place-items: center;
|
|
width: 30px;
|
|
height: 30px;
|
|
flex-shrink: 0;
|
|
color: var(--text-muted);
|
|
}
|
|
|
|
.controls {
|
|
margin-left: auto;
|
|
display: flex;
|
|
align-self: stretch;
|
|
}
|
|
|
|
/* download status ring */
|
|
.dl-ring {
|
|
align-self: center;
|
|
display: grid;
|
|
place-items: center;
|
|
width: 34px;
|
|
height: 30px;
|
|
margin-right: 4px;
|
|
border-radius: 7px;
|
|
}
|
|
|
|
.dl-ring:hover {
|
|
background: var(--bg-highlight);
|
|
}
|
|
|
|
.dl-ring .track {
|
|
fill: none;
|
|
stroke: rgba(255, 255, 255, 0.16);
|
|
stroke-width: 2.5;
|
|
}
|
|
|
|
.dl-ring .prog {
|
|
fill: none;
|
|
stroke: var(--accent-hover);
|
|
stroke-width: 2.5;
|
|
stroke-linecap: round;
|
|
transition: stroke-dashoffset 0.4s ease;
|
|
}
|
|
|
|
.dl-ring text {
|
|
fill: var(--text-primary);
|
|
font-size: 10px;
|
|
font-weight: 700;
|
|
}
|
|
|
|
.dl-ring .tick {
|
|
fill: none;
|
|
stroke: var(--accent-hover);
|
|
stroke-width: 2;
|
|
stroke-linecap: round;
|
|
stroke-linejoin: round;
|
|
}
|
|
|
|
.win-btn {
|
|
width: 46px;
|
|
display: grid;
|
|
place-items: center;
|
|
color: var(--text-secondary);
|
|
border-radius: 0;
|
|
}
|
|
|
|
.win-btn:hover {
|
|
background: var(--bg-highlight);
|
|
color: var(--text-primary);
|
|
}
|
|
|
|
.win-btn.close:hover {
|
|
background: #c42b1c;
|
|
color: #fff;
|
|
}
|
|
</style>
|