diff --git a/server/lib/services.ts b/server/lib/services.ts index ff68f3f..d219dc2 100644 --- a/server/lib/services.ts +++ b/server/lib/services.ts @@ -132,6 +132,7 @@ interface JellyfinItem { }; SeriesId?: string; SeriesName?: string; + SeriesPrimaryImageTag?: string; ParentIndexNumber?: number; IndexNumber?: number; ParentBackdropItemId?: string; @@ -2801,8 +2802,8 @@ async function getLibrarySnapshot(config: AppConfig): Promise<{ try { [resume, nextUp, allItems] = await Promise.all([ - jellyfinFetch(config, `/Users/${config.jellyfin.userId}/Items/Resume?mediaTypes=Video&enableUserData=true&fields=ProviderIds,Overview,SeriesId,ParentBackdropItemId,ParentBackdropImageTags,RunTimeTicks,ParentIndexNumber,IndexNumber,UserData`), - jellyfinFetch(config, `/Shows/NextUp?userId=${config.jellyfin.userId}&enableUserData=true&fields=ProviderIds,Overview,SeriesId,ParentBackdropItemId,ParentBackdropImageTags,RunTimeTicks,ParentIndexNumber,IndexNumber,UserData`), + jellyfinFetch(config, `/Users/${config.jellyfin.userId}/Items/Resume?mediaTypes=Video&enableUserData=true&fields=ProviderIds,Overview,SeriesId,SeriesPrimaryImageTag,ParentBackdropItemId,ParentBackdropImageTags,RunTimeTicks,ParentIndexNumber,IndexNumber,UserData`), + jellyfinFetch(config, `/Shows/NextUp?userId=${config.jellyfin.userId}&enableUserData=true&fields=ProviderIds,Overview,SeriesId,SeriesPrimaryImageTag,ParentBackdropItemId,ParentBackdropImageTags,RunTimeTicks,ParentIndexNumber,IndexNumber,UserData`), jellyfinFetch( config, `/Users/${config.jellyfin.userId}/Items?recursive=true&includeItemTypes=Movie,Series&fields=ProviderIds,DateCreated,DateLastMediaAdded,Overview,ImageTags,BackdropImageTags,ProductionYear` @@ -3770,7 +3771,10 @@ function jellyfinToCard( return null; } - const posterTag = item.ImageTags?.Primary || ''; + const posterItemId = item.Type === 'Episode' && item.SeriesId ? item.SeriesId : item.Id; + const posterTag = item.Type === 'Episode' + ? item.SeriesPrimaryImageTag || item.ImageTags?.Primary || '' + : item.ImageTags?.Primary || ''; const backdropItemId = item.ParentBackdropItemId || item.Id; const backdropTag = item.ParentBackdropImageTags?.[0] || item.BackdropImageTags?.[0] || posterTag; const progress = Math.round(item.UserData?.PlayedPercentage || 0); @@ -3789,7 +3793,7 @@ function jellyfinToCard( : item.Type || 'Library', overview: item.Overview || '', mediaType: item.Type === 'Movie' ? 'movie' : item.Type === 'Episode' ? 'episode' : 'series', - posterUrl: `/api/assets/jellyfin/${item.Id}?kind=Primary&maxWidth=480&tag=${encodeURIComponent(posterTag)}`, + posterUrl: `/api/assets/jellyfin/${posterItemId}?kind=Primary&maxWidth=480&tag=${encodeURIComponent(posterTag)}`, backdropUrl: `/api/assets/jellyfin/${backdropItemId}?kind=Backdrop&maxWidth=1920&tag=${encodeURIComponent(backdropTag)}`, badge: item.Type || 'Jellyfin', progress: progress > 0 ? progress : undefined, diff --git a/src/App.tsx b/src/App.tsx index 2c70746..cac348e 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -566,31 +566,69 @@ function Sidebar(props: { busy: boolean onExitProfile: () => void }) { + const [menuOpen, setMenuOpen] = useState(false) const hasServiceFailure = props.connections.some((connection) => !connection.ok) + useEffect(() => { + function closeOnEscape(event: KeyboardEvent) { + if (event.key === 'Escape') { + setMenuOpen(false) + } + } + + window.addEventListener('keydown', closeOnEscape) + return () => window.removeEventListener('keydown', closeOnEscape) + }, []) + + function navigate(route: AppRoute) { + setMenuOpen(false) + startTransition(() => props.setRoute(route)) + } + return ( - + ) } function DiskSpaceIndicator({ diskSpace }: { diskSpace: DiskSpaceStatus }) { - const availablePercentage = diskSpace.totalBytes > 0 - ? Math.max(0, Math.min(100, (diskSpace.availableBytes / diskSpace.totalBytes) * 100)) + const usedPercentage = diskSpace.totalBytes > 0 + ? Math.max(0, Math.min(100, ((diskSpace.totalBytes - diskSpace.availableBytes) / diskSpace.totalBytes) * 100)) : 0 return (
- + @@ -1347,7 +1386,12 @@ function MediaTile(props: { }} type="button" > - {imageUrl ? {props.card.title} :
} + {imageUrl ? ( + + {props.styleType === 'landscape' || props.styleType === 'episode' ? : null} + {props.card.title} + + ) :
} {showLandscapeLogo ? (
@@ -1677,7 +1721,7 @@ function TitleDetailsModal(props: { || props.card.firstAirDate?.slice(0, 4) || displaySubtitle.match(/\b(19|20)\d{2}\b/)?.[0] || '' - const truncatedOverview = truncateOverview(displayOverview, 260) + const truncatedOverview = truncateOverview(displayOverview, window.matchMedia('(max-width: 980px)').matches ? 150 : 260) const shouldShowOverviewToggle = truncatedOverview !== displayOverview const jellyfinPlayerUrl = playerTarget && props.config.jellyfin.baseUrl ? buildJellyfinPlayerUrl(props.config.jellyfin.baseUrl, playerTarget.id) @@ -2175,6 +2219,12 @@ function TitleDetailsModal(props: {

{displayTitle}

)}
+ {canPlay ? ( + setPlayerTarget({ id: playId!, title: playLabel })} variant="play"> + + Play + + ) : null}

{isOverviewExpanded ? displayOverview : truncatedOverview} @@ -2193,7 +2243,7 @@ function TitleDetailsModal(props: {

{canPlay && details?.mediaType !== 'series' ? ( - setPlayerTarget({ id: playId!, title: playLabel })} variant="play"> + setPlayerTarget({ id: playId!, title: playLabel })} variant="play"> Play @@ -2250,6 +2300,16 @@ function TitleDetailsModal(props: { {details.seasons.length ? (
Season +