From 23de1dd120e94a6a072447b683c9a6a8346ea32e Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Mon, 2 Nov 2026 00:07:01 -0500 Subject: [PATCH] fix: show album formats with older servers and fit narrow headers --- .../app/(app)/(tabs)/home/album/[id].tsx | 20 +++++++++++++--- apps/web/components/album-view.tsx | 24 +++++++++++++++---- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx index efd1406..54632b2 100644 --- a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx +++ b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx @@ -76,6 +76,20 @@ export default function AlbumScreen() { [album] ) + // Older servers do not include album format availability yet. + const formatTracks = useCachedQuery( + api.library.getSongsForPlayback, + album && (album.hasLossless === undefined || album.hasAtmos === undefined) + ? { ids: songIds } + : "skip" + ) + const hasLossless = + album?.hasLossless ?? + formatTracks?.some((track) => track && "lossless" in track.files) + const hasAtmos = + album?.hasAtmos ?? + formatTracks?.some((track) => track && "atmos" in track.files) + useEffect(() => { if (album) { rememberSongs(albumDetailSongs(album)) @@ -233,7 +247,7 @@ export default function AlbumScreen() { {metadata} ) : null} - {album.hasLossless ? ( + {hasLossless ? ( <> {metadata ? ( @@ -247,9 +261,9 @@ export default function AlbumScreen() { /> ) : null} - {album.hasAtmos ? ( + {hasAtmos ? ( <> - {metadata || album.hasLossless ? ( + {metadata || hasLossless ? ( · diff --git a/apps/web/components/album-view.tsx b/apps/web/components/album-view.tsx index 00323ac..9d6d598 100644 --- a/apps/web/components/album-view.tsx +++ b/apps/web/components/album-view.tsx @@ -22,6 +22,8 @@ import { } from "@/components/media-context-menu" import { Button } from "@/components/ui/button" import { ScrollArea } from "@/components/ui/scroll-area" +import { useCachedQuery } from "@/hooks/use-cached-query" +import { api } from "@otunes/convex/_generated/api" import { useQueueMediaActions } from "@/hooks/use-queue-media-actions" import { useTrackSelection } from "@/hooks/use-track-selection" import { cn } from "@/lib/utils" @@ -274,6 +276,20 @@ export function AlbumView({ [album.tracks] ) + // Older servers do not include album format availability yet. + const formatTracks = useCachedQuery( + api.library.getSongsForPlayback, + album.hasLossless === undefined || album.hasAtmos === undefined + ? { ids: albumSongIds } + : "skip" + ) + const hasLossless = + album.hasLossless ?? + formatTracks?.some((track) => track && "lossless" in track.files) + const hasAtmos = + album.hasAtmos ?? + formatTracks?.some((track) => track && "atmos" in track.files) + React.useEffect(() => { rememberSongs(albumDetailSongs(album)) }, [album]) @@ -373,7 +389,7 @@ export function AlbumView({ return (
- +
@@ -407,15 +423,15 @@ export function AlbumView({
{metadata ? {metadata} : null} - {album.hasLossless ? ( + {hasLossless ? ( <> {metadata ? · : null} ) : null} - {album.hasAtmos ? ( + {hasAtmos ? ( <> - {metadata || album.hasLossless ? ( + {metadata || hasLossless ? ( · ) : null}