Compare commits

..
127 changed files with 667 additions and 8070 deletions

No files matched your search

+1 -6
View File
@@ -41,9 +41,4 @@ apps/web/next-env.d.ts
/.convex
/.cursor
/database
docker-compose.yml
**/credentials.json
**/credentials/
**/*.ipa
**/*.apk
docker-compose.yml
+15 -7
View File
@@ -25,16 +25,20 @@ FROM node:${NODE_VERSION} AS dependencies
WORKDIR /app
# Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex).
# Mobile's manifest is never copied, so the workspace globs cannot discover it.
# The workspace file must be the real one: its overrides and patches are
# checked against the lockfile.
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
# Mobile is intentionally omitted so its deps are never installed.
COPY package.json pnpm-lock.yaml .npmrc ./
# pnpm validates patches even when their packages are outside the install filter.
COPY patches ./patches
COPY apps/web/package.json ./apps/web/
COPY packages/convex/package.json ./packages/convex/
RUN printf '\n%s\n' \
# Explicit workspace — do not use apps/* so mobile cannot be discovered.
RUN printf '%s\n' \
'packages:' \
' - "apps/web"' \
' - "packages/convex"' \
>> pnpm-workspace.yaml \
&& printf '\n%s\n' \
'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \
@@ -78,11 +82,15 @@ FROM node:${NODE_VERSION} AS convex-functions
WORKDIR /app
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
COPY package.json pnpm-lock.yaml .npmrc ./
COPY patches ./patches
COPY packages/convex/package.json ./packages/convex/
RUN printf '\n%s\n' \
RUN printf '%s\n' \
'packages:' \
' - "packages/convex"' \
> pnpm-workspace.yaml \
&& printf '\n%s\n' \
'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \
@@ -1,11 +1,7 @@
import { Stack } from "expo-router"
import { renderTabScreenContent } from "@/components/tab-screen-content"
import {
inlineTitleOptions,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
export default function TabletSectionLayout({ segment }: { segment: string }) {
@@ -18,7 +14,6 @@ export default function TabletSectionLayout({ segment }: { segment: string }) {
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...options,
...inlineTitleOptions,
title:
route.name === "index"
? section?.title
@@ -5,7 +5,6 @@ import Songs from "../home/browse/songs"
import Playlists from "../home/browse/playlists"
import Favorites from "../home/playlist/favorites"
import RecentlyPlayed from "../home/recently-played"
import Downloads from "../home/downloads"
import { TabletSectionContext } from "@/lib/tablet-navigation"
const screens = {
@@ -15,7 +14,6 @@ const screens = {
playlists: Playlists,
favorites: Favorites,
recent: RecentlyPlayed,
downloads: Downloads,
}
export default function TabletSectionScreen() {
@@ -1 +0,0 @@
export { default } from "../../home/downloads"
@@ -1 +0,0 @@
export { default } from "../../home/downloads/other"
-8
View File
@@ -193,14 +193,6 @@ function TabsContent() {
<NativeTabs.Trigger.Icon sf="music.note" />
<NativeTabs.Trigger.Label>Songs</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger
name="(downloads)"
hidden={!(Platform.OS === "ios" && Platform.isPad)}
disableTransparentOnScrollEdge
>
<NativeTabs.Trigger.Icon sf="arrow.down.circle" />
<NativeTabs.Trigger.Label>Downloads</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger
name="(playlists)"
hidden={!(Platform.OS === "ios" && Platform.isPad)}
+13 -11
View File
@@ -2,12 +2,7 @@ import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import {
inlineTitleOptions,
showHeaderProfile,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
export const unstable_settings = {
anchor: "index",
@@ -21,12 +16,19 @@ export default function HomeLayout() {
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
...inlineTitleOptions,
title: tabStackScreenTitles[route.name] ?? "Home",
// iOS shows the profile button inline with the screen title instead.
headerRight: showHeaderProfile(route.name)
? () => <ProfileHeaderButton />
: undefined,
headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
unstable_headerRightItems:
route.name === "index"
? () => [
{
type: "custom",
element: <ProfileHeaderButton />,
hidesSharedBackground: true,
},
]
: undefined,
})}
/>
)
+39 -102
View File
@@ -22,18 +22,6 @@ import {
DiscHeader,
} from "@/components/collection-list"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import {
CollectionDownloadButton,
DownloadedQuality,
} from "@/components/collection-download-button"
import { useOpenedFromDownloads } from "@/lib/downloads-navigation"
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
import {
useDownloads,
useIsCollectionDownloaded,
useSongDownloadState,
useToggleSongDownload,
} from "@/contexts/downloads"
import { CoverImage } from "@/components/cover-image"
import {
@@ -70,18 +58,9 @@ export default function AlbumScreen() {
api.library.browseAlbumDetail,
typeof id === "string" ? { id: id as Id<"albums"> } : "skip"
)
const {
playAlbum,
playAlbumShuffled,
playFromSong,
playInOrder,
playShuffled,
} = usePlaybackActions()
const fromDownloads = useOpenedFromDownloads()
const playOrigin = fromDownloads
? downloadsQueueOrigin(`album:${id}`)
: `album:${id}`
const { isSongFavorite } = useFavorites()
const { playAlbum, playAlbumShuffled, playFromSong } = usePlaybackActions()
const { isAlbumFavorite, toggleAlbumFavorite, isSongFavorite } =
useFavorites()
const {
handleAlbumDetailAction,
handleAlbumTrackAction,
@@ -102,17 +81,6 @@ export default function AlbumScreen() {
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
[album]
)
const { requestDownload, removeDownload } = useDownloads()
const downloadTarget = useMemo(
() => ({
kind: "album" as const,
id: typeof id === "string" ? id : "",
title: album?.title ?? "",
songIds,
}),
[album?.title, id, songIds]
)
const albumDownloaded = useIsCollectionDownloaded(downloadTarget)
useEffect(() => {
if (album) {
@@ -124,8 +92,8 @@ export default function AlbumScreen() {
const playTrack = useCallback(
(songId: Id<"songs">, ids: Id<"songs">[]) =>
playFromSong(songId, ids, playOrigin),
[playOrigin, playFromSong]
playFromSong(songId, ids, `album:${id}`),
[id, playFromSong]
)
const renderItem = useCallback(
@@ -204,6 +172,7 @@ export default function AlbumScreen() {
}
const metadata = formatMetadata(album.genre, album.year)
const favorited = isAlbumFavorite(album.id)
return (
<>
@@ -228,22 +197,15 @@ export default function AlbumScreen() {
stationArtistId={album.artist.id}
selectedCount={album.tracks.length}
favorited={isAlbumFav(album.id)}
downloaded={albumDownloaded}
share={{ type: "album", albumId: album.id, title: album.title }}
onAction={(action) => {
if (action === "download") {
void requestDownload(downloadTarget)
} else if (action === "remove-download") {
void removeDownload(downloadTarget)
} else {
void handleAlbumDetailAction(
album.id as Id<"albums">,
songIds,
action,
album.artist.id as Id<"artists">
)
}
}}
onAction={(action) =>
void handleAlbumDetailAction(
album.id as Id<"albums">,
songIds,
action,
album.artist.id as Id<"artists">
)
}
>
<Pressable hitSlop={8}>
<Ionicons
@@ -299,15 +261,35 @@ export default function AlbumScreen() {
heroLayout.landscape && { flexDirection: "row-reverse" },
]}
>
<Pressable
onPress={() => void toggleAlbumFavorite(album.id)}
hitSlop={8}
style={[
styles.iconAction,
{ backgroundColor: palette.surface },
]}
>
<Ionicons
name={favorited ? "star" : "star-outline"}
size={24}
color={favorited ? palette.accent : palette.foreground}
/>
</Pressable>
<Button
title="Play"
icon="play"
onPress={() => void playAlbum(album.id, songIds)}
style={styles.playButton}
tint={{
background: palette.accent,
foreground: palette.accentForeground,
}}
/>
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={() =>
void (fromDownloads
? playShuffled(songIds, playOrigin)
: playAlbumShuffled(album.id, songIds))
}
onPress={() => void playAlbumShuffled(album.id, songIds)}
style={[
styles.iconAction,
{ backgroundColor: palette.surface },
@@ -319,28 +301,6 @@ export default function AlbumScreen() {
color={palette.foreground}
/>
</Pressable>
<Button
title="Play"
icon="play"
onPress={() =>
void (fromDownloads
? playInOrder(songIds, playOrigin)
: playAlbum(album.id, songIds))
}
style={styles.playButton}
tint={{
background: palette.accent,
foreground: palette.accentForeground,
}}
/>
<CollectionDownloadButton
target={downloadTarget}
color={palette.foreground}
style={[
styles.iconAction,
{ backgroundColor: palette.surface },
]}
/>
</View>
}
>
@@ -412,11 +372,6 @@ export default function AlbumScreen() {
</>
) : null}
</View>
<DownloadedQuality
collection={downloadTarget}
color={palette.secondaryForeground}
backgroundColor={palette.background}
/>
</CollectionHero>
</MusicEntityView>
<CollectionDivider color={palette.divider} />
@@ -496,13 +451,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
}) {
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
const { config } = useServerConfig()
const downloadRef = useMemo(
() => ({ kind: "album" as const, id: album.id }),
[album.id]
)
const downloadState = useSongDownloadState(track.id, downloadRef)
const downloaded = downloadState === "here"
const toggleDownload = useToggleSongDownload()
return (
<MediaContextMenu
preview={
@@ -519,7 +467,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
}
stationArtistId={album.artist.id}
favorited={favorited}
downloaded={downloaded}
navigation={{
artist: { id: album.artist.id },
album: { id: album.id },
@@ -538,8 +485,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
backgroundColor={palette.background}
onPlayNext={() => void onAction(track, album, "play-next")}
onAddToQueue={() => void onAction(track, album, "play-last")}
downloaded={downloaded}
onDownload={() => toggleDownload(track, downloaded, downloadRef)}
style={styles.trackRow}
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
>
@@ -570,14 +515,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
</Text>
) : null}
</View>
{downloaded || downloadState === "device" ? (
<Ionicons
name="arrow-down-circle"
size={14}
color={palette.secondaryForeground}
accessibilityLabel="Downloaded"
/>
) : null}
<Text style={{ color: palette.secondaryForeground }}>
{formatDuration(track.durationSeconds)}
</Text>
@@ -53,7 +53,7 @@ export default function AlbumsScreen() {
return (
<>
{searchBar}
<MediaGridSkeleton title="Albums" />
<MediaGridSkeleton />
</>
)
}
@@ -63,7 +63,6 @@ export default function AlbumsScreen() {
{searchBar}
<MediaGridList
title="Albums"
content={albums}
paddingBottom={contentBottomInset}
onEndReached={() => {
@@ -2,13 +2,12 @@ import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
import { memo, useCallback } from "react"
import {
type FlatList,
FlatList,
Pressable,
StyleSheet,
Text,
type ListRenderItemInfo,
} from "react-native"
import Animated from "react-native-reanimated"
import {
MediaContextMenu,
@@ -16,7 +15,6 @@ import {
} from "@/components/media-context-menu"
import { CoverImage } from "@/components/cover-image"
import { ArtistListSkeleton } from "@/components/skeletons"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { contentBottomInset } from "@/components/player"
import { useServerConfig } from "@/contexts/server-config"
import {
@@ -35,7 +33,6 @@ import { spacing, useThemeColors } from "@/lib/theme"
const PAGE_SIZE = 50
export default function ArtistsScreen() {
const { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseArtist>>()
const { push } = useAppNavigation()
const colors = useThemeColors()
const { config } = useServerConfig()
@@ -97,7 +94,7 @@ export default function ArtistsScreen() {
return (
<>
{searchBar}
<ArtistListSkeleton title="Artists" />
<ArtistListSkeleton />
</>
)
}
@@ -106,11 +103,8 @@ export default function ArtistsScreen() {
<>
{searchBar}
<Animated.FlatList
<FlatList
{...longListProps}
ref={ref}
scrollEventThrottle={16}
ListHeaderComponent={<ScreenTitle title="Artists" scrollY={scrollY} />}
data={artists}
keyExtractor={artistKey}
renderItem={renderItem}
@@ -1,4 +1,3 @@
import { useContext } from "react"
import { Pressable } from "react-native"
import { MediaGridList } from "@/components/media-cards"
@@ -11,20 +10,19 @@ import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
import { SymbolView } from "expo-symbols"
import { useAddToPlaylist } from "@/contexts/add-to-playlist"
import { TabletSectionContext } from "@/lib/tablet-navigation"
export default function PlaylistsTabScreen() {
const colors = useThemeColors()
const playlists = useCachedQuery(api.playlists.listAllPlaylists)
const { openCreatePlaylist } = useAddToPlaylist()
const title = useContext(TabletSectionContext)?.title ?? "Playlists"
if (playlists === undefined) {
return (
<>
<Stack.Screen
options={{
title,
title: "Playlists",
headerLargeTitle: true,
headerRight: () => (
<Pressable
onPress={openCreatePlaylist}
@@ -40,7 +38,7 @@ export default function PlaylistsTabScreen() {
),
}}
/>
<MediaGridSkeleton title={title} />
<MediaGridSkeleton />
</>
)
}
@@ -49,7 +47,8 @@ export default function PlaylistsTabScreen() {
<>
<Stack.Screen
options={{
title,
title: "Playlists",
headerLargeTitle: true,
headerRight: () => (
<Pressable
onPress={openCreatePlaylist}
@@ -62,7 +61,6 @@ export default function PlaylistsTabScreen() {
}}
/>
<MediaGridList
title={title}
content={playlists}
paddingBottom={tabContentBottomInset}
/>
@@ -1,16 +1,10 @@
import { Stack } from "expo-router"
import { useCallback, useState } from "react"
import {
type FlatList,
StyleSheet,
type ListRenderItemInfo,
} from "react-native"
import Animated from "react-native-reanimated"
import { FlatList, StyleSheet, type ListRenderItemInfo } from "react-native"
import type { MediaAction } from "@/components/media-context-menu"
import { contentBottomInset, SongListRow } from "@/components/player"
import { SongListSkeleton } from "@/components/skeletons"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
import {
@@ -26,7 +20,6 @@ import { longListProps } from "@/lib/list"
const PAGE_SIZE = 50
export default function SongsScreen() {
const { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseSong>>()
const { playFromLibrarySong } = usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
@@ -94,7 +87,7 @@ export default function SongsScreen() {
return (
<>
{searchBar}
<SongListSkeleton title="Songs" />
<SongListSkeleton />
</>
)
}
@@ -103,11 +96,8 @@ export default function SongsScreen() {
<>
{searchBar}
<Animated.FlatList
<FlatList
{...longListProps}
ref={ref}
scrollEventThrottle={16}
ListHeaderComponent={<ScreenTitle title="Songs" scrollY={scrollY} />}
data={songs}
keyExtractor={songKey}
renderItem={renderItem}
@@ -1,188 +0,0 @@
import { useMemo } from "react"
import {
type FlatList,
Pressable,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
import { Stack } from "expo-router"
import Animated from "react-native-reanimated"
import { CoverImage } from "@/components/cover-image"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { tabContentBottomInset } from "@/components/player"
import {
FAVORITES_DOWNLOAD_ID,
useDownloads,
useDownloadsVersion,
} from "@/contexts/downloads"
import { useServerConfig } from "@/contexts/server-config"
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { useAppNavigation } from "@/lib/app-navigation"
import {
FROM_DOWNLOADS_PARAM,
OTHER_DOWNLOADS_TITLE,
} from "@/lib/downloads-navigation"
import { radius, spacing, useThemeColors } from "@/lib/theme"
import { albumCoverUrl, playlistCoverUrl } from "@/lib/urls"
import type { DownloadedCollection } from "@otunes/convex/client/download-queue"
import { formatBytes } from "@otunes/convex/download-quality"
type Card =
| { kind: "other"; songCount: number; bytes: number }
| { kind: "collection"; collection: DownloadedCollection; bytes: number }
function songCount(count: number) {
return count === 1 ? "1 song" : `${count} songs`
}
function collectionPath({ kind, id }: DownloadedCollection) {
if (kind === "album") return `/album/${id}?${FROM_DOWNLOADS_PARAM}`
if (id === FAVORITES_DOWNLOAD_ID) {
return `/playlist/favorites?${FROM_DOWNLOADS_PARAM}`
}
return `/playlist/${id}?${FROM_DOWNLOADS_PARAM}`
}
/** Downloaded albums and playlists, newest first, after Other Downloaded Songs. */
export default function DownloadsScreen() {
const colors = useThemeColors()
const { config } = useServerConfig()
const { queue } = useDownloads()
const version = useDownloadsVersion()
const { push } = useAppNavigation()
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
useMediaGridLayout()
const { ref, scrollY } = useScreenTitleScroll<FlatList<Card>>()
const cards = useMemo<Card[]>(() => {
if (!queue) return []
const breakdown = queue.breakdown()
const bytesByCollection = new Map(
breakdown.collections.map((row) => [row.collection, row.bytes])
)
const other: Card[] =
breakdown.otherSongs.songIds.length > 0
? [
{
kind: "other",
songCount: breakdown.otherSongs.songIds.length,
bytes: breakdown.otherSongs.bytes,
},
]
: []
return [
...other,
...queue
.collections()
.reverse()
.map((collection): Card => ({
kind: "collection",
collection,
bytes: bytesByCollection.get(collection) ?? 0,
})),
]
// version invalidates the lookup when downloads change.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [queue, version])
function renderItem({ item }: ListRenderItemInfo<Card>) {
if (!config) return null
const isOther = item.kind === "other"
const collection = isOther ? null : item.collection
const isFavorites = collection?.id === FAVORITES_DOWNLOAD_ID
const title = collection?.title ?? OTHER_DOWNLOADS_TITLE
const subtitle = isOther
? `${songCount(item.songCount)} · ${formatBytes(item.bytes)}`
: `${collection!.kind === "album" ? "Album" : "Playlist"} · ${formatBytes(item.bytes)}`
const coverUri = !collection
? ""
: collection.kind === "album"
? albumCoverUrl(config.serverUrl, collection.id)
: playlistCoverUrl(config.serverUrl, collection.id, null)
return (
<Pressable
accessibilityRole="button"
style={[styles.card, { width: cardWidth }]}
onPress={() =>
push(collection ? collectionPath(collection) : "/downloads/other")
}
>
<CoverImage
uri={coverUri}
hasCover={collection !== null && !isFavorites}
placeholderIcon={isOther ? "arrow-down" : "star"}
style={{
width: cardWidth,
height: cardWidth,
borderRadius: radius.md,
}}
/>
<Text
style={[styles.title, { color: colors.foreground }]}
numberOfLines={1}
>
{title}
</Text>
<Text
style={[styles.subtitle, { color: colors.mutedForeground }]}
numberOfLines={1}
>
{subtitle}
</Text>
</Pressable>
)
}
return (
<>
<Stack.Screen options={{ title: "Downloads" }} />
<Animated.FlatList
ref={ref}
scrollEventThrottle={16}
key={columns}
onLayout={onLayout}
data={cards}
keyExtractor={(card) =>
card.kind === "other"
? "other"
: `${card.collection.kind}:${card.collection.id}`
}
renderItem={renderItem}
numColumns={columns}
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{
paddingHorizontal: horizontalPadding,
paddingBottom: tabContentBottomInset,
gap,
}}
columnWrapperStyle={columns > 1 ? { gap } : undefined}
contentInsetAdjustmentBehavior="automatic"
ListHeaderComponent={
<ScreenTitle
title="Downloads"
scrollY={scrollY}
// The list padding already insets the title.
style={{ paddingHorizontal: 0 }}
/>
}
ListEmptyComponent={
<View style={styles.empty}>
<Text style={{ color: colors.mutedForeground }}>
Nothing downloaded on this device.
</Text>
</View>
}
/>
</>
)
}
const styles = StyleSheet.create({
card: { gap: spacing.xs },
title: { fontSize: 14, fontWeight: "600" },
subtitle: { fontSize: 12, fontVariant: ["tabular-nums"] },
empty: { alignItems: "center", paddingTop: spacing.xl },
})
@@ -1,162 +0,0 @@
import { useCallback, useMemo } from "react"
import {
type FlatList,
Pressable,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
import Animated from "react-native-reanimated"
import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { useSwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
import type { MediaAction } from "@/components/media-context-menu"
import { contentBottomInset, SongListRow } from "@/components/player"
import { Button } from "@/components/ui/primitives"
import { useDownloads, useDownloadsVersion } from "@/contexts/downloads"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { OTHER_DOWNLOADS_TITLE } from "@/lib/downloads-navigation"
import { longListProps } from "@/lib/list"
import { useSongs } from "@/lib/song-cache"
import { spacing, useThemeColors } from "@/lib/theme"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
import type { BrowseSong } from "@otunes/convex/types"
const PLAY_ORIGIN = downloadsQueueOrigin("other")
/** Songs downloaded on their own. Playback here always uses the downloads. */
export default function OtherDownloadsScreen() {
const colors = useThemeColors()
const { queue } = useDownloads()
const version = useDownloadsVersion()
const songIds = useMemo(
() =>
(queue?.otherSongIds() ?? [])
.filter((songId) => queue?.getDownloaded(songId))
.reverse() as Id<"songs">[],
// version invalidates the lookup when downloads change.
// eslint-disable-next-line react-hooks/exhaustive-deps
[queue, version]
)
const cachedSongs = useSongs(songIds)
const songs = useMemo(
() => cachedSongs.filter((song): song is BrowseSong => song != null),
[cachedSongs]
)
const playableIds = useMemo(() => songs.map((song) => song.id), [songs])
const { playFromSong, playInOrder, playShuffled } = usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
const swipeGroup = useSwipeRowGroup()
const { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseSong>>()
const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, playableIds, PLAY_ORIGIN),
[playFromSong, playableIds]
)
const handleAction = useCallback(
(song: BrowseSong, action: MediaAction) =>
void handleSongAction(song, action, "other"),
[handleSongAction]
)
const renderItem = useCallback(
({ item: song }: ListRenderItemInfo<BrowseSong>) => (
<SongListRow
song={song}
favorited={isSongFavorite(song.id)}
downloadFrom="other"
swipe={{
group: swipeGroup,
backgroundColor: colors.background,
onPlayNext: () => handleAction(song, "play-next"),
onAddToQueue: () => handleAction(song, "play-last"),
}}
onPlay={handlePlaySong}
onAction={handleAction}
/>
),
[
colors.background,
handleAction,
handlePlaySong,
isSongFavorite,
swipeGroup,
]
)
return (
<>
<Stack.Screen options={{ title: OTHER_DOWNLOADS_TITLE }} />
<Animated.FlatList
{...longListProps}
ref={ref}
scrollEventThrottle={16}
data={songs}
keyExtractor={(song) => song.id}
renderItem={renderItem}
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{ paddingBottom: contentBottomInset }}
contentInsetAdjustmentBehavior="automatic"
onScrollBeginDrag={swipeGroup.closeOpenRow}
ListHeaderComponent={
<>
<ScreenTitle title={OTHER_DOWNLOADS_TITLE} scrollY={scrollY} />
{songs.length > 0 ? (
<View style={styles.actions}>
<Button
title="Play"
icon="play"
onPress={() => void playInOrder(playableIds, PLAY_ORIGIN)}
style={styles.play}
/>
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={() => void playShuffled(playableIds, PLAY_ORIGIN)}
style={[styles.shuffle, { backgroundColor: colors.card }]}
>
<Ionicons
name="shuffle"
size={24}
color={colors.foreground}
/>
</Pressable>
</View>
) : null}
</>
}
ListEmptyComponent={
<Text style={[styles.empty, { color: colors.mutedForeground }]}>
Songs you download on their own appear here.
</Text>
}
/>
</>
)
}
const styles = StyleSheet.create({
actions: {
flexDirection: "row",
alignItems: "center",
gap: spacing.sm,
padding: spacing.lg,
},
play: { flex: 1 },
shuffle: {
width: 48,
height: 48,
borderRadius: 24,
alignItems: "center",
justifyContent: "center",
},
empty: { padding: spacing.lg, textAlign: "center" },
})
+4 -24
View File
@@ -1,11 +1,8 @@
import { memo } from "react"
import { type ScrollViewInstance, StyleSheet } from "react-native"
import Animated from "react-native-reanimated"
import { ScrollView, StyleSheet } from "react-native"
import { ContentCarousel } from "@/components/media-cards"
import { HomeSkeleton } from "@/components/skeletons"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabContentBottomInset } from "@/components/player"
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api"
@@ -41,7 +38,6 @@ const HomeCarousels = memo(function HomeCarousels({
export default function HomeScreen() {
const colors = useThemeColors()
const { ref, scrollY } = useScreenTitleScroll<ScrollViewInstance>()
const recentlyAdded = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated,
{},
@@ -57,18 +53,14 @@ export default function HomeScreen() {
(result) => result.status === "LoadingFirstPage" && !result.isCached
)
if (isLoading) {
return (
<HomeSkeleton title="Home" titleAccessory={<ProfileHeaderButton />} />
)
return <HomeSkeleton />
}
const added = recentlyAdded.results.slice(0, CAROUSEL_ITEM_LIMIT)
const played = recentlyPlayed.results.slice(0, CAROUSEL_ITEM_LIMIT)
return (
<Animated.ScrollView
ref={ref}
scrollEventThrottle={16}
<ScrollView
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[
styles.content,
@@ -76,14 +68,8 @@ export default function HomeScreen() {
]}
contentInsetAdjustmentBehavior="automatic"
>
<ScreenTitle
title="Home"
scrollY={scrollY}
accessory={<ProfileHeaderButton />}
style={styles.title}
/>
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
</Animated.ScrollView>
</ScrollView>
)
}
@@ -92,10 +78,4 @@ const styles = StyleSheet.create({
padding: spacing.lg,
gap: spacing.xl,
},
// The content padding already insets the title.
title: {
paddingHorizontal: 0,
marginTop: -spacing.lg,
marginBottom: -spacing.md,
},
})
@@ -44,19 +44,6 @@ import {
import { CollectionDetailSkeleton } from "@/components/skeletons"
import { Button } from "@/components/ui/primitives"
import { contentBottomInset, SongListRow } from "@/components/player"
import {
CollectionDownloadButton,
type CollectionDownloadTarget,
DownloadedQuality,
} from "@/components/collection-download-button"
import { useOpenedFromDownloads } from "@/lib/downloads-navigation"
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
import type { CollectionRef } from "@otunes/convex/client/download-queue"
import {
FAVORITES_DOWNLOAD_ID,
useDownloads,
useIsCollectionDownloaded,
} from "@/contexts/downloads"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
@@ -189,17 +176,10 @@ function PlaylistContent({
const router = useRouter()
const isFocused = useIsFocused()
const colors = useThemeColors()
const {
playPlaylist,
playPlaylistShuffled,
playFromSong,
playInOrder,
playShuffled,
} = usePlaybackActions()
const fromDownloads = useOpenedFromDownloads()
const { playPlaylist, playPlaylistShuffled, playFromSong } =
usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction, handlePlaylistDetailAction } = useMediaMenuActions()
const { requestDownload, removeDownload } = useDownloads()
const subscribe = useMutation(api.playlists.subscribeToPlaylist)
const unsubscribe = useMutation(api.playlists.unsubscribeFromPlaylist)
const deletePlaylist = useMutation(api.playlists.deletePlaylist)
@@ -212,25 +192,11 @@ function PlaylistContent({
const { filteredSongs, onQueryChange, onSearchSubmit } =
usePlaylistSearch(songs)
const swipeGroup = useSwipeRowGroup()
const downloadRef = useMemo(
() => ({
kind: "playlist" as const,
id: playlistId ?? FAVORITES_DOWNLOAD_ID,
}),
[playlistId]
)
const downloadTarget = useMemo(
() => ({ ...downloadRef, title: playlist.title, songIds }),
[downloadRef, playlist.title, songIds]
)
const playOrigin = fromDownloads
? downloadsQueueOrigin(`playlist:${downloadRef.id}`)
: `playlist:${playlistId}`
const playlistDownloaded = useIsCollectionDownloaded(downloadTarget)
const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
[playFromSong, songIds, playOrigin]
(song: BrowseSong) =>
void playFromSong(song.id, songIds, `playlist:${playlistId}`),
[playFromSong, songIds, playlistId]
)
const handleRemoveSong = useCallback(
@@ -254,34 +220,18 @@ function PlaylistContent({
const handleSongMenuAction = useCallback(
(song: BrowseSong, action: MediaAction) => {
if (action === "remove-from-playlist") void handleRemoveSong(song.id)
else void handleSongAction(song, action, downloadRef)
else void handleSongAction(song, action)
},
[downloadRef, handleRemoveSong, handleSongAction]
[handleRemoveSong, handleSongAction]
)
const handlePlay = useCallback(() => {
if (fromDownloads) void playInOrder(songIds, playOrigin)
else if (playlistId) void playPlaylist(playlistId, songIds)
}, [
fromDownloads,
playInOrder,
playOrigin,
playPlaylist,
playlistId,
songIds,
])
if (playlistId) void playPlaylist(playlistId, songIds)
}, [playPlaylist, playlistId, songIds])
const handleShuffle = useCallback(() => {
if (fromDownloads) void playShuffled(songIds, playOrigin)
else if (playlistId) void playPlaylistShuffled(playlistId, songIds)
}, [
fromDownloads,
playShuffled,
playOrigin,
playPlaylistShuffled,
playlistId,
songIds,
])
if (playlistId) void playPlaylistShuffled(playlistId, songIds)
}, [playPlaylistShuffled, playlistId, songIds])
const handleSubscribeToggle = useCallback(async () => {
if (!playlistId) return
@@ -325,14 +275,6 @@ function PlaylistContent({
}
return
}
if (action === "download") {
void requestDownload(downloadTarget)
return
}
if (action === "remove-download") {
void removeDownload(downloadTarget)
return
}
void handlePlaylistDetailAction(songIds, action)
}
@@ -353,7 +295,6 @@ function PlaylistContent({
<MediaActionMenu
selectedCount={songIds.length}
playlistLabel={PLAYLIST_LABEL}
downloaded={playlistDownloaded}
share={{
type: "playlist",
playlistId: playlistId ?? "favorites",
@@ -376,10 +317,6 @@ function PlaylistContent({
canEdit,
colors.foreground,
deletePlaylist,
downloadTarget,
playlistDownloaded,
requestDownload,
removeDownload,
handlePlaylistDetailAction,
palette.foreground,
palette.isDark,
@@ -397,7 +334,6 @@ function PlaylistContent({
removable={canEdit}
palette={palette}
swipeGroup={swipeGroup}
downloadRef={downloadRef}
onPlay={handlePlaySong}
onAction={handleSongMenuAction}
onRemove={handleRemoveSong}
@@ -405,7 +341,6 @@ function PlaylistContent({
),
[
canEdit,
downloadRef,
handlePlaySong,
handleRemoveSong,
handleSongMenuAction,
@@ -460,7 +395,6 @@ function PlaylistContent({
isSubscribed={isSubscribed}
showSubscribe={!playlist.isOwner && playlistId !== null}
onSubscribeToggle={handleSubscribeToggle}
downloadTarget={downloadTarget}
onPlay={handlePlay}
onShuffle={handleShuffle}
/>
@@ -480,7 +414,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
removable,
palette,
swipeGroup,
downloadRef,
onPlay,
onAction,
onRemove,
@@ -490,7 +423,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
removable: boolean
palette: CoverPalette
swipeGroup: SwipeRowGroup
downloadRef: CollectionRef
onPlay: (song: BrowseSong) => void
onAction: (song: BrowseSong, action: MediaAction) => void
onRemove: (songId: Id<"songs">) => Promise<boolean>
@@ -505,7 +437,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
palette={palette}
inset
removable={removable}
downloadFrom={downloadRef}
swipe={
Platform.OS !== "web"
? {
@@ -571,11 +502,9 @@ const PlaylistHero = memo(function PlaylistHero({
isSubscribed,
showSubscribe = false,
onSubscribeToggle,
downloadTarget,
onPlay,
onShuffle,
}: {
downloadTarget: CollectionDownloadTarget
entityId: string
coverUri: string
hasCover: boolean
@@ -643,15 +572,6 @@ const PlaylistHero = memo(function PlaylistHero({
/>
</Pressable>
) : null}
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={onShuffle}
style={[styles.iconAction, { backgroundColor: palette.surface }]}
>
<Ionicons name="shuffle" size={24} color={palette.foreground} />
</Pressable>
<Button
title="Play"
icon="play"
@@ -662,11 +582,15 @@ const PlaylistHero = memo(function PlaylistHero({
foreground: palette.accentForeground,
}}
/>
<CollectionDownloadButton
target={downloadTarget}
color={palette.foreground}
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={onShuffle}
style={[styles.iconAction, { backgroundColor: palette.surface }]}
/>
>
<Ionicons name="shuffle" size={24} color={palette.foreground} />
</Pressable>
</View>
}
>
@@ -687,11 +611,6 @@ const PlaylistHero = memo(function PlaylistHero({
>
{ownerName}
</Text>
<DownloadedQuality
collection={downloadTarget}
color={palette.secondaryForeground}
backgroundColor={palette.background}
/>
</CollectionHero>
<CollectionDivider color={palette.divider} />
</MusicEntityView>
@@ -16,14 +16,6 @@ import { CollectionDivider } from "@/components/collection-list"
import { CollectionDetailSkeleton } from "@/components/skeletons"
import { Button } from "@/components/ui/primitives"
import { contentBottomInset, SongListRow } from "@/components/player"
import {
CollectionDownloadButton,
type CollectionDownloadTarget,
DownloadedQuality,
} from "@/components/collection-download-button"
import { useOpenedFromDownloads } from "@/lib/downloads-navigation"
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
import { FAVORITES_DOWNLOAD_ID } from "@/contexts/downloads"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
@@ -39,7 +31,6 @@ import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
const DOWNLOAD_REF = { kind: "playlist", id: FAVORITES_DOWNLOAD_ID } as const
export default function FavoritesScreen() {
const colors = useThemeColors()
@@ -50,18 +41,6 @@ export default function FavoritesScreen() {
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
const fromDownloads = useOpenedFromDownloads()
const playOrigin = fromDownloads
? downloadsQueueOrigin("playlist:favorites")
: undefined
const downloadTarget = useMemo(
() => ({
...DOWNLOAD_REF,
title: favorites?.title ?? "Favorites",
songIds,
}),
[favorites?.title, songIds]
)
const { filteredSongs, onQueryChange, onSearchSubmit } =
usePlaylistSearch(songs)
@@ -70,21 +49,21 @@ export default function FavoritesScreen() {
}, [songs])
const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
[playFromSong, playOrigin, songIds]
(song: BrowseSong) => void playFromSong(song.id, songIds),
[playFromSong, songIds]
)
const handleSongMenuAction = useCallback(
(song: BrowseSong, action: MediaAction) =>
void handleSongAction(song, action, DOWNLOAD_REF),
void handleSongAction(song, action),
[handleSongAction]
)
const handlePlay = useCallback(
() => void playInOrder(songIds, playOrigin),
[playInOrder, playOrigin, songIds]
() => void playInOrder(songIds),
[playInOrder, songIds]
)
const handleShuffle = useCallback(
() => void playShuffled(songIds, playOrigin),
[playShuffled, playOrigin, songIds]
() => void playShuffled(songIds),
[playShuffled, songIds]
)
const renderItem = useCallback(
@@ -94,7 +73,6 @@ export default function FavoritesScreen() {
favorited={isSongFavorite(song.id)}
playlistLabel="Add to Another Playlist"
inset
downloadFrom={DOWNLOAD_REF}
onPlay={handlePlaySong}
onAction={handleSongMenuAction}
/>
@@ -149,7 +127,6 @@ export default function FavoritesScreen() {
ListHeaderComponent={
<FavoritesHero
title={favorites.title}
downloadTarget={downloadTarget}
onPlay={handlePlay}
onShuffle={handleShuffle}
/>
@@ -165,12 +142,10 @@ function songKey(song: BrowseSong) {
const FavoritesHero = memo(function FavoritesHero({
title,
downloadTarget,
onPlay,
onShuffle,
}: {
title: string
downloadTarget: CollectionDownloadTarget
onPlay: () => void
onShuffle: () => void
}) {
@@ -191,12 +166,13 @@ const FavoritesHero = memo(function FavoritesHero({
<Text style={[styles.title, { color: colors.foreground }]}>
{title}
</Text>
<DownloadedQuality
collection={DOWNLOAD_REF}
color={colors.mutedForeground}
backgroundColor={colors.background}
/>
<View style={styles.actions}>
<Button
title="Play"
icon="play"
onPress={onPlay}
style={styles.playButton}
/>
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
@@ -206,17 +182,6 @@ const FavoritesHero = memo(function FavoritesHero({
>
<Ionicons name="shuffle" size={24} color={colors.foreground} />
</Pressable>
<Button
title="Play"
icon="play"
onPress={onPlay}
style={styles.playButton}
/>
<CollectionDownloadButton
target={downloadTarget}
color={colors.foreground}
style={[styles.iconAction, { backgroundColor: colors.muted }]}
/>
</View>
</View>
<CollectionDivider />
@@ -14,12 +14,11 @@ export default function RecentlyAddedScreen() {
)
if (status === "LoadingFirstPage" && !isCached) {
return <MediaGridSkeleton title="Recently Added" />
return <MediaGridSkeleton />
}
return (
<MediaGridList
title="Recently Added"
content={results}
paddingBottom={contentBottomInset}
onEndReached={() => {
@@ -14,12 +14,11 @@ export default function RecentlyPlayedScreen() {
)
if (status === "LoadingFirstPage" && !isCached) {
return <MediaGridSkeleton title="Recently Played" />
return <MediaGridSkeleton />
}
return (
<MediaGridList
title="Recently Played"
content={results}
paddingBottom={contentBottomInset}
onEndReached={() => {
+2 -335
View File
@@ -3,10 +3,9 @@ import { Ionicons } from "@expo/vector-icons"
import { useAction, useMutation, useQuery } from "convex/react"
import { Image } from "expo-image"
import * as ImagePicker from "expo-image-picker"
import { useEffect, useMemo, useState } from "react"
import { useState } from "react"
import { router } from "expo-router"
import {
Alert,
Platform,
Pressable,
ScrollView,
@@ -17,20 +16,7 @@ import {
} from "react-native"
import type { StyleProp, ViewStyle } from "react-native"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import { contentBottomInset } from "@/components/player"
import { useDownloads, useDownloadsVersion } from "@/contexts/downloads"
import {
readRememberedDownloadQuality,
writeRememberedDownloadQuality,
} from "@/lib/downloads"
import {
DOWNLOAD_QUALITIES,
DOWNLOAD_QUALITY_DETAILS,
DOWNLOAD_QUALITY_LABELS,
formatBytes,
type DownloadQuality,
} from "@otunes/convex/download-quality"
import { Button, Input, LoadingView } from "@/components/ui/primitives"
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
import { useServerConfig } from "@/contexts/server-config"
@@ -49,7 +35,7 @@ import type { PlaybackQuality } from "@otunes/convex/playback-stream"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
type Section = "profile" | "quality" | "downloads" | "library" | "users"
type Section = "profile" | "quality" | "library" | "users"
type CurrentUser = {
_id: Id<"users">
@@ -89,7 +75,6 @@ const QUALITY_OPTIONS: {
const SECTIONS: SectionConfig[] = [
{ id: "profile", label: "Profile", icon: "person-circle-outline" },
{ id: "quality", label: "Playback", icon: "volume-high-outline" },
{ id: "downloads", label: "Downloads", icon: "arrow-down-circle-outline" },
{ id: "library", label: "Library", icon: "library-outline", admin: true },
{ id: "users", label: "Users", icon: "people-outline", admin: true },
]
@@ -171,7 +156,6 @@ export default function SettingsScreen() {
</>
) : null}
{section === "quality" ? <QualitySection user={user} /> : null}
{section === "downloads" ? <DownloadsSection /> : null}
{section === "library" && isAdmin ? <LibrarySection /> : null}
{section === "users" && isAdmin && allUsers ? (
<UsersSection users={allUsers} currentUserId={user._id} />
@@ -448,298 +432,6 @@ function QualitySection({ user }: { user: CurrentUser }) {
)
}
/** Shades of the text color, faintest for the smallest files. */
const QUALITY_OPACITY: Record<DownloadQuality, number> = {
medium: 0.25,
high: 0.45,
lossless: 0.7,
atmos: 1,
}
function songCount(count: number) {
return count === 1 ? "1 song" : `${count} songs`
}
function QualityName({
quality,
color,
backgroundColor,
}: {
quality: DownloadQuality
color: string
backgroundColor: string
}) {
if (quality === "lossless" || quality === "atmos") {
return (
<AudioFormatBadge
format={quality}
color={color}
backgroundColor={backgroundColor}
/>
)
}
return (
<Text style={{ color, fontSize: 13, fontWeight: "500" }}>
{DOWNLOAD_QUALITY_LABELS[quality]}
</Text>
)
}
function confirm(title: string, onConfirm: () => void) {
Alert.alert(title, undefined, [
{ text: "Cancel", style: "cancel" },
{ text: "Remove", style: "destructive", onPress: onConfirm },
])
}
function RememberedQualityCard() {
const colors = useThemeColors()
// undefined until read; null means ask every time.
const [remembered, setRemembered] = useState<DownloadQuality | null>()
useEffect(() => {
void readRememberedDownloadQuality().then((quality) =>
setRemembered(quality ?? null)
)
}, [])
const options: {
value: DownloadQuality | null
label: string
detail: string
}[] = [
{ value: null, label: "Ask every time", detail: "Choose when downloading" },
...DOWNLOAD_QUALITIES.map((quality) => ({
value: quality,
label: DOWNLOAD_QUALITY_LABELS[quality],
detail: DOWNLOAD_QUALITY_DETAILS[quality],
})),
]
return (
<SettingsCard title="Download Quality">
{options.map((option) => {
const selected = remembered === option.value
return (
<Pressable
key={option.value ?? "ask"}
accessibilityRole="button"
accessibilityState={{ selected }}
onPress={() => {
setRemembered(option.value)
void writeRememberedDownloadQuality(option.value ?? undefined)
}}
style={[
styles.optionRow,
{
borderColor: selected ? colors.primary : colors.border,
backgroundColor: selected ? colors.muted : colors.card,
},
]}
>
<View style={styles.optionCopy}>
<Text style={[styles.optionTitle, { color: colors.foreground }]}>
{option.label}
</Text>
<Text style={{ color: colors.mutedForeground }}>
{option.detail}
</Text>
</View>
{selected ? (
<Ionicons
name="checkmark-circle"
size={22}
color={colors.primary}
/>
) : null}
</Pressable>
)
})}
</SettingsCard>
)
}
function DownloadsSection() {
const colors = useThemeColors()
const { queue } = useDownloads()
const version = useDownloadsVersion()
const breakdown = useMemo(
() => queue?.breakdown(),
// version invalidates the breakdown when downloads change.
// eslint-disable-next-line react-hooks/exhaustive-deps
[queue, version]
)
if (!queue || !breakdown) return null
const qualities = breakdown.byQuality.filter((entry) => entry.songs > 0)
return (
<>
<SettingsCard title="Storage">
<Text style={{ color: colors.foreground, fontSize: 15 }}>
{formatBytes(breakdown.bytes)} · {songCount(breakdown.songs)}
{breakdown.queued > 0 ? ` · ${breakdown.queued} downloading` : ""}
</Text>
{breakdown.songs > 0 ? (
<>
<View
style={[styles.storageBar, { backgroundColor: colors.muted }]}
>
{qualities.map((entry) => (
<View
key={entry.quality}
style={{
flex: entry.bytes,
backgroundColor: colors.foreground,
opacity: QUALITY_OPACITY[entry.quality],
}}
/>
))}
</View>
{qualities.map((entry) => (
<View key={entry.quality} style={styles.storageRow}>
<View
style={[
styles.storageDot,
{
backgroundColor: colors.foreground,
opacity: QUALITY_OPACITY[entry.quality],
},
]}
/>
<View style={{ flex: 1 }}>
<QualityName
quality={entry.quality}
color={colors.foreground}
backgroundColor={colors.card}
/>
</View>
<Text style={{ color: colors.mutedForeground, fontSize: 13 }}>
{songCount(entry.songs)}
</Text>
<Text
style={[styles.storageSize, { color: colors.foreground }]}
>
{formatBytes(entry.bytes)}
</Text>
</View>
))}
</>
) : null}
</SettingsCard>
<RememberedQualityCard />
{breakdown.collections.length > 0 ||
breakdown.otherSongs.songIds.length > 0 ? (
<SettingsCard title="Downloaded">
{breakdown.collections.map(
({ collection, bytes, status, fallbackCount }) => (
<View
key={`${collection.kind}:${collection.id}`}
style={styles.storageRow}
>
<View style={styles.optionCopy}>
<Text
style={{ color: colors.foreground, fontSize: 15 }}
numberOfLines={1}
>
{collection.title}
</Text>
<View style={styles.collectionMeta}>
<Text
style={{ color: colors.mutedForeground, fontSize: 13 }}
>
{collection.kind === "album" ? "Album" : "Playlist"} ·
</Text>
<QualityName
quality={collection.quality}
color={colors.mutedForeground}
backgroundColor={colors.card}
/>
{fallbackCount > 0 ? (
<Text
style={{ color: colors.mutedForeground, fontSize: 13 }}
>
({fallbackCount} in High)
</Text>
) : null}
{status.downloaded < status.total ? (
<Text
style={{ color: colors.mutedForeground, fontSize: 13 }}
>
· {status.downloaded} of {status.total}
</Text>
) : null}
</View>
</View>
<Text
style={[styles.storageSize, { color: colors.foreground }]}
>
{formatBytes(bytes)}
</Text>
<Pressable
hitSlop={8}
accessibilityRole="button"
accessibilityLabel={`Remove download of ${collection.title}`}
onPress={() =>
confirm(
`Remove ${collection.title}?`,
() => void queue.removeCollection(collection)
)
}
>
<Ionicons
name="trash-outline"
size={20}
color={colors.mutedForeground}
/>
</Pressable>
</View>
)
)}
{breakdown.otherSongs.songIds.length > 0 ? (
<View style={styles.storageRow}>
<View style={styles.optionCopy}>
<Text style={{ color: colors.foreground, fontSize: 15 }}>
Other Downloaded Songs
</Text>
<Text style={{ color: colors.mutedForeground, fontSize: 13 }}>
{songCount(breakdown.otherSongs.songIds.length)}
</Text>
</View>
<Text style={[styles.storageSize, { color: colors.foreground }]}>
{formatBytes(breakdown.otherSongs.bytes)}
</Text>
<Pressable
hitSlop={8}
accessibilityRole="button"
accessibilityLabel="Remove Other Downloaded Songs"
onPress={() =>
confirm(
"Remove Other Downloaded Songs?",
() => void queue.removeOtherSongs()
)
}
>
<Ionicons
name="trash-outline"
size={20}
color={colors.mutedForeground}
/>
</Pressable>
</View>
) : null}
<Button
title="Remove All Downloads"
variant="destructive"
onPress={() =>
confirm("Remove all downloads?", () => void queue.removeAll())
}
/>
</SettingsCard>
) : null}
</>
)
}
function LibrarySection() {
const updateLibrary = useAction(api.actions.updateLibrary)
const cleanupHlsStreams = useAction(api.actions.adminCleanupHlsStreams)
@@ -1182,31 +874,6 @@ const styles = StyleSheet.create({
divider: {
height: StyleSheet.hairlineWidth,
},
storageBar: {
height: 8,
borderRadius: 4,
overflow: "hidden",
flexDirection: "row",
},
storageRow: {
flexDirection: "row",
alignItems: "center",
gap: spacing.md,
minHeight: 36,
},
storageDot: { width: 8, height: 8, borderRadius: 4 },
storageSize: {
minWidth: 56,
textAlign: "right",
fontSize: 13,
fontVariant: ["tabular-nums"],
},
collectionMeta: {
flexDirection: "row",
alignItems: "center",
flexWrap: "wrap",
gap: 4,
},
optionRow: {
borderWidth: 1,
borderRadius: radius.lg,
@@ -3,12 +3,7 @@ import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import {
inlineTitleOptions,
showHeaderProfile,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
export const unstable_settings = {
anchor: "index",
@@ -23,14 +18,21 @@ export default function LibraryLayout() {
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
...inlineTitleOptions,
title:
tabStackScreenTitles[route.name] ??
(tabletLayout ? "Recently Added" : "Library"),
// iOS shows the profile button inline with the screen title instead.
headerRight: showHeaderProfile(route.name)
? () => <ProfileHeaderButton />
: undefined,
headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
unstable_headerRightItems:
route.name === "index"
? () => [
{
type: "custom",
element: <ProfileHeaderButton />,
hidesSharedBackground: true,
},
]
: undefined,
})}
/>
)
@@ -1 +0,0 @@
export { default } from "../../home/downloads"
@@ -1 +0,0 @@
export { default } from "../../home/downloads/other"
+1 -18
View File
@@ -8,7 +8,6 @@ import { Ionicons } from "@expo/vector-icons"
import { MediaGridList } from "@/components/media-cards"
import { tabContentBottomInset } from "@/components/player"
import { MediaGridSkeleton } from "@/components/skeletons"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
import { useAppNavigation } from "@/lib/app-navigation"
import { api } from "@otunes/convex/_generated/api"
@@ -25,11 +24,6 @@ const links = [
{ title: "Artists", href: "/browse/artists", icon: "mic.fill" as const },
{ title: "Albums", href: "/browse/albums", icon: "square.stack" as const },
{ title: "Songs", href: "/browse/songs", icon: "music.note" as const },
{
title: "Downloads",
href: "/downloads",
icon: "arrow.down.circle" as const,
},
{
title: "Recently Played",
href: "/recently-played",
@@ -57,7 +51,6 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
clock: "time",
sparkles: "sparkles",
star: "star",
"arrow.down.circle": "arrow-down-circle",
}
return (
<Ionicons
@@ -73,7 +66,6 @@ export default function LibraryScreen() {
const { push } = useAppNavigation()
const isTablet = tabletLayout
const colors = useThemeColors()
const title = isTablet ? "Recently Added" : "Library"
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated,
{},
@@ -126,20 +118,11 @@ export default function LibraryScreen() {
)
if (status === "LoadingFirstPage" && !isCached) {
return (
<MediaGridSkeleton
title={title}
titleAccessory={<ProfileHeaderButton />}
contentInset={false}
header={listHeader}
/>
)
return <MediaGridSkeleton contentInset={false} header={listHeader} />
}
return (
<MediaGridList
title={title}
titleAccessory={<ProfileHeaderButton />}
content={results}
paddingBottom={tabContentBottomInset}
contentInset={false}
+13 -11
View File
@@ -2,12 +2,7 @@ import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import {
inlineTitleOptions,
showHeaderProfile,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
export const unstable_settings = {
anchor: "index",
@@ -21,12 +16,19 @@ export default function SearchLayout() {
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
...inlineTitleOptions,
title: tabStackScreenTitles[route.name] ?? "Search",
// iOS shows the profile button inline with the screen title instead.
headerRight: showHeaderProfile(route.name)
? () => <ProfileHeaderButton />
: undefined,
headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
unstable_headerRightItems:
route.name === "index"
? () => [
{
type: "custom",
element: <ProfileHeaderButton />,
hidesSharedBackground: true,
},
]
: undefined,
})}
/>
)
@@ -1 +0,0 @@
export { default } from "../../home/downloads"
@@ -1 +0,0 @@
export { default } from "../../home/downloads/other"
@@ -35,7 +35,7 @@ export default function SearchScreen() {
: {})}
/>
<SearchResults searchQuery={searchQuery} title="Search" />
<SearchResults searchQuery={searchQuery} />
</>
)
}
+62 -65
View File
@@ -17,7 +17,6 @@ import { useEffect, useSyncExternalStore } from "react"
import { AppIntentBridge } from "@/components/app-intent-bridge"
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
import { AddToPlaylistProvider } from "@/contexts/add-to-playlist"
import { DownloadsProvider } from "@/contexts/downloads"
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
import { FavoritesProvider } from "@/contexts/favorites"
import { PlaybackProvider } from "@/contexts/playback"
@@ -76,70 +75,68 @@ export default function AppLayout() {
<PlaybackProvider>
<AppNavigationSync />
<AddToPlaylistProvider>
<DownloadsProvider>
<FavoritesProvider>
<AppIntentBridge />
<Stack screenOptions={stackOptions}>
<Stack.Screen
name="(tabs)"
options={{ headerShown: false, animation: "none" }}
/>
<Stack.Screen
name="settings"
options={{
headerShown: Platform.OS === "android",
title: "Settings",
presentation:
Platform.OS === "ios" ? "modal" : "fullScreenModal",
animation: "slide_from_bottom",
gestureEnabled: true,
gestureDirection: "vertical",
}}
/>
<Stack.Screen
name="create-account"
options={{
title: "Create account",
presentation: "modal",
headerLargeTitle: false,
headerTransparent: false,
headerStyle: { backgroundColor: "#000" },
headerTintColor: "#fff",
contentStyle: { backgroundColor: "#000" },
}}
/>
<Stack.Screen
name="playlist-cover"
options={{
title: "Cover",
headerTitleAlign: "center",
presentation:
Platform.OS === "ios" ? "modal" : "fullScreenModal",
animation: "slide_from_bottom",
headerLargeTitle: false,
headerTransparent: false,
headerShadowVisible: false,
headerStyle: { backgroundColor: "#000" },
headerTintColor: "#fff",
contentStyle: { backgroundColor: "#000" },
}}
/>
<Stack.Screen
name="player"
options={{
headerShown: false,
// Keep the library visible behind the custom swipe animation.
presentation: "transparentModal",
contentStyle: { backgroundColor: "transparent" },
animation: "slide_from_bottom",
gestureEnabled: true,
gestureDirection: "vertical",
fullScreenGestureEnabled: true,
}}
/>
</Stack>
</FavoritesProvider>
</DownloadsProvider>
<FavoritesProvider>
<AppIntentBridge />
<Stack screenOptions={stackOptions}>
<Stack.Screen
name="(tabs)"
options={{ headerShown: false, animation: "none" }}
/>
<Stack.Screen
name="settings"
options={{
headerShown: Platform.OS === "android",
title: "Settings",
presentation:
Platform.OS === "ios" ? "modal" : "fullScreenModal",
animation: "slide_from_bottom",
gestureEnabled: true,
gestureDirection: "vertical",
}}
/>
<Stack.Screen
name="create-account"
options={{
title: "Create account",
presentation: "modal",
headerLargeTitle: false,
headerTransparent: false,
headerStyle: { backgroundColor: "#000" },
headerTintColor: "#fff",
contentStyle: { backgroundColor: "#000" },
}}
/>
<Stack.Screen
name="playlist-cover"
options={{
title: "Cover",
headerTitleAlign: "center",
presentation:
Platform.OS === "ios" ? "modal" : "fullScreenModal",
animation: "slide_from_bottom",
headerLargeTitle: false,
headerTransparent: false,
headerShadowVisible: false,
headerStyle: { backgroundColor: "#000" },
headerTintColor: "#fff",
contentStyle: { backgroundColor: "#000" },
}}
/>
<Stack.Screen
name="player"
options={{
headerShown: false,
// Keep the library visible behind the custom swipe animation.
presentation: "transparentModal",
contentStyle: { backgroundColor: "transparent" },
animation: "slide_from_bottom",
gestureEnabled: true,
gestureDirection: "vertical",
fullScreenGestureEnabled: true,
}}
/>
</Stack>
</FavoritesProvider>
</AddToPlaylistProvider>
</PlaybackProvider>
</ConvexAuthRecovery>
+15 -52
View File
@@ -1,8 +1,5 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import {
TabletNowPlaying,
type PlayerPanel,
} from "@/components/tablet-now-playing"
import { TabletNowPlaying } from "@/components/tablet-now-playing"
import { atmosEnabled } from "@/lib/playback-capabilities"
import { NavigationBar } from "expo-navigation-bar"
import { MusicEntityView } from "@/components/music-entity-view"
@@ -54,9 +51,7 @@ import { PlayerSymbol } from "@/components/player-symbol"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import { LyricsView } from "@/components/lyrics-view"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { useLyrics } from "@/hooks/use-lyrics"
import { useCoverPalette } from "@/hooks/use-cover-palette"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { useSystemVolume } from "@/hooks/use-system-volume"
@@ -98,14 +93,8 @@ export default function PlayerScreen() {
queueSongIds,
} = usePlaybackQueue()
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
const params = useLocalSearchParams<{ queue?: string; lyrics?: string }>()
// The queue or lyrics, shown in place of the artwork.
const [panel, setPanel] = useState<PlayerPanel | null>(
params.queue === "1" ? "queue" : params.lyrics === "1" ? "lyrics" : null
)
const showQueue = panel === "queue"
const showLyrics = panel === "lyrics"
const lyrics = useLyrics(currentSong?.id ?? null)
const { queue } = useLocalSearchParams<{ queue?: string }>()
const [showQueue, setShowQueue] = useState(queue === "1")
const [isDismissing, setIsDismissing] = useState(false)
const [stageHeight, setStageHeight] = useState(0)
const user = useCachedQuery(api.auth.currentUser)
@@ -198,8 +187,8 @@ export default function PlayerScreen() {
const handleGesture = useMemo(makeDismissGesture, [makeDismissGesture])
const controlsGesture = useMemo(makeDismissGesture, [makeDismissGesture])
const stageGesture = useMemo(
() => makeDismissGesture().enabled(panel === null),
[makeDismissGesture, panel]
() => makeDismissGesture().enabled(!showQueue),
[makeDismissGesture, showQueue]
)
const hasCover = currentSong ? currentSong.album.cover != null : false
@@ -254,9 +243,9 @@ export default function PlayerScreen() {
setIsPlaying(!isPlaying)
}
function togglePanel(next: PlayerPanel) {
function toggleQueue() {
void Haptics.selectionAsync()
setPanel((value) => (value === next ? null : next))
setShowQueue((value) => !value)
}
if (isTablet) {
@@ -267,9 +256,8 @@ export default function PlayerScreen() {
backgroundStyle={backgroundStyle}
dismissStyle={dismissStyle}
dismissGestures={{ handle: handleGesture, artwork: controlsGesture }}
panel={panel}
togglePanel={togglePanel}
lyrics={lyrics}
showQueue={showQueue}
toggleQueue={toggleQueue}
metadata={songMeta}
/>
</MusicEntityView>
@@ -334,20 +322,6 @@ export default function PlayerScreen() {
/>
</Animated.View>
) : null
) : showLyrics ? (
<Animated.View
key="lyrics"
entering={MODE_FADE_IN}
exiting={MODE_FADE_OUT}
style={[styles.fill, styles.artworkMode]}
>
{queueHeader}
<LyricsView
key={currentSong.id}
lyrics={lyrics}
colors={colors}
/>
</Animated.View>
) : (
<Animated.View
key="artwork"
@@ -435,29 +409,18 @@ export default function PlayerScreen() {
<View style={styles.footer}>
<Pressable
onPress={() => togglePanel("lyrics")}
disabled={!lyrics && !showLyrics}
hitSlop={8}
disabled
accessibilityRole="button"
accessibilityLabel={showLyrics ? "Hide lyrics" : "Show lyrics"}
accessibilityState={{
selected: showLyrics,
disabled: !lyrics && !showLyrics,
}}
style={[
styles.queueButton,
!lyrics && !showLyrics && styles.unavailable,
showLyrics && { backgroundColor: colors.selected },
]}
accessibilityLabel="Lyrics"
accessibilityState={{ disabled: true }}
style={[styles.queueButton, styles.unavailable]}
>
<PlayerSymbol
name="quote.bubble"
fallback={{ material: "lyrics" }}
size={27}
weight="semibold"
color={
showLyrics ? colors.selectedForeground : colors.foreground
}
color={colors.foreground}
/>
</Pressable>
<AudioOutputButton
@@ -465,7 +428,7 @@ export default function PlayerScreen() {
style={styles.queueButton}
/>
<Pressable
onPress={() => togglePanel("queue")}
onPress={toggleQueue}
hitSlop={8}
accessibilityRole="button"
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
@@ -1,172 +0,0 @@
import { Ionicons } from "@expo/vector-icons"
import {
Alert,
Pressable,
StyleSheet,
Text,
View,
type StyleProp,
type ViewStyle,
} from "react-native"
import Svg, { Circle, Rect } from "react-native-svg"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import {
useDownloads,
useDownloadsVersion,
useIsCollectionDownloaded,
type DownloadTarget,
} from "@/contexts/downloads"
import type { CollectionRef } from "@otunes/convex/client/download-queue"
import { DOWNLOAD_QUALITY_LABELS } from "@otunes/convex/download-quality"
const SIZE = 22
const RADIUS = 9
const RING_LENGTH = 2 * Math.PI * RADIUS
/** Static ring that fills as songs finish; the square means "tap to stop". */
function ProgressRing({
fraction,
color,
}: {
fraction: number
color: string
}) {
return (
<Svg width={SIZE} height={SIZE} viewBox="0 0 22 22">
<Circle
cx={11}
cy={11}
r={RADIUS}
fill="none"
stroke={color}
strokeOpacity={0.3}
strokeWidth={2}
/>
<Circle
cx={11}
cy={11}
r={RADIUS}
fill="none"
stroke={color}
strokeWidth={2}
strokeDasharray={RING_LENGTH}
strokeDashoffset={RING_LENGTH * (1 - fraction)}
transform="rotate(-90 11 11)"
/>
<Rect x={8} y={8} width={6} height={6} fill={color} />
</Svg>
)
}
export type CollectionDownloadTarget = Exclude<
DownloadTarget,
{ kind: "songs" }
>
/** Download, progress, and downloaded states for an album or playlist hero, beside Play. */
export function CollectionDownloadButton({
target,
color,
style,
}: {
target: CollectionDownloadTarget
color: string
style?: StyleProp<ViewStyle>
}) {
const { queue, requestDownload, removeDownload } = useDownloads()
useDownloadsVersion()
const collection = queue?.getCollection(target)
const status = queue?.status(target.songIds)
const inProgress = collection !== undefined && (status?.queued ?? 0) > 0
const done = collection !== undefined && !inProgress
function handlePress() {
if (inProgress) {
void removeDownload(target)
} else if (done) {
Alert.alert("Remove download?", undefined, [
{ text: "Cancel", style: "cancel" },
{
text: "Remove",
style: "destructive",
onPress: () => void removeDownload(target),
},
])
} else {
void requestDownload(target)
}
}
return (
<Pressable
hitSlop={8}
accessibilityRole="button"
accessibilityLabel={
inProgress
? "Stop downloading"
: done
? `Remove download of ${target.title}`
: `Download ${target.title}`
}
disabled={target.songIds.length === 0}
onPress={handlePress}
style={style}
>
{inProgress && status ? (
<ProgressRing
fraction={status.downloaded / status.total}
color={color}
/>
) : (
<Ionicons
name={done ? "checkmark" : "arrow-down"}
size={24}
color={color}
/>
)}
</Pressable>
)
}
/** The quality an album or playlist was downloaded in, once downloaded. */
export function DownloadedQuality({
collection,
color,
backgroundColor,
}: {
collection: CollectionRef
color: string
backgroundColor: string
}) {
const { queue } = useDownloads()
const downloaded = useIsCollectionDownloaded(collection)
const quality = downloaded
? queue?.getCollection(collection)?.quality
: undefined
if (!quality) return null
return (
<View
style={styles.quality}
accessible
accessibilityLabel={`Downloaded in ${DOWNLOAD_QUALITY_LABELS[quality]}`}
>
<Ionicons name="arrow-down-circle" size={14} color={color} />
{quality === "lossless" || quality === "atmos" ? (
<AudioFormatBadge
format={quality}
color={color}
backgroundColor={backgroundColor}
/>
) : (
<Text style={{ color, fontSize: 13 }}>
{DOWNLOAD_QUALITY_LABELS[quality]}
</Text>
)}
</View>
)
}
const styles = StyleSheet.create({
quality: { flexDirection: "row", alignItems: "center", gap: 4 },
})
+1 -12
View File
@@ -11,7 +11,6 @@ import {
} from "react-native"
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
import { downloadedCoverUri } from "@/lib/downloads"
import { useThemeColors } from "@/lib/theme"
import {
@@ -67,7 +66,6 @@ export const CoverImage = memo(function CoverImage({
contentFit = "cover",
blurRadius,
placeholderVariant = "icon",
placeholderIcon = "musical-note",
}: {
uri: string
hasCover: boolean
@@ -75,7 +73,6 @@ export const CoverImage = memo(function CoverImage({
contentFit?: ImageContentFit
blurRadius?: number
placeholderVariant?: "icon" | "solid"
placeholderIcon?: keyof typeof Ionicons.glyphMap
}) {
const colors = useThemeColors()
const flatStyle = useMemo(() => StyleSheet.flatten(style) ?? {}, [style])
@@ -84,12 +81,6 @@ export const CoverImage = memo(function CoverImage({
[flatStyle, hasCover, uri]
)
const source = useMemo(() => ({ uri: sourceUri }), [sourceUri])
// A downloaded cover shows while the network copy loads, and offline.
const savedUri = hasCover ? downloadedCoverUri(uri) : null
const placeholder = useMemo(
() => (savedUri ? { uri: savedUri } : undefined),
[savedUri]
)
if (!hasCover) {
return (
@@ -102,7 +93,7 @@ export const CoverImage = memo(function CoverImage({
>
{placeholderVariant === "icon" ? (
<Ionicons
name={placeholderIcon}
name="musical-note"
size={placeholderIconSize(flatStyle)}
color={colors.coverPlaceholderIcon}
/>
@@ -116,8 +107,6 @@ export const CoverImage = memo(function CoverImage({
source={source}
style={[style, { backgroundColor: colors.coverPlaceholder }]}
contentFit={contentFit}
placeholder={placeholder}
placeholderContentFit={contentFit}
transition={150}
blurRadius={blurRadius}
onLoad={
-243
View File
@@ -1,243 +0,0 @@
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react"
import {
Pressable,
ScrollView,
StyleSheet,
Text,
View,
type ScrollViewInstance,
} from "react-native"
import {
usePlaybackActions,
usePlaybackProgress,
usePlaybackQueue,
} from "@/contexts/playback"
import { useLyricsTime } from "@/hooks/use-lyrics"
import type { NowPlayingColors } from "@/lib/now-playing-colors"
import {
activeLineIndex,
type LyricLine,
type Lyrics,
} from "@otunes/convex/client/lyrics"
/** How long a manual scroll keeps the view from following the song. */
const MANUAL_SCROLL_HOLD_MS = 3000
/** Where the playing line sits, as a share of the view's height from the top. */
const ACTIVE_LINE_POSITION = 0.12
/**
* Lyrics in the player's own colors. Synced lines follow playback and seek
* when tapped; `null` lyrics show a short note instead.
*/
export function LyricsView({
lyrics,
colors,
fontSize = 30,
}: {
lyrics: Lyrics | null | undefined
colors: NowPlayingColors
fontSize?: number
}) {
if (lyrics === undefined) return null
if (lyrics === null) {
return (
<View style={styles.empty}>
<Text style={[styles.emptyText, { color: colors.secondaryForeground }]}>
No lyrics
</Text>
</View>
)
}
return <LyricsLines lyrics={lyrics} colors={colors} fontSize={fontSize} />
}
function LyricsLines({
lyrics,
colors,
fontSize,
}: {
lyrics: Lyrics
colors: NowPlayingColors
fontSize: number
}) {
const { currentTime } = usePlaybackProgress()
const { isPlaying } = usePlaybackQueue()
const { seekTo, setIsPlaying } = usePlaybackActions()
const time = useLyricsTime(lyrics, currentTime, isPlaying)
const active = activeLineIndex(lyrics, time)
const synced = lyrics.synced !== "none"
const scrollRef = useRef<ScrollViewInstance>(null)
const lineOffsets = useRef<number[]>([])
const [height, setHeight] = useState(0)
const manualScrollAt = useRef(0)
const scrollToLine = useCallback(
(index: number) => {
const y = lineOffsets.current[Math.max(index, 0)]
if (y === undefined || !synced || height === 0) return
if (Date.now() - manualScrollAt.current < MANUAL_SCROLL_HOLD_MS) return
scrollRef.current?.scrollTo({
y: Math.max(0, y - height * ACTIVE_LINE_POSITION),
animated: true,
})
},
[height, synced]
)
useEffect(() => {
scrollToLine(active)
}, [active, scrollToLine])
const activeRef = useRef(active)
useEffect(() => {
activeRef.current = active
}, [active])
const handleLineLayout = useCallback(
(index: number, y: number) => {
lineOffsets.current[index] = y
// Opening mid-song: jump once the playing line has been measured.
if (index === Math.max(activeRef.current, 0)) scrollToLine(index)
},
[scrollToLine]
)
const playFrom = useCallback(
(seconds: number) => {
seekTo(seconds)
setIsPlaying(true)
manualScrollAt.current = 0
},
[seekTo, setIsPlaying]
)
const lineStyle = useMemo(
() => ({ fontSize, lineHeight: Math.round(fontSize * 1.18) }),
[fontSize]
)
return (
<ScrollView
ref={scrollRef}
style={styles.fill}
contentContainerStyle={{
paddingTop: height * ACTIVE_LINE_POSITION,
paddingBottom: height * 0.7,
}}
showsVerticalScrollIndicator={false}
onLayout={(event) => setHeight(event.nativeEvent.layout.height)}
onScrollBeginDrag={() => {
manualScrollAt.current = Date.now()
}}
onMomentumScrollEnd={() => {
// Hold from when the scroll settles, not when the finger lifted.
if (manualScrollAt.current > 0) manualScrollAt.current = Date.now()
}}
>
{lyrics.lines.map((line, index) =>
synced ? (
<SyncedLine
key={index}
index={index}
line={line}
state={
index === active ? "active" : index < active ? "past" : "next"
}
time={index === active ? time : null}
colors={colors}
textStyle={lineStyle}
onSelect={playFrom}
onLayoutY={handleLineLayout}
/>
) : (
<Text
key={index}
style={[
styles.plainLine,
{
color: colors.foreground,
fontSize: fontSize * 0.75,
lineHeight: Math.round(fontSize * 0.75 * 1.25),
},
line.text === "" && styles.stanzaGap,
]}
>
{line.text}
</Text>
)
)}
</ScrollView>
)
}
/**
* One timed line. Only the playing line gets the time, so the others skip
* re-rendering as the song plays.
*/
const SyncedLine = memo(function SyncedLine({
index,
line,
state,
time,
colors,
textStyle,
onSelect,
onLayoutY,
}: {
index: number
line: LyricLine
state: "past" | "active" | "next"
time: number | null
colors: NowPlayingColors
textStyle: { fontSize: number; lineHeight: number }
onSelect: (seconds: number) => void
onLayoutY: (index: number, y: number) => void
}) {
const active = state === "active"
return (
<Pressable
onPress={() => onSelect(line.start ?? 0)}
onLayout={(event) => onLayoutY(index, event.nativeEvent.layout.y)}
accessibilityRole="button"
accessibilityHint="Plays from this line"
style={styles.line}
>
<Text
style={[
styles.lineText,
textStyle,
{
color:
active && !line.words ? colors.foreground : colors.lyricsInactive,
},
]}
>
{active && line.words
? line.words.map((word, wordIndex) => (
<Text
key={wordIndex}
style={{
color:
time !== null && time >= word.start
? colors.foreground
: colors.lyricsUnsung,
}}
>
{word.text}
</Text>
))
: line.text}
</Text>
</Pressable>
)
})
const styles = StyleSheet.create({
fill: { flex: 1 },
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
emptyText: { fontSize: 17, fontWeight: "600" },
line: { paddingVertical: 9 },
lineText: { fontWeight: "800" },
plainLine: { fontWeight: "700", paddingVertical: 2 },
stanzaGap: { height: 18 },
})
+3 -38
View File
@@ -4,10 +4,9 @@ import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { TabletMediaGrid } from "@/components/tablet-media-grid"
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { MusicEntityView } from "@/components/music-entity-view"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { Link } from "expo-router"
import { Ionicons } from "@expo/vector-icons"
import { memo, useCallback, type ReactElement, type ReactNode } from "react"
import { memo, useCallback, type ReactElement } from "react"
import {
FlatList,
Platform,
@@ -21,7 +20,6 @@ import {
import { CoverImage } from "@/components/cover-image"
import { MediaContextMenu } from "@/components/media-context-menu"
import { useIsCollectionDownloaded } from "@/contexts/downloads"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { useServerConfig } from "@/contexts/server-config"
import { useAppNavigation } from "@/lib/app-navigation"
@@ -53,7 +51,6 @@ export const AlbumCard = memo(function AlbumCard({
const { config } = useServerConfig()
const colors = useThemeColors()
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
const downloaded = useIsCollectionDownloaded({ kind: "album", id: album.id })
if (!config) return null
const card = (
@@ -105,7 +102,6 @@ export const AlbumCard = memo(function AlbumCard({
hasArtwork: album.cover != null,
}}
favorited={isAlbumFavorite(album.id)}
downloaded={downloaded}
stationArtistId={album.artist.id}
navigation={{ artist: { id: album.artist.id } }}
share={{ type: "album", albumId: album.id, title: album.title }}
@@ -191,10 +187,6 @@ export const PlaylistCard = memo(function PlaylistCard({
const { config } = useServerConfig()
const colors = useThemeColors()
const { handlePlaylistAction } = useMediaMenuActions()
const downloaded = useIsCollectionDownloaded({
kind: "playlist",
id: playlist.id,
})
if (!config) return null
const card = (
@@ -243,7 +235,6 @@ export const PlaylistCard = memo(function PlaylistCard({
return (
<MediaContextMenu
showFavorite={false}
downloaded={downloaded}
share={{
type: "playlist",
playlistId: playlist.id,
@@ -301,23 +292,17 @@ export function MediaGridList({
onEndReached,
ListHeaderComponent,
contentInset = true,
title,
titleAccessory,
}: {
content: MediaItem[]
paddingBottom: number
onEndReached?: () => void
ListHeaderComponent?: ReactElement
contentInset?: boolean
/** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
title?: string
titleAccessory?: ReactNode
}) {
const tabletLayout = useTabletLayout()
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
useMediaGridLayout()
const colors = useThemeColors()
const { ref, scrollY } = useScreenTitleScroll<FlatList<MediaItem>>()
const renderItem = useCallback(
({ item }: ListRenderItemInfo<MediaItem>) => (
<View style={{ width: cardWidth }}>
@@ -335,32 +320,13 @@ export function MediaGridList({
onEndReached={onEndReached}
ListHeaderComponent={ListHeaderComponent}
contentInset={contentInset}
title={title}
titleAccessory={titleAccessory}
renderCard={renderTabletCard}
/>
)
}
const header = title ? (
<View>
<ScreenTitle
title={title}
scrollY={scrollY}
accessory={titleAccessory}
// Inset grids already pad the whole list horizontally.
style={{ paddingHorizontal: contentInset ? 0 : horizontalPadding }}
/>
{ListHeaderComponent}
</View>
) : (
ListHeaderComponent
)
return (
<Animated.FlatList
ref={ref}
scrollEventThrottle={16}
<FlatList
key={columns}
onLayout={onLayout}
data={content}
@@ -377,7 +343,6 @@ export function MediaGridList({
paddingBottom,
gap,
...(contentInset ? { paddingHorizontal: horizontalPadding } : {}),
...(title ? { paddingTop: 0 } : {}),
},
]}
columnWrapperStyle={[
@@ -386,7 +351,7 @@ export function MediaGridList({
{ gap },
]}
contentInsetAdjustmentBehavior="automatic"
ListHeaderComponent={header}
ListHeaderComponent={ListHeaderComponent}
onEndReached={onEndReached}
onEndReachedThreshold={0.5}
/>
+19 -31
View File
@@ -35,8 +35,6 @@ export type MediaAction =
| "remove-from-playlist"
| "change-cover"
| "delete-playlist"
| "download"
| "remove-download"
export type MediaNavigation = {
artist?: { id: string }
@@ -62,8 +60,6 @@ export type MediaMenuConfig = {
stationArtistId?: string
navigation?: MediaNavigation
share?: MediaShareContext
/** Shows Download, or Remove Download when true. Omit to hide both. */
downloaded?: boolean
includeActions?: MediaAction[]
onAction: (action: MediaAction) => void
}
@@ -77,39 +73,33 @@ const QUEUE_ACTIONS: MediaAction[] = ["play-next", "play-last", "shuffle"]
const MEDIA_ACTION_ITEMS: {
action: MediaAction
label: (favorited: boolean | undefined, playlistLabel: string) => string
label: (
countSuffix: string,
favorited: boolean | undefined,
playlistLabel: string
) => string
image: NonNullable<MenuAction["image"]> & string
destructive?: boolean
}[] = [
{
action: "playlist",
label: (_favorited, playlistLabel) => playlistLabel,
label: (countSuffix, _favorited, playlistLabel) =>
`${playlistLabel}${countSuffix}`,
image: "text.badge.plus",
},
{
action: "download",
label: () => "Download",
image: "arrow.down.circle",
},
{
action: "remove-download",
label: () => "Remove Download",
image: "xmark.circle",
destructive: true,
},
{
action: "play-next",
label: () => "Play Next",
label: (countSuffix) => `Play Next${countSuffix}`,
image: "text.line.first.and.arrowtriangle.forward",
},
{
action: "play-last",
label: () => "Play Last",
label: (countSuffix) => `Play Last${countSuffix}`,
image: "text.line.last.and.arrowtriangle.forward",
},
{
action: "shuffle",
label: () => "Shuffle",
label: (countSuffix) => `Shuffle${countSuffix}`,
image: "shuffle",
},
{
@@ -129,7 +119,8 @@ const MEDIA_ACTION_ITEMS: {
},
{
action: "favorite",
label: (favorited) => (favorited ? "Unfavorite" : "Favorite"),
label: (countSuffix, favorited) =>
`${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`,
image: "star",
},
{
@@ -162,14 +153,6 @@ function isActionIncluded(
return config.showRemoveFromPlaylist === true
}
if (action === "download") {
return config.downloaded === false
}
if (action === "remove-download") {
return config.downloaded === true
}
if (config.includeActions) {
return config.includeActions.includes(action)
}
@@ -200,7 +183,12 @@ function isActionIncluded(
export function buildMediaMenuActions(
config: Omit<MediaMenuConfig, "onAction">
): MenuAction[] {
const { favorited, playlistLabel = "Add to Playlist" } = config
const {
selectedCount = 1,
favorited,
playlistLabel = "Add to Playlist",
} = config
const countSuffix = selectedCount > 1 ? ` (${selectedCount})` : ""
const actions: MenuAction[] = []
@@ -219,7 +207,7 @@ export function buildMediaMenuActions(
actions.push({
id: item.action,
title: item.label(favorited, playlistLabel),
title: item.label(countSuffix, favorited, playlistLabel),
image: item.action === "favorite" && favorited ? "star.fill" : item.image,
...(item.destructive ? { attributes: { destructive: true } } : {}),
})
@@ -28,8 +28,6 @@ const actionIcons = {
"remove-from-playlist": "remove-circle-outline",
"change-cover": "image-outline",
"delete-playlist": "trash-outline",
download: "arrow-down-circle-outline",
"remove-download": "close-circle-outline",
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
// The community MenuView creates a dynamic-color Host internally. Own this
-109
View File
@@ -1,109 +0,0 @@
import { Ionicons } from "@expo/vector-icons"
import {
connectivityStore,
type PlatformNetwork,
} from "@otunes/convex/client/connectivity"
import { useConvex } from "convex/react"
import {
addNetworkStateListener,
getNetworkStateAsync,
type NetworkState,
} from "expo-network"
import { useTheme } from "expo-router"
import { useContext, useSyncExternalStore } from "react"
import { Pressable, StyleSheet, Text, View } from "react-native"
import { useAppNavigation } from "@/lib/app-navigation"
import { TabletSectionContext } from "@/lib/tablet-navigation"
import { spacing, useThemeColors } from "@/lib/theme"
let deviceOnline = true
/** The device's network state. Unknown reachability counts as online. */
const deviceNetwork: PlatformNetwork = {
isOnline: () => deviceOnline,
subscribe(onChange) {
const apply = (state: NetworkState) => {
deviceOnline =
state.isConnected !== false && state.isInternetReachable !== false
onChange()
}
const subscription = addNetworkStateListener(apply)
void getNetworkStateAsync().then(apply)
return () => subscription.remove()
},
}
/** True while the device has no network or the server can't be reached. */
export function useIsOffline() {
const store = connectivityStore(useConvex(), deviceNetwork)
return useSyncExternalStore(store.subscribe, store.getSnapshot)
}
type ScreenRoute = { name: string; params?: object }
/** Downloads screens, and albums and playlists opened from them, stay usable offline. */
function worksOffline(route: ScreenRoute, tabletSection: string | undefined) {
if (route.name.startsWith("downloads/")) return true
if (route.name === "index" && tabletSection === "downloads") return true
// Settings stays reachable so an unreachable server can be changed.
if (route.name === "settings") return true
return (route.params as { from?: string } | undefined)?.from === "downloads"
}
/**
* Covers a tab screen with a no-connection message while offline. The screen
* stays mounted underneath so it picks up where it was once the server is back.
*/
export function OfflineOverlay({ route }: { route: ScreenRoute }) {
const offline = useIsOffline()
const tabletSection = useContext(TabletSectionContext)?.name
const { push } = useAppNavigation()
const { colors: routerColors } = useTheme()
const colors = useThemeColors()
if (!offline || worksOffline(route, tabletSection)) return null
return (
<View
style={[
StyleSheet.absoluteFill,
styles.overlay,
{ backgroundColor: routerColors.background },
]}
>
<Ionicons
name="cloud-offline-outline"
size={28}
color={colors.mutedForeground}
/>
<Text style={[styles.title, { color: routerColors.text }]}>
No connection
</Text>
<Text style={[styles.body, { color: colors.mutedForeground }]}>
Your downloads still play.
</Text>
<Pressable
accessibilityRole="link"
hitSlop={spacing.sm}
onPress={() => push("/downloads")}
>
<Text style={[styles.link, { color: colors.primary }]}>
Go to Downloads
</Text>
</Pressable>
</View>
)
}
const styles = StyleSheet.create({
overlay: {
alignItems: "center",
justifyContent: "center",
gap: spacing.sm,
padding: spacing.lg,
},
title: { fontSize: 17, fontWeight: "600", marginTop: spacing.xs },
body: { fontSize: 15, textAlign: "center" },
link: { fontSize: 15, fontWeight: "600", marginTop: spacing.xs },
})
+3 -40
View File
@@ -3,14 +3,8 @@ import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
import { MusicEntityView } from "@/components/music-entity-view"
import { collectionInset } from "@/components/collection-list"
import { CoverImage } from "@/components/cover-image"
import { Ionicons } from "@expo/vector-icons"
import {
useSongDownloadState,
useToggleSongDownload,
} from "@/contexts/downloads"
import type { DownloadSource } from "@otunes/convex/client/download-queue"
import { useServerConfig } from "@/contexts/server-config"
import type { BrowseSong, SearchSong } from "@otunes/convex/types"
import type { BrowseSong } from "@otunes/convex/types"
import type { CoverPalette } from "@/lib/cover-palette"
import { formatDuration } from "@/lib/format"
import { albumCoverUrl } from "@/lib/urls"
@@ -39,10 +33,8 @@ export const SongRow = memo(function SongRow({
palette,
inset = false,
swipe,
downloadFrom,
}: {
/** Search results also show the lyrics line they matched. */
song: SearchSong
song: BrowseSong
onPress?: () => void
contextMenu?: Omit<MediaMenuConfig, "onAction"> & {
onAction: MediaMenuConfig["onAction"]
@@ -58,14 +50,9 @@ export const SongRow = memo(function SongRow({
}
/** Album/playlist layout: the divider starts at the title, not the artwork. */
inset?: boolean
/** The download this row belongs to; removing only takes it out of that. */
downloadFrom?: DownloadSource
}) {
const { config } = useServerConfig()
const colors = useThemeColors()
const downloadState = useSongDownloadState(song.id, downloadFrom)
const downloaded = downloadState === "here"
const toggleDownload = useToggleSongDownload()
if (!config) return null
const foreground = palette?.foreground ?? colors.foreground
@@ -88,23 +75,7 @@ export const SongRow = memo(function SongRow({
>
{song.artist.name} · {song.album.title}
</Text>
{song.lyricsSnippet ? (
<Text
style={[styles.rowSubtitle, { color: secondaryForeground }]}
numberOfLines={1}
>
Lyrics: “{song.lyricsSnippet}”
</Text>
) : null}
</View>
{downloaded || downloadState === "device" ? (
<Ionicons
name="arrow-down-circle"
size={14}
color={secondaryForeground}
accessibilityLabel="Downloaded"
/>
) : null}
<Text style={[styles.duration, { color: secondaryForeground }]}>
{formatDuration(song.durationSeconds)}
</Text>
@@ -138,8 +109,6 @@ export const SongRow = memo(function SongRow({
onPlayNext={swipe.onPlayNext}
onAddToQueue={swipe.onAddToQueue}
onRemove={swipe.onRemove}
downloaded={downloaded}
onDownload={() => toggleDownload(song, downloaded, downloadFrom)}
backgroundColor={swipe.backgroundColor}
onPress={onPress}
style={rowStyle}
@@ -186,11 +155,10 @@ export const SongListRow = memo(function SongListRow({
inset,
swipe,
removable,
downloadFrom,
onPlay,
onAction,
}: {
song: SearchSong
song: BrowseSong
favorited: boolean
playlistLabel?: string
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
@@ -204,13 +172,10 @@ export const SongListRow = memo(function SongListRow({
}
/** Shows "Remove from Playlist" in the context menu. */
removable?: boolean
/** The download this row belongs to; removing only takes it out of that. */
downloadFrom?: DownloadSource
onPlay: (song: BrowseSong) => void
onAction: (song: BrowseSong, action: MediaAction) => void
}) {
const { config } = useServerConfig()
const downloaded = useSongDownloadState(song.id, downloadFrom) === "here"
const handlePress = useCallback(() => onPlay(song), [onPlay, song])
return (
@@ -219,7 +184,6 @@ export const SongListRow = memo(function SongListRow({
palette={palette}
inset={inset}
swipe={swipe}
downloadFrom={downloadFrom}
onPress={handlePress}
contextMenu={{
preview: config
@@ -234,7 +198,6 @@ export const SongListRow = memo(function SongListRow({
: undefined,
stationArtistId: song.artist.id,
favorited,
downloaded,
playlistLabel,
showRemoveFromPlaylist: removable,
navigation: {
@@ -2,23 +2,16 @@ import { useCallback, useMemo } from "react"
import { Platform } from "react-native"
import { Stack } from "expo-router"
import { useQuery } from "convex/react"
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
import { api } from "@otunes/convex/_generated/api"
import { useThemeColors } from "@/lib/theme"
import { filterSongs } from "@otunes/convex/client/song-search"
import type { BrowseSong } from "@otunes/convex/types"
export function usePlaylistSearch(songs: BrowseSong[]) {
const search = useDebouncedSearch()
const lyricsMatches = useQuery(
api.lyrics.matchingSongIds,
search.searchQuery.trim() ? { query: search.searchQuery } : "skip"
)
const filteredSongs = useMemo(
() => filterSongs(songs, search.searchQuery, lyricsMatches),
[songs, search.searchQuery, lyricsMatches]
() => filterSongs(songs, search.searchQuery),
[songs, search.searchQuery]
)
return { ...search, filteredSongs }
-97
View File
@@ -1,97 +0,0 @@
import { useHeaderHeight } from "expo-router/react-navigation"
import type { Component, ReactNode } from "react"
import {
Platform,
StyleSheet,
Text,
type ScrollViewInstance,
type StyleProp,
type ViewStyle,
} from "react-native"
import Animated, {
useAnimatedRef,
useAnimatedStyle,
useScrollOffset,
type SharedValue,
} from "react-native-reanimated"
import { spacing, useThemeColors } from "@/lib/theme"
/**
* Tracks the scroll view that renders a `ScreenTitle`. Attach `ref` to that
* Reanimated `Animated.ScrollView` / `Animated.FlatList` and pass `scrollY`
* to the title.
*/
export function useScreenTitleScroll<
TScrollView extends Component | ScrollViewInstance,
>() {
const ref = useAnimatedRef<TScrollView>()
const scrollY = useScrollOffset(ref)
return { ref, scrollY }
}
/**
* iOS screen title rendered as the first item of a screen's scroll content,
* in place of the native large title (Apple Music style): it scrolls away
* with the content, never collapses into the bar, and stays put on
* pull-down. `accessory` (e.g. the profile button) sits on the same row and
* scrolls with it. Android keeps its native header, so this renders nothing.
*/
export function ScreenTitle({
title,
scrollY,
accessory,
style,
}: {
title: string
/** From `useScreenTitleScroll`; omit for screens that never scroll. */
scrollY?: SharedValue<number>
accessory?: ReactNode
style?: StyleProp<ViewStyle>
}) {
const colors = useThemeColors()
// At rest the scroll offset is minus the automatic header inset, so any
// offset below that is overscroll the title should cancel out.
const headerHeight = useHeaderHeight()
const pinStyle = useAnimatedStyle(() => ({
transform: [
{
translateY: scrollY ? Math.min(0, scrollY.value + headerHeight) : 0,
},
],
}))
if (Platform.OS !== "ios") return null
return (
<Animated.View style={[styles.row, style, pinStyle]}>
<Text
accessibilityRole="header"
numberOfLines={2}
style={[styles.title, { color: colors.foreground }]}
>
{title}
</Text>
{accessory}
</Animated.View>
)
}
// Matches UIKit's large title metrics: 34pt bold in a 52pt tall area.
const styles = StyleSheet.create({
row: {
flexDirection: "row",
alignItems: "center",
gap: spacing.md,
paddingHorizontal: spacing.lg,
paddingTop: 3,
paddingBottom: 8,
},
title: {
flex: 1,
fontSize: 34,
lineHeight: 41,
fontWeight: "700",
letterSpacing: 0.37,
},
})
+15 -34
View File
@@ -1,16 +1,13 @@
import { memo, useCallback, useMemo } from "react"
import {
type FlatList,
FlatList,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
import Animated from "react-native-reanimated"
import { ContentCarousel } from "@/components/media-cards"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import type { MediaAction } from "@/components/media-context-menu"
import { tabContentBottomInset, SongListRow } from "@/components/player"
import { SongListSkeleton } from "@/components/skeletons"
@@ -19,19 +16,11 @@ import { usePlaybackActions } from "@/contexts/playback"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { api } from "@otunes/convex/_generated/api"
import type { BrowseSong, SearchSong } from "@otunes/convex/types"
import type { BrowseSong } from "@otunes/convex/types"
import { spacing, useThemeColors } from "@/lib/theme"
function SearchResultsBody({
searchQuery,
title,
}: {
searchQuery: string
/** iOS `ScreenTitle`, shown above the results and while idle. */
title: string
}) {
function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
const colors = useThemeColors()
const { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseSong>>()
const { playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
@@ -75,7 +64,7 @@ function SearchResultsBody({
[handleSongAction]
)
const renderItem = useCallback(
({ item: song }: ListRenderItemInfo<SearchSong>) => (
({ item: song }: ListRenderItemInfo<BrowseSong>) => (
<SongListRow
song={song}
favorited={isSongFavorite(song.id)}
@@ -87,19 +76,16 @@ function SearchResultsBody({
)
if (isSearching) {
return (
<SongListSkeleton
title={title}
titleAccessory={<ProfileHeaderButton />}
/>
)
return <SongListSkeleton />
}
if (!hasQuery) {
return <></>
}
return (
<Animated.FlatList
ref={ref}
scrollEventThrottle={16}
data={hasQuery ? (results?.songs ?? []) : []}
<FlatList
data={results?.songs ?? []}
keyExtractor={(song) => song.id}
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{ paddingBottom: tabContentBottomInset }}
@@ -107,12 +93,7 @@ function SearchResultsBody({
keyboardShouldPersistTaps="handled"
ListHeaderComponent={
<>
<ScreenTitle
title={title}
scrollY={scrollY}
accessory={<ProfileHeaderButton />}
/>
{hasQuery && !hasResults ? (
{!hasResults ? (
<View style={styles.empty}>
<Text
style={[styles.emptyText, { color: colors.mutedForeground }]}
@@ -122,13 +103,13 @@ function SearchResultsBody({
</View>
) : null}
{hasQuery && results?.artists.length ? (
{results?.artists.length ? (
<View style={styles.section}>
<ContentCarousel title="Artists" content={results.artists} />
</View>
) : null}
{hasQuery && results?.albums.length ? (
{results?.albums.length ? (
<View style={styles.section}>
<ContentCarousel title="Albums" content={results.albums} />
</View>
@@ -137,7 +118,7 @@ function SearchResultsBody({
}
renderItem={renderItem}
ListFooterComponent={
hasQuery && playlistResults && playlistResults.length > 0 ? (
playlistResults && playlistResults.length > 0 ? (
<View style={styles.section}>
<ContentCarousel title="Playlists" content={playlistResults} />
</View>
+5 -70
View File
@@ -9,7 +9,6 @@ import {
collectionInset,
} from "@/components/collection-list"
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
import { ScreenTitle } from "@/components/screen-title"
import { Link } from "expo-router"
import { useHeaderHeight } from "expo-router/react-navigation"
import Reanimated from "react-native-reanimated"
@@ -152,18 +151,9 @@ function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
))
}
export function SongListSkeleton({
rows = 10,
title,
titleAccessory,
}: {
rows?: number
title?: string
titleAccessory?: ReactNode
}) {
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
return (
<SkeletonScreen>
{title ? <ScreenTitle title={title} accessory={titleAccessory} /> : null}
<SongRows rows={rows} />
</SkeletonScreen>
)
@@ -244,54 +234,23 @@ export function MediaGridSkeleton({
items = 6,
contentInset = true,
header,
title,
titleAccessory,
}: {
items?: number
contentInset?: boolean
/** The loaded list's `ListHeaderComponent`, so it keeps its position. */
header?: ReactNode
/** The loaded list's `ScreenTitle`, which replaces its top inset. */
title?: string
titleAccessory?: ReactNode
}) {
return (
<SkeletonScreen>
<MediaGridContent
items={items}
contentInset={contentInset && !title}
header={
title ? (
<>
<MediaGridTitle title={title} accessory={titleAccessory} />
{header}
</>
) : (
header
)
}
contentInset={contentInset}
header={header}
/>
</SkeletonScreen>
)
}
function MediaGridTitle({
title,
accessory,
}: {
title: string
accessory?: ReactNode
}) {
const { horizontalPadding } = useMediaGridLayout()
return (
<ScreenTitle
title={title}
accessory={accessory}
style={{ paddingHorizontal: horizontalPadding }}
/>
)
}
export function CarouselSkeleton() {
return (
<View style={styles.carousel}>
@@ -305,21 +264,10 @@ export function CarouselSkeleton() {
)
}
export function HomeSkeleton({
title,
titleAccessory,
}: {
title: string
titleAccessory?: ReactNode
}) {
export function HomeSkeleton() {
return (
<SkeletonScreen>
<View style={styles.home}>
<ScreenTitle
title={title}
accessory={titleAccessory}
style={styles.homeTitle}
/>
<CarouselSkeleton />
<CarouselSkeleton />
</View>
@@ -440,17 +388,10 @@ export function CollectionDetailSkeleton({
)
}
export function ArtistListSkeleton({
rows = 12,
title,
}: {
rows?: number
title?: string
}) {
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
const colors = useThemeColors()
return (
<SkeletonScreen>
{title ? <ScreenTitle title={title} /> : null}
{Array.from({ length: rows }, (_, index) => (
<View
key={index}
@@ -515,12 +456,6 @@ const styles = StyleSheet.create({
carousel: { gap: spacing.md, overflow: "hidden" },
carouselRow: { flexDirection: "row", gap: spacing.md },
home: { padding: spacing.lg, gap: spacing.xl },
// Mirrors the home screen's title spacing.
homeTitle: {
paddingHorizontal: 0,
marginTop: -spacing.lg,
marginBottom: -spacing.md,
},
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
actions: {
flexDirection: "row",
+14 -38
View File
@@ -42,8 +42,7 @@ function impact() {
/**
* A tap competes with the swipe so dragging a moving row never starts playback.
* A full swipe commits the outer action: Add to Queue on the leading side, and
* Remove on the trailing side when `onRemove` is set, else Download. Download
* turns into a red Remove Download once `downloaded`.
* Remove on the trailing side when `onRemove` is set.
*/
export function SongSwipeRow({
children,
@@ -54,8 +53,6 @@ export function SongSwipeRow({
onPlayNext,
onAddToQueue,
onRemove,
onDownload,
downloaded = false,
}: {
children: ReactNode
style?: StyleProp<ViewStyle>
@@ -65,8 +62,6 @@ export function SongSwipeRow({
onPlayNext: () => void
onAddToQueue: () => void
onRemove?: () => void
onDownload?: () => void
downloaded?: boolean
}) {
const hasRemove = !!onRemove
const trailingWidth = hasRemove ? PAIRED_ACTION_WIDTH * 2 : ACTION_WIDTH
@@ -100,10 +95,10 @@ export function SongSwipeRow({
(side: number) => {
close()
if (side > 0) onAddToQueue()
else if (onRemove) onRemove()
else onDownload?.()
// Without Remove, the trailing action is the Download placeholder.
else onRemove?.()
},
[close, onAddToQueue, onRemove, onDownload]
[close, onAddToQueue, onRemove]
)
const tapRow = useCallback(() => {
if (open) close()
@@ -238,7 +233,6 @@ export function SongSwipeRow({
side={-1}
paired={hasRemove}
remove={hasRemove}
downloaded={downloaded}
x={x}
height={height}
progress={commitProgress}
@@ -250,15 +244,11 @@ export function SongSwipeRow({
side={-1}
secondary
paired
downloaded={downloaded}
x={x}
height={height}
progress={commitProgress}
open={open === -1}
onPress={() => {
close()
onDownload?.()
}}
onPress={close}
/>
)}
<GestureDetector gesture={gesture}>
@@ -269,10 +259,7 @@ export function SongSwipeRow({
accessibilityActions={[
{ name: "addToQueue", label: "Add to Queue" },
{ name: "playNext", label: "Play Next" },
{
name: "download",
label: downloaded ? "Remove Download" : "Download",
},
{ name: "download", label: "Download" },
...(hasRemove
? [{ name: "remove", label: "Remove from Playlist" }]
: []),
@@ -280,10 +267,6 @@ export function SongSwipeRow({
onAccessibilityAction={(event) => {
if (event.nativeEvent.actionName === "remove") activate(-1)
if (event.nativeEvent.actionName === "addToQueue") activate(1)
if (event.nativeEvent.actionName === "download") {
close()
onDownload?.()
}
if (event.nativeEvent.actionName === "playNext") {
close()
onPlayNext()
@@ -307,7 +290,6 @@ function SwipeAction({
secondary = false,
paired = side > 0,
remove = false,
downloaded = false,
x,
height,
progress,
@@ -318,8 +300,6 @@ function SwipeAction({
secondary?: boolean
paired?: boolean
remove?: boolean
/** Shows the download action as Remove Download. */
downloaded?: boolean
x: SharedValue<number>
height: SharedValue<number>
progress: SharedValue<number>
@@ -390,8 +370,6 @@ function SwipeAction({
},
],
}))
const removesDownload = side < 0 && !remove && downloaded
const destructive = remove || removesDownload
return (
<Animated.View
pointerEvents={open ? "auto" : "none"}
@@ -408,13 +386,11 @@ function SwipeAction({
accessibilityLabel={
remove
? "Remove from Playlist"
: removesDownload
? "Remove Download"
: side > 0
? secondary
? "Play Next"
: "Add to Queue"
: "Download"
: side > 0
? secondary
? "Play Next"
: "Add to Queue"
: "Download"
}
onPress={onPress}
style={styles.actionButton}
@@ -423,7 +399,7 @@ function SwipeAction({
style={[
styles.pill,
{
backgroundColor: destructive
backgroundColor: remove
? IS_ANDROID
? "#d32f2f"
: "#ff3b30"
@@ -440,7 +416,7 @@ function SwipeAction({
{IS_ANDROID ? (
<Ionicons
name={
destructive
remove
? "trash-outline"
: side < 0
? "arrow-down"
@@ -454,7 +430,7 @@ function SwipeAction({
) : (
<SymbolView
name={
destructive
remove
? "trash"
: side > 0
? secondary
+5 -42
View File
@@ -5,46 +5,16 @@ import type { ReactNode } from "react"
import { useTabletBackgroundStyle } from "@/contexts/android-tab-theme"
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
import { OfflineOverlay } from "@/components/offline-overlay"
import { TabletSidebar } from "@/components/tablet-sidebar"
type ScreenRoute = { name: string; params?: object }
/**
* Screen content with the no-connection overlay layered on top. A fragment
* keeps the scroll view as the screen's first subview for large titles.
*/
function ScreenBody({
route,
children,
}: {
route: ScreenRoute
children: ReactNode
}) {
return (
<>
{children}
<OfflineOverlay route={route} />
</>
)
}
/** Apply sidebar insets natively, before Yoga measures the content pane. */
export function TabScreenContent({
route,
children,
}: {
route: ScreenRoute
children: ReactNode
}) {
export function TabScreenContent({ children }: { children: ReactNode }) {
const backgroundStyle = useTabletBackgroundStyle()
if (Platform.OS !== "ios" || !Platform.isPad) {
return <ScreenBody route={route}>{children}</ScreenBody>
}
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
return (
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
<SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}>
<ScreenBody route={route}>{children}</ScreenBody>
{children}
</SafeAreaView>
<TabletSidebar />
<TabletPlayerLayoutSync />
@@ -52,13 +22,6 @@ export function TabScreenContent({
)
}
/** `screenLayout` for every tab stack. */
export function renderTabScreenContent({
route,
children,
}: {
route: ScreenRoute
children: ReactNode
}) {
return <TabScreenContent route={route}>{children}</TabScreenContent>
export function renderTabScreenContent({ children }: { children: ReactNode }) {
return <TabScreenContent>{children}</TabScreenContent>
}
+5 -24
View File
@@ -4,10 +4,9 @@ import {
useRef,
useState,
type ReactElement,
type ReactNode,
} from "react"
import {
type ScrollViewInstance,
ScrollView,
View,
type NativeSyntheticEvent,
type NativeScrollEvent,
@@ -16,7 +15,6 @@ import Animated from "react-native-reanimated"
import { useSafeAreaInsets } from "react-native-safe-area-context"
import type { MediaItem } from "@/components/media-cards"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { useThemeColors } from "@/lib/theme"
@@ -30,9 +28,6 @@ type GridProps = {
onEndReached?: () => void
ListHeaderComponent?: ReactElement
contentInset?: boolean
/** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
title?: string
titleAccessory?: ReactNode
renderCard: (item: MediaItem, width: number) => ReactElement
}
@@ -46,13 +41,9 @@ export function TabletMediaGrid({
onEndReached,
ListHeaderComponent,
contentInset = true,
title,
titleAccessory,
renderCard,
}: GridProps) {
const colors = useThemeColors()
const { ref, scrollY: titleScrollY } =
useScreenTitleScroll<ScrollViewInstance>()
const insets = useSafeAreaInsets()
const { columns, cardWidth, onLayout, horizontalPadding, gap, ready } =
useMediaGridLayout()
@@ -111,28 +102,18 @@ export function TabletMediaGrid({
setViewportHeight(event.nativeEvent.layout.height)
}}
>
<Animated.ScrollView
ref={ref}
<ScrollView
onScroll={onScroll}
// Every frame, so the title pins smoothly on pull-down.
scrollEventThrottle={16}
scrollEventThrottle={32}
contentInsetAdjustmentBehavior="automatic"
contentContainerStyle={{
paddingTop: contentInset && !title ? horizontalPadding : 0,
paddingTop: contentInset ? horizontalPadding : 0,
paddingBottom: paddingBottom + insets.bottom,
}}
>
<View
onLayout={(event) => setHeaderHeight(event.nativeEvent.layout.height)}
>
{title ? (
<ScreenTitle
title={title}
scrollY={titleScrollY}
accessory={titleAccessory}
style={{ paddingHorizontal: horizontalPadding }}
/>
) : null}
{ListHeaderComponent}
</View>
<View style={{ height: gridHeight }}>
@@ -155,7 +136,7 @@ export function TabletMediaGrid({
)
})}
</View>
</Animated.ScrollView>
</ScrollView>
</Animated.View>
)
}
+4 -12
View File
@@ -23,7 +23,6 @@ import { PlayerSymbol } from "@/components/player-symbol"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import { useLyrics } from "@/hooks/use-lyrics"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { tabletMiniPlayerHeight } from "@/lib/theme"
import { albumCoverUrl } from "@/lib/urls"
@@ -59,7 +58,6 @@ export function TabletMiniPlayer() {
const { handleSongAction } = useMediaMenuActions()
const { isSongFavorite } = useFavorites()
const roomy = width - insets.left - insets.right >= 650
const lyrics = useLyrics(roomy ? (currentSong?.id ?? null) : null)
if (!focused || !config || !currentSong || queueSongIds.length === 0)
return null
@@ -168,22 +166,16 @@ export function TabletMiniPlayer() {
{roomy ? (
<Pressable
style={styles.control}
disabled={!lyrics}
onPress={() =>
router.push({
pathname: "/(app)/player",
params: { lyrics: "1" },
})
}
disabled
accessibilityRole="button"
accessibilityLabel="Show lyrics"
accessibilityState={{ disabled: !lyrics }}
accessibilityLabel="Lyrics"
accessibilityState={{ disabled: true }}
>
<PlayerSymbol
name="quote.bubble"
fallback="chatbox-outline"
size={23}
color={lyrics ? color : inactive}
color={inactive}
/>
</Pressable>
) : null}
+21 -46
View File
@@ -15,7 +15,6 @@ import { StatusBar } from "expo-status-bar"
import { AudioOutputButton } from "@/components/audio-output-button"
import { CoverImage } from "@/components/cover-image"
import { LyricsView } from "@/components/lyrics-view"
import { NowPlayingQueue } from "@/components/now-playing-queue"
import { PlayerProgress } from "@/components/player-progress"
import { PlayerSlider } from "@/components/player-slider"
@@ -25,10 +24,6 @@ import { useServerConfig } from "@/contexts/server-config"
import { useSystemVolume } from "@/hooks/use-system-volume"
import type { NowPlayingColors } from "@/lib/now-playing-colors"
import { albumCoverUrl } from "@/lib/urls"
import type { Lyrics } from "@otunes/convex/client/lyrics"
/** What the Now Playing screen shows beside or instead of the artwork. */
export type PlayerPanel = "queue" | "lyrics"
const queueMotion = {
duration: 420,
@@ -36,18 +31,14 @@ const queueMotion = {
reduceMotion: ReduceMotion.System,
}
/**
* Tablet player keeps transport controls visible while the queue or lyrics
* open beside them.
*/
/** Tablet player keeps transport controls visible while the queue opens beside them. */
export function TabletNowPlaying({
colors,
backgroundStyle,
dismissStyle,
dismissGestures,
panel,
togglePanel,
lyrics,
showQueue,
toggleQueue,
metadata,
}: {
colors: NowPlayingColors
@@ -57,9 +48,8 @@ export function TabletNowPlaying({
handle: ReturnType<typeof Gesture.Pan>
artwork: ReturnType<typeof Gesture.Pan>
}
panel: PlayerPanel | null
togglePanel: (panel: PlayerPanel) => void
lyrics: Lyrics | null | undefined
showQueue: boolean
toggleQueue: () => void
metadata: ReactNode
}) {
const router = useRouter()
@@ -73,9 +63,7 @@ export function TabletNowPlaying({
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
const [queueHeight, setQueueHeight] = useState(0)
const wideLayout = width >= 700
const showQueue = panel === "queue"
const showLyrics = panel === "lyrics"
const sideBySide = panel !== null && wideLayout
const sideBySide = showQueue && wideLayout
const progress = useSharedValue(sideBySide ? 1 : 0)
useEffect(() => {
progress.value = withTiming(sideBySide ? 1 : 0, queueMotion)
@@ -136,14 +124,7 @@ export function TabletNowPlaying({
/>
</Pressable>
)
const panelContent = showLyrics ? (
<LyricsView
key={currentSong.id}
lyrics={lyrics}
colors={colors}
fontSize={34}
/>
) : (
const queue = (
<NowPlayingQueue
tablet
colors={colors}
@@ -260,18 +241,20 @@ export function TabletNowPlaying({
</Animated.View>
{wideLayout ? (
<Animated.View
pointerEvents={panel ? "auto" : "none"}
accessibilityElementsHidden={!panel}
importantForAccessibility={panel ? "auto" : "no-hide-descendants"}
pointerEvents={showQueue ? "auto" : "none"}
accessibilityElementsHidden={!showQueue}
importantForAccessibility={
showQueue ? "auto" : "no-hide-descendants"
}
style={[styles.queue, queueStyle]}
onLayout={(event) =>
setQueueHeight(event.nativeEvent.layout.height)
}
>
{queueHeight > 0 ? panelContent : null}
{queueHeight > 0 ? queue : null}
</Animated.View>
) : null}
{panel && !sideBySide ? (
{showQueue && !sideBySide ? (
<View
style={[
styles.portraitQueue,
@@ -281,7 +264,7 @@ export function TabletNowPlaying({
setQueueHeight(event.nativeEvent.layout.height)
}
>
{queueHeight > 0 ? panelContent : null}
{queueHeight > 0 ? queue : null}
</View>
) : null}
</View>
@@ -297,29 +280,21 @@ export function TabletNowPlaying({
/>
<View style={styles.footerActions}>
<Pressable
onPress={() => togglePanel("lyrics")}
disabled={!lyrics && !showLyrics}
disabled
accessibilityRole="button"
accessibilityLabel={showLyrics ? "Hide lyrics" : "Show lyrics"}
accessibilityState={{
selected: showLyrics,
disabled: !lyrics && !showLyrics,
}}
style={[
styles.footerButton,
!lyrics && !showLyrics && { opacity: 0.4 },
showLyrics && { backgroundColor: colors.selected },
]}
accessibilityLabel="Lyrics"
accessibilityState={{ disabled: true }}
style={[styles.footerButton, { opacity: 0.4 }]}
>
<PlayerSymbol
name="quote.bubble"
fallback="chatbox-outline"
size={25}
color={showLyrics ? colors.selectedForeground : colors.foreground}
color={colors.foreground}
/>
</Pressable>
<Pressable
onPress={() => togglePanel("queue")}
onPress={toggleQueue}
accessibilityRole="button"
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
accessibilityState={{ selected: showQueue }}
-476
View File
@@ -1,476 +0,0 @@
import { useConvex, useQuery } from "convex/react"
import {
createContext,
useCallback,
useContext,
useEffect,
useMemo,
useState,
useSyncExternalStore,
type ReactNode,
} from "react"
import {
Alert,
Modal,
Platform,
Pressable,
StyleSheet,
Switch,
Text,
View,
} from "react-native"
import { toast } from "sonner-native"
import { AndroidSheet } from "@/components/android-sheet"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import { useCacheScope } from "@/contexts/persistent-cache"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { getAuthCookieHeader } from "@/lib/auth-cookies"
import {
downloadQueueFor,
readRememberedDownloadQuality,
writeRememberedDownloadQuality,
} from "@/lib/downloads"
import { loadPlaybackSongs } from "@/lib/playback-files"
import type { ServerConfig } from "@/lib/server-config"
import { showError } from "@/lib/toast"
import { useThemeColors } from "@/lib/theme"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import type {
CollectionRef,
DownloadableSong,
DownloadSource,
DownloadQueue,
SongDownloadState,
} from "@otunes/convex/client/download-queue"
import { FAVORITES_ID } from "@otunes/convex/client/download-queue"
import {
DOWNLOAD_OPTIONS_PATH,
DOWNLOAD_QUALITY_DETAILS,
DOWNLOAD_QUALITY_LABELS,
formatBytes,
type DownloadOptionsResponse,
type DownloadQuality,
type SizedDownloadOption,
} from "@otunes/convex/download-quality"
/** Songs on their own, or an album or playlist that stays downloaded as a whole. */
export type DownloadTarget =
| {
kind: "songs"
songIds: string[]
title: string
/** Removing takes the songs out of only this download. */
from?: DownloadSource
}
| (CollectionRef & { title: string; songIds: string[] })
/** The Favorites playlist has no ID, so downloads use this one. */
export const FAVORITES_DOWNLOAD_ID = FAVORITES_ID
type DownloadsContextValue = {
queue: DownloadQueue | null
/** Asks for a quality (unless remembered) and starts downloading. */
requestDownload: (target: DownloadTarget) => Promise<void>
removeDownload: (target: DownloadTarget) => Promise<void>
}
const DownloadsContext = createContext<DownloadsContextValue | null>(null)
export function useDownloads() {
const context = useContext(DownloadsContext)
if (!context) {
throw new Error("useDownloads must be used within DownloadsProvider")
}
return context
}
const noopSubscribe = () => () => {}
/** Re-renders on every download change. Prefer the narrower hooks in lists. */
export function useDownloadsVersion() {
const { queue } = useDownloads()
return useSyncExternalStore(
queue?.subscribe ?? noopSubscribe,
() => queue?.getVersion() ?? 0
)
}
/**
* A song's download state as seen from `from` (see `downloadState`). Only
* re-renders when that state changes.
*/
export function useSongDownloadState(
songId: string,
from?: DownloadSource
): SongDownloadState {
const { queue } = useDownloads()
return useSyncExternalStore(
queue?.subscribe ?? noopSubscribe,
() => queue?.downloadState(songId, from) ?? "none"
)
}
/** Whether an album or playlist is downloaded. */
export function useIsCollectionDownloaded(ref: CollectionRef) {
const { queue } = useDownloads()
return useSyncExternalStore(
queue?.subscribe ?? noopSubscribe,
() => queue?.getCollection(ref) !== undefined
)
}
/**
* For swipe actions: downloads a song, or asks before removing its download
* (from `from` only, when given).
*/
export function useToggleSongDownload() {
const { requestDownload, removeDownload } = useDownloads()
return useCallback(
(
song: { id: string; title: string },
downloaded: boolean,
from?: DownloadSource
) => {
const target = {
kind: "songs" as const,
songIds: [song.id],
title: song.title,
from,
}
if (!downloaded) {
void requestDownload(target)
return
}
Alert.alert("Remove download?", song.title, [
{ text: "Cancel", style: "cancel" },
{
text: "Remove",
style: "destructive",
onPress: () => void removeDownload(target),
},
])
},
[requestDownload, removeDownload]
)
}
async function fetchDownloadOptions(config: ServerConfig, songIds: string[]) {
const cookieHeader = await getAuthCookieHeader(
config.serverUrl,
config.convexUrl
)
if (!cookieHeader) throw new Error("Sign in to download")
const response = await fetch(`${config.serverUrl}${DOWNLOAD_OPTIONS_PATH}`, {
method: "POST",
headers: { "Content-Type": "application/json", Cookie: cookieHeader },
body: JSON.stringify({
songIds,
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
}),
})
if (!response.ok) {
throw new Error("Could not reach the server to download")
}
return (await response.json()) as DownloadOptionsResponse
}
function startDownload(
queue: DownloadQueue,
target: DownloadTarget,
songs: DownloadableSong[],
quality: DownloadQuality
) {
if (target.kind === "songs") return queue.enqueue(songs, quality)
return queue.downloadCollection(
{ kind: target.kind, id: target.id, title: target.title, quality },
songs
)
}
function optionDetail(option: SizedDownloadOption, songCount: number) {
if (option.fallbackCount === 0) {
return DOWNLOAD_QUALITY_DETAILS[option.quality]
}
const included = songCount - option.fallbackCount
return `${included} of ${songCount} songs, ${option.fallbackCount} in High`
}
/** Centered popup asking which quality to download a target at. */
function DownloadQualityPopup({
pending,
onClose,
onPick,
}: {
pending: { target: DownloadTarget; response: DownloadOptionsResponse } | null
onClose: () => void
onPick: (quality: DownloadQuality, remember: boolean) => void
}) {
const colors = useThemeColors()
const [remember, setRemember] = useState(false)
const songCount = pending?.response.songs.length ?? 0
return (
<Modal
visible={pending !== null}
animationType="fade"
transparent
onRequestClose={onClose}
>
<AndroidSheet>
<Pressable style={styles.overlay} onPress={onClose}>
<Pressable
style={[
styles.popup,
{ backgroundColor: colors.card, borderColor: colors.border },
]}
onPress={(event) => event.stopPropagation()}
>
<Text style={[styles.title, { color: colors.foreground }]}>
Download Quality
</Text>
<Text
style={[styles.subtitle, { color: colors.mutedForeground }]}
numberOfLines={1}
>
{pending?.target.title}
</Text>
{pending?.response.options.map((option) => (
<Pressable
key={option.quality}
accessibilityRole="button"
style={[styles.row, { borderBottomColor: colors.border }]}
onPress={() => onPick(option.quality, remember)}
>
<View style={styles.rowText}>
{option.quality === "lossless" ||
option.quality === "atmos" ? (
<AudioFormatBadge
format={option.quality}
color={colors.foreground}
backgroundColor={colors.card}
/>
) : (
<Text style={[styles.label, { color: colors.foreground }]}>
{DOWNLOAD_QUALITY_LABELS[option.quality]}
</Text>
)}
<Text style={{ color: colors.mutedForeground, fontSize: 12 }}>
{optionDetail(option, songCount)}
</Text>
</View>
<Text style={[styles.size, { color: colors.mutedForeground }]}>
{option.estimated ? "~" : ""}
{formatBytes(option.bytes)}
</Text>
</Pressable>
))}
<View style={styles.rememberRow}>
<Text style={{ color: colors.foreground, fontSize: 15 }}>
Remember my choice
</Text>
<Switch value={remember} onValueChange={setRemember} />
</View>
</Pressable>
</Pressable>
</AndroidSheet>
</Modal>
)
}
/** Keeps a downloaded playlist's songs in step with the playlist. */
function useSyncDownloadedPlaylist(
queue: DownloadQueue,
id: string,
songIds: readonly string[] | undefined
) {
const convex = useConvex()
const cacheScope = useCacheScope()
useEffect(() => {
if (!songIds) return
void queue
.syncCollection({ kind: "playlist", id }, songIds, async (added) => {
const songs = await loadPlaybackSongs(
convex,
cacheScope,
added as Id<"songs">[]
)
return songs.filter((song) => song !== null)
})
.catch(() => {})
}, [cacheScope, convex, id, queue, songIds])
}
function PlaylistSync({ queue, id }: { queue: DownloadQueue; id: string }) {
const songIds = useQuery(api.playlists.getPlaylistSongIds, {
playlistId: id as Id<"playlists">,
})
useSyncDownloadedPlaylist(queue, id, songIds)
return null
}
function FavoritesSync({ queue }: { queue: DownloadQueue }) {
const favorites = useCachedQuery(api.favorites.getUserFavorites)
const songIds = useMemo(() => favorites?.favoriteSongs.flat(), [favorites])
useSyncDownloadedPlaylist(queue, FAVORITES_DOWNLOAD_ID, songIds)
return null
}
function DownloadSync({ queue }: { queue: DownloadQueue }) {
useSyncExternalStore(queue.subscribe, queue.getVersion)
return queue
.collections()
.filter((collection) => collection.kind === "playlist")
.map((collection) =>
collection.id === FAVORITES_DOWNLOAD_ID ? (
<FavoritesSync key={collection.id} queue={queue} />
) : (
<PlaylistSync key={collection.id} queue={queue} id={collection.id} />
)
)
}
export function DownloadsProvider({ children }: { children: ReactNode }) {
const { config } = useServerConfig()
const convex = useConvex()
const cacheScope = useCacheScope()
const queue = useMemo(
() => (config ? downloadQueueFor(config) : null),
[config]
)
const [pending, setPending] = useState<{
target: DownloadTarget
response: DownloadOptionsResponse
} | null>(null)
useEffect(() => {
if (!queue) return
void queue.load().catch(() => {})
// Reports failed songs once per burst instead of once per song.
let failed = 0
let timer: ReturnType<typeof setTimeout> | null = null
const unsubscribe = queue.onFailure(() => {
failed += 1
timer ??= setTimeout(() => {
showError(
failed === 1
? "A song could not be downloaded"
: `${failed} songs could not be downloaded`
)
failed = 0
timer = null
}, 1000)
})
return () => {
unsubscribe()
if (timer) clearTimeout(timer)
}
}, [queue])
const requestDownload = useCallback(
async (target: DownloadTarget) => {
if (!config || !queue || target.songIds.length === 0) return
if (target.songIds.every((id) => queue.getDownloaded(id))) {
// Already on this device: just give them back to their downloads.
await queue.enqueue(
target.songIds.map((id) => ({ id, files: {} })),
"high"
)
return
}
try {
// Caches titles and formats so downloads can be queued offline.
void loadPlaybackSongs(
convex,
cacheScope,
target.songIds as Id<"songs">[]
).catch(() => {})
const response = await fetchDownloadOptions(config, target.songIds)
const remembered = await readRememberedDownloadQuality()
if (remembered) {
await startDownload(queue, target, response.songs, remembered)
toast(`Downloading ${target.title}`)
} else {
setPending({ target, response })
}
} catch (error) {
showError(error instanceof Error ? error.message : "Download failed")
}
},
[cacheScope, config, convex, queue]
)
const removeDownload = useCallback(
async (target: DownloadTarget) => {
if (!queue) return
if (target.kind === "songs") {
await queue.removeSongs(target.songIds, target.from)
} else await queue.removeCollection(target)
},
[queue]
)
const handlePick = useCallback(
(quality: DownloadQuality, remember: boolean) => {
if (!pending || !queue) return
setPending(null)
if (remember) void writeRememberedDownloadQuality(quality)
void startDownload(queue, pending.target, pending.response.songs, quality)
},
[pending, queue]
)
const value = useMemo(
() => ({ queue, requestDownload, removeDownload }),
[queue, requestDownload, removeDownload]
)
return (
<DownloadsContext.Provider value={value}>
{children}
{queue ? <DownloadSync queue={queue} /> : null}
<DownloadQualityPopup
pending={pending}
onClose={() => setPending(null)}
onPick={handlePick}
/>
</DownloadsContext.Provider>
)
}
const styles = StyleSheet.create({
overlay: {
flex: 1,
backgroundColor: "rgba(0,0,0,0.6)",
justifyContent: "center",
alignItems: "center",
padding: 24,
},
popup: {
width: "100%",
maxWidth: 420,
borderRadius: 16,
borderWidth: 1,
padding: 16,
},
title: { fontSize: 18, fontWeight: "700" },
subtitle: { fontSize: 13, marginBottom: 4 },
row: {
flexDirection: "row",
alignItems: "center",
gap: 12,
paddingVertical: 12,
borderBottomWidth: StyleSheet.hairlineWidth,
},
rowText: { flex: 1, minWidth: 0, gap: 2 },
label: { fontSize: 15, fontWeight: "500" },
size: { fontSize: 13, fontVariant: ["tabular-nums"] },
rememberRow: {
flexDirection: "row",
alignItems: "center",
justifyContent: "space-between",
paddingTop: 12,
},
})
+5 -12
View File
@@ -24,7 +24,6 @@ import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
import * as playbackQueue from "@otunes/convex/client/playback-queue"
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
import { getPlaybackStore } from "@otunes/convex/client/playback-store"
import { isDownloadsQueueOrigin } from "@otunes/convex/download-quality"
import { rememberSongs, useSong, useSongs } from "@/lib/song-cache"
import { donateMusicPlay, type MusicEntityKind } from "@/lib/app-intents"
import { showError } from "@/lib/toast"
@@ -44,9 +43,8 @@ type PlaybackContextValue = {
seekTo: (seconds: number) => void
waitForPlaybackReady: (playing?: boolean) => Promise<void>
setIsPlaying: (playing: boolean) => void
/** An origin from `downloadsQueueOrigin` plays downloads in any quality. */
playInOrder: (songIds: Id<"songs">[], origin?: string) => Promise<void>
playShuffled: (songIds: Id<"songs">[], origin?: string) => Promise<void>
playInOrder: (songIds: Id<"songs">[]) => Promise<void>
playShuffled: (songIds: Id<"songs">[]) => Promise<void>
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
playFromSong: (
@@ -247,8 +245,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const queueOriginRef = useRef<string | undefined>(undefined)
const playRequestRef = useRef(0)
const [queueStartVersion, setQueueStartVersion] = useState(0)
// Queues started from the Downloads page play downloads in any quality.
const [fromDownloads, setFromDownloads] = useState(false)
const queueSongIds = playback.queue
const queueHistorySongIds = playback.history
@@ -284,7 +280,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
repeatEnabled,
currentSong,
queueStartVersion,
fromDownloads,
})
const { resetProgress } = useProgressPersistence({
@@ -315,7 +310,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
queueOriginRef.current =
recorded.origin ??
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
setFromDownloads(isDownloadsQueueOrigin(recorded.origin))
resetQueuePlayback()
store.update(playbackQueue.clearQueue)
store.update(recipe)
@@ -369,11 +363,10 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
)
const playSongs = useCallback(
(shuffled: boolean) => async (songIds: Id<"songs">[], origin?: string) => {
(shuffled: boolean) => async (songIds: Id<"songs">[]) => {
if (songIds.length === 0) return
startPlayback(
(state) => playbackQueue.startQueue(state, songIds, shuffled),
{ origin }
startPlayback((state) =>
playbackQueue.startQueue(state, songIds, shuffled)
)
},
[startPlayback]
+2 -4
View File
@@ -9,15 +9,13 @@
"APP_VARIANT": "development"
},
"developmentClient": true,
"distribution": "internal",
"credentialsSource": "local"
"distribution": "internal"
},
"preview": {
"env": {
"APP_VARIANT": "preview"
},
"distribution": "internal",
"credentialsSource": "local"
"distribution": "internal"
},
"production": {
"env": {
-109
View File
@@ -1,109 +0,0 @@
import { File } from "expo-file-system"
import { useEffect, useMemo, useState, useSyncExternalStore } from "react"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import {
followLyrics,
parseLyrics,
type Lyrics,
} from "@otunes/convex/client/lyrics"
import { readLyricsTag } from "@otunes/convex/client/lyrics-tags"
import { useDownloads } from "@/contexts/downloads"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { downloadedAudioUri } from "@/lib/downloads"
// Lyrics read from downloaded files, by file. Files do not change once saved.
const localLyrics = new Map<string, Promise<string | null>>()
async function readFileLyrics(uri: string) {
const handle = new File(uri).open()
try {
const text = await readLyricsTag({
size: handle.size ?? 0,
read: (offset, length) => {
handle.offset = offset
return handle.readBytes(length)
},
})
return text?.trim() || null
} finally {
handle.close()
}
}
function readLocalLyrics(uri: string) {
let lyrics = localLyrics.get(uri)
if (!lyrics) {
lyrics = readFileLyrics(uri).catch(() => null)
localLyrics.set(uri, lyrics)
}
return lyrics
}
const noopSubscribe = () => () => {}
/**
* A song's lyrics: from its downloaded file when there is one, otherwise from
* the server. `undefined` while loading, `null` when the song has none.
*/
export function useLyrics(songId: Id<"songs"> | null) {
const { config } = useServerConfig()
const { queue } = useDownloads()
const fileUri = useSyncExternalStore(queue?.subscribe ?? noopSubscribe, () =>
songId && config && queue?.getDownloaded(songId)
? downloadedAudioUri(config, songId)
: null
)
const [local, setLocal] = useState<{ uri: string; text: string | null }>()
useEffect(() => {
if (!fileUri) return
let current = true
void readLocalLyrics(fileUri).then((text) => {
if (current) setLocal({ uri: fileUri, text })
})
return () => {
current = false
}
}, [fileUri])
const localText = fileUri && local?.uri === fileUri ? local.text : undefined
// Songs without a downloaded copy, or whose copy has no lyrics tag.
const remote = useCachedQuery(
api.lyrics.forSong,
songId && (!fileUri || localText === null) ? { id: songId } : "skip"
)
const text = localText || remote
return useMemo<Lyrics | null | undefined>(() => {
if (!songId) return null
if (text === undefined) return undefined
return text ? parseLyrics(text) : null
}, [songId, text])
}
/**
* The playback time for highlighting lyrics: the player's `currentTime`,
* advanced by `followLyrics` between its progress updates.
*/
export function useLyricsTime(
lyrics: Lyrics | null | undefined,
currentTime: number,
isPlaying: boolean
) {
// Time reached since the player last reported `from`.
const [advanced, setAdvanced] = useState<{ from: number; time: number }>()
useEffect(() => {
if (!lyrics || !isPlaying) return
return followLyrics(lyrics, currentTime, (time) =>
setAdvanced({ from: currentTime, time })
)
}, [lyrics, currentTime, isPlaying])
return isPlaying && advanced?.from === currentTime
? advanced.time
: currentTime
}
+3 -69
View File
@@ -2,9 +2,7 @@ import { useConvex } from "convex/react"
import { useCallback } from "react"
import type { MediaAction } from "@/components/media-context-menu"
import type { DownloadSource } from "@otunes/convex/client/download-queue"
import { useAddToPlaylist } from "@/contexts/add-to-playlist"
import { useDownloads } from "@/contexts/downloads"
import { useCacheScope } from "@/contexts/persistent-cache"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
@@ -50,7 +48,6 @@ export function useMediaMenuActions() {
} = useFavorites()
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
usePlaybackActions()
const { requestDownload, removeDownload } = useDownloads()
const runQueueAction = useCallback(
async (action: MediaAction, songIds: Id<"songs">[]) => {
@@ -74,9 +71,8 @@ export function useMediaMenuActions() {
[addToQueueLast, addToQueueNext, playShuffled]
)
/** `from` limits removing a download to that album, playlist, or Other. */
const handleSongAction = useCallback(
async (song: BrowseSong, action: MediaAction, from?: DownloadSource) => {
async (song: BrowseSong, action: MediaAction) => {
const songIds = [song.id as Id<"songs">]
switch (action) {
case "create-station":
@@ -101,19 +97,6 @@ export function useMediaMenuActions() {
case "go-album":
push(`/album/${song.album.id}`)
break
case "download":
case "remove-download": {
const target = {
kind: "songs" as const,
songIds,
title: song.title,
from,
}
await (action === "download"
? requestDownload(target)
: removeDownload(target))
break
}
default:
break
}
@@ -124,8 +107,6 @@ export function useMediaMenuActions() {
runQueueAction,
toggleSongFavorite,
playArtistShuffled,
requestDownload,
removeDownload,
]
)
@@ -157,25 +138,6 @@ export function useMediaMenuActions() {
case "go-artist":
push(`/artist/${album.artist.id}`)
break
case "download":
case "remove-download": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{ albumId: album.id as Id<"albums"> }
)
const target = {
kind: "album" as const,
id: album.id,
title: album.title,
songIds,
}
await (action === "download"
? requestDownload(target)
: removeDownload(target))
break
}
default:
break
}
@@ -189,8 +151,6 @@ export function useMediaMenuActions() {
push,
runQueueAction,
toggleAlbumFavorite,
requestDownload,
removeDownload,
]
)
@@ -251,38 +211,12 @@ export function useMediaMenuActions() {
await runQueueAction(action, songIds)
break
}
case "download":
case "remove-download": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getPlaylistSongIds,
{ playlistId: playlist.id as Id<"playlists"> }
)
const target = {
kind: "playlist" as const,
id: playlist.id,
title: playlist.title,
songIds,
}
await (action === "download"
? requestDownload(target)
: removeDownload(target))
break
}
default:
break
}
})
},
[
convex,
cacheScope,
openAddPlaylistToPlaylist,
runQueueAction,
requestDownload,
removeDownload,
]
[convex, cacheScope, openAddPlaylistToPlaylist, runQueueAction]
)
const handleAlbumDetailAction = useCallback(
@@ -331,7 +265,7 @@ export function useMediaMenuActions() {
cover: album.cover,
},
}
await handleSongAction(song, action, { kind: "album", id: album.id })
await handleSongAction(song, action)
},
[handleSongAction]
)
+2 -25
View File
@@ -18,12 +18,10 @@ import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong } from "@otunes/convex/types"
import { playbackStreamPlan } from "@otunes/convex/playback-stream"
import { streamDownloadQuality } from "@otunes/convex/download-quality"
import * as playbackQueue from "@otunes/convex/client/playback-queue"
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
import type { PlaybackStore } from "@otunes/convex/client/playback-store"
import { getAuthCookieHeader } from "@/lib/auth-cookies"
import { downloadedAudioUri, downloadQueueFor } from "@/lib/downloads"
import { loadPlaybackSongs } from "@/lib/playback-files"
import { showError } from "@/lib/toast"
import { albumCoverUrl, songAudioSource } from "@/lib/urls"
@@ -73,7 +71,6 @@ export function useNativePlaylistSync({
repeatEnabled,
currentSong,
queueStartVersion,
fromDownloads,
}: {
store: PlaybackStore
queueSongIds: Id<"songs">[]
@@ -81,8 +78,6 @@ export function useNativePlaylistSync({
repeatEnabled: RepeatMode
currentSong: BrowseSong | null
queueStartVersion: number
/** Plays downloads in any quality, for queues started from Downloads. */
fromDownloads: boolean
}) {
const convex = useConvex()
const { config } = useServerConfig()
@@ -464,7 +459,7 @@ export function useNativePlaylistSync({
}
if (!isCurrentLoad()) return
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${fromDownloads}:${cookieHeader}`
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${cookieHeader}`
const needsRebuild =
loadedLoadKeyRef.current !== loadKey ||
nativePlaylistNeedsRebuild(
@@ -498,12 +493,7 @@ export function useNativePlaylistSync({
}
const buildSources = async (songIds: Id<"songs">[]) => {
const [songs] = await Promise.all([
loadPlaybackSongs(convex, cacheScope, songIds),
downloadQueueFor(config)
.load()
.catch(() => {}),
])
const songs = await loadPlaybackSongs(convex, cacheScope, songIds)
const sources = new Map<Id<"songs">, AudioSource>()
for (const song of songs) {
if (!song) return null
@@ -512,18 +502,6 @@ export function useNativePlaylistSync({
user.playbackQuality,
atmosEnabled(user)
)
// Downloads stand in for streams in the same quality, and always
// play in queues started from Downloads.
const download = downloadQueueFor(config).getDownloaded(song.id)
const localUri =
download &&
(fromDownloads || download.quality === streamDownloadQuality(plan))
? downloadedAudioUri(config, song.id)
: null
if (localUri) {
sources.set(song.id, { uri: localUri, name: song.title })
continue
}
sources.set(
song.id,
songAudioSource(
@@ -650,7 +628,6 @@ export function useNativePlaylistSync({
currentSongId,
currentSongSyncKey,
destroyPlaylist,
fromDownloads,
ensurePlaylist,
handlePlaybackLoadFailure,
historySyncKey,
-15
View File
@@ -1,15 +0,0 @@
import { useLocalSearchParams } from "expo-router"
export const OTHER_DOWNLOADS_TITLE = "Other Downloaded Songs"
/** Route param marking album and playlist screens opened from Downloads. */
export const FROM_DOWNLOADS_PARAM = "from=downloads"
/**
* True on album and playlist screens opened from Downloads, where playback
* uses the downloads whatever their quality.
*/
export function useOpenedFromDownloads() {
const { from } = useLocalSearchParams<{ from?: string }>()
return from === "downloads"
}
-229
View File
@@ -1,229 +0,0 @@
import AsyncStorage from "@react-native-async-storage/async-storage"
import { Directory, File, Paths } from "expo-file-system"
import { Platform } from "react-native"
import {
createDownloadQueue,
type DownloadedCover,
type DownloadedSong,
type DownloadIndex,
type DownloadQueue,
type DownloadStorage,
} from "@otunes/convex/client/download-queue"
import {
parseDownloadQuality,
songDownloadPath,
type DownloadQuality,
} from "@otunes/convex/download-quality"
import { getAuthCookieHeader } from "@/lib/auth-cookies"
import type { ServerConfig } from "@/lib/server-config"
const REMEMBERED_QUALITY_KEY = "otunes.download-quality"
const PARTIAL_SUFFIX = ".partial"
const COVERS_FOLDER = "covers"
const COVER_SIZE = 1024
// Each song is a folder named `<songId>.<quality>.<albumId>` holding one audio
// file, named by the server so it keeps the right extension. Folders end in
// `.partial` until their download completes. Covers are files named
// `<kind>-<id>` in the `covers` folder.
function serverDirectory(config: ServerConfig) {
const host = config.hostname.replace(/[^a-z0-9.-]/gi, "_")
return new Directory(Paths.document, "downloads", host)
}
function songFolderName(song: {
songId: string
quality: DownloadQuality
albumId?: string
}) {
return [song.songId, song.quality, song.albumId].filter(Boolean).join(".")
}
function parseSongFolder(name: string) {
const [songId, rawQuality, albumId, ...rest] = name.split(".")
const quality = parseDownloadQuality(rawQuality)
if (!songId || !quality || rest.length > 0) return null
return { songId, quality, albumId: albumId || undefined }
}
function songFolders(root: Directory) {
if (!root.exists) return []
return root
.list()
.filter(
(entry): entry is Directory =>
entry instanceof Directory && entry.name !== COVERS_FOLDER
)
}
function coverFileName({ kind, id }: DownloadedCover) {
return `${kind}-${id}`
}
// Saved covers by their server URL, for `downloadedCoverUri`.
const savedCoverUris = new Map<string, string>()
function coverUrl(config: ServerConfig, { kind, id }: DownloadedCover) {
return `${config.serverUrl}/api/${kind}/${id}/cover`
}
function audioFile(folder: Directory) {
return folder.list().find((entry): entry is File => entry instanceof File)
}
function createStorage(config: ServerConfig): DownloadStorage {
const root = serverDirectory(config)
const indexFile = new File(root, "index.json")
const coversFolder = new Directory(root, COVERS_FOLDER)
// Remembers the covers saved in earlier launches.
if (coversFolder.exists) {
for (const entry of coversFolder.list()) {
const dash = entry.name.indexOf("-")
const kind = entry.name.slice(0, dash)
if (entry instanceof File && (kind === "album" || kind === "playlist")) {
const cover = { kind, id: entry.name.slice(dash + 1) } as const
savedCoverUris.set(coverUrl(config, cover), entry.uri)
}
}
}
function foldersFor(songIds: ReadonlySet<string>) {
return songFolders(root).filter((folder) => {
const name = folder.name.replace(PARTIAL_SUFFIX, "")
const parsed = parseSongFolder(name)
return parsed !== null && songIds.has(parsed.songId)
})
}
return {
async list() {
const songs: DownloadedSong[] = []
for (const folder of songFolders(root)) {
const parsed = parseSongFolder(folder.name)
const file = parsed ? audioFile(folder) : undefined
if (!parsed || !file) {
// Interrupted downloads from an earlier launch.
folder.delete()
continue
}
songs.push({ ...parsed, bytes: file.size ?? 0 })
}
return songs
},
async save({ songId, requested, quality, albumId }, signal) {
const cookieHeader = await getAuthCookieHeader(
config.serverUrl,
config.convexUrl
)
if (!cookieHeader) throw new Error("Sign in to download")
root.create({ intermediates: true, idempotent: true })
const name = songFolderName({ songId, quality, albumId })
const partial = new Directory(root, `${name}${PARTIAL_SUFFIX}`)
if (partial.exists) partial.delete()
partial.create()
try {
const path = songDownloadPath(songId, requested, {
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
})
const file = await File.downloadFileAsync(
`${config.serverUrl}${path}`,
partial,
{ headers: { Cookie: cookieHeader }, signal }
)
signal.throwIfAborted()
partial.rename(name)
return file.size ?? 0
} catch (error) {
if (partial.exists) partial.delete()
throw error
}
},
async saveCover(cover) {
const file = new File(coversFolder, coverFileName(cover))
if (file.exists) return
coversFolder.create({ intermediates: true, idempotent: true })
const url = coverUrl(config, cover)
await File.downloadFileAsync(`${url}?size=${COVER_SIZE}`, file)
savedCoverUris.set(url, file.uri)
},
async pruneCovers(keep) {
if (!coversFolder.exists) return
const kept = new Set(keep.map(coverFileName))
for (const entry of coversFolder.list()) {
if (kept.has(entry.name)) continue
entry.delete()
for (const [url, uri] of savedCoverUris) {
if (uri === entry.uri) savedCoverUris.delete(url)
}
}
},
async readIndex() {
if (indexFile.exists) {
try {
return JSON.parse(await indexFile.text()) as DownloadIndex
} catch {
// An unreadable index starts empty.
}
}
return { collections: [], otherSongIds: [] }
},
async writeIndex(index) {
root.create({ intermediates: true, idempotent: true })
if (!indexFile.exists) indexFile.create()
await indexFile.write(JSON.stringify(index))
},
async remove(songIds) {
for (const folder of foldersFor(new Set(songIds))) folder.delete()
},
}
}
const queues = new Map<string, DownloadQueue>()
/** Downloads are kept per server, since song IDs only mean something there. */
export function downloadQueueFor(config: ServerConfig) {
let queue = queues.get(config.hostname)
if (!queue) {
queue = createDownloadQueue(createStorage(config))
queues.set(config.hostname, queue)
}
return queue
}
/** The local file for a downloaded song, for the player to use offline. */
export function downloadedAudioUri(config: ServerConfig, songId: string) {
const song = downloadQueueFor(config).getDownloaded(songId)
if (!song) return null
const folder = new Directory(serverDirectory(config), songFolderName(song))
return folder.exists ? (audioFile(folder)?.uri ?? null) : null
}
/**
* The saved copy of a cover URL (`albumCoverUrl` or `playlistCoverUrl`,
* without size), for showing while the network copy loads or fails.
*/
export function downloadedCoverUri(url: string) {
return savedCoverUris.get(url.split("?")[0]) ?? null
}
export async function readRememberedDownloadQuality() {
try {
return parseDownloadQuality(
await AsyncStorage.getItem(REMEMBERED_QUALITY_KEY)
)
} catch {
return undefined
}
}
/** Pass undefined to ask every time again. */
export async function writeRememberedDownloadQuality(
quality: DownloadQuality | undefined
) {
if (quality) await AsyncStorage.setItem(REMEMBERED_QUALITY_KEY, quality)
else await AsyncStorage.removeItem(REMEMBERED_QUALITY_KEY)
}
+1 -15
View File
@@ -13,20 +13,6 @@ export const tabStackScreenTitles: Record<string, string> = {
"recently-played": "Recently Played",
"recently-added": "Recently Added",
settings: "Settings",
"downloads/index": "Downloads",
"downloads/other": "Other Downloaded Songs",
}
/**
* iOS tab stacks render their titles in the scroll content with
* `ScreenTitle`, so the bar keeps the title (for back menus) but hides it.
*/
export const inlineTitleOptions: StackScreenOptions =
Platform.OS === "ios" ? { headerTitleStyle: { color: "transparent" } } : {}
/** Tab roots show the profile button in the header, except on iOS where `ScreenTitle` holds it. */
export function showHeaderProfile(routeName: string) {
return routeName === "index" && Platform.OS !== "ios"
}
export function useStackScreenOptions(
@@ -35,7 +21,7 @@ export function useStackScreenOptions(
const theme = useThemeColors()
return {
headerLargeTitle: false,
headerLargeTitle: true,
headerTransparent: true,
headerTintColor: theme.foreground,
headerLargeTitleStyle: { color: theme.foreground },
-6
View File
@@ -12,10 +12,6 @@ export type NowPlayingColors = {
selected: string
selectedForeground: string
highlight: string
/** Lyrics lines other than the one playing. */
lyricsInactive: string
/** Words of the playing line not yet sung. */
lyricsUnsung: string
isDark: boolean
}
@@ -32,8 +28,6 @@ export function nowPlayingColors(palette: CoverPalette): NowPlayingColors {
selected: withAlpha(foreground, 0.8),
selectedForeground: palette.background,
highlight: withAlpha(foreground, 0.1),
lyricsInactive: withAlpha(foreground, 0.35),
lyricsUnsung: withAlpha(foreground, 0.55),
isDark: palette.isDark,
}
}
-1
View File
@@ -4,7 +4,6 @@ export const tabletSections = [
{ name: "albums", group: "(albums)", title: "Albums" },
{ name: "artists", group: "(artists)", title: "Artists" },
{ name: "songs", group: "(songs)", title: "Songs" },
{ name: "downloads", group: "(downloads)", title: "Downloads" },
{ name: "playlists", group: "(playlists)", title: "All Playlists" },
{ name: "favorites", group: "(favorites)", title: "Favorites" },
{ name: "recent", group: "(recent)", title: "Recently Played" },
+3 -5
View File
@@ -44,9 +44,7 @@ final class TabletSidebarView: ExpoView {
let onPlaylistPress = EventDispatcher()
var playlists: [SidebarPlaylist] = []
private let selectionProxy = SidebarSelectionProxy()
/// Playlist rows by identifier. Typed loosely because stored properties
/// can't be gated to iOS 18, where `UITab` arrives; values are always `UITab`.
private var playlistTabs: [String: NSObject] = [:]
private var playlistTabs: [String: UITab] = [:]
private var coverImages: [String: UIImage] = [:]
private var coverTasks: [String: URLSessionDataTask] = [:]
var accountName = ""
@@ -203,7 +201,7 @@ extension TabletSidebarView {
var rows: [UITab] = []
for playlist in playlists {
let identifier = playlistTabPrefix + playlist.id
let tab = playlistTabs[identifier] as? UITab ?? UITab(
let tab = playlistTabs[identifier] ?? UITab(
title: playlist.title, image: nil, identifier: identifier,
viewControllerProvider: { _ in UIViewController() })
playlistTabs[identifier] = tab
@@ -235,7 +233,7 @@ extension TabletSidebarView {
guard let self else { return }
self.coverTasks[url] = nil
self.coverImages[url] = roundedIcon(image)
if let tab = self.playlistTabs[identifier] as? UITab { tab.image = self.coverImages[url] }
if let tab = self.playlistTabs[identifier] { tab.image = self.coverImages[url] }
}
}
coverTasks[url] = task
-2
View File
@@ -29,7 +29,6 @@
"expo-blur": "~58.0.5",
"expo-constants": "~58.0.13",
"expo-dev-client": "~58.0.14",
"expo-file-system": "~58.0.10",
"expo-font": "~58.0.9",
"expo-glass-effect": "~58.0.5",
"expo-haptics": "~58.0.7",
@@ -37,7 +36,6 @@
"expo-image-picker": "~58.0.10",
"expo-linking": "~58.0.14",
"expo-navigation-bar": "~58.0.4",
"expo-network": "~58.0.5",
"expo-router": "~58.0.25",
"expo-secure-store": "~58.0.2",
"expo-sharing": "~58.0.20",
+12 -18
View File
@@ -1,7 +1,5 @@
import { AddToPlaylistProvider } from "@/components/add-to-playlist-provider"
import { DownloadsProvider } from "@/components/downloads-provider"
import { FavoritesProvider } from "@/components/favorites-provider"
import { OfflineGate } from "@/components/offline-gate"
import { PlaybackProvider } from "@/components/playback-provider"
import { PlayerBar } from "@/components/player-bar"
import { LazyQueuePanel } from "@/components/lazy-queue-panel"
@@ -19,22 +17,18 @@ export default function AppLayout({
<SidebarProvider>
<PlaybackProvider>
<AddToPlaylistProvider>
<DownloadsProvider>
<FavoritesProvider>
<AppSidebar />
<div className="flex min-h-svh min-w-0 flex-1">
<SidebarInset className="min-w-0 flex-1">
<Suspense>
<ScrollRestoration>
<OfflineGate>{children}</OfflineGate>
</ScrollRestoration>
</Suspense>
</SidebarInset>
<LazyQueuePanel />
</div>
<PlayerBar />
</FavoritesProvider>
</DownloadsProvider>
<FavoritesProvider>
<AppSidebar />
<div className="flex min-h-svh min-w-0 flex-1">
<SidebarInset className="min-w-0 flex-1">
<Suspense>
<ScrollRestoration>{children}</ScrollRestoration>
</Suspense>
</SidebarInset>
<LazyQueuePanel />
</div>
<PlayerBar />
</FavoritesProvider>
</AddToPlaylistProvider>
</PlaybackProvider>
</SidebarProvider>
@@ -1,7 +0,0 @@
"use client"
import { OtherDownloadsView } from "@/components/other-downloads-view"
export default function Page() {
return <OtherDownloadsView />
}
@@ -1,7 +0,0 @@
"use client"
import { DownloadsView } from "@/components/downloads-view"
export default function Page() {
return <DownloadsView />
}
+1 -1
View File
@@ -1,5 +1,5 @@
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
export default function Loading() {
return <CollectionDetailSkeleton search />
return <CollectionDetailSkeleton />
}
@@ -1,5 +1,5 @@
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
export default function Loading() {
return <CollectionDetailSkeleton search />
return <CollectionDetailSkeleton />
}
-104
View File
@@ -1,104 +0,0 @@
import {
DOWNLOAD_QUALITIES,
downloadOptions,
downloadPlan,
estimatedAacBytes,
type DownloadOptionsResponse,
} from "@otunes/convex/download-quality"
import { audioInfo } from "@/lib/server-audio-info"
import { getSongSources } from "@/lib/server-song"
import { NextRequest, NextResponse, userAgent } from "next/server"
import fs from "node:fs/promises"
const MAX_SONGS = 5000
type FileSize = { bytes: number; estimated: boolean }
/**
* Sizes every quality the songs can download in. Files sent as-is have exact
* sizes; re-encodes (including ALAC to FLAC) are estimates.
*/
export async function POST(request: NextRequest) {
const body = (await request.json().catch(() => null)) as {
songIds?: unknown
losslessFormat?: unknown
} | null
const songIds = body?.songIds
if (
!Array.isArray(songIds) ||
songIds.length > MAX_SONGS ||
!songIds.every((id) => typeof id === "string")
) {
return new Response("Expected songIds", { status: 400 })
}
const acceptsAlac =
userAgent(request).browser.name === "Safari" ||
body?.losslessFormat === "alac"
let songs: Awaited<ReturnType<typeof getSongSources>>
try {
songs = await getSongSources(songIds)
} catch {
return new Response("Not found", { status: 404 })
}
const fileSizes = new Map<string, Promise<FileSize>>()
const sizeOf = (path: string, source: string, seconds: number) => {
let size = fileSizes.get(path)
if (!size) {
size = (async () => {
const { size: bytes } = await fs.stat(path)
if (source !== "lossless" || acceptsAlac) {
return { bytes, estimated: false }
}
// ALAC is converted to FLAC for clients that cannot play it.
const estimated = (await audioInfo(path)).codec === "ALAC"
return { bytes, estimated }
})().catch(() => ({
bytes: estimatedAacBytes(seconds, 256),
estimated: true,
}))
fileSizes.set(path, size)
}
return size
}
const totals = await Promise.all(
DOWNLOAD_QUALITIES.map(async (quality) => {
const sizes = await Promise.all(
songs.map((song) => {
const plan = downloadPlan(song.files, quality)
if (plan.kbps > 0) {
return {
bytes: estimatedAacBytes(song.length, plan.kbps),
estimated: true,
}
}
return sizeOf(song.files[plan.source], plan.source, song.length)
})
)
return {
quality,
bytes: sizes.reduce((total, size) => total + size.bytes, 0),
estimated: sizes.some((size) => size.estimated),
}
})
)
const response: DownloadOptionsResponse = {
songs: songs.map((song) => ({
id: song._id,
albumId: song.album,
files: Object.fromEntries(
Object.keys(song.files).map((codec) => [codec, true as const])
),
})),
options: downloadOptions(songs.map((song) => song.files)).map((option) => {
const total = totals.find(({ quality }) => quality === option.quality)!
return { ...option, bytes: total.bytes, estimated: total.estimated }
}),
}
return NextResponse.json(response, {
headers: { "Cache-Control": "no-store" },
})
}
@@ -1,161 +0,0 @@
import {
downloadPlan,
parseDownloadQuality,
} from "@otunes/convex/download-quality"
import { audioContentTypeForPath } from "@/lib/audio-content-type"
import { audioInfo } from "@/lib/server-audio-info"
import { streamFile } from "@/lib/server-audio-stream"
import { spawnFfmpeg } from "@/lib/server-ffmpeg"
import { seekableLosslessFile } from "@/lib/server-lossless"
import { getSongLyrics, getSongSource } from "@/lib/server-song"
import { NextRequest, NextResponse, userAgent } from "next/server"
import fs from "node:fs/promises"
import os from "node:os"
import path from "node:path"
/** The filename tells native clients which extension to save the file with. */
function downloadHeaders(
songId: string,
extension: string,
contentType: string,
size: number
) {
return {
"Cache-Control": "no-store",
"Content-Disposition": `attachment; filename="${songId}${extension}"`,
"Content-Length": String(size),
"Content-Type": contentType,
}
}
async function fileResponse(songId: string, file: string, contentType: string) {
const { size } = await fs.stat(file)
return new NextResponse(streamFile(file), {
headers: downloadHeaders(
songId,
path.extname(file).toLowerCase(),
contentType,
size
),
})
}
/** Longest lyrics passed to ffmpeg; Linux caps one argument at 128 KiB. */
const MAX_LYRICS_ARGUMENT_BYTES = 100 * 1024
/**
* Transcodes to an AAC .m4a with its index up front, so the saved file has a
* duration and seeks offline. Tags carry over, and the stored lyrics are
* written too, since ffmpeg drops some formats' lyrics tags (like MP3 USLT)
* when writing MP4. The temporary file is removed once sent.
*/
async function transcodeResponse(
songId: string,
source: string,
kbps: number,
signal: AbortSignal
) {
const lyrics = await getSongLyrics(songId)
const lyricsArgs =
lyrics && Buffer.byteLength(lyrics) <= MAX_LYRICS_ARGUMENT_BYTES
? ["-metadata", `lyrics=${lyrics}`]
: []
const dir = await fs.mkdtemp(path.join(os.tmpdir(), "otunes-download-"))
const output = path.join(dir, "audio.m4a")
const cleanup = () => fs.rm(dir, { recursive: true, force: true })
try {
const ffmpeg = await spawnFfmpeg(
[
"-i",
source,
"-map",
"0:a:0",
"-c:a",
"aac",
"-b:a",
`${kbps}k`,
...lyricsArgs,
"-movflags",
"+faststart",
output,
],
signal
)
const onAbort = () => ffmpeg.child.kill("SIGKILL")
signal.addEventListener("abort", onAbort, { once: true })
const code = await ffmpeg.exited
signal.removeEventListener("abort", onAbort)
if (code !== 0) {
throw new Error(
`Download transcode failed: ${code}: ${ffmpeg.stderrTail()}`
)
}
const { size } = await fs.stat(output)
return new NextResponse(streamFile(output, undefined, cleanup), {
headers: downloadHeaders(songId, ".m4a", "audio/mp4", size),
})
} catch (error) {
await cleanup()
throw error
}
}
/** Sends one song as a whole file for offline playback. */
export async function GET(
request: NextRequest,
{ params }: { params: Promise<{ id: string }> }
) {
const { id } = await params
const quality = parseDownloadQuality(
request.nextUrl.searchParams.get("quality")
)
if (!quality) {
return new Response("Unknown quality", { status: 400 })
}
let song: Awaited<ReturnType<typeof getSongSource>>
try {
song = await getSongSource(id)
} catch {
return new Response("Not found", { status: 404 })
}
const plan = downloadPlan(song.files, quality)
const sourceFile = song.files[plan.source]
if (!sourceFile) {
return new Response("Not found", { status: 404 })
}
try {
if (plan.kbps > 0) {
return await transcodeResponse(
song._id,
sourceFile,
plan.kbps,
request.signal
)
}
if (plan.source === "lossless") {
// Only Safari and iOS play ALAC, so everyone else gets FLAC.
const acceptsAlac =
userAgent(request).browser.name === "Safari" ||
request.nextUrl.searchParams.get("losslessFormat") === "alac"
if (!acceptsAlac && (await audioInfo(sourceFile)).codec === "ALAC") {
const flac = await seekableLosslessFile(sourceFile)
return await fileResponse(song._id, flac, "audio/flac")
}
}
return await fileResponse(
song._id,
sourceFile,
audioContentTypeForPath(sourceFile)
)
} catch (error) {
if (!request.signal.aborted) {
console.error("Song download failed", error)
}
return new Response("Server Error", { status: 500 })
}
}
-20
View File
@@ -14,8 +14,6 @@ import {
type MediaContextAction,
} from "@/components/media-context-menu"
import { usePlaybackActions } from "@/components/playback-provider"
import { useDownloads } from "@/components/downloads-provider"
import { useIsCollectionDownloaded } from "@/hooks/use-downloads"
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { api } from "@otunes/convex/_generated/api"
import { Button } from "@/components/ui/button"
@@ -52,9 +50,6 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
const { isAlbumFavorite, toggleAlbumFavorite } = useFavorites()
const { playAlbum } = usePlaybackActions()
const { runQueueAction, createStation } = useQueueMediaActions()
const { requestDownload, removeDownload } = useDownloads()
const downloadRef = { kind: "album" as const, id: album.id }
const downloaded = useIsCollectionDownloaded(downloadRef)
const [menuOpen, setMenuOpen] = React.useState(false)
const [hovered, setHovered] = React.useState(false)
const showActions = hovered || menuOpen
@@ -99,20 +94,6 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
void runQueueAction(action, songIds)
break
}
case "download":
case "remove-download": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{ albumId: album.id as Id<"albums"> }
)
const target = { ...downloadRef, title: album.title, songIds }
void (action === "download"
? requestDownload(target)
: removeDownload(target))
break
}
}
}
@@ -176,7 +157,6 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
selectedCount={1}
onAction={(action) => void handleCardAction(action)}
favorited={isAlbumFavorite(album.id)}
downloaded={downloaded}
navigation={{ artist: { id: album.artist.id } }}
share={{ type: "album", albumId: album.id }}
/>
+12 -57
View File
@@ -9,14 +9,7 @@ import { Play, Share2, Shuffle } from "lucide-react"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import { MediaCollectionFooter } from "@/components/media-collection-footer"
import { DownloadButton, DownloadedQuality } from "@/components/download-button"
import { useDownloads } from "@/components/downloads-provider"
import { FavoriteMediaButton } from "@/components/favorite-media-button"
import {
useIsCollectionDownloaded,
useOpenedFromDownloads,
} from "@/hooks/use-downloads"
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
import { useFavorites } from "@/components/favorites-provider"
import {
useCurrentSongId,
@@ -119,13 +112,7 @@ export function AlbumView({
toggleAlbumFavorite,
} = useFavorites()
const currentSongId = useCurrentSongId()
const {
playFromSong,
playAlbum,
playAlbumShuffled,
playInOrder,
playShuffled,
} = usePlaybackActions()
const { playFromSong, playAlbum, playAlbumShuffled } = usePlaybackActions()
const { runSongsAction } = useMediaActions()
const albumSongIds = React.useMemo(
() => album.tracks.map((track) => track.id as Id<"songs">),
@@ -198,30 +185,10 @@ export function AlbumView({
[album.tracks, album.artist, album.id, album.title, album.cover]
)
const downloadRef = React.useMemo(
() => ({ kind: "album" as const, id: album.id }),
[album.id]
)
const fromDownloads = useOpenedFromDownloads()
const playOrigin = fromDownloads
? downloadsQueueOrigin(`album:${album.id}`)
: `album:${album.id}`
const handleMediaAction = useTrackListMediaAction({
selectedIds,
artistId: album.artist.id,
downloadFrom: downloadRef,
})
const { requestDownload, removeDownload } = useDownloads()
const downloadTarget = React.useMemo(
() => ({
kind: "album" as const,
id: album.id,
title: album.title,
songIds: albumSongIds,
}),
[album.id, album.title, albumSongIds]
)
const albumDownloaded = useIsCollectionDownloaded(downloadTarget)
const handleRowSelect = React.useCallback(
(index: number, event: React.MouseEvent) => {
@@ -234,9 +201,13 @@ export function AlbumView({
const handleRowPlay = React.useCallback(
(index: number) => {
void playFromSong(album.tracks[index].id, albumSongIds, playOrigin)
void playFromSong(
album.tracks[index].id,
albumSongIds,
`album:${album.id}`
)
},
[album.tracks, albumSongIds, playOrigin, playFromSong]
[album.tracks, album.id, albumSongIds, playFromSong]
)
const handleToggleFavorite = React.useCallback(
@@ -249,14 +220,6 @@ export function AlbumView({
void toggleAlbumFavorite(album.id as Id<"albums">)
return
}
if (action === "download") {
void requestDownload(downloadTarget)
return
}
if (action === "remove-download") {
void removeDownload(downloadTarget)
return
}
runSongsAction(action, albumSongIds, album.artist.id)
}
@@ -308,7 +271,6 @@ export function AlbumView({
<AudioFormatBadge format="atmos" />
</>
) : null}
<DownloadedQuality collection={downloadRef} />
</div>
</div>
@@ -319,12 +281,10 @@ export function AlbumView({
className="rounded-full"
aria-label="Shuffle album"
onClick={() =>
void (fromDownloads
? playShuffled(albumSongIds, playOrigin)
: playAlbumShuffled(
album.id as Id<"albums">,
albumSongIds
))
void playAlbumShuffled(
album.id as Id<"albums">,
albumSongIds
)
}
>
<Shuffle />
@@ -333,9 +293,7 @@ export function AlbumView({
className="h-10 gap-2 rounded-full bg-foreground px-6 text-background hover:bg-foreground/90"
aria-label={`Play ${album.title}`}
onClick={() =>
void (fromDownloads
? playInOrder(albumSongIds, playOrigin)
: playAlbum(album.id as Id<"albums">, albumSongIds))
void playAlbum(album.id as Id<"albums">, albumSongIds)
}
>
<Play className="fill-current" />
@@ -349,7 +307,6 @@ export function AlbumView({
favoritedLabel={`Remove ${album.title} from favorites`}
unfavoritedLabel={`Favorite ${album.title}`}
/>
<DownloadButton target={downloadTarget} />
<Button
variant="secondary"
size="icon"
@@ -366,7 +323,6 @@ export function AlbumView({
onOpenMenu={() => {}}
onAction={handleAlbumMediaAction}
favorited={isAlbumFavorite(album.id)}
downloaded={albumDownloaded}
trackRowTrigger={false}
triggerVariant="secondary"
triggerClassName="rounded-full"
@@ -407,7 +363,6 @@ export function AlbumView({
: sectionTrackIndex + 1
}
subtitle={track.artists?.join(", ")}
downloadCollection={downloadRef}
isActive={track.id === activeTrackId}
selectionPosition={selectionPositions[listIndex]}
isFavorite={isSongFavorite(track.id)}
+4 -28
View File
@@ -1,7 +1,6 @@
"use client"
import {
ArrowDownToLine,
Disc3,
House,
LayoutGrid,
@@ -48,8 +47,6 @@ import { playlistCoverUrl } from "@/lib/cover-urls"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { useMounted } from "@/hooks/use-mounted"
import { clearPersistentCache } from "@/lib/persistent-cache"
import { clearOfflinePages, DOWNLOADS_PATH } from "@/lib/downloads"
import { OfflineLink } from "@/components/offline-gate"
import { resetPlaybackStores } from "@otunes/convex/client/playback-store"
const OptionsModal = dynamic(() =>
@@ -65,13 +62,6 @@ const library = [
{ title: "Albums", path: "/library/albums", icon: Disc3 },
{ title: "Artists", path: "/library/artists", icon: Mic },
{ title: "Songs", path: "/library/songs", icon: Music2 },
// Opens offline, so it uses OfflineLink.
{
title: "Downloads",
path: DOWNLOADS_PATH,
icon: ArrowDownToLine,
worksOffline: true,
},
]
export function AppSidebar() {
@@ -91,7 +81,6 @@ export function AppSidebar() {
await signOut()
resetPlaybackStores()
await clearPersistentCache()
await clearOfflinePages()
router.push("/signin")
}
@@ -169,23 +158,10 @@ export function AppSidebar() {
}
asChild
>
{item.worksOffline ? (
<OfflineLink
href={item.path}
onClick={() => setOpenMobile(false)}
>
<item.icon />
<span>{item.title}</span>
</OfflineLink>
) : (
<Link
href={item.path}
onClick={() => setOpenMobile(false)}
>
<item.icon />
<span>{item.title}</span>
</Link>
)}
<Link href={item.path} onClick={() => setOpenMobile(false)}>
<item.icon />
<span>{item.title}</span>
</Link>
</SidebarMenuButton>
</SidebarMenuItem>
))}
-145
View File
@@ -1,145 +0,0 @@
"use client"
import * as React from "react"
import { ArrowDownToLine, Check } from "lucide-react"
import {
useDownloads,
type DownloadTarget,
} from "@/components/downloads-provider"
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import { Button } from "@/components/ui/button"
import {
useCollectionDownload,
useIsCollectionDownloaded,
} from "@/hooks/use-downloads"
import { downloadQueue } from "@/lib/downloads"
import type { CollectionRef } from "@otunes/convex/client/download-queue"
import { DOWNLOAD_QUALITY_LABELS } from "@otunes/convex/download-quality"
const RING_RADIUS = 14
const RING_LENGTH = 2 * Math.PI * RING_RADIUS
/** Static ring that fills as songs finish; a square in the middle means "tap to stop". */
function ProgressRing({ fraction }: { fraction: number }) {
return (
<svg viewBox="0 0 36 36" className="size-6" aria-hidden>
<circle
cx="18"
cy="18"
r={RING_RADIUS}
fill="none"
stroke="currentColor"
strokeOpacity={0.25}
strokeWidth={3}
/>
<circle
cx="18"
cy="18"
r={RING_RADIUS}
fill="none"
stroke="currentColor"
strokeWidth={3}
strokeDasharray={RING_LENGTH}
strokeDashoffset={RING_LENGTH * (1 - fraction)}
transform="rotate(-90 18 18)"
/>
<rect x="14" y="14" width="8" height="8" fill="currentColor" />
</svg>
)
}
/** Download, progress, and downloaded states for an album or playlist header. */
export function DownloadButton({
target,
}: {
target: Exclude<DownloadTarget, { kind: "songs" }>
}) {
const { requestDownload, removeDownload } = useDownloads()
const { collection, status } = useCollectionDownload(target, target.songIds)
const [confirmRemove, setConfirmRemove] = React.useState(false)
const inProgress = collection !== undefined && status.queued > 0
const done = collection !== undefined && !inProgress && status.total > 0
let label = `Download ${target.title}`
let icon: React.ReactNode = <ArrowDownToLine />
if (inProgress) {
label = `Stop downloading, ${status.downloaded} of ${status.total} done`
icon = <ProgressRing fraction={status.downloaded / status.total} />
} else if (done) {
label = `Remove download of ${target.title}`
icon = <Check />
}
return (
<>
<Button
variant={done ? "default" : "secondary"}
size="icon"
className="rounded-full"
aria-label={label}
title={label}
disabled={target.songIds.length === 0}
onClick={() => {
if (inProgress) void removeDownload(target)
else if (done) setConfirmRemove(true)
else void requestDownload(target)
}}
>
{icon}
</Button>
<AlertDialog open={confirmRemove} onOpenChange={setConfirmRemove}>
<AlertDialogContent size="sm">
<AlertDialogHeader>
<AlertDialogTitle>Remove download?</AlertDialogTitle>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>Cancel</AlertDialogCancel>
<AlertDialogAction
variant="destructive"
onClick={() => void removeDownload(target)}
>
Remove
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</>
)
}
/** The quality an album or playlist was downloaded in, once downloaded. */
export function DownloadedQuality({
collection,
}: {
collection: CollectionRef
}) {
const downloaded = useIsCollectionDownloaded(collection)
const quality = downloaded
? downloadQueue.getCollection(collection)?.quality
: undefined
if (!quality) return null
return (
<span
className="inline-flex items-center gap-1"
aria-label={`Downloaded in ${DOWNLOAD_QUALITY_LABELS[quality]}`}
>
<ArrowDownToLine className="size-3.5" aria-hidden />
{quality === "lossless" || quality === "atmos" ? (
<AudioFormatBadge format={quality} />
) : (
DOWNLOAD_QUALITY_LABELS[quality]
)}
</span>
)
}
-364
View File
@@ -1,364 +0,0 @@
"use client"
import * as React from "react"
import { useConvex, useQuery } from "convex/react"
import { toast } from "sonner"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import { Button } from "@/components/ui/button"
import { Checkbox } from "@/components/ui/checkbox"
import {
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog"
import { Label } from "@/components/ui/label"
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { useDownloadsVersion } from "@/hooks/use-downloads"
import {
downloadQueue,
readRememberedDownloadQuality,
DOWNLOADS_PATH,
downloadedCollectionPath,
OTHER_DOWNLOADS_PATH,
registerDownloadsServiceWorker,
requestPersistentStorage,
saveDownloadPagesForOffline,
writeRememberedDownloadQuality,
} from "@/lib/downloads"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import type {
CollectionRef,
DownloadableSong,
DownloadSource,
} from "@otunes/convex/client/download-queue"
import { FAVORITES_ID } from "@otunes/convex/client/download-queue"
import {
DOWNLOAD_OPTIONS_PATH,
DOWNLOAD_QUALITY_DETAILS,
DOWNLOAD_QUALITY_LABELS,
formatBytes,
type DownloadOptionsResponse,
type DownloadQuality,
type SizedDownloadOption,
} from "@otunes/convex/download-quality"
/** Songs on their own, or an album or playlist that stays downloaded as a whole. */
export type DownloadTarget =
| {
kind: "songs"
songIds: string[]
title: string
/** Removing takes the songs out of only this download. */
from?: DownloadSource
}
| (CollectionRef & { title: string; songIds: string[] })
/** The Favorites playlist has no ID, so downloads use this one. */
export const FAVORITES_DOWNLOAD_ID = FAVORITES_ID
type DownloadsContextValue = {
/** Asks for a quality (unless remembered) and starts downloading. */
requestDownload: (target: DownloadTarget) => Promise<void>
removeDownload: (target: DownloadTarget) => Promise<void>
}
const DownloadsContext = React.createContext<DownloadsContextValue | null>(null)
export function useDownloads() {
const context = React.useContext(DownloadsContext)
if (!context) {
throw new Error("useDownloads must be used within DownloadsProvider")
}
return context
}
async function fetchDownloadOptions(songIds: string[]) {
const response = await fetch(DOWNLOAD_OPTIONS_PATH, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ songIds }),
})
if (!response.ok) {
throw new Error("Could not reach the server to download")
}
return (await response.json()) as DownloadOptionsResponse
}
function startDownload(
target: DownloadTarget,
songs: DownloadableSong[],
quality: DownloadQuality
) {
requestPersistentStorage()
if (target.kind === "songs") {
return downloadQueue.enqueue(songs, quality)
}
return downloadQueue.downloadCollection(
{ kind: target.kind, id: target.id, title: target.title, quality },
songs
)
}
function optionDetail(option: SizedDownloadOption, songCount: number) {
if (option.fallbackCount === 0) {
return DOWNLOAD_QUALITY_DETAILS[option.quality]
}
const included = songCount - option.fallbackCount
return `${included} of ${songCount} songs, ${option.fallbackCount} in High`
}
function QualityLabel({ quality }: { quality: DownloadQuality }) {
if (quality === "lossless" || quality === "atmos") {
return (
<AudioFormatBadge format={quality} backgroundColor="var(--popover)" />
)
}
return (
<span className="text-[13px] font-medium">
{DOWNLOAD_QUALITY_LABELS[quality]}
</span>
)
}
function DownloadQualityDialog({
pending,
onClose,
}: {
pending: { target: DownloadTarget; response: DownloadOptionsResponse } | null
onClose: () => void
}) {
const [quality, setQuality] = React.useState<DownloadQuality>("high")
const [remember, setRemember] = React.useState(false)
const options = pending?.response.options ?? []
const songCount = pending?.response.songs.length ?? 0
async function handleDownload() {
if (!pending) return
if (remember) writeRememberedDownloadQuality(quality)
onClose()
await startDownload(pending.target, pending.response.songs, quality)
}
return (
<Dialog open={pending !== null} onOpenChange={(open) => !open && onClose()}>
<DialogContent className="gap-3 sm:max-w-sm">
<DialogHeader>
<DialogTitle className="truncate">
Download &ldquo;{pending?.target.title}&rdquo;
</DialogTitle>
</DialogHeader>
<RadioGroup
value={quality}
onValueChange={(value) => setQuality(value as DownloadQuality)}
className="gap-0"
>
{options.map((option) => (
<Label
key={option.quality}
htmlFor={`download-${option.quality}`}
className="grid cursor-pointer grid-cols-[auto_1fr_auto] items-center gap-3 rounded-md px-1 py-2 font-normal has-data-[state=checked]:bg-muted"
>
<RadioGroupItem
value={option.quality}
id={`download-${option.quality}`}
/>
<span className="flex min-w-0 flex-col gap-0.5">
<QualityLabel quality={option.quality} />
<span className="text-xs text-muted-foreground">
{optionDetail(option, songCount)}
</span>
</span>
<span className="text-xs text-muted-foreground tabular-nums">
{option.estimated ? "~" : ""}
{formatBytes(option.bytes)}
</span>
</Label>
))}
</RadioGroup>
<div className="flex items-center gap-2">
<Checkbox
id="download-remember"
checked={remember}
onCheckedChange={(checked) => setRemember(checked === true)}
/>
<Label htmlFor="download-remember" className="font-normal">
Remember my choice
</Label>
</div>
<DialogFooter>
<Button variant="ghost" onClick={onClose}>
Cancel
</Button>
<Button onClick={() => void handleDownload()}>Download</Button>
</DialogFooter>
</DialogContent>
</Dialog>
)
}
const SYNC_BATCH_SIZE = 200
/** Keeps a downloaded playlist's songs in step with the playlist. */
function useSyncDownloadedPlaylist(
id: string,
songIds: readonly string[] | undefined
) {
const convex = useConvex()
React.useEffect(() => {
if (!songIds) return
void downloadQueue
.syncCollection({ kind: "playlist", id }, songIds, async (added) => {
const songs: DownloadableSong[] = []
for (let start = 0; start < added.length; start += SYNC_BATCH_SIZE) {
const batch = await convex.query(api.library.getSongsForPlayback, {
ids: added.slice(start, start + SYNC_BATCH_SIZE) as Id<"songs">[],
})
for (const song of batch) if (song) songs.push(song)
}
return songs
})
.catch(() => {})
}, [convex, id, songIds])
}
function PlaylistSync({ id }: { id: string }) {
const songIds = useQuery(api.playlists.getPlaylistSongIds, {
playlistId: id as Id<"playlists">,
})
useSyncDownloadedPlaylist(id, songIds)
return null
}
function FavoritesSync() {
const favorites = useCachedQuery(api.favorites.getUserFavorites)
const songIds = React.useMemo(
() => favorites?.favoriteSongs.flat(),
[favorites]
)
useSyncDownloadedPlaylist(FAVORITES_DOWNLOAD_ID, songIds)
return null
}
function DownloadSync() {
useDownloadsVersion()
return downloadQueue
.collections()
.filter((collection) => collection.kind === "playlist")
.map((collection) =>
collection.id === FAVORITES_DOWNLOAD_ID ? (
<FavoritesSync key={collection.id} />
) : (
<PlaylistSync key={collection.id} id={collection.id} />
)
)
}
/** Reports failed songs once per burst instead of once per song. */
function useFailureToasts() {
React.useEffect(() => {
let failed = 0
let timer: ReturnType<typeof setTimeout> | null = null
const unsubscribe = downloadQueue.onFailure(() => {
failed += 1
timer ??= setTimeout(() => {
toast.error(
failed === 1
? "A song could not be downloaded"
: `${failed} songs could not be downloaded`
)
failed = 0
timer = null
}, 1000)
})
return () => {
unsubscribe()
if (timer) clearTimeout(timer)
}
}, [])
}
/** Keeps Downloads and each downloaded collection's page saved for offline. */
function OfflinePagesSync() {
useDownloadsVersion()
const collectionPaths = downloadQueue
.collections()
.map(downloadedCollectionPath)
const hasOtherSongs = downloadQueue.otherSongIds().length > 0
// A string, so the effect reruns only when the saved set changes.
const pathsKey = collectionPaths.join("\n")
React.useEffect(() => {
if (!pathsKey && !hasOtherSongs) return
saveDownloadPagesForOffline([
DOWNLOADS_PATH,
OTHER_DOWNLOADS_PATH,
...(pathsKey ? pathsKey.split("\n") : []),
])
}, [pathsKey, hasOtherSongs])
return null
}
export function DownloadsProvider({ children }: { children: React.ReactNode }) {
const [pending, setPending] = React.useState<{
target: DownloadTarget
response: DownloadOptionsResponse
} | null>(null)
useFailureToasts()
React.useEffect(() => {
void downloadQueue.load().catch(() => {})
registerDownloadsServiceWorker()
}, [])
const requestDownload = React.useCallback(async (target: DownloadTarget) => {
if (target.songIds.length === 0) return
if (target.songIds.every((id) => downloadQueue.getDownloaded(id))) {
// Already on this device: just give them back to their downloads.
await downloadQueue.enqueue(
target.songIds.map((id) => ({ id, files: {} })),
"high"
)
return
}
try {
const response = await fetchDownloadOptions(target.songIds)
const remembered = readRememberedDownloadQuality()
if (remembered) {
await startDownload(target, response.songs, remembered)
toast(`Downloading ${target.title}`)
} else {
setPending({ target, response })
}
} catch (error) {
toast.error(error instanceof Error ? error.message : "Download failed")
}
}, [])
const removeDownload = React.useCallback(async (target: DownloadTarget) => {
if (target.kind === "songs") {
await downloadQueue.removeSongs(target.songIds, target.from)
} else await downloadQueue.removeCollection(target)
}, [])
const value = React.useMemo(
() => ({ requestDownload, removeDownload }),
[requestDownload, removeDownload]
)
return (
<DownloadsContext.Provider value={value}>
{children}
<DownloadSync />
<OfflinePagesSync />
<DownloadQualityDialog
pending={pending}
onClose={() => setPending(null)}
/>
</DownloadsContext.Provider>
)
}
-248
View File
@@ -1,248 +0,0 @@
"use client"
import * as React from "react"
import { Trash2 } from "lucide-react"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
AlertDialogTrigger,
} from "@/components/ui/alert-dialog"
import { Button } from "@/components/ui/button"
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select"
import { useDownloadsVersion } from "@/hooks/use-downloads"
import {
downloadQueue,
readRememberedDownloadQuality,
writeRememberedDownloadQuality,
} from "@/lib/downloads"
import {
DOWNLOAD_QUALITIES,
DOWNLOAD_QUALITY_LABELS,
formatBytes,
type DownloadQuality,
} from "@otunes/convex/download-quality"
const ASK_EVERY_TIME = "ask"
/** Shades of the text color, darkest for the smallest files. */
const QUALITY_OPACITY: Record<DownloadQuality, number> = {
medium: 0.25,
high: 0.45,
lossless: 0.7,
atmos: 1,
}
function QualityName({ quality }: { quality: DownloadQuality }) {
if (quality === "lossless" || quality === "atmos") {
return <AudioFormatBadge format={quality} />
}
return <span>{DOWNLOAD_QUALITY_LABELS[quality]}</span>
}
function songCount(count: number) {
return count === 1 ? "1 song" : `${count} songs`
}
function RememberedQualitySelect() {
const [value, setValue] = React.useState<string>(
() => readRememberedDownloadQuality() ?? ASK_EVERY_TIME
)
return (
<div className="flex items-center justify-between gap-4 text-sm">
<span>Download quality</span>
<Select
value={value}
onValueChange={(next) => {
setValue(next)
writeRememberedDownloadQuality(
next === ASK_EVERY_TIME ? undefined : (next as DownloadQuality)
)
}}
>
<SelectTrigger className="w-40">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value={ASK_EVERY_TIME}>Ask every time</SelectItem>
{DOWNLOAD_QUALITIES.map((quality) => (
<SelectItem key={quality} value={quality}>
{DOWNLOAD_QUALITY_LABELS[quality]}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
)
}
/** Storage used by downloads in this browser, by quality and by album or playlist. */
export function DownloadsSettings() {
const version = useDownloadsVersion()
const breakdown = React.useMemo(
() => downloadQueue.breakdown(),
// version invalidates the breakdown when downloads change.
// eslint-disable-next-line react-hooks/exhaustive-deps
[version]
)
const qualities = breakdown.byQuality.filter((entry) => entry.songs > 0)
return (
<div className="space-y-6">
<div className="flex items-baseline justify-between gap-4">
<h3 className="text-base font-medium">Downloads</h3>
<span className="text-sm text-muted-foreground tabular-nums">
{formatBytes(breakdown.bytes)} · {songCount(breakdown.songs)}
{breakdown.queued > 0 ? ` · ${breakdown.queued} downloading` : ""}
</span>
</div>
<RememberedQualitySelect />
{breakdown.songs > 0 ? (
<div className="space-y-2">
<div className="flex h-2 overflow-hidden rounded-full bg-muted">
{qualities.map((entry) => (
<div
key={entry.quality}
className="h-full bg-foreground"
style={{
width: `${(entry.bytes / breakdown.bytes) * 100}%`,
opacity: QUALITY_OPACITY[entry.quality],
}}
/>
))}
</div>
<div className="divide-y text-sm">
{qualities.map((entry) => (
<div
key={entry.quality}
className="flex items-center gap-3 py-1.5"
>
<span
className="size-2 shrink-0 rounded-full bg-foreground"
style={{ opacity: QUALITY_OPACITY[entry.quality] }}
/>
<span className="flex-1">
<QualityName quality={entry.quality} />
</span>
<span className="text-muted-foreground tabular-nums">
{songCount(entry.songs)}
</span>
<span className="w-16 text-right tabular-nums">
{formatBytes(entry.bytes)}
</span>
</div>
))}
</div>
</div>
) : null}
{breakdown.collections.length > 0 ||
breakdown.otherSongs.songIds.length > 0 ? (
<div className="divide-y text-sm">
{breakdown.collections.map(
({ collection, bytes, status, fallbackCount }) => (
<div
key={`${collection.kind}:${collection.id}`}
className="flex items-center gap-3 py-2"
>
<div className="min-w-0 flex-1">
<p className="truncate">{collection.title}</p>
<p className="flex flex-wrap items-center gap-x-1.5 text-xs text-muted-foreground">
<span>
{collection.kind === "album" ? "Album" : "Playlist"}
</span>
<span aria-hidden>·</span>
<QualityName quality={collection.quality} />
{fallbackCount > 0 ? (
<span>({fallbackCount} in High)</span>
) : null}
{status.downloaded < status.total ? (
<>
<span aria-hidden>·</span>
<span className="tabular-nums">
{status.downloaded} of {status.total}
</span>
</>
) : null}
</p>
</div>
<span className="tabular-nums">{formatBytes(bytes)}</span>
<Button
variant="ghost"
size="icon-sm"
aria-label={`Remove download of ${collection.title}`}
onClick={() =>
void downloadQueue.removeCollection(collection)
}
>
<Trash2 />
</Button>
</div>
)
)}
{breakdown.otherSongs.songIds.length > 0 ? (
<div className="flex items-center gap-3 py-2">
<div className="min-w-0 flex-1">
<p>Other Downloaded Songs</p>
<p className="text-xs text-muted-foreground">
{songCount(breakdown.otherSongs.songIds.length)}
</p>
</div>
<span className="tabular-nums">
{formatBytes(breakdown.otherSongs.bytes)}
</span>
<Button
variant="ghost"
size="icon-sm"
aria-label="Remove Other Downloaded Songs"
onClick={() => void downloadQueue.removeOtherSongs()}
>
<Trash2 />
</Button>
</div>
) : null}
</div>
) : (
<p className="text-sm text-muted-foreground">
Nothing downloaded in this browser.
</p>
)}
{breakdown.songs > 0 || breakdown.queued > 0 ? (
<AlertDialog>
<AlertDialogTrigger asChild>
<Button variant="destructive">Remove all downloads</Button>
</AlertDialogTrigger>
<AlertDialogContent size="sm">
<AlertDialogHeader>
<AlertDialogTitle>Remove all downloads?</AlertDialogTitle>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>Cancel</AlertDialogCancel>
<AlertDialogAction
variant="destructive"
onClick={() => void downloadQueue.removeAll()}
>
Remove
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
) : null}
</div>
)
}
-144
View File
@@ -1,144 +0,0 @@
"use client"
import * as React from "react"
import Image from "next/image"
import { Star } from "lucide-react"
import { FAVORITES_DOWNLOAD_ID } from "@/components/downloads-provider"
import { PageHeader } from "@/components/library-skeletons"
import { OfflineLink } from "@/components/offline-gate"
import { useDownloadsVersion } from "@/hooks/use-downloads"
import { albumGridClassName } from "@/lib/album-grid-classes"
import { albumCoverUrl, playlistCoverUrl } from "@/lib/cover-urls"
import {
downloadedCollectionPath,
downloadQueue,
OTHER_DOWNLOADS_PATH,
} from "@/lib/downloads"
import type { DownloadedCollection } from "@otunes/convex/client/download-queue"
import { formatBytes } from "@otunes/convex/download-quality"
export const OTHER_DOWNLOADS_TITLE = "Other Downloaded Songs"
function CollectionCover({ collection }: { collection: DownloadedCollection }) {
if (collection.id === FAVORITES_DOWNLOAD_ID) {
return (
<div className="flex size-full items-center justify-center bg-muted">
<Star className="size-1/4 fill-primary text-primary" />
</div>
)
}
return (
<Image
src={
collection.kind === "album"
? albumCoverUrl(collection.id)
: playlistCoverUrl(collection.id, null)
}
alt={collection.title}
fill
sizes="(max-width: 640px) 50vw, (max-width: 1024px) 25vw, 16vw"
className="object-cover"
/>
)
}
function DownloadCard({
href,
title,
subtitle,
cover,
}: {
href: string
title: string
subtitle: string
cover: React.ReactNode
}) {
return (
<OfflineLink href={href} className="group flex flex-col gap-2">
<div className="relative aspect-square overflow-hidden rounded-lg ring-1 ring-foreground/10">
{cover}
</div>
<div className="min-w-0">
<p className="truncate text-sm font-medium group-hover:underline">
{title}
</p>
<p className="truncate text-xs text-muted-foreground tabular-nums">
{subtitle}
</p>
</div>
</OfflineLink>
)
}
function songCount(count: number) {
return count === 1 ? "1 song" : `${count} songs`
}
/** Downloaded albums and playlists, newest first, after Other Downloaded Songs. */
export function DownloadsView() {
const version = useDownloadsVersion()
const { otherSongs, rows } = React.useMemo(() => {
const breakdown = downloadQueue.breakdown()
const bytesByCollection = new Map(
breakdown.collections.map((row) => [row.collection, row.bytes])
)
return {
otherSongs: breakdown.otherSongs,
rows: downloadQueue
.collections()
.reverse()
.map((collection) => ({
collection,
bytes: bytesByCollection.get(collection) ?? 0,
})),
}
// version invalidates the lookup when downloads change.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [version])
const empty = rows.length === 0 && otherSongs.songIds.length === 0
return (
<div className="flex h-svh flex-col">
<PageHeader title="Downloads" />
{empty ? (
<div className="flex flex-1 items-center justify-center p-6 pb-28">
<p className="text-sm text-muted-foreground">
Nothing downloaded in this browser.
</p>
</div>
) : (
<div className="flex-1 overflow-y-auto p-6 pb-28">
<div className={albumGridClassName}>
{otherSongs.songIds.length > 0 ? (
<DownloadCard
href={OTHER_DOWNLOADS_PATH}
title={OTHER_DOWNLOADS_TITLE}
subtitle={`${songCount(otherSongs.songIds.length)} · ${formatBytes(otherSongs.bytes)}`}
cover={
<Image
src="/placeholder-downloads.svg"
alt=""
fill
className="object-cover"
unoptimized
/>
}
/>
) : null}
{rows.map(({ collection, bytes }) => (
<DownloadCard
key={`${collection.kind}:${collection.id}`}
href={downloadedCollectionPath(collection)}
title={collection.title}
subtitle={`${collection.kind === "album" ? "Album" : "Playlist"} · ${formatBytes(bytes)}`}
cover={<CollectionCover collection={collection} />}
/>
))}
</div>
</div>
)}
</div>
)
}
+1 -7
View File
@@ -8,14 +8,8 @@ const QueuePanel = dynamic(() =>
import("@/components/queue-panel").then((module) => module.QueuePanel)
)
const LyricsPanel = dynamic(() =>
import("@/components/lyrics-panel").then((module) => module.LyricsPanel)
)
/** The queue or lyrics panel beside the page, whichever is open. */
export function LazyQueuePanel() {
const { queueOpen, lyricsOpen } = usePlayback()
const { queueOpen } = usePlayback()
if (lyricsOpen) return <LyricsPanel />
return queueOpen ? <QueuePanel /> : null
}
+2 -14
View File
@@ -148,23 +148,11 @@ export function SongListSkeleton() {
)
}
/**
* Matches the header + track list layout of album and playlist pages.
* Pass `search` on playlist pages to reserve the "Find in Playlist" toolbar row.
*/
export function CollectionDetailSkeleton({
search = false,
}: {
search?: boolean
}) {
/** Matches the header + track list layout of album and playlist pages. */
export function CollectionDetailSkeleton() {
return (
<LoadingRegion className="flex h-svh flex-col overflow-hidden pb-28">
<PageHeader />
{search ? (
<div className="flex shrink-0 justify-end px-4 pt-3 pb-1">
<Skeleton className="h-9 w-full rounded-full md:w-64" />
</div>
) : null}
<div className="mx-auto w-full max-w-9/10 min-w-0">
<div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end">
<Skeleton className="mx-auto aspect-square w-full max-w-60 shrink-0 rounded-lg sm:mx-0" />
-164
View File
@@ -1,164 +0,0 @@
"use client"
import * as React from "react"
import {
useIsPlaying,
usePlayback,
usePlaybackProgress,
} from "@/components/playback-provider"
import { useLyrics, useLyricsTime } from "@/hooks/use-lyrics"
import { cn } from "@/lib/utils"
import {
activeLineIndex,
type LyricLine,
type Lyrics,
} from "@otunes/convex/client/lyrics"
/** How long a manual scroll keeps the panel from following the song. */
const MANUAL_SCROLL_HOLD_MS = 3000
/** Lyrics beside the page, in the queue's place. Synced lines follow playback. */
export function LyricsPanel() {
const { currentSong } = usePlayback()
const lyrics = useLyrics(currentSong?.id ?? null)
return (
<aside
aria-label="Lyrics"
className={cn(
"flex h-svh w-72 shrink-0 flex-col border-l bg-background",
"max-md:fixed max-md:inset-y-0 max-md:right-0 max-md:z-20 max-md:shadow-xl"
)}
>
{lyrics === null ? (
<p className="m-auto text-sm text-muted-foreground">No lyrics</p>
) : lyrics ? (
<LyricsLines key={currentSong?.id} lyrics={lyrics} />
) : null}
</aside>
)
}
function LyricsLines({ lyrics }: { lyrics: Lyrics }) {
const { seekTo, currentTime } = usePlaybackProgress()
const isPlaying = useIsPlaying()
const { setIsPlaying } = usePlayback()
const time = useLyricsTime(lyrics, currentTime, isPlaying)
const active = activeLineIndex(lyrics, time)
const scrollRef = React.useRef<HTMLDivElement>(null)
const manualScrollAt = React.useRef(0)
const synced = lyrics.synced !== "none"
React.useEffect(() => {
const container = scrollRef.current
const line = container?.querySelector<HTMLElement>(
`[data-line="${Math.max(active, 0)}"]`
)
if (
!container ||
!line ||
!synced ||
Date.now() - manualScrollAt.current < MANUAL_SCROLL_HOLD_MS
) {
return
}
container.scrollTo({
top: line.offsetTop - container.clientHeight * 0.25,
behavior: "smooth",
})
}, [active, synced])
const playFrom = React.useCallback(
(seconds: number) => {
seekTo(seconds)
setIsPlaying(true)
},
[seekTo, setIsPlaying]
)
const holdScroll = () => {
manualScrollAt.current = Date.now()
}
return (
<div
ref={scrollRef}
onWheel={holdScroll}
onTouchMove={holdScroll}
className="relative min-h-0 flex-1 overflow-y-auto px-6 pt-[25svh] pb-[60svh]"
>
{lyrics.lines.map((line, index) =>
synced ? (
<SyncedLine
key={index}
index={index}
line={line}
state={
index === active ? "active" : index < active ? "past" : "next"
}
time={index === active ? time : null}
onSelect={playFrom}
/>
) : (
<p
key={index}
className={cn(
"text-lg leading-snug font-semibold text-foreground/85",
line.text === "" && "h-4"
)}
>
{line.text}
</p>
)
)}
</div>
)
}
/**
* One timed line. Only the active line gets the playback time, so memoized
* lines elsewhere skip re-rendering as the song plays.
*/
const SyncedLine = React.memo(function SyncedLine({
index,
line,
state,
time,
onSelect,
}: {
index: number
line: LyricLine
state: "past" | "active" | "next"
time: number | null
onSelect: (seconds: number) => void
}) {
const active = state === "active"
return (
<button
type="button"
data-line={index}
onClick={() => onSelect(line.start ?? 0)}
className={cn(
"-mx-2 my-1 block w-[calc(100%+1rem)] rounded-md px-2 py-1.5 text-left text-[22px] leading-tight font-bold transition-colors duration-300 hover:bg-foreground/5",
active && !line.words ? "text-foreground" : "text-foreground/30"
)}
>
{active && line.words
? line.words.map((word, wordIndex) => (
<span
key={wordIndex}
className={cn(
"transition-colors duration-200",
time !== null && time >= word.start
? "text-foreground"
: "text-foreground/45"
)}
>
{word.text}
</span>
))
: line.text}
</button>
)
})
+9 -25
View File
@@ -3,8 +3,6 @@
import * as React from "react"
import Link from "next/link"
import {
ArrowDownToLine,
CircleX,
GalleryVerticalEnd,
ListEnd,
ListPlus,
@@ -42,8 +40,6 @@ export type MediaContextAction =
| "shuffle"
| "create-station"
| "favorite"
| "download"
| "remove-download"
export type MediaContextNavigation = {
artist?: { id: string }
@@ -74,6 +70,10 @@ export function MediaMenuSeparator() {
)
}
function actionLabel(base: string, selectedCount: number) {
return selectedCount > 1 ? `${base} (${selectedCount})` : base
}
export function MediaContextMenuItems({
selectedCount,
onAction,
@@ -83,7 +83,6 @@ export function MediaContextMenuItems({
stationArtistId,
navigation,
share,
downloaded,
}: {
selectedCount: number
onAction: (action: MediaContextAction) => void
@@ -93,8 +92,6 @@ export function MediaContextMenuItems({
stationArtistId?: string
navigation?: MediaContextNavigation
share?: MediaShareContext
/** Shows Download, or Remove Download when true. Omit to hide both. */
downloaded?: boolean
}) {
const { artist, album } = navigation ?? {}
const showShare = shouldShowShare(share, selectedCount)
@@ -117,38 +114,29 @@ export function MediaContextMenuItems({
className="justify-between"
onClick={() => onAction("playlist")}
>
{playlistLabel}
{actionLabel(playlistLabel, selectedCount)}
<ListPlus />
</MediaMenuItem>
{downloaded !== undefined ? (
<MediaMenuItem
className="justify-between"
onClick={() => onAction(downloaded ? "remove-download" : "download")}
>
{downloaded ? "Remove Download" : "Download"}
{downloaded ? <CircleX /> : <ArrowDownToLine />}
</MediaMenuItem>
) : null}
<MediaMenuSeparator />
<MediaMenuItem
className="justify-between"
onClick={() => onAction("play-next")}
>
Play Next
{actionLabel("Play Next", selectedCount)}
<ListStart />
</MediaMenuItem>
<MediaMenuItem
className="justify-between"
onClick={() => onAction("play-last")}
>
Play Last
{actionLabel("Play Last", selectedCount)}
<ListEnd />
</MediaMenuItem>
<MediaMenuItem
className="justify-between"
onClick={() => onAction("shuffle")}
>
Shuffle
{actionLabel("Shuffle", selectedCount)}
<Shuffle />
</MediaMenuItem>
{stationArtistId ? (
@@ -189,7 +177,7 @@ export function MediaContextMenuItems({
className="justify-between"
onClick={() => onAction("favorite")}
>
{favorited ? "Unfavorite" : "Favorite"}
{actionLabel(favorited ? "Unfavorite" : "Favorite", selectedCount)}
<Star />
</MediaMenuItem>
</>
@@ -234,7 +222,6 @@ export type MediaContextMenuProps = {
stationArtistId?: string
navigation?: MediaContextNavigation
share?: MediaShareContext
downloaded?: boolean
inSelectionRange?: boolean
/** When false, the trigger uses default button/dropdown styling (page headers). */
trackRowTrigger?: boolean
@@ -277,7 +264,6 @@ export function MediaContextMenuArea({
stationArtistId={menu.stationArtistId}
navigation={menu.navigation}
share={menu.share}
downloaded={menu.downloaded}
/>
{menu.children}
</MenuKindContext>
@@ -297,7 +283,6 @@ export function MediaContextMenu({
stationArtistId,
navigation,
share,
downloaded,
inSelectionRange = false,
trackRowTrigger = true,
triggerClassName,
@@ -339,7 +324,6 @@ export function MediaContextMenu({
stationArtistId={stationArtistId}
navigation={navigation}
share={share}
downloaded={downloaded}
/>
{children}
</DropdownMenuContent>
-101
View File
@@ -1,101 +0,0 @@
"use client"
import { connectivityStore } from "@otunes/convex/client/connectivity"
import { useConvex } from "convex/react"
import { WifiOff } from "lucide-react"
import Link from "next/link"
import { usePathname, useSearchParams } from "next/navigation"
import { useOffline } from "next/offline"
import { useEffect, useRef, useSyncExternalStore } from "react"
import { PageHeader } from "@/components/library-skeletons"
import { DOWNLOADS_PATH } from "@/lib/downloads"
/** How long an offline navigation may wait before loading the page in full. */
const STALLED_NAVIGATION_MS = 1_500
/**
* True while the browser is offline or the server can't be reached. Next's
* `useOffline` covers the network and the web server (it needs
* `experimental.useOffline`); the shared store covers the Convex backend.
*/
export function useIsOffline() {
const nextOffline = useOffline()
const store = connectivityStore(useConvex())
const convexOffline = useSyncExternalStore(
store.subscribe,
store.getSnapshot,
() => false
)
return nextOffline || convexOffline
}
/**
* Replaces page content with a no-connection message while offline. Downloads
* pages, and albums and playlists opened from them, keep rendering so offline
* playback stays reachable. Needs a Suspense boundary for `useSearchParams`.
*/
export function OfflineGate({ children }: { children: React.ReactNode }) {
const offline = useIsOffline()
const pathname = usePathname()
const fromDownloads = useSearchParams().get("from") === "downloads"
const isDownloadsPage =
pathname === DOWNLOADS_PATH || pathname.startsWith(`${DOWNLOADS_PATH}/`)
if (!offline || isDownloadsPage || fromDownloads) return children
return (
<div className="flex h-svh flex-col">
<PageHeader />
<div className="flex flex-1 flex-col items-center justify-center gap-2 p-6 pb-28 text-center">
<WifiOff className="mb-1 size-7 text-muted-foreground" />
<p className="text-sm font-medium">No connection</p>
<p className="text-sm text-muted-foreground">
Your downloads still play.
</p>
<OfflineLink
href={DOWNLOADS_PATH}
className="text-sm underline underline-offset-4"
>
Go to Downloads
</OfflineLink>
</div>
</div>
)
}
/**
* A fully prefetched link for pages that work offline. Offline, a page that
* was never prefetched would wait for the connection, so after a moment it
* loads in full instead and the service worker serves its saved copy.
*/
export function OfflineLink({
href,
onClick,
...props
}: React.ComponentProps<typeof Link> & { href: string }) {
const offline = useIsOffline()
const pathname = usePathname()
const fallback = useRef<ReturnType<typeof setTimeout>>(undefined)
// Any completed navigation, or leaving the page, cancels the fallback.
useEffect(() => () => clearTimeout(fallback.current), [pathname])
return (
<Link
href={href}
prefetch
onClick={(event) => {
onClick?.(event)
if (!offline || event.defaultPrevented) return
if (event.metaKey || event.ctrlKey || event.shiftKey) return
clearTimeout(fallback.current)
fallback.current = setTimeout(
() => window.location.assign(href),
STALLED_NAVIGATION_MS
)
}}
{...props}
/>
)
}
+1 -9
View File
@@ -39,7 +39,6 @@ import {
TableHeader,
TableRow,
} from "@/components/ui/table"
import { DownloadsSettings } from "@/components/downloads-settings"
import { usePlayback } from "@/components/playback-provider"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
@@ -47,7 +46,7 @@ import type { PlaybackQuality } from "@otunes/convex/playback-stream"
import { resizeProfileImageToDataUrl } from "@/lib/resize-image"
import { cn } from "@/lib/utils"
type Section = "profile" | "quality" | "downloads" | "users" | "library"
type Section = "profile" | "quality" | "users" | "library"
type CurrentUser = {
_id: Id<"users">
@@ -950,12 +949,6 @@ export function OptionsModal({
>
Quality
</NavButton>
<NavButton
active={activeSection === "downloads"}
onClick={() => setSection("downloads")}
>
Downloads
</NavButton>
</nav>
{isAdmin ? (
@@ -986,7 +979,6 @@ export function OptionsModal({
<div className="p-6">
{activeSection === "profile" && <ProfileSection user={user} />}
{activeSection === "quality" && <QualitySection user={user} />}
{activeSection === "downloads" && <DownloadsSettings />}
{activeSection === "library" && isAdmin ? (
<LibrarySection />
) : null}
@@ -1,158 +0,0 @@
"use client"
import { useCallback, useMemo, type MouseEvent } from "react"
import { Play, Shuffle } from "lucide-react"
import { OTHER_DOWNLOADS_TITLE } from "@/components/downloads-view"
import { useFavorites } from "@/components/favorites-provider"
import { PageHeader } from "@/components/library-skeletons"
import { usePlaybackActions } from "@/components/playback-provider"
import { LibraryTrackListHeader, TrackRow } from "@/components/track-row"
import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area"
import { VirtualList } from "@/components/virtual-list"
import { useDownloadsVersion } from "@/hooks/use-downloads"
import { useTrackListMediaAction } from "@/hooks/use-media-actions"
import { useTrackSelection } from "@/hooks/use-track-selection"
import { downloadQueue } from "@/lib/downloads"
import { getSelectionRangePositions } from "@/lib/selection-range-styles"
import { stationArtistId } from "@/lib/station-artist"
import { useSongs } from "@/lib/song-cache"
import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong } from "@otunes/convex/types"
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
const PLAY_ORIGIN = downloadsQueueOrigin("other")
const estimateSongRowSize = () => 56
/** Songs downloaded on their own. Playback here always uses the downloads. */
export function OtherDownloadsView() {
const version = useDownloadsVersion()
const songIds = useMemo(
() =>
downloadQueue
.otherSongIds()
.filter((songId) => downloadQueue.getDownloaded(songId))
.reverse() as Id<"songs">[],
// version invalidates the lookup when downloads change.
// eslint-disable-next-line react-hooks/exhaustive-deps
[version]
)
const cachedSongs = useSongs(songIds)
const songs = useMemo(
() => cachedSongs.filter((song): song is BrowseSong => song !== undefined),
[cachedSongs]
)
const playableIds = useMemo(
() => songs.map((song) => song.id as Id<"songs">),
[songs]
)
const { isSongFavorite, toggleSongFavorite } = useFavorites()
const { playFromSong, playInOrder, playShuffled } = usePlaybackActions()
const {
selectedIds,
selectedCount,
handleSelect,
handlePointerDown,
prepareContextMenu,
clearSelection,
} = useTrackSelection(songs)
const selectedStationArtistId = useMemo(
() => stationArtistId(songs, selectedIds),
[songs, selectedIds]
)
const selectionPositions = useMemo(
() =>
getSelectionRangePositions(
songs.map((song) => song.id),
selectedIds
),
[songs, selectedIds]
)
const handleMediaAction = useTrackListMediaAction({
selectedIds,
songs,
downloadFrom: "other",
})
const handleRowSelect = useCallback(
(index: number, event: MouseEvent) =>
handleSelect(songs[index].id, index, event),
[songs, handleSelect]
)
const handleRowPlay = useCallback(
(index: number) =>
void playFromSong(songs[index].id, playableIds, PLAY_ORIGIN),
[songs, playableIds, playFromSong]
)
const handleToggleFavorite = useCallback(
(songId: string) => void toggleSongFavorite(songId as Id<"songs">),
[toggleSongFavorite]
)
return (
<div className="flex h-svh flex-col">
<PageHeader title={OTHER_DOWNLOADS_TITLE} />
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!">
<div
className="w-full pb-28"
onClick={(event) => {
if (event.target === event.currentTarget) clearSelection()
}}
>
{songIds.length === 0 ? (
<p className="p-6 text-sm text-muted-foreground">
Songs you download on their own appear here.
</p>
) : (
<>
<div className="flex gap-2 px-6 py-4">
<Button
className="h-10 gap-2 rounded-full bg-foreground px-6 text-background hover:bg-foreground/90"
onClick={() => void playInOrder(playableIds, PLAY_ORIGIN)}
disabled={playableIds.length === 0}
>
<Play className="fill-current" />
Play
</Button>
<Button
variant="secondary"
size="icon"
className="rounded-full"
aria-label="Shuffle"
onClick={() => void playShuffled(playableIds, PLAY_ORIGIN)}
disabled={playableIds.length === 0}
>
<Shuffle />
</Button>
</div>
<LibraryTrackListHeader />
<VirtualList
count={songs.length}
estimateSize={estimateSongRowSize}
getItemKey={(index) => songs[index].id}
renderItem={(index) => (
<TrackRow
variant="library"
song={songs[index]}
index={index}
selectionPosition={selectionPositions[index]}
isFavorite={isSongFavorite(songs[index].id)}
selectedCount={selectedCount}
selectionStationArtistId={selectedStationArtistId}
onPointerDown={handlePointerDown}
onSelect={handleRowSelect}
onPlay={handleRowPlay}
onToggleFavorite={handleToggleFavorite}
onPrepareContextMenu={prepareContextMenu}
onMediaAction={handleMediaAction}
/>
)}
/>
</>
)}
</div>
</ScrollArea>
</div>
)
}
+65 -228
View File
@@ -35,11 +35,6 @@ import { useCachedQuery } from "@/hooks/use-cached-query"
import { useMediaSession } from "@/hooks/use-media-session"
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
import { supportsDolbyAtmosPlayback } from "@/lib/dolby-atmos-support"
import { downloadedAudioUrl, downloadQueue } from "@/lib/downloads"
import {
isDownloadsQueueOrigin,
streamDownloadQuality,
} from "@otunes/convex/download-quality"
import { flushPersistentCache } from "@/lib/persistent-cache"
import * as playbackQueue from "@otunes/convex/client/playback-queue"
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
@@ -60,18 +55,14 @@ type PlaybackContextValue = {
shuffleEnabled: boolean
repeatEnabled: RepeatMode
queueOpen: boolean
/** The lyrics panel, which shares the queue's place beside the page. */
lyricsOpen: boolean
isPlaying: boolean
volume: number
setQueueOpen: (open: boolean) => void
toggleQueueOpen: () => void
toggleLyricsOpen: () => void
setIsPlaying: (playing: boolean) => void
setVolume: (volume: number) => void
/** An origin from `downloadsQueueOrigin` plays downloads in any quality. */
playInOrder: (songIds: Id<"songs">[], origin?: string) => Promise<void>
playShuffled: (songIds: Id<"songs">[], origin?: string) => Promise<void>
playInOrder: (songIds: Id<"songs">[]) => Promise<void>
playShuffled: (songIds: Id<"songs">[]) => Promise<void>
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
playFromSong: (
@@ -106,11 +97,8 @@ type PlaybackContextValue = {
toggleShuffle: () => Promise<void>
cycleRepeat: () => Promise<void>
clearQueue: () => Promise<void>
clearHistory: () => Promise<void>
reorderQueue: (songIds: Id<"songs">[]) => Promise<void>
skipToQueueIndex: (index: number) => Promise<void>
/** Plays `history[index]`, moving it and every later song back into the queue. */
skipToHistoryIndex: (index: number) => Promise<void>
skipNext: () => Promise<void>
skipPrevious: () => Promise<void>
dolbyAtmosSupported: boolean | null
@@ -125,7 +113,6 @@ type PlaybackActions = Omit<
| "shuffleEnabled"
| "repeatEnabled"
| "queueOpen"
| "lyricsOpen"
| "isPlaying"
| "volume"
| "dolbyAtmosSupported"
@@ -202,79 +189,28 @@ type PlaybackLoadSettings = {
useHls: boolean
}
function userStreamPlan(
function playbackLoadSettings(
user: {
preferAtmos?: boolean
playbackQuality?: PlaybackQuality
},
dolbyAtmosSupported: boolean | null,
files: Record<string, unknown>
) {
): PlaybackLoadSettings {
const preferAtmos =
dolbyAtmosSupported === true && (user.preferAtmos ?? false)
return playbackStreamPlan(files, user.playbackQuality, preferAtmos)
}
/** Where a song plays from: this device's download, or the server. */
type AudioSourceChoice =
{ kind: "download" } | { kind: "stream"; settings: PlaybackLoadSettings }
/**
* Downloads stand in for streams in the same quality, and always play in
* queues started from Downloads. Without the user or file info (offline),
* any download plays.
*/
function audioSourceChoice(
songId: string,
user: { preferAtmos?: boolean; playbackQuality?: PlaybackQuality } | null,
dolbyAtmosSupported: boolean | null,
files: Record<string, unknown> | undefined,
fromDownloads: boolean
): AudioSourceChoice | null {
const download = downloadQueue.getDownloaded(songId)
if (!user || !files) {
return download ? { kind: "download" } : null
}
const plan = userStreamPlan(user, dolbyAtmosSupported, files)
if (
download &&
(fromDownloads || download.quality === streamDownloadQuality(plan))
) {
return { kind: "download" }
}
const plan = playbackStreamPlan(files, user.playbackQuality, preferAtmos)
return {
kind: "stream",
settings: {
preferAtmos: plan.preferAtmos,
playbackQuality: plan.playbackQuality,
useHls: plan.useHls,
},
preferAtmos: plan.preferAtmos,
playbackQuality: plan.playbackQuality,
useHls: plan.useHls,
}
}
function songLoadKey(songId: string, source: AudioSourceChoice) {
if (source.kind === "download") {
return `${songId}:download`
}
const { settings } = source
function songLoadKey(songId: string, settings: PlaybackLoadSettings) {
return `${songId}:${settings.preferAtmos}:${settings.playbackQuality}:${settings.useHls ? "hls" : "file"}`
}
/**
* True when `loadedKey` is this song from the other side of download vs
* stream. Finishing or removing a download keeps the loaded audio playing.
*/
function switchesDownloadSource(
loadedKey: string | null,
songId: string,
source: AudioSourceChoice
) {
if (!loadedKey?.startsWith(`${songId}:`)) {
return false
}
return (source.kind === "download") !== loadedKey.endsWith(":download")
}
function destroyHlsInstance(hlsRef: RefObject<Hls | null>) {
hlsRef.current?.destroy()
hlsRef.current = null
@@ -306,11 +242,21 @@ function loadAudioSource(
audio: HTMLAudioElement,
hlsRef: RefObject<Hls | null>,
songId: string,
source: AudioSourceChoice,
settings: PlaybackLoadSettings,
onReady: () => void
): AudioSourceCleanup {
let disposed = false
let hlsInstance: Hls | null = null
const directUrl = songPlayPath(
songId,
settings.playbackQuality,
settings.preferAtmos
)
const hlsUrl = songHlsPlaylistPath(
songId,
settings.playbackQuality,
settings.preferAtmos
)
const onReadyToPlay = () => {
audio.removeEventListener("loadedmetadata", onReadyToPlay)
@@ -323,48 +269,6 @@ function loadAudioSource(
audio.addEventListener("loadeddata", onReadyToPlay)
audio.addEventListener("canplay", onReadyToPlay)
const cleanup = () => {
disposed = true
audio.removeEventListener("loadedmetadata", onReadyToPlay)
audio.removeEventListener("loadeddata", onReadyToPlay)
audio.removeEventListener("canplay", onReadyToPlay)
if (hlsInstance && hlsRef.current === hlsInstance) {
hlsInstance.destroy()
hlsRef.current = null
}
}
if (source.kind === "download") {
void downloadedAudioUrl(songId)
.catch(() => null)
.then((url) => {
if (disposed) {
return
}
if (!url) {
// Removed since it was chosen; the audio error handler reports it.
audio.removeAttribute("src")
audio.load()
return
}
audio.src = url
audio.load()
})
return cleanup
}
const { settings } = source
const directUrl = songPlayPath(
songId,
settings.playbackQuality,
settings.preferAtmos
)
const hlsUrl = songHlsPlaylistPath(
songId,
settings.playbackQuality,
settings.preferAtmos
)
const loadDirectSource = () => {
if (disposed) {
return
@@ -398,7 +302,16 @@ function loadAudioSource(
loadDirectSource()
}
return cleanup
return () => {
disposed = true
audio.removeEventListener("loadedmetadata", onReadyToPlay)
audio.removeEventListener("loadeddata", onReadyToPlay)
audio.removeEventListener("canplay", onReadyToPlay)
if (hlsInstance && hlsRef.current === hlsInstance) {
hlsInstance.destroy()
hlsRef.current = null
}
}
}
export function usePlayback() {
@@ -510,12 +423,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const currentTimeRef = useRef(0)
const durationRef = useRef(0)
const [sidePanel, setSidePanel] = useState<"queue" | "lyrics" | null>(null)
const queueOpen = sidePanel === "queue"
const lyricsOpen = sidePanel === "lyrics"
const setQueueOpen = useCallback((open: boolean) => {
setSidePanel((panel) => (open ? "queue" : panel === "queue" ? null : panel))
}, [])
const [queueOpen, setQueueOpen] = useState(false)
const [isPlaying, setIsPlaying] = useState(false)
const [playbackStartVersion, setPlaybackStartVersion] = useState(0)
const [currentTime, setCurrentTime] = useState(0)
@@ -531,17 +439,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
getDolbyAtmosSnapshot,
() => null
)
// Re-picks audio sources when songs finish downloading or are removed.
const downloadsVersion = useSyncExternalStore(
downloadQueue.subscribe,
downloadQueue.getVersion,
() => 0
)
useEffect(() => {
void downloadQueue.load().catch(() => {})
}, [])
// Queues started from the Downloads page play downloads in any quality.
const [fromDownloads, setFromDownloads] = useState(false)
const volume = useSyncExternalStore(
subscribeVolume,
readStoredVolume,
@@ -862,22 +759,18 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
return
}
const source = audioSourceChoice(
currentSongId,
user ? { playbackQuality, preferAtmos } : null,
dolbyAtmosSupported,
currentSongDoc?.files,
fromDownloads
)
if (!source) {
if (!user || !currentSongDoc) {
return
}
const loadKey = songLoadKey(currentSongId, source)
if (
loadedSongKeyRef.current === loadKey ||
switchesDownloadSource(loadedSongKeyRef.current, currentSongId, source)
) {
const settings = playbackLoadSettings(
{ playbackQuality, preferAtmos },
dolbyAtmosSupported,
currentSongDoc.files
)
const loadKey = songLoadKey(currentSongId, settings)
if (loadedSongKeyRef.current === loadKey) {
return
}
@@ -918,7 +811,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
audio,
hlsRef,
currentSongId,
source,
settings,
requestPlay
)
@@ -933,8 +826,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
playbackQuality,
preferAtmos,
dolbyAtmosSupported,
downloadsVersion,
fromDownloads,
runWithoutAudioSync,
destroyHls,
clearPreload,
@@ -948,17 +839,16 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
return
}
const source = audioSourceChoice(
nextQueueSongId,
user ? { playbackQuality, preferAtmos } : null,
dolbyAtmosSupported,
nextQueueSongDoc?.files,
fromDownloads
)
if (!source) {
if (!user || !nextQueueSongDoc) {
return
}
const loadKey = songLoadKey(nextQueueSongId, source)
const settings = playbackLoadSettings(
{ playbackQuality, preferAtmos },
dolbyAtmosSupported,
nextQueueSongDoc.files
)
const loadKey = songLoadKey(nextQueueSongId, settings)
if (preloadedSongKeyRef.current === loadKey) {
return
@@ -977,7 +867,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
preloadAudio,
preloadHlsRef,
nextQueueSongId,
source,
settings,
onPreloadReady
)
@@ -998,8 +888,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
playbackQuality,
preferAtmos,
dolbyAtmosSupported,
downloadsVersion,
fromDownloads,
clearPreload,
destroyPreloadHls,
])
@@ -1061,22 +949,19 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
}
const preloadAudio = preloadAudioRef.current
const nextSource = nextQueueSongId
? audioSourceChoice(
nextQueueSongId,
user ?? null,
dolbyAtmosSupported,
nextQueueSongDoc?.files,
fromDownloads
)
: null
if (
shouldContinuePlaying &&
preloadAudio &&
nextQueueSongId &&
nextSource
user &&
nextQueueSongDoc
) {
const nextLoadKey = songLoadKey(nextQueueSongId, nextSource)
const settings = playbackLoadSettings(
user,
dolbyAtmosSupported,
nextQueueSongDoc.files
)
const nextLoadKey = songLoadKey(nextQueueSongId, settings)
if (
preloadedSongKeyRef.current === nextLoadKey &&
@@ -1163,7 +1048,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
nextQueueSongDoc,
user,
dolbyAtmosSupported,
fromDownloads,
store,
destroyHls,
runWithoutAudioSync,
@@ -1225,7 +1109,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
queueOriginRef.current =
recorded.origin ??
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
setFromDownloads(isDownloadsQueueOrigin(recorded.origin))
const previousSongId = store.getState().queue[0]
store.update(playbackQueue.clearQueue)
store.update(recipe)
@@ -1278,26 +1161,21 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
)
const playInOrder = useCallback(
async (songIds: Id<"songs">[], origin?: string) => {
async (songIds: Id<"songs">[]) => {
if (songIds.length === 0) {
return
}
startPlayback(
(state) => playbackQueue.startQueue(state, songIds, false),
{ origin }
)
startPlayback((state) => playbackQueue.startQueue(state, songIds, false))
},
[startPlayback]
)
const playShuffled = useCallback(
async (songIds: Id<"songs">[], origin?: string) => {
async (songIds: Id<"songs">[]) => {
if (songIds.length === 0) {
return
}
startPlayback((state) => playbackQueue.startQueue(state, songIds, true), {
origin,
})
startPlayback((state) => playbackQueue.startQueue(state, songIds, true))
},
[startPlayback]
)
@@ -1450,11 +1328,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
)
const toggleQueueOpen = useCallback(() => {
setSidePanel((panel) => (panel === "queue" ? null : "queue"))
}, [])
const toggleLyricsOpen = useCallback(() => {
setSidePanel((panel) => (panel === "lyrics" ? null : "lyrics"))
setQueueOpen((open) => !open)
}, [])
const toggleShuffle = useCallback(async () => {
@@ -1471,10 +1345,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
setIsPlaying(false)
}, [store])
const clearHistory = useCallback(async () => {
store.update(playbackQueue.clearHistory)
}, [store])
const reorderQueue = useCallback(
async (songIds: Id<"songs">[]) => {
store.update((state) => playbackQueue.reorderQueue(state, songIds))
@@ -1489,13 +1359,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
[store]
)
const skipToHistoryIndex = useCallback(
async (index: number) => {
store.update((state) => playbackQueue.skipToHistoryIndex(state, index))
},
[store]
)
const skipNext = useCallback(async () => {
const before = store.getState()
if (before.repeatEnabled === "none" && before.queue.length <= 1) {
@@ -1530,25 +1393,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
skipPrevious,
})
const currentSource = currentSongId
? audioSourceChoice(
currentSongId,
user ? { playbackQuality, preferAtmos } : null,
dolbyAtmosSupported,
currentSongDoc?.files,
fromDownloads
)
: null
const currentDownload =
currentSource?.kind === "download" && currentSongId
? downloadQueue.getDownloaded(currentSongId)
: undefined
const currentFormat = currentDownload
? currentDownload.quality === "atmos" ||
currentDownload.quality === "lossless"
? currentDownload.quality
: null
: currentSongDoc && user
const currentFormat =
currentSongDoc && user
? playbackFormat(
currentSongDoc.files,
user.playbackQuality,
@@ -1560,7 +1406,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
() => ({
setQueueOpen,
toggleQueueOpen,
toggleLyricsOpen,
setIsPlaying,
setVolume,
playInOrder,
@@ -1578,17 +1423,13 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
toggleShuffle,
cycleRepeat,
clearQueue,
clearHistory,
reorderQueue,
skipToQueueIndex,
skipToHistoryIndex,
skipNext,
skipPrevious,
}),
[
setQueueOpen,
toggleQueueOpen,
toggleLyricsOpen,
setVolume,
playInOrder,
playShuffled,
@@ -1605,10 +1446,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
toggleShuffle,
cycleRepeat,
clearQueue,
clearHistory,
reorderQueue,
skipToQueueIndex,
skipToHistoryIndex,
skipNext,
skipPrevious,
]
@@ -1624,7 +1463,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
shuffleEnabled: playback.shuffleEnabled,
repeatEnabled: playback.repeatEnabled,
queueOpen,
lyricsOpen,
isPlaying: isPlaybackActive,
volume,
dolbyAtmosSupported,
@@ -1635,7 +1473,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
currentSong,
currentFormat,
queueOpen,
lyricsOpen,
isPlaybackActive,
volume,
dolbyAtmosSupported,
+3 -12
View File
@@ -29,7 +29,6 @@ import {
import { Button } from "@/components/ui/button"
import { Slider } from "@/components/ui/slider"
import { useSidebar } from "@/components/ui/sidebar"
import { useLyrics } from "@/hooks/use-lyrics"
import { albumCoverUrl } from "@/lib/cover-urls"
import { cn } from "@/lib/utils"
import { formatDuration } from "@/lib/format-duration"
@@ -74,21 +73,18 @@ export function PlayerBar() {
shuffleEnabled,
repeatEnabled,
queueOpen,
lyricsOpen,
isPlaying,
volume,
queueSongIds,
setIsPlaying,
setVolume,
toggleQueueOpen,
toggleLyricsOpen,
toggleShuffle,
cycleRepeat,
skipNext,
skipPrevious,
} = usePlayback()
const { state, isMobile } = useSidebar()
const lyrics = useLyrics(currentSong?.id ?? null)
const hasQueue = queueSongIds.length > 0
const sidebarExpanded = !isMobile && state === "expanded"
@@ -98,7 +94,7 @@ export function PlayerBar() {
className={cn(
"@container pointer-events-none fixed bottom-4 z-50 flex justify-center px-4 transition-[left,right] duration-200 ease-linear",
sidebarExpanded ? "right-0 left-[16rem]" : "inset-x-0",
(queueOpen || lyricsOpen) && !isMobile && "right-72"
queueOpen && !isMobile && "right-72"
)}
>
<div className="pointer-events-auto flex w-full max-w-[40rem] items-center gap-2 rounded-full border border-foreground/20 bg-(--player-background) px-3 py-2 text-card-foreground shadow-lg [--player-background:var(--card)] md:gap-3 md:py-1.5 dark:border-white/20 dark:text-white dark:[--player-background:#303033]">
@@ -231,14 +227,9 @@ export function PlayerBar() {
<Button
variant="ghost"
size="icon"
className="hidden @min-[640px]:inline-flex"
aria-label="Lyrics"
aria-pressed={lyricsOpen}
className={cn(
"hidden @min-[640px]:inline-flex",
lyricsOpen && "text-primary"
)}
disabled={!lyrics && !lyricsOpen}
onClick={toggleLyricsOpen}
disabled
>
<MessageSquareQuote className="size-4" />
</Button>
-20
View File
@@ -22,8 +22,6 @@ import {
DropdownMenuContent,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"
import { useDownloads } from "@/components/downloads-provider"
import { useIsCollectionDownloaded } from "@/hooks/use-downloads"
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { api } from "@otunes/convex/_generated/api"
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
@@ -34,9 +32,6 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
const { openAddPlaylistToPlaylist } = useAddToPlaylist()
const { playPlaylist } = usePlaybackActions()
const { runQueueAction } = useQueueMediaActions()
const { requestDownload, removeDownload } = useDownloads()
const downloadRef = { kind: "playlist" as const, id: playlist.id }
const downloaded = useIsCollectionDownloaded(downloadRef)
async function handleCardAction(action: MediaContextAction) {
switch (action) {
@@ -57,20 +52,6 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
void runQueueAction(action, songIds)
break
}
case "download":
case "remove-download": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getPlaylistSongIds,
{ playlistId: playlist.id as Id<"playlists"> }
)
const target = { ...downloadRef, title: playlist.title, songIds }
void (action === "download"
? requestDownload(target)
: removeDownload(target))
break
}
case "favorite":
break
}
@@ -120,7 +101,6 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
<MediaContextMenuItems
selectedCount={1}
showFavorite={false}
downloaded={downloaded}
onAction={(action) => void handleCardAction(action)}
share={{ type: "playlist", playlistId: playlist.id }}
/>
+28 -81
View File
@@ -5,7 +5,7 @@ import { stationArtistId } from "@/lib/station-artist"
import * as React from "react"
import Image from "next/image"
import { useRouter } from "next/navigation"
import { useMutation, useQuery } from "convex/react"
import { useMutation } from "convex/react"
import {
ImageIcon,
Pencil,
@@ -18,17 +18,7 @@ import {
} from "lucide-react"
import { toast } from "sonner"
import { DownloadButton, DownloadedQuality } from "@/components/download-button"
import {
FAVORITES_DOWNLOAD_ID,
useDownloads,
} from "@/components/downloads-provider"
import { useFavorites } from "@/components/favorites-provider"
import {
useIsCollectionDownloaded,
useOpenedFromDownloads,
} from "@/hooks/use-downloads"
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
import {
useCurrentSongId,
usePlaybackActions,
@@ -101,13 +91,9 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
: playlistSongs
const [searchQuery, setSearchQuery] = React.useState("")
const isSearching = searchQuery.trim() !== ""
const lyricsMatches = useQuery(
api.lyrics.matchingSongIds,
isSearching ? { query: searchQuery } : "skip"
)
const filteredSongs = React.useMemo(
() => filterSongs(songs, searchQuery, lyricsMatches),
[songs, searchQuery, lyricsMatches]
() => filterSongs(songs, searchQuery),
[songs, searchQuery]
)
const playlistSongIds = React.useMemo(
() => songs.map((song) => song.id as Id<"songs">),
@@ -161,22 +147,8 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
rememberSongs(playlist.songs)
}, [playlist.songs])
const downloadRef = React.useMemo(
() => ({
kind: "playlist" as const,
id: playlist.id ?? FAVORITES_DOWNLOAD_ID,
}),
[playlist.id]
)
const fromDownloads = useOpenedFromDownloads()
const playOrigin = fromDownloads
? downloadsQueueOrigin(`playlist:${downloadRef.id}`)
: `playlist:${playlist.id}`
function playAll(shuffled: boolean) {
if (fromDownloads) {
void (shuffled ? playShuffled : playInOrder)(playlistSongIds, playOrigin)
} else if (playlist.id) {
if (playlist.id) {
const play = shuffled ? playPlaylistShuffled : playPlaylist
void play(playlist.id, playlistSongIds)
} else {
@@ -184,32 +156,9 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
}
}
const handleMediaAction = useTrackListMediaAction({
selectedIds,
songs,
downloadFrom: downloadRef,
})
const { requestDownload, removeDownload } = useDownloads()
const downloadTarget = React.useMemo(
() => ({
...downloadRef,
title: playlist.title,
songIds: playlistSongIds,
}),
[downloadRef, playlist.title, playlistSongIds]
)
const playlistDownloaded = useIsCollectionDownloaded(downloadTarget)
const handleMediaAction = useTrackListMediaAction({ selectedIds, songs })
function handlePlaylistMediaAction(action: MediaContextAction) {
if (action === "download") {
void requestDownload(downloadTarget)
return
}
if (action === "remove-download") {
void removeDownload(downloadTarget)
return
}
runSongsAction(action, playlistSongIds)
}
@@ -222,7 +171,11 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
}
function handleRowPlay(index: number) {
void playFromSong(filteredSongs[index].id, playlistSongIds, playOrigin)
void playFromSong(
filteredSongs[index].id,
playlistSongIds,
`playlist:${playlist.id}`
)
}
function handleToggleFavorite(songId: string) {
@@ -346,24 +299,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
return (
<div className="flex h-svh flex-col">
<PageHeader openApp />
<div className="flex shrink-0 justify-end px-4 pt-3 pb-1">
<div className="relative w-full md:w-64">
<SearchIcon className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
<input
type="search"
aria-label="Find in playlist"
placeholder="Find in Playlist"
value={searchQuery}
onChange={(event) => {
setSearchQuery(event.target.value)
clearSelection()
setActiveTrackId("")
setDragIndex(null)
}}
className="h-9 w-full min-w-0 rounded-full border border-input bg-input/30 pr-3 pl-9 text-sm text-foreground transition-colors outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/50"
/>
</div>
</div>
<ScrollArea className="min-h-0 flex-1">
<div className="pb-28">
<div className="mx-auto w-full max-w-9/10 min-w-0">
@@ -407,9 +342,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
<p className="text-lg font-semibold text-primary">
{playlist.owner.name}
</p>
<p className="text-sm text-muted-foreground empty:hidden">
<DownloadedQuality collection={downloadRef} />
</p>
</div>
<div className="flex flex-wrap items-center justify-center gap-2 sm:justify-start">
@@ -442,7 +374,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
{isSubscribed ? "Subscribed" : "Subscribe"}
</Button>
) : null}
<DownloadButton target={downloadTarget} />
{!isFavorites ? (
<Button
variant="secondary"
@@ -465,7 +396,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
onAction={handlePlaylistMediaAction}
playlistLabel={ADD_TO_ANOTHER_PLAYLIST}
showFavorite={!isFavorites}
downloaded={playlistDownloaded}
trackRowTrigger={false}
triggerVariant="secondary"
triggerClassName="rounded-full"
@@ -500,6 +430,24 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
</div>
</div>
<div className="px-6 pb-4">
<div className="relative max-w-sm">
<SearchIcon className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
<input
type="search"
aria-label="Search playlist"
placeholder="Search playlist"
value={searchQuery}
onChange={(event) => {
setSearchQuery(event.target.value)
clearSelection()
setActiveTrackId("")
setDragIndex(null)
}}
className="h-10 w-full min-w-0 rounded-full border border-input bg-input/30 pr-3 pl-9 text-sm text-foreground transition-colors outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/50"
/>
</div>
</div>
{filteredSongs.length > 0 ? (
<VirtualList
count={filteredSongs.length}
@@ -523,7 +471,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
selectedCount={selectedCount}
selectionStationArtistId={selectedStationArtistId}
playlistLabel={ADD_TO_ANOTHER_PLAYLIST}
downloadCollection={downloadRef}
showFavoriteInMenu={!isFavorites}
removeLabel={
isFavorites
+118 -178
View File
@@ -5,11 +5,13 @@ import * as React from "react"
import { PlaybackSongMeta } from "@/components/playback-song-meta"
import { usePlayback } from "@/components/playback-provider"
import { TrackCover, TrackRow } from "@/components/track-row"
import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area"
import { Skeleton } from "@/components/ui/skeleton"
import { Spinner } from "@/components/ui/spinner"
import { useTrackSelection } from "@/hooks/use-track-selection"
import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong, QueueSong } from "@otunes/convex/types"
import type { BrowseSong, HistorySong, QueueSong } from "@otunes/convex/types"
import {
getContiguousSelectedIndices,
moveQueueBlock,
@@ -17,6 +19,7 @@ import {
import { getSelectionRangePositions } from "@/lib/selection-range-styles"
import { useSongs } from "@/lib/song-cache"
import { cn } from "@/lib/utils"
import { formatDuration } from "@/lib/format-duration"
const QUEUE_INITIAL_VISIBLE_COUNT = 100
const QUEUE_PAGE_SIZE = 50
@@ -29,13 +32,11 @@ type QueueItem = {
song: QueueSelectable | null
}
/** Upcoming songs only: queue index 0 is the current song, shown on its own. */
function toSelectableQueue(
songIds: Id<"songs">[],
songs: (BrowseSong | undefined)[]
): QueueItem[] {
return songIds.slice(1).map((songId, offset) => {
const queueIndex = offset + 1
return songIds.map((songId, queueIndex) => {
const selectionId = `${songId}-${queueIndex}`
const song = songs[queueIndex]
return {
@@ -46,75 +47,57 @@ function toSelectableQueue(
})
}
/** A played song; clicking it plays it again from that point in history. */
function HistorySongRow({
song,
historyIndex,
onPlay,
}: {
song: BrowseSong | undefined
historyIndex: number
onPlay: (historyIndex: number) => void
}) {
if (!song) {
return <QueueSongRowSkeleton />
}
function HistorySongRow({ song }: { song: HistorySong }) {
return (
<li
role="button"
tabIndex={0}
className="flex cursor-pointer items-center gap-3 px-4 py-2 text-sm hover:bg-foreground/5"
onClick={() => onPlay(historyIndex)}
onKeyDown={(event) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault()
onPlay(historyIndex)
}
}}
>
<TrackCover
albumId={song.album.id}
alt={song.album.title}
inRange={false}
/>
<PlaybackSongMeta song={song} align="start" showAlbum={false} />
<li className="relative w-full py-2 text-left text-sm opacity-60">
<div className="relative z-10 flex items-center gap-3 px-2">
<TrackCover
albumId={song.album.id}
alt={song.album.title}
inRange={false}
square
/>
<PlaybackSongMeta
song={song}
isCurrent={false}
inRange={false}
align="start"
showAlbum={false}
/>
<span className="shrink-0 text-xs text-muted-foreground tabular-nums">
{formatDuration(song.durationSeconds)}
</span>
</div>
</li>
)
}
function QueueSongRowSkeleton() {
return (
<li className="flex items-center gap-3 px-4 py-2" aria-hidden>
<Skeleton className="size-10 shrink-0 rounded" />
<li className="flex items-center gap-3 px-2 py-2" aria-hidden>
<Skeleton className="size-10 shrink-0 rounded-none" />
<div className="flex min-w-0 flex-1 flex-col gap-1.5">
<Skeleton className="h-3.5 w-3/4" />
<Skeleton className="h-3 w-1/2" />
</div>
<Skeleton className="h-3 w-8 shrink-0" />
</li>
)
}
/**
* The queue sidebar, laid out like the mobile now playing queue: history above
* (scrolled out of view at first), then the current song and the upcoming
* songs, which can be dragged to reorder. Shuffle and repeat live in the
* player bar.
*/
export function QueuePanel() {
const {
queueSongIds,
queueHistorySongIds,
queueOpen,
clearHistory,
clearQueue,
reorderQueue,
skipToQueueIndex,
skipToHistoryIndex,
} = usePlayback()
const loadMoreRef = React.useRef<HTMLDivElement>(null)
const scrollRef = React.useRef<HTMLDivElement>(null)
const currentRef = React.useRef<HTMLDivElement>(null)
const nowPlayingRef = React.useRef<HTMLElement>(null)
const [visibleCount, setVisibleCount] = React.useState(
QUEUE_INITIAL_VISIBLE_COUNT
)
@@ -124,10 +107,15 @@ export function QueuePanel() {
[queueSongIds, visibleCount]
)
const visibleQueueSongs = useSongs(visibleQueueIds)
const historySongs = useSongs(queueHistorySongIds)
const currentSong = visibleQueueSongs[0]
const historySongMetadata = useSongs(queueHistorySongIds)
const historySongs = React.useMemo(
() =>
historySongMetadata.flatMap((song, historyIndex) =>
song ? [{ ...song, historyIndex }] : []
),
[historySongMetadata]
)
const hasMore = queueSongIds.length > visibleCount
const hasUpcoming = queueSongIds.length > 1
const selectableQueue = React.useMemo(
() => toSelectableQueue(visibleQueueIds, visibleQueueSongs),
@@ -137,21 +125,17 @@ export function QueuePanel() {
const [dragIndex, setDragIndex] = React.useState<number | null>(null)
const currentQueueSongId = queueSongIds[0]
// Keep the current song at the top as playback moves through the queue:
// jump there on open, then scroll smoothly as songs change.
const hasScrolledRef = React.useRef(false)
React.useLayoutEffect(() => {
const scroller = scrollRef.current
const current = currentRef.current
if (!queueOpen || !scroller || !current) {
React.useEffect(() => {
if (!queueOpen || queueSongIds.length === 0) {
return
}
scroller.scrollTo({
top: current.offsetTop,
behavior: hasScrolledRef.current ? "smooth" : "instant",
const frame = requestAnimationFrame(() => {
nowPlayingRef.current?.scrollIntoView({ block: "center" })
})
hasScrolledRef.current = true
}, [queueOpen, currentQueueSongId, queueHistorySongIds.length])
return () => cancelAnimationFrame(frame)
}, [queueOpen, queueSongIds.length, currentQueueSongId])
React.useEffect(() => {
if (!hasMore) {
@@ -159,8 +143,12 @@ export function QueuePanel() {
}
const sentinel = loadMoreRef.current
const root = scrollRef.current
if (!sentinel || !root) {
if (!sentinel) {
return
}
const viewport = sentinel.closest('[data-slot="scroll-area-viewport"]')
if (!viewport) {
return
}
@@ -170,7 +158,7 @@ export function QueuePanel() {
setVisibleCount((count) => count + QUEUE_PAGE_SIZE)
}
},
{ root, rootMargin: "240px" }
{ root: viewport, rootMargin: "240px" }
)
observer.observe(sentinel)
@@ -198,11 +186,6 @@ export function QueuePanel() {
[selectableQueue, skipToQueueIndex]
)
const handleHistoryPlay = React.useCallback(
(historyIndex: number) => void skipToHistoryIndex(historyIndex),
[skipToHistoryIndex]
)
const selectionPositions = React.useMemo(
() =>
getSelectionRangePositions(
@@ -257,119 +240,76 @@ export function QueuePanel() {
return (
<aside
className={cn(
"relative flex h-svh w-72 shrink-0 flex-col border-l bg-background",
"flex h-svh w-72 shrink-0 flex-col border-l bg-background",
"max-md:fixed max-md:inset-y-0 max-md:right-0 max-md:z-20 max-md:shadow-xl"
)}
>
<div
ref={scrollRef}
className="relative min-h-0 flex-1 [scrollbar-width:none] overflow-y-auto overscroll-contain"
>
{queueHistorySongIds.length > 0 ? (
<section>
<header className="flex items-center justify-between px-4 pt-3 pb-1">
<h2 className="text-base font-bold">History</h2>
<button
type="button"
className="text-sm text-muted-foreground hover:text-foreground"
onClick={() => void clearHistory()}
>
Clear
</button>
</header>
<ul className="flex flex-col">
{queueHistorySongIds.map((songId, historyIndex) => (
<HistorySongRow
key={`history-${songId}-${historyIndex}`}
song={historySongs[historyIndex]}
historyIndex={historyIndex}
onPlay={handleHistoryPlay}
/>
))}
</ul>
</section>
) : null}
<header className="flex items-center justify-between gap-2 border-b px-4 py-3">
<h1 className="text-lg font-semibold">Up Next</h1>
<Button
variant="ghost"
size="sm"
className="text-primary hover:text-primary"
onClick={() => void clearQueue()}
disabled={queueSongIds.length === 0}
>
Clear
</Button>
</header>
{/* Fills the viewport so the current song can always scroll to the top. */}
<div ref={currentRef} className="flex min-h-full flex-col">
{currentQueueSongId ? (
<div className="flex items-center gap-3 px-4 py-3">
{currentSong ? (
<>
<TrackCover
albumId={currentSong.album.id}
alt={currentSong.album.title}
inRange={false}
size="lg"
<ScrollArea className="min-h-0 flex-1">
{queueSongIds.length === 0 ? (
<p className="px-4 py-8 text-sm text-muted-foreground">
Nothing in the queue.
</p>
) : (
<>
{historySongs.length > 0 ? (
<ul className="flex flex-col border-b py-1">
{historySongs.map((song) => (
<HistorySongRow
key={`history-${song.id}-${song.historyIndex}`}
song={song}
/>
<PlaybackSongMeta
song={currentSong}
align="start"
showAlbum={false}
/>
</>
) : (
<Skeleton className="size-14 shrink-0 rounded-md" />
)}
</div>
) : null}
<header className="sticky top-0 z-20 flex items-center justify-between bg-background px-4 py-2">
<h2 className="text-base font-bold">Continue Playing</h2>
<button
type="button"
className="text-sm text-muted-foreground hover:text-foreground disabled:pointer-events-none disabled:opacity-50"
onClick={() => void clearQueue()}
disabled={queueSongIds.length === 0}
>
Clear
</button>
</header>
{hasUpcoming ? (
<>
<ul className="flex flex-col pb-8">
{selectableQueue.map((item, index) =>
item.song ? (
<TrackRow
key={item.selectionId}
variant="queue"
song={item.song}
index={index}
selectionPosition={selectionPositions[index]}
isDragging={draggingIndices.has(index)}
onPointerDown={handlePointerDown}
onSelect={handleRowSelect}
onPlay={handleRowPlay}
onDragStart={setDragIndex}
onDrop={handleDrop}
/>
) : (
<QueueSongRowSkeleton key={item.selectionId} />
)
)}
))}
</ul>
{hasMore ? (
<div
ref={loadMoreRef}
className="flex items-center justify-center py-4"
aria-hidden
>
<Spinner className="size-5 text-muted-foreground" />
</div>
) : null}
</>
) : (
<p className="flex flex-1 items-center justify-center px-4 pb-24 text-center text-lg font-semibold text-muted-foreground">
Nothing else is queued.
</p>
)}
</div>
</div>
<div
aria-hidden
className="pointer-events-none absolute inset-x-0 bottom-0 h-9 bg-linear-to-b from-transparent to-background"
/>
) : null}
<ul className="flex flex-col py-1">
{selectableQueue.map((item, index) =>
item.song ? (
<TrackRow
key={item.selectionId}
ref={item.queueIndex === 0 ? nowPlayingRef : undefined}
variant="queue"
song={item.song}
index={index}
isActive={item.queueIndex === 0}
isNowPlaying={item.queueIndex === 0}
selectionPosition={selectionPositions[index]}
isDragging={draggingIndices.has(index)}
onPointerDown={handlePointerDown}
onSelect={handleRowSelect}
onPlay={handleRowPlay}
onDragStart={setDragIndex}
onDrop={handleDrop}
/>
) : (
<QueueSongRowSkeleton key={item.selectionId} />
)
)}
</ul>
{hasMore ? (
<div
ref={loadMoreRef}
className="flex items-center justify-center py-4"
aria-hidden
>
<Spinner className="size-5 text-muted-foreground" />
</div>
) : null}
</>
)}
</ScrollArea>
</aside>
)
}
+2 -23
View File
@@ -1,7 +1,5 @@
"use client"
import { useDownloads } from "@/components/downloads-provider"
import { useSongDownloadState } from "@/hooks/use-downloads"
import Image from "next/image"
import Link from "next/link"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
@@ -14,21 +12,14 @@ import {
type MediaContextMenuProps,
} from "@/components/media-context-menu"
import type { Id } from "@otunes/convex/_generated/dataModel"
import type { SearchSong } from "@otunes/convex/types"
import type { BrowseSong } from "@otunes/convex/types"
import { albumCoverUrl } from "@/lib/cover-urls"
export function SearchSongItem({ song }: { song: SearchSong }) {
export function SearchSongItem({ song }: { song: BrowseSong }) {
const { openAddToPlaylist } = useAddToPlaylist()
const { isSongFavorite, toggleSongFavorite } = useFavorites()
const { runQueueAction, createStation } = useQueueMediaActions()
const songIds = [song.id as Id<"songs">]
const { requestDownload, removeDownload } = useDownloads()
const downloaded = useSongDownloadState(song.id) === "here"
const downloadTarget = {
kind: "songs" as const,
songIds,
title: song.title,
}
function handleAction(action: MediaContextAction) {
switch (action) {
@@ -46,12 +37,6 @@ export function SearchSongItem({ song }: { song: SearchSong }) {
case "favorite":
void toggleSongFavorite(song.id as Id<"songs">)
break
case "download":
void requestDownload(downloadTarget)
break
case "remove-download":
void removeDownload(downloadTarget)
break
}
}
@@ -62,7 +47,6 @@ export function SearchSongItem({ song }: { song: SearchSong }) {
onOpenMenu: () => {},
onAction: handleAction,
favorited: isSongFavorite(song.id),
downloaded,
navigation: {
artist: { id: song.artist.id },
album: { id: song.album.id },
@@ -103,11 +87,6 @@ export function SearchSongItem({ song }: { song: SearchSong }) {
>
<p className="truncate text-sm">{song.artist.name}</p>
</Link>
{song.lyricsSnippet ? (
<p className="truncate text-xs text-muted-foreground">
Lyrics: “{song.lyricsSnippet}”
</p>
) : null}
</div>
<MediaContextMenu {...menu} />
+12 -33
View File
@@ -3,7 +3,7 @@
import * as React from "react"
import Image from "next/image"
import Link from "next/link"
import { ArrowDownToLine, Menu, Music2, Play, Star, Trash2 } from "lucide-react"
import { Music2, Play, Star, Trash2 } from "lucide-react"
import {
MediaContextMenu,
@@ -28,17 +28,15 @@ import {
type SelectionRangePosition,
} from "@/lib/selection-range-styles"
import { formatDuration } from "@/lib/format-duration"
import { useSongDownloadState } from "@/hooks/use-downloads"
import { cn } from "@/lib/utils"
import type { BrowseSong } from "@otunes/convex/types"
import type { DownloadSource } from "@otunes/convex/client/download-queue"
/**
* - `library`: favorite star, cover with play overlay, title, artist and album
* columns (use with `LibraryTrackListHeader`).
* - `album`: favorite star, track number, title with optional credits.
* - `playlist`: cover with favorite overlay, track number, title.
* - `queue`: cover, title and artist, duration, and a reorder grip. No menu.
* - `queue`: square cover, title and artist, no menu.
*/
export type TrackRowVariant = "library" | "album" | "playlist" | "queue"
@@ -51,8 +49,6 @@ export type TrackRowProps = {
trackNumber?: number
/** Secondary line under the title, e.g. album track credits. */
subtitle?: string
/** The download this row belongs to; defaults to Other Downloaded Songs. */
downloadCollection?: DownloadSource
selectionPosition: SelectionRangePosition
isActive?: boolean
isNowPlaying?: boolean
@@ -89,14 +85,13 @@ export function TrackCover({
albumId,
alt,
inRange,
size = "md",
square = false,
children,
}: {
albumId: string | undefined
alt: string
inRange: boolean
/** `lg` is the larger current-song cover in the queue. */
size?: "md" | "lg"
square?: boolean
/** Overlay shown above the cover image. */
children?: React.ReactNode
}) {
@@ -106,8 +101,8 @@ export function TrackCover({
return (
<div
className={cn(
"flex shrink-0 items-center justify-center bg-muted ring-1",
size === "lg" ? "size-14 rounded-md" : "size-10 rounded",
"flex size-10 shrink-0 items-center justify-center bg-muted ring-1",
!square && "rounded",
ringClass
)}
>
@@ -119,8 +114,8 @@ export function TrackCover({
return (
<div
className={cn(
"group/cover relative shrink-0 overflow-hidden ring-1",
size === "lg" ? "size-14 rounded-md" : "size-10 rounded",
"group/cover relative size-10 shrink-0 overflow-hidden ring-1",
!square && "rounded",
ringClass
)}
>
@@ -128,7 +123,7 @@ export function TrackCover({
src={albumCoverUrl(albumId)}
alt={alt}
fill
sizes={size === "lg" ? "56px" : "40px"}
sizes="40px"
className="object-cover"
/>
{children}
@@ -253,7 +248,6 @@ function TrackRowComponent({
index,
trackNumber,
subtitle,
downloadCollection,
selectionPosition,
isActive = false,
isNowPlaying = false,
@@ -276,11 +270,6 @@ function TrackRowComponent({
onDrop,
}: TrackRowProps) {
const inRange = isInSelectionRange(selectionPosition)
const downloadState = useSongDownloadState(song.id, downloadCollection)
const isDownloaded = downloadState === "here"
// The queue row only shows the duration, like the mobile queue.
const showDownloaded =
variant !== "queue" && (isDownloaded || downloadState === "device")
const flush = variant === "library" || variant === "queue"
const play = () => onPlay(index)
const toggleFavorite = () => onToggleFavorite?.(song.id)
@@ -314,14 +303,11 @@ function TrackRowComponent({
const duration = (
<span
className={cn(
"flex shrink-0 items-center justify-end gap-2 tabular-nums",
"shrink-0 text-right tabular-nums",
variant === "queue" && "text-xs",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
>
{showDownloaded ? (
<ArrowDownToLine className="size-3.5" aria-label="Downloaded" />
) : null}
{formatDuration(song.durationSeconds)}
</span>
)
@@ -343,7 +329,6 @@ function TrackRowComponent({
album: { id: song.album.id },
},
share: { type: "song", albumId: song.album.id, songId: song.id },
downloaded: isDownloaded,
children:
removeLabel && onRemove ? (
<>
@@ -462,11 +447,12 @@ function TrackRowComponent({
break
case "queue":
content = (
<div className="relative z-10 flex items-center gap-3 pr-2 pl-4">
<div className="relative z-10 flex items-center gap-3 px-2">
<TrackCover
albumId={song.album.id}
alt={song.album.title}
inRange={inRange}
square
/>
<PlaybackSongMeta
song={song}
@@ -476,13 +462,6 @@ function TrackRowComponent({
showAlbum={false}
/>
{duration}
<Menu
aria-hidden
className={cn(
"size-4 shrink-0 cursor-grab",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
/>
</div>
)
break
Loaded 100 of 127 files, more files were not shown because too many files have changed in this diff. Show more