fix(offline): cancellable downloads + stable sidebar progress toast (#694)

* fix(sidebar): keep offline-download toast from squishing in a short window

The toast lives in the sidebar nav flex column; without flex-shrink: 0 the
column compressed it vertically when the main window was small. The label
now also ellipsis-truncates instead of overflowing on a narrow sidebar.

* fix(offline): make offline downloads cancellable down to the Rust transfer

A running offline download could not be stopped — the sidebar X button only
dropped not-yet-started tracks between batches of 8, and the Rust transfer had
no cancellation path at all, so in-flight HTTP streams always ran to completion.

Add an offline_cancel_flags() registry (mirroring sync_cancel_flags for the
device-sync side) plus additive cancel_offline_downloads / clear_offline_cancel
commands. download_track_offline takes an optional download_id, checks the flag
right after acquiring its semaphore slot, and threads it through
finalize_streamed_download / stream_to_file so an in-flight stream aborts at the
next chunk — the partial .part file is cleaned up by the existing error path.

* fix(offline): cancel per-track and clear the sidebar toast immediately

downloadAlbum tags each run with a downloadId, checks for cancellation before
every track instead of once per 8-track batch (which never re-ran for albums of
8 or fewer tracks), and persists tracks that finished before the cancel so they
are not orphaned on disk. cancelDownload / cancelAllDownloads drop every job for
the album and call cancel_offline_downloads so Rust aborts the in-flight
transfers — the toast disappears at once instead of lingering on stuck rows.

Adds offlineJobStore cancellation tests.

* docs(changelog): offline download cancel button + toast sizing fixes
This commit is contained in:
Frank Stellmacher
2026-05-14 20:08:08 +02:00
committed by GitHub
parent 946528350c
commit b4c8ed4b65
12 changed files with 316 additions and 28 deletions
+24 -10
View File
@@ -1,4 +1,5 @@
import { create } from 'zustand';
import { invoke } from '@tauri-apps/api/core';
export interface DownloadJob {
trackId: string;
@@ -8,6 +9,8 @@ export interface DownloadJob {
trackIndex: number;
totalTracks: number;
status: 'queued' | 'downloading' | 'done' | 'error';
/** Unique per `downloadAlbum` run — keys the Rust-side cancellation flag. */
downloadId: string;
}
interface OfflineJobState {
@@ -17,30 +20,41 @@ interface OfflineJobState {
cancelAllDownloads: () => void;
}
// Module-level cancellation set — checked by downloadAlbum before each batch.
// Module-level cancellation set — checked by downloadAlbum before each track.
export const cancelledDownloads = new Set<string>();
/** Tells Rust to abort any in-flight `download_track_offline` calls for these jobs. */
function abortDownloadsInRust(jobs: DownloadJob[]) {
const downloadIds = [...new Set(jobs.map(j => j.downloadId).filter(Boolean))];
if (downloadIds.length > 0) {
invoke('cancel_offline_downloads', { downloadIds }).catch(() => {});
}
}
export const useOfflineJobStore = create<OfflineJobState>()((set, get) => ({
jobs: [],
bulkProgress: {},
cancelDownload: (albumId) => {
cancelledDownloads.add(albumId);
// Remove queued (not yet started) jobs immediately so the counter drops.
// Abort the in-flight Rust transfers, then drop every job for this album
// (queued AND downloading) so the sidebar toast clears right away.
abortDownloadsInRust(get().jobs.filter(j => j.albumId === albumId));
set(state => ({
jobs: state.jobs.filter(j => !(j.albumId === albumId && j.status === 'queued')),
jobs: state.jobs.filter(j => j.albumId !== albumId),
}));
},
cancelAllDownloads: () => {
const unique = [...new Set(
get().jobs
.filter(j => j.status === 'queued' || j.status === 'downloading')
.map(j => j.albumId),
)];
unique.forEach(id => cancelledDownloads.add(id));
const active = get().jobs.filter(
j => j.status === 'queued' || j.status === 'downloading',
);
[...new Set(active.map(j => j.albumId))].forEach(id => cancelledDownloads.add(id));
abortDownloadsInRust(active);
// Keep only already-settled jobs (done/error) — the active ones are gone,
// so the toast disappears instead of lingering on stuck "downloading" rows.
set(state => ({
jobs: state.jobs.filter(j => j.status !== 'queued'),
jobs: state.jobs.filter(j => j.status !== 'queued' && j.status !== 'downloading'),
}));
},
}));