dtourolle
eb76c96e94
Skipping to the next episode left a mid-episode resume point behind, so the skipped episode reappeared in Continue Watching with a partial progress bar. Skipping means "done with this one", not "stopped here". - reportSkippedEpisode marks the outgoing episode played instead of reporting a stop position, and arms a one-shot suppression consumed by the player's stop handler, so VideoPlayer's post-navigation unmount stop report can't overwrite the 100% progress with the partial one. - Continue Watching drops resume entries superseded by Next Up: an in-progress episode whose series has a next-up entry strictly later in series order (season, then episode) is hidden from the Home and TV rows. Movies, series without a next-up entry, and items with unknown or mixed ordering are always kept. Adds UR-059, DR-088, DR-089. TRACES: UR-059 | DR-088, DR-089
105 lines
3.8 KiB
TypeScript
105 lines
3.8 KiB
TypeScript
// Home screen data store - featured items, continue watching, recently added
|
|
// TRACES: UR-023, UR-024, UR-034, UR-059 | DR-026, DR-027, DR-038, DR-039, DR-089
|
|
import { writable, derived } from "svelte/store";
|
|
import type { MediaItem } from "$lib/api/types";
|
|
import { auth } from "./auth";
|
|
import { filterSupersededResumeItems } from "./continueWatchingFilter";
|
|
|
|
interface HomeState {
|
|
heroItems: MediaItem[];
|
|
resumeItems: MediaItem[];
|
|
nextUpItems: MediaItem[];
|
|
latestItems: MediaItem[];
|
|
recentlyPlayedAudio: MediaItem[];
|
|
resumeMovies: MediaItem[];
|
|
isLoading: boolean;
|
|
error: string | null;
|
|
}
|
|
|
|
function createHomeStore() {
|
|
const initialState: HomeState = {
|
|
heroItems: [],
|
|
resumeItems: [],
|
|
nextUpItems: [],
|
|
latestItems: [],
|
|
recentlyPlayedAudio: [],
|
|
resumeMovies: [],
|
|
isLoading: false,
|
|
error: null,
|
|
};
|
|
|
|
const { subscribe, set, update } = writable<HomeState>(initialState);
|
|
|
|
async function loadHomeSections() {
|
|
// Only show loading spinner when no data is available yet
|
|
update(s => ({ ...s, isLoading: s.heroItems.length === 0 && s.latestItems.length === 0, error: null }));
|
|
|
|
try {
|
|
const repo = auth.getRepository();
|
|
|
|
// Use allSettled so one failing section (e.g. Next Up is online-only and
|
|
// rejects offline) doesn't wipe out the whole homepage. Each section falls
|
|
// back to an empty list; cached sections (resume/latest/recent) still show.
|
|
const settled = await Promise.allSettled([
|
|
repo.getResumeItems(undefined, 12),
|
|
repo.getNextUpEpisodes(undefined, 12),
|
|
repo.getLatestItems("", 16),
|
|
repo.getRecentlyPlayedAudio(12), // Backend now handles intelligent grouping
|
|
repo.getResumeMovies(12),
|
|
]);
|
|
|
|
const valueOr = <T>(i: number, fallback: T): T =>
|
|
settled[i].status === "fulfilled" ? (settled[i] as PromiseFulfilledResult<T>).value : fallback;
|
|
|
|
const rawResume = valueOr(0, [] as typeof initialState.resumeItems);
|
|
const nextUp = valueOr(1, [] as typeof initialState.nextUpItems);
|
|
// Drop episodes the user has already moved past (their series' Next Up
|
|
// points further ahead) so Continue Watching isn't cluttered with stale
|
|
// partial positions left behind by skipping.
|
|
const resume = filterSupersededResumeItems(rawResume, nextUp);
|
|
const latest = valueOr(2, [] as typeof initialState.latestItems);
|
|
const recentAudio = valueOr(3, [] as typeof initialState.recentlyPlayedAudio);
|
|
const resumeMovies = valueOr(4, [] as typeof initialState.resumeMovies);
|
|
|
|
// Use resume items or latest as hero items
|
|
const hero = resume.length >= 3 ? resume.slice(0, 5) : latest.slice(0, 5);
|
|
|
|
update(s => ({
|
|
...s,
|
|
heroItems: hero,
|
|
resumeItems: resume,
|
|
nextUpItems: nextUp,
|
|
latestItems: latest,
|
|
recentlyPlayedAudio: recentAudio,
|
|
resumeMovies: resumeMovies,
|
|
isLoading: false,
|
|
}));
|
|
} catch (error) {
|
|
const message = error instanceof Error ? error.message : "Failed to load home sections";
|
|
update(s => ({ ...s, isLoading: false, error: message }));
|
|
console.error("Failed to load home sections:", error);
|
|
}
|
|
}
|
|
|
|
function reset() {
|
|
set(initialState);
|
|
}
|
|
|
|
return {
|
|
subscribe,
|
|
loadHomeSections,
|
|
reset,
|
|
};
|
|
}
|
|
|
|
export const home = createHomeStore();
|
|
|
|
// Derived stores for convenience
|
|
export const heroItems = derived(home, $home => $home.heroItems);
|
|
export const resumeItems = derived(home, $home => $home.resumeItems);
|
|
export const nextUpItems = derived(home, $home => $home.nextUpItems);
|
|
export const latestItems = derived(home, $home => $home.latestItems);
|
|
export const recentlyPlayedAudio = derived(home, $home => $home.recentlyPlayedAudio);
|
|
export const resumeMovies = derived(home, $home => $home.resumeMovies);
|
|
export const isHomeLoading = derived(home, $home => $home.isLoading);
|