🏗️ Build and Test JellyTau / Run Tests (push) Successful in 4m57s
Traceability Validation / Check Requirement Traces (push) Successful in 22s
Build & Release / Run Tests (push) Successful in 5m13s
🏗️ Build and Test JellyTau / Android Compile Check (push) Successful in 4m30s
Build & Release / Build Linux (push) Successful in 17m52s
Build & Release / Build Android (push) Failing after 58s
Build & Release / Create Release (push) Has been skipped
Navigation: - Split conflated "back" into navigateUp (deterministic route parent) and a history-safe navigateBack that tracks in-app depth via afterNavigate instead of history.length. Fixes the resume-from-background trap where a stale WebView stack left the header arrow stuck on the current page. - /library self-corrects for music/tv/movies (which have dedicated landing pages): a leftover currentLibrary no longer forces the inline content-list view, so "up"/back shows the libraries overview. Live TV / channels / other types still render inline. Startup (unblock first paint): - auth.initialize() no longer awaits security-status, player-config, or session verification before flipping isInitialized. These run fire-and-forget after the session is restored, so the library overview paints without waiting on several serial IPC round-trips. Versioning / CI: - tauri.conf.json + package.json aligned to 0.0.15 (the tag series had drifted to 0.1.0, whose formula-derived versionCode 1000 outran the v0.0.x tags). - Release workflow now pins a monotonic Android versionCode (1000 + major*10000 + minor*100 + patch) so tagged builds never downgrade below prior installs and always increase in semver order. Tests: navigation (4), auth (29), playbackMode (23) green. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
261 lines
8.7 KiB
Svelte
261 lines
8.7 KiB
Svelte
<script lang="ts">
|
|
import { onMount } from "svelte";
|
|
import { page } from "$app/stores";
|
|
import { truncateMiddle } from "$lib/utils/truncateMiddle";
|
|
import { goto } from "$app/navigation";
|
|
import { navigateUp } from "$lib/utils/navigation";
|
|
import { currentLibrary } from "$lib/stores/library";
|
|
import { auth } from "$lib/stores/auth";
|
|
import SearchBar from "$lib/components/common/SearchBar.svelte";
|
|
import BackButton from "$lib/components/common/BackButton.svelte";
|
|
import ResultsCounter from "$lib/components/common/ResultsCounter.svelte";
|
|
import CachedImage from "$lib/components/common/CachedImage.svelte";
|
|
import { useServerReachabilityReload } from "$lib/composables/useServerReachabilityReload";
|
|
import type { Genre, MediaItem, ItemType } from "$lib/api/types";
|
|
|
|
/**
|
|
* Generic genre browser supporting Movies, Music Albums, and TV Series
|
|
* Consolidates duplicate genre-browsing logic across media types
|
|
*
|
|
* @req: UR-007 - Navigate media in library
|
|
* @req: UR-030 - Quick genre browsing and filtering
|
|
* @req: DR-007 - Library browsing screens (genre filtering)
|
|
*/
|
|
|
|
export interface GenreConfig {
|
|
itemTypes: ItemType[]; // ["Movie"] or ["MusicAlbum"] or ["Series"]
|
|
title: string; // "Movie Genres" or "Genres" or "TV Genres"
|
|
backPath: string; // "/library" or "/library/music"
|
|
genreIcon: string; // SVG path for genre icon
|
|
itemDisplayMode: "poster" | "square"; // Aspect ratio: 2/3 or 1/1
|
|
searchPlaceholder?: string; // Optional custom placeholder
|
|
noItemsMessage?: string; // Optional custom empty state
|
|
}
|
|
|
|
interface Props {
|
|
config: GenreConfig;
|
|
}
|
|
|
|
let { config }: Props = $props();
|
|
|
|
let genres = $state<Genre[]>([]);
|
|
let filteredGenres = $state<Genre[]>([]);
|
|
let loading = $state(true);
|
|
let searchQuery = $state("");
|
|
let selectedGenre = $state<Genre | null>(null);
|
|
let genreItems = $state<MediaItem[]>([]);
|
|
let loadingItems = $state(false);
|
|
const { markLoaded } = useServerReachabilityReload(async () => {
|
|
await loadGenres();
|
|
if (selectedGenre) {
|
|
await loadGenreItems(selectedGenre);
|
|
}
|
|
});
|
|
|
|
onMount(async () => {
|
|
await loadGenres();
|
|
// Auto-select a genre when linked with ?genre=<name> (e.g. from a genre tag)
|
|
const requestedGenre = $page.url.searchParams.get("genre");
|
|
if (requestedGenre) {
|
|
const match = genres.find(
|
|
(g) => g.name.toLowerCase() === requestedGenre.toLowerCase(),
|
|
);
|
|
if (match) {
|
|
await loadGenreItems(match);
|
|
}
|
|
}
|
|
markLoaded();
|
|
});
|
|
|
|
async function loadGenres() {
|
|
if (!$currentLibrary) {
|
|
goto(config.backPath);
|
|
return;
|
|
}
|
|
|
|
try {
|
|
loading = true;
|
|
const repo = auth.getRepository();
|
|
const result = await repo.getGenres($currentLibrary.id);
|
|
genres = result.sort((a, b) => a.name.localeCompare(b.name));
|
|
applyFilter();
|
|
} catch (e) {
|
|
console.error("Failed to load genres:", e);
|
|
} finally {
|
|
loading = false;
|
|
}
|
|
}
|
|
|
|
async function loadGenreItems(genre: Genre) {
|
|
if (!$currentLibrary) return;
|
|
|
|
try {
|
|
loadingItems = true;
|
|
selectedGenre = genre;
|
|
const repo = auth.getRepository();
|
|
const result = await repo.getItems($currentLibrary.id, {
|
|
includeItemTypes: config.itemTypes,
|
|
genres: [genre.name],
|
|
sortBy: "SortName",
|
|
sortOrder: "Ascending",
|
|
recursive: true,
|
|
limit: 10000,
|
|
});
|
|
genreItems = result.items;
|
|
} catch (e) {
|
|
console.error("Failed to load genre items:", e);
|
|
} finally {
|
|
loadingItems = false;
|
|
}
|
|
}
|
|
|
|
function applyFilter() {
|
|
let result = [...genres];
|
|
|
|
if (searchQuery.trim()) {
|
|
const query = searchQuery.toLowerCase();
|
|
result = result.filter((genre) => genre.name.toLowerCase().includes(query));
|
|
}
|
|
|
|
filteredGenres = result;
|
|
}
|
|
|
|
function handleSearch(query: string) {
|
|
searchQuery = query;
|
|
applyFilter();
|
|
}
|
|
|
|
function handleGenreClick(genre: Genre) {
|
|
loadGenreItems(genre);
|
|
}
|
|
|
|
function handleItemClick(item: MediaItem) {
|
|
goto(`/library/${item.id}`);
|
|
}
|
|
|
|
function goBack() {
|
|
if (selectedGenre) {
|
|
selectedGenre = null;
|
|
genreItems = [];
|
|
} else {
|
|
navigateUp(config.backPath);
|
|
}
|
|
}
|
|
|
|
const aspectRatioClass = $derived(config.itemDisplayMode === "poster" ? "aspect-[2/3]" : "aspect-square");
|
|
const gridColsClass = $derived(
|
|
config.itemDisplayMode === "poster"
|
|
? "grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5"
|
|
: "grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6"
|
|
);
|
|
const searchPlaceholder = $derived(config.searchPlaceholder || `Search ${config.title.toLowerCase()}...`);
|
|
const noItemsMessage = $derived(config.noItemsMessage || `No ${config.itemTypes[0]?.toLowerCase() || "items"} found in this genre`);
|
|
</script>
|
|
|
|
<div class="space-y-6">
|
|
<!-- Header -->
|
|
<div class="flex items-center gap-4">
|
|
<BackButton onClick={goBack} label="Back" />
|
|
<h1 class="text-3xl font-bold text-white">
|
|
{#if selectedGenre}
|
|
{selectedGenre.name}
|
|
{:else}
|
|
{config.title}
|
|
{/if}
|
|
</h1>
|
|
</div>
|
|
|
|
{#if !selectedGenre}
|
|
<!-- Genre Browser -->
|
|
<SearchBar value={searchQuery} placeholder={searchPlaceholder} onInput={handleSearch} />
|
|
|
|
{#if !loading && filteredGenres.length > 0}
|
|
<ResultsCounter count={filteredGenres.length} itemType="genre" searchQuery={searchQuery} />
|
|
{/if}
|
|
|
|
<!-- Genres Grid -->
|
|
{#if loading}
|
|
<div class="grid {gridColsClass} gap-4">
|
|
{#each Array(12) as _}
|
|
<div class="animate-pulse">
|
|
<div class="aspect-square bg-[var(--color-surface)] rounded-lg"></div>
|
|
<div class="mt-2 h-4 bg-[var(--color-surface)] rounded w-3/4"></div>
|
|
</div>
|
|
{/each}
|
|
</div>
|
|
{:else if filteredGenres.length === 0}
|
|
<div class="text-center py-12 text-gray-400">
|
|
<p>No genres found</p>
|
|
</div>
|
|
{:else}
|
|
<div class="grid {gridColsClass} gap-4">
|
|
{#each filteredGenres as genre (genre.id)}
|
|
<button onclick={() => handleGenreClick(genre)} class="group text-left">
|
|
<div
|
|
class="aspect-square bg-gradient-to-br from-[var(--color-jellyfin)]/20 to-[var(--color-jellyfin)]/5 rounded-lg flex items-center justify-center group-hover:from-[var(--color-jellyfin)]/30 group-hover:to-[var(--color-jellyfin)]/10 transition-all"
|
|
>
|
|
<svg
|
|
class="w-12 h-12 text-[var(--color-jellyfin)] opacity-70 group-hover:opacity-100 transition-opacity"
|
|
fill="currentColor"
|
|
viewBox="0 0 24 24"
|
|
>
|
|
{@html config.genreIcon}
|
|
</svg>
|
|
</div>
|
|
<p class="mt-2 text-sm font-medium text-white truncate group-hover:text-[var(--color-jellyfin)] transition-colors">
|
|
{genre.name}
|
|
</p>
|
|
</button>
|
|
{/each}
|
|
</div>
|
|
{/if}
|
|
{:else}
|
|
<!-- Genre Items View -->
|
|
{#if loadingItems}
|
|
<div class="grid {gridColsClass} gap-4">
|
|
{#each Array(10) as _}
|
|
<div class="animate-pulse">
|
|
<div class="{aspectRatioClass} bg-[var(--color-surface)] rounded-lg"></div>
|
|
<div class="mt-2 h-4 bg-[var(--color-surface)] rounded w-3/4"></div>
|
|
</div>
|
|
{/each}
|
|
</div>
|
|
{:else if genreItems.length === 0}
|
|
<div class="text-center py-12 text-gray-400">
|
|
<p>{noItemsMessage}</p>
|
|
</div>
|
|
{:else}
|
|
<div>
|
|
<ResultsCounter count={genreItems.length} itemType={config.itemTypes[0]?.toLowerCase() || "item"} />
|
|
<div class="grid {gridColsClass} gap-4 mt-4">
|
|
{#each genreItems as item (item.id)}
|
|
<button onclick={() => handleItemClick(item)} class="group text-left">
|
|
<div class="{aspectRatioClass} bg-[var(--color-surface)] rounded-lg overflow-hidden mb-2">
|
|
<CachedImage
|
|
itemId={item.id}
|
|
imageType="Primary"
|
|
tag={item.primaryImageTag}
|
|
maxWidth={300}
|
|
alt={item.name}
|
|
class="w-full h-full object-cover group-hover:scale-105 transition-transform"
|
|
/>
|
|
</div>
|
|
<p class="font-medium text-white truncate group-hover:text-[var(--color-jellyfin)] transition-colors">
|
|
{truncateMiddle(item.name, 40)}
|
|
</p>
|
|
{#if item.productionYear}
|
|
<p class="text-sm text-gray-400">
|
|
{item.productionYear}
|
|
{#if item.communityRating}
|
|
<span class="text-yellow-500 ml-1">★ {item.communityRating.toFixed(1)}</span>
|
|
{/if}
|
|
</p>
|
|
{/if}
|
|
</button>
|
|
{/each}
|
|
</div>
|
|
</div>
|
|
{/if}
|
|
{/if}
|
|
</div>
|