Compare commits

..
166 changed files with 9009 additions and 2503 deletions

No files matched your search

+7 -15
View File
@@ -25,20 +25,16 @@ FROM node:${NODE_VERSION} AS dependencies
WORKDIR /app
# Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex).
# Mobile is intentionally omitted so its deps are never installed.
COPY package.json pnpm-lock.yaml .npmrc ./
# 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 ./
# 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/
# 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' \
RUN printf '\n%s\n' \
'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \
@@ -82,15 +78,11 @@ FROM node:${NODE_VERSION} AS convex-functions
WORKDIR /app
COPY package.json pnpm-lock.yaml .npmrc ./
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
COPY patches ./patches
COPY packages/convex/package.json ./packages/convex/
RUN printf '%s\n' \
'packages:' \
' - "packages/convex"' \
> pnpm-workspace.yaml \
&& printf '\n%s\n' \
RUN printf '\n%s\n' \
'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \
@@ -0,0 +1 @@
export { default } from "../../home/downloads"
@@ -0,0 +1 @@
export { default } from "../../home/downloads/other"
@@ -5,6 +5,7 @@ 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 = {
@@ -14,6 +15,7 @@ const screens = {
playlists: Playlists,
favorites: Favorites,
recent: RecentlyPlayed,
downloads: Downloads,
}
export default function TabletSectionScreen() {
+11 -1
View File
@@ -127,7 +127,9 @@ function TabsContent() {
tintColor={tabColors.tintColor}
minimizeBehavior="onScrollDown"
{...(Platform.OS === "android"
? { disableIndicator: true, rippleColor: tabColors.tintColor }
? // A new ripple color rebuilds Material's item backgrounds and
// cuts off the in-flight ripple, so it must not follow the palette.
{ disableIndicator: true, rippleColor: appleMusic.tabInactive }
: {})}
>
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
@@ -215,6 +217,14 @@ function TabsContent() {
<NativeTabs.Trigger.Icon sf="clock" />
<NativeTabs.Trigger.Label>Recently Played</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>
{!keyboardVisible ? <AndroidMiniPlayer /> : null}
{tabletLayout ? <TabletMiniPlayer /> : null}
+105 -27
View File
@@ -22,6 +22,18 @@ import {
DiscHeader,
} from "@/components/collection-list"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import {
DownloadHeaderButton,
DownloadedQuality,
} from "@/components/download-header-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 {
@@ -58,7 +70,17 @@ export default function AlbumScreen() {
api.library.browseAlbumDetail,
typeof id === "string" ? { id: id as Id<"albums"> } : "skip"
)
const { playAlbum, playAlbumShuffled, playFromSong } = usePlaybackActions()
const {
playAlbum,
playAlbumShuffled,
playFromSong,
playInOrder,
playShuffled,
} = usePlaybackActions()
const fromDownloads = useOpenedFromDownloads()
const playOrigin = fromDownloads
? downloadsQueueOrigin(`album:${id}`)
: `album:${id}`
const { isAlbumFavorite, toggleAlbumFavorite, isSongFavorite } =
useFavorites()
const {
@@ -81,6 +103,17 @@ 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) {
@@ -92,8 +125,8 @@ export default function AlbumScreen() {
const playTrack = useCallback(
(songId: Id<"songs">, ids: Id<"songs">[]) =>
playFromSong(songId, ids, `album:${id}`),
[id, playFromSong]
playFromSong(songId, ids, playOrigin),
[playOrigin, playFromSong]
)
const renderItem = useCallback(
@@ -193,28 +226,41 @@ export default function AlbumScreen() {
}
: {}),
headerRight: () => (
<MediaActionMenu
stationArtistId={album.artist.id}
selectedCount={album.tracks.length}
favorited={isAlbumFav(album.id)}
share={{ type: "album", albumId: album.id, title: album.title }}
onAction={(action) =>
void handleAlbumDetailAction(
album.id as Id<"albums">,
songIds,
action,
album.artist.id as Id<"artists">
)
}
>
<Pressable hitSlop={8}>
<Ionicons
name="ellipsis-horizontal"
size={22}
color={colors.foreground}
/>
</Pressable>
</MediaActionMenu>
<View style={styles.headerActions}>
<DownloadHeaderButton
target={downloadTarget}
color={colors.foreground}
/>
<MediaActionMenu
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">
)
}
}}
>
<Pressable hitSlop={8}>
<Ionicons
name="ellipsis-horizontal"
size={22}
color={colors.foreground}
/>
</Pressable>
</MediaActionMenu>
</View>
),
}}
/>
@@ -278,7 +324,11 @@ export default function AlbumScreen() {
<Button
title="Play"
icon="play"
onPress={() => void playAlbum(album.id, songIds)}
onPress={() =>
void (fromDownloads
? playInOrder(songIds, playOrigin)
: playAlbum(album.id, songIds))
}
style={styles.playButton}
tint={{
background: palette.accent,
@@ -289,7 +339,11 @@ export default function AlbumScreen() {
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={() => void playAlbumShuffled(album.id, songIds)}
onPress={() =>
void (fromDownloads
? playShuffled(songIds, playOrigin)
: playAlbumShuffled(album.id, songIds))
}
style={[
styles.iconAction,
{ backgroundColor: palette.surface },
@@ -372,6 +426,11 @@ export default function AlbumScreen() {
</>
) : null}
</View>
<DownloadedQuality
collection={downloadTarget}
color={palette.secondaryForeground}
backgroundColor={palette.background}
/>
</CollectionHero>
</MusicEntityView>
<CollectionDivider color={palette.divider} />
@@ -451,6 +510,13 @@ 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={
@@ -467,6 +533,7 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
}
stationArtistId={album.artist.id}
favorited={favorited}
downloaded={downloaded}
navigation={{
artist: { id: album.artist.id },
album: { id: album.id },
@@ -485,6 +552,8 @@ 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)}
>
@@ -515,6 +584,14 @@ 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>
@@ -527,6 +604,7 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
const styles = StyleSheet.create({
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
headerActions: { flexDirection: "row", alignItems: "center", gap: 16 },
cover: {
width: 220,
height: 220,
@@ -0,0 +1,176 @@
import { useMemo } from "react"
import {
FlatList,
Pressable,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
import { Stack } from "expo-router"
import { CoverImage } from "@/components/cover-image"
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 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", headerLargeTitle: true }} />
<FlatList
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={{
paddingTop: spacing.lg,
paddingHorizontal: horizontalPadding,
paddingBottom: tabContentBottomInset,
gap,
}}
columnWrapperStyle={columns > 1 ? { gap } : undefined}
contentInsetAdjustmentBehavior="automatic"
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 },
})
@@ -0,0 +1,152 @@
import { useCallback, useMemo } from "react"
import {
FlatList,
Pressable,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
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 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, headerLargeTitle: false }}
/>
<FlatList
{...longListProps}
data={songs}
keyExtractor={(song) => song.id}
renderItem={renderItem}
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{ paddingBottom: contentBottomInset }}
contentInsetAdjustmentBehavior="automatic"
onScrollBeginDrag={swipeGroup.closeOpenRow}
ListHeaderComponent={
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>
) : undefined
}
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 -1
View File
@@ -62,7 +62,10 @@ export default function HomeScreen() {
return (
<ScrollView
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[styles.content, { paddingBottom: tabContentBottomInset }]}
contentContainerStyle={[
styles.content,
{ paddingBottom: tabContentBottomInset },
]}
contentInsetAdjustmentBehavior="automatic"
>
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
@@ -44,6 +44,18 @@ import {
import { CollectionDetailSkeleton } from "@/components/skeletons"
import { Button } from "@/components/ui/primitives"
import { contentBottomInset, SongListRow } from "@/components/player"
import {
DownloadHeaderButton,
DownloadedQuality,
} from "@/components/download-header-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"
@@ -68,6 +80,7 @@ const OWNER_MENU_ACTIONS: MediaAction[] = [
"play-last",
"shuffle",
"favorite",
"change-cover",
"delete-playlist",
]
@@ -83,7 +96,11 @@ export default function PlaylistScreen() {
const songs = playlist?.songs
const coverUri =
config && playlistId
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
? playlistCoverUrl(
config.serverUrl,
playlist?.id ?? playlistId,
playlist?.cover ?? null
)
: ""
const { palette: artworkPalette, settled } = useCoverPalette(
coverUri,
@@ -171,10 +188,17 @@ function PlaylistContent({
const router = useRouter()
const isFocused = useIsFocused()
const colors = useThemeColors()
const { playPlaylist, playPlaylistShuffled, playFromSong } =
usePlaybackActions()
const {
playPlaylist,
playPlaylistShuffled,
playFromSong,
playInOrder,
playShuffled,
} = usePlaybackActions()
const fromDownloads = useOpenedFromDownloads()
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)
@@ -187,11 +211,25 @@ 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, `playlist:${playlistId}`),
[playFromSong, songIds, playlistId]
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
[playFromSong, songIds, playOrigin]
)
const handleRemoveSong = useCallback(
@@ -215,18 +253,34 @@ function PlaylistContent({
const handleSongMenuAction = useCallback(
(song: BrowseSong, action: MediaAction) => {
if (action === "remove-from-playlist") void handleRemoveSong(song.id)
else void handleSongAction(song, action)
else void handleSongAction(song, action, downloadRef)
},
[handleRemoveSong, handleSongAction]
[downloadRef, handleRemoveSong, handleSongAction]
)
const handlePlay = useCallback(() => {
if (playlistId) void playPlaylist(playlistId, songIds)
}, [playPlaylist, playlistId, songIds])
if (fromDownloads) void playInOrder(songIds, playOrigin)
else if (playlistId) void playPlaylist(playlistId, songIds)
}, [
fromDownloads,
playInOrder,
playOrigin,
playPlaylist,
playlistId,
songIds,
])
const handleShuffle = useCallback(() => {
if (playlistId) void playPlaylistShuffled(playlistId, songIds)
}, [playPlaylistShuffled, playlistId, songIds])
if (fromDownloads) void playShuffled(songIds, playOrigin)
else if (playlistId) void playPlaylistShuffled(playlistId, songIds)
}, [
fromDownloads,
playShuffled,
playOrigin,
playPlaylistShuffled,
playlistId,
songIds,
])
const handleSubscribeToggle = useCallback(async () => {
if (!playlistId) return
@@ -261,6 +315,23 @@ function PlaylistContent({
void handleDelete()
return
}
if (action === "change-cover") {
if (playlistId) {
router.push({
pathname: "/playlist-cover",
params: { id: playlistId },
})
}
return
}
if (action === "download") {
void requestDownload(downloadTarget)
return
}
if (action === "remove-download") {
void removeDownload(downloadTarget)
return
}
void handlePlaylistDetailAction(songIds, action)
}
@@ -278,31 +349,42 @@ function PlaylistContent({
}
: {}),
headerRight: () => (
<MediaActionMenu
selectedCount={songIds.length}
playlistLabel={PLAYLIST_LABEL}
share={{
type: "playlist",
playlistId: playlistId ?? "favorites",
title: playlist?.title ?? "oTunes",
}}
includeActions={canEdit ? OWNER_MENU_ACTIONS : undefined}
onAction={handlePlaylistMenuAction}
>
<Pressable hitSlop={8}>
<Ionicons
name="ellipsis-horizontal"
size={22}
color={colors.foreground}
/>
</Pressable>
</MediaActionMenu>
<View style={styles.headerActions}>
<DownloadHeaderButton
target={downloadTarget}
color={colors.foreground}
/>
<MediaActionMenu
selectedCount={songIds.length}
playlistLabel={PLAYLIST_LABEL}
downloaded={playlistDownloaded}
share={{
type: "playlist",
playlistId: playlistId ?? "favorites",
title: playlist?.title ?? "oTunes",
}}
includeActions={canEdit ? OWNER_MENU_ACTIONS : undefined}
onAction={handlePlaylistMenuAction}
>
<Pressable hitSlop={8}>
<Ionicons
name="ellipsis-horizontal"
size={22}
color={colors.foreground}
/>
</Pressable>
</MediaActionMenu>
</View>
),
}
}, [
canEdit,
colors.foreground,
deletePlaylist,
downloadTarget,
playlistDownloaded,
requestDownload,
removeDownload,
handlePlaylistDetailAction,
palette.foreground,
palette.isDark,
@@ -320,6 +402,7 @@ function PlaylistContent({
removable={canEdit}
palette={palette}
swipeGroup={swipeGroup}
downloadRef={downloadRef}
onPlay={handlePlaySong}
onAction={handleSongMenuAction}
onRemove={handleRemoveSong}
@@ -327,6 +410,7 @@ function PlaylistContent({
),
[
canEdit,
downloadRef,
handlePlaySong,
handleRemoveSong,
handleSongMenuAction,
@@ -381,6 +465,7 @@ function PlaylistContent({
isSubscribed={isSubscribed}
showSubscribe={!playlist.isOwner && playlistId !== null}
onSubscribeToggle={handleSubscribeToggle}
downloadRef={downloadRef}
onPlay={handlePlay}
onShuffle={handleShuffle}
/>
@@ -400,6 +485,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
removable,
palette,
swipeGroup,
downloadRef,
onPlay,
onAction,
onRemove,
@@ -409,6 +495,7 @@ 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>
@@ -423,6 +510,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
palette={palette}
inset
removable={removable}
downloadFrom={downloadRef}
swipe={
Platform.OS !== "web"
? {
@@ -488,9 +576,11 @@ const PlaylistHero = memo(function PlaylistHero({
isSubscribed,
showSubscribe = false,
onSubscribeToggle,
downloadRef,
onPlay,
onShuffle,
}: {
downloadRef: CollectionRef
entityId: string
coverUri: string
hasCover: boolean
@@ -597,6 +687,11 @@ const PlaylistHero = memo(function PlaylistHero({
>
{ownerName}
</Text>
<DownloadedQuality
collection={downloadRef}
color={palette.secondaryForeground}
backgroundColor={palette.background}
/>
</CollectionHero>
<CollectionDivider color={palette.divider} />
</MusicEntityView>
@@ -606,6 +701,7 @@ const PlaylistHero = memo(function PlaylistHero({
const styles = StyleSheet.create({
emptyResults: { padding: spacing.lg, textAlign: "center" },
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
headerActions: { flexDirection: "row", alignItems: "center", gap: 16 },
listContent: { paddingBottom: contentBottomInset },
cover: {
width: 200,
@@ -16,6 +16,13 @@ import { CollectionDivider } from "@/components/collection-list"
import { CollectionDetailSkeleton } from "@/components/skeletons"
import { Button } from "@/components/ui/primitives"
import { contentBottomInset, SongListRow } from "@/components/player"
import {
DownloadHeaderButton,
DownloadedQuality,
} from "@/components/download-header-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"
@@ -31,39 +38,61 @@ 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()
const { config } = useServerConfig()
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
const songs = favorites?.songs ?? []
const songs = useMemo(() => favorites?.songs.flat() ?? [], [favorites])
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
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 screenOptions = useMemo(
() => ({
...SCREEN_OPTIONS,
headerRight: () => (
<DownloadHeaderButton
target={{
kind: "playlist",
id: FAVORITES_DOWNLOAD_ID,
title: favorites?.title ?? "Favorites",
songIds,
}}
color={colors.foreground}
/>
),
}),
[colors.foreground, favorites?.title, songIds]
)
const { filteredSongs, onQueryChange, onSearchSubmit } =
usePlaylistSearch(songs)
useEffect(() => {
if (favorites) rememberSongs(favorites.songs)
}, [favorites])
rememberSongs(songs)
}, [songs])
const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds),
[playFromSong, songIds]
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
[playFromSong, playOrigin, songIds]
)
const handleSongMenuAction = useCallback(
(song: BrowseSong, action: MediaAction) =>
void handleSongAction(song, action),
void handleSongAction(song, action, DOWNLOAD_REF),
[handleSongAction]
)
const handlePlay = useCallback(
() => void playInOrder(songIds),
[playInOrder, songIds]
() => void playInOrder(songIds, playOrigin),
[playInOrder, playOrigin, songIds]
)
const handleShuffle = useCallback(
() => void playShuffled(songIds),
[playShuffled, songIds]
() => void playShuffled(songIds, playOrigin),
[playShuffled, playOrigin, songIds]
)
const renderItem = useCallback(
@@ -73,6 +102,7 @@ export default function FavoritesScreen() {
favorited={isSongFavorite(song.id)}
playlistLabel="Add to Another Playlist"
inset
downloadFrom={DOWNLOAD_REF}
onPlay={handlePlaySong}
onAction={handleSongMenuAction}
/>
@@ -104,7 +134,7 @@ export default function FavoritesScreen() {
return (
<>
<Stack.Screen options={SCREEN_OPTIONS} />
<Stack.Screen options={screenOptions} />
<PlaylistSearchBar
onQueryChange={onQueryChange}
onSearchSubmit={onSearchSubmit}
@@ -166,6 +196,11 @@ 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"
+335 -2
View File
@@ -3,9 +3,10 @@ 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 { useState } from "react"
import { useEffect, useMemo, useState } from "react"
import { router } from "expo-router"
import {
Alert,
Platform,
Pressable,
ScrollView,
@@ -16,7 +17,20 @@ 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"
@@ -35,7 +49,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" | "library" | "users"
type Section = "profile" | "quality" | "downloads" | "library" | "users"
type CurrentUser = {
_id: Id<"users">
@@ -75,6 +89,7 @@ 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 },
]
@@ -156,6 +171,7 @@ 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} />
@@ -432,6 +448,298 @@ 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)
@@ -874,6 +1182,31 @@ 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,
@@ -0,0 +1 @@
export { default } from "../../home/downloads"
@@ -0,0 +1 @@
export { default } from "../../home/downloads/other"
@@ -30,6 +30,11 @@ const links = [
icon: "clock" as const,
},
{ title: "Favorites", href: "/playlist/favorites", icon: "star" as const },
{
title: "Downloads",
href: "/downloads",
icon: "arrow.down.circle" as const,
},
]
function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
@@ -51,6 +56,7 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
clock: "time",
sparkles: "sparkles",
star: "star",
"arrow.down.circle": "arrow-down-circle",
}
return (
<Ionicons
@@ -0,0 +1 @@
export { default } from "../../home/downloads"
@@ -0,0 +1 @@
export { default } from "../../home/downloads/other"
+65 -46
View File
@@ -17,6 +17,7 @@ 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"
@@ -75,52 +76,70 @@ export default function AppLayout() {
<PlaybackProvider>
<AppNavigationSync />
<AddToPlaylistProvider>
<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="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>
</DownloadsProvider>
</AddToPlaylistProvider>
</PlaybackProvider>
</ConvexAuthRecovery>
+391
View File
@@ -0,0 +1,391 @@
import { useMutation } from "convex/react"
import { Image } from "expo-image"
import * as ImagePicker from "expo-image-picker"
import { router, Stack, useLocalSearchParams } from "expo-router"
import { useMemo, useState, type ReactNode } from "react"
import {
Pressable,
ScrollView,
StyleSheet,
Text,
useWindowDimensions,
View,
} from "react-native"
import { CoverImage } from "@/components/cover-image"
import { Button, LoadingView } from "@/components/ui/primitives"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { showError } from "@/lib/toast"
import { albumCoverUrl, playlistCoverUrl } from "@/lib/urls"
import { radius, spacing, useThemeColors } from "@/lib/theme"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import {
COVER_GRID_ALBUMS,
playlistCoverAlbums,
randomPlaylistCovers,
} from "@otunes/convex/client/playlist-cover"
type Choice =
| { kind: "current" }
| { kind: "albums"; albumIds: Id<"albums">[] }
| { kind: "upload"; uri: string; image: string }
const STRIP_GAP = spacing.sm
/** Selection border and padding around each thumb, both sides. */
const THUMB_CHROME = 6
/**
* Full screen cover editor for a playlist owner: a large preview of the
* selected cover, the current cover pinned apart from four random album
* grids, and Save in the header. Opened from the playlist's menu.
*/
export default function PlaylistCoverScreen() {
const { id } = useLocalSearchParams<{ id: string }>()
const playlistId = id as Id<"playlists">
const playlist = useCachedQuery(api.playlists.browsePlaylistDetail, {
id: playlistId,
})
const { config } = useServerConfig()
const colors = useThemeColors()
const { width } = useWindowDimensions()
const setCoverAlbums = useMutation(api.playlists.setPlaylistCoverAlbums)
const uploadCover = useMutation(api.playlists.uploadPlaylistCover)
const albums = useMemo(
() => (playlist ? playlistCoverAlbums(playlist.songs) : []),
[playlist]
)
const [options, setOptions] = useState<Id<"albums">[][] | null>(null)
const [selected, setSelected] = useState<Choice | null>(null)
const [saving, setSaving] = useState(false)
// Draw options once the songs arrive.
if (options === null && playlist) {
setOptions(randomPlaylistCovers(albums))
}
const hasCurrent = playlist?.cover != null
const choice: Choice | null =
selected ??
(hasCurrent
? { kind: "current" }
: options?.[0]
? { kind: "albums", albumIds: options[0] }
: null)
async function pickImage() {
const result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"],
allowsEditing: true,
aspect: [1, 1],
quality: 0.7,
base64: true,
})
const asset = result.canceled ? undefined : result.assets[0]
if (!asset?.base64) return
setSelected({
kind: "upload",
uri: asset.uri,
image: `data:${asset.mimeType ?? "image/jpeg"};base64,${asset.base64}`,
})
}
async function save() {
if (!choice || choice.kind === "current") {
router.back()
return
}
setSaving(true)
try {
if (choice.kind === "albums") {
await setCoverAlbums({ playlistId, albumIds: choice.albumIds })
} else {
await uploadCover({ playlistId, image: choice.image })
}
router.back()
} catch (error) {
showError(
error instanceof Error ? error.message : "Failed to change cover"
)
setSaving(false)
}
}
const header = (
<Stack.Screen
options={{
headerLeft: () => (
<HeaderButton label="Cancel" onPress={() => router.back()} />
),
headerRight: () => (
<HeaderButton
label="Save"
bold
disabled={saving || !choice}
onPress={() => void save()}
/>
),
}}
/>
)
if (!playlist || !config || !options) {
return (
<>
{header}
<LoadingView />
</>
)
}
const serverUrl = config.serverUrl
const currentUri = playlistCoverUrl(serverUrl, playlistId, playlist.cover)
const previewSize = Math.min(width - spacing.lg * 2, 360)
// One row: current | uploaded? | options, thumbs at most 72pt.
const thumbCount =
options.length + (hasCurrent ? 1 : 0) + (choice?.kind === "upload" ? 1 : 0)
const rowItems = thumbCount + (hasCurrent ? 1 : 0)
const thumbSize = Math.min(
72,
Math.floor(
(width - spacing.lg * 2 - STRIP_GAP * (rowItems - 1) - 1) /
Math.max(thumbCount, 1)
) - THUMB_CHROME
)
function renderChoice(item: Choice, size: number) {
if (item.kind === "current") {
return (
<CoverImage
uri={currentUri}
hasCover
style={{ width: size, height: size }}
/>
)
}
if (item.kind === "upload") {
return (
<Image
source={{ uri: item.uri }}
style={{ width: size, height: size }}
/>
)
}
return (
<AlbumGrid serverUrl={serverUrl} albumIds={item.albumIds} size={size} />
)
}
const isSelected = (item: Choice) =>
choice?.kind === item.kind &&
(item.kind !== "albums" ||
(choice.kind === "albums" && choice.albumIds === item.albumIds))
return (
<ScrollView
style={{ backgroundColor: colors.background }}
contentContainerStyle={styles.content}
>
{header}
<View
style={[
styles.preview,
{
width: previewSize,
height: previewSize,
backgroundColor: colors.coverPlaceholder,
},
]}
>
{choice ? renderChoice(choice, previewSize) : null}
</View>
<View style={styles.strip}>
{hasCurrent ? (
<>
<Thumb
size={thumbSize}
selected={isSelected({ kind: "current" })}
label="Current cover"
onPress={() => setSelected({ kind: "current" })}
>
{renderChoice({ kind: "current" }, thumbSize)}
</Thumb>
<View
style={[styles.separator, { backgroundColor: colors.border }]}
/>
</>
) : null}
{choice?.kind === "upload" ? (
<Thumb size={thumbSize} selected label="Uploaded image">
{renderChoice(choice, thumbSize)}
</Thumb>
) : null}
{options.map((albumIds) => {
const item: Choice = { kind: "albums", albumIds }
return (
<Thumb
key={albumIds.join(",")}
size={thumbSize}
selected={isSelected(item)}
label="Album cover option"
onPress={() => setSelected(item)}
>
{renderChoice(item, thumbSize)}
</Thumb>
)
})}
</View>
{albums.length === 0 ? (
<Text style={{ color: colors.mutedForeground, textAlign: "center" }}>
No album artwork in this playlist yet.
</Text>
) : null}
<View style={styles.actions}>
{albums.length >= COVER_GRID_ALBUMS ? (
<Button
title="Shuffle"
icon="shuffle"
variant="secondary"
onPress={() => {
setOptions(randomPlaylistCovers(albums))
if (selected?.kind === "albums") setSelected(null)
}}
/>
) : null}
<Button
title="Upload"
icon="arrow-up"
variant="secondary"
onPress={() => void pickImage()}
/>
</View>
</ScrollView>
)
}
function HeaderButton({
label,
bold = false,
disabled = false,
onPress,
}: {
label: string
bold?: boolean
disabled?: boolean
onPress: () => void
}) {
const colors = useThemeColors()
return (
<Pressable
accessibilityRole="button"
hitSlop={8}
disabled={disabled}
onPress={onPress}
style={{ opacity: disabled ? 0.4 : 1, paddingHorizontal: spacing.xs }}
>
<Text
style={{
color: colors.foreground,
fontSize: 17,
fontWeight: bold ? "600" : "400",
}}
>
{label}
</Text>
</Pressable>
)
}
function Thumb({
size,
selected,
label,
onPress,
children,
}: {
size: number
selected: boolean
label: string
onPress?: () => void
children: ReactNode
}) {
const colors = useThemeColors()
return (
<Pressable
accessibilityRole="button"
accessibilityLabel={label}
accessibilityState={{ selected }}
onPress={onPress}
style={[
styles.thumb,
{
width: size + THUMB_CHROME,
height: size + THUMB_CHROME,
borderColor: selected ? colors.foreground : "transparent",
},
]}
>
<View style={styles.thumbInner}>{children}</View>
</Pressable>
)
}
/** A generated cover option: one album alone, or four tiled 2x2. */
function AlbumGrid({
serverUrl,
albumIds,
size,
}: {
serverUrl: string
albumIds: Id<"albums">[]
size: number
}) {
const tile = albumIds.length > 1 ? size / 2 : size
return (
<View
style={{
width: size,
height: size,
flexDirection: "row",
flexWrap: "wrap",
}}
>
{albumIds.map((albumId) => (
<CoverImage
key={albumId}
uri={albumCoverUrl(serverUrl, albumId)}
hasCover
style={{ width: tile, height: tile }}
/>
))}
</View>
)
}
const styles = StyleSheet.create({
content: {
alignItems: "center",
gap: spacing.xl,
padding: spacing.lg,
},
preview: { borderRadius: radius.lg, overflow: "hidden" },
strip: {
flexDirection: "row",
alignItems: "center",
justifyContent: "center",
gap: STRIP_GAP,
},
separator: { width: StyleSheet.hairlineWidth, alignSelf: "stretch" },
thumb: {
borderWidth: 2,
borderRadius: radius.sm + 2,
padding: 1,
},
thumbInner: { flex: 1, borderRadius: radius.sm, overflow: "hidden" },
actions: { flexDirection: "row", gap: spacing.sm },
})
@@ -23,19 +23,16 @@ type LibraryKind = (typeof LIBRARY_KINDS)[number]
const PAGE_SIZE = 500
type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page>
type Favorites = {
favoriteSongs: string[]
favoriteAlbums: string[]
favoriteArtists: string[]
}
type Favorites = FunctionReturnType<typeof api.favorites.getUserFavorites>
function favoriteIds(favorites: Favorites, kind: LibraryKind) {
return new Set<string>(
kind === "song"
(kind === "song"
? favorites.favoriteSongs
: kind === "album"
? favorites.favoriteAlbums
: favorites.favoriteArtists
).flat()
)
}
@@ -214,12 +214,13 @@ export function useIntentDispatch() {
)
}
if (kind === "artist") {
return fetchCachedQuery(
const chunks = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: id as Id<"artists"> }
)
return chunks.flat()
}
if (kind === "playlist") {
if (id === FAVORITES_PLAYLIST_ID) {
@@ -229,7 +230,7 @@ export function useIntentDispatch() {
api.favorites.getUserFavorites,
{}
)
return favorites.favoriteSongs
return favorites.favoriteSongs.flat()
}
return fetchCachedQuery(
convex,
@@ -391,17 +392,18 @@ export function useIntentDispatch() {
api.favorites.getUserFavorites,
{}
)
if (favorites.favoriteSongs.length === 0) {
const favoriteSongs = favorites.favoriteSongs.flat()
if (favoriteSongs.length === 0) {
throw new IntentRejected(
"Nothing is queued, and your favorites are empty."
)
}
if (shuffled) {
ensureActive(invocation)
await actions.playShuffled(favorites.favoriteSongs)
await actions.playShuffled(favoriteSongs)
} else {
ensureActive(invocation)
await actions.playInOrder(favorites.favoriteSongs)
await actions.playInOrder(favoriteSongs)
}
return
}
@@ -71,7 +71,10 @@ class ConvexAuthErrorBoundary extends Component<
}
}
export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) {
export function ConvexAuthRecovery({
children,
onInvalidate,
}: ConvexAuthRecoveryProps) {
const localAuth = useLocalConvexAuth()
const serverAuth = useServerConvexAuth()
const hadServerAuthRef = useRef(false)
@@ -113,9 +116,9 @@ export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecover
const sessionEstablished = Boolean(
serverAuth &&
!serverAuth.isLoading &&
!serverAuth.isRefreshing &&
serverAuth.isAuthenticated
!serverAuth.isLoading &&
!serverAuth.isRefreshing &&
serverAuth.isAuthenticated
)
return (
+12 -1
View File
@@ -11,6 +11,7 @@ import {
} from "react-native"
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
import { downloadedCoverUri } from "@/lib/downloads"
import { useThemeColors } from "@/lib/theme"
import {
@@ -66,6 +67,7 @@ export const CoverImage = memo(function CoverImage({
contentFit = "cover",
blurRadius,
placeholderVariant = "icon",
placeholderIcon = "musical-note",
}: {
uri: string
hasCover: boolean
@@ -73,6 +75,7 @@ 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])
@@ -81,6 +84,12 @@ 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 (
@@ -93,7 +102,7 @@ export const CoverImage = memo(function CoverImage({
>
{placeholderVariant === "icon" ? (
<Ionicons
name="musical-note"
name={placeholderIcon}
size={placeholderIconSize(flatStyle)}
color={colors.coverPlaceholderIcon}
/>
@@ -107,6 +116,8 @@ export const CoverImage = memo(function CoverImage({
source={source}
style={[style, { backgroundColor: colors.coverPlaceholder }]}
contentFit={contentFit}
placeholder={placeholder}
placeholderContentFit={contentFit}
transition={150}
blurRadius={blurRadius}
onLoad={
@@ -0,0 +1,156 @@
import { Ionicons } from "@expo/vector-icons"
import { Alert, Pressable, StyleSheet, Text, View } 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>
)
}
/** Download, progress, and downloaded states for an album or playlist header. */
export function DownloadHeaderButton({
target,
color,
}: {
target: Exclude<DownloadTarget, { kind: "songs" }>
color: string
}) {
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}
>
{inProgress && status ? (
<ProgressRing
fraction={status.downloaded / status.total}
color={color}
/>
) : (
<Ionicons
name={done ? "checkmark-circle" : "arrow-down-circle-outline"}
size={SIZE + 2}
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 },
})
@@ -112,7 +112,10 @@ function SwipeRowBody({
setIsOpen(false)
}, [removing, translateX])
const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group])
const handleSwipeStart = useCallback(
() => group.setOpen(close),
[close, group]
)
const handleSettle = useCallback(
(open: boolean) => {
@@ -251,8 +254,7 @@ function SwipeRowBody({
const pillWidth = Math.max(
0,
resting +
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) *
commitProgress.value
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value
)
const restingHeight = interpolate(
pillWidth,
+13 -1
View File
@@ -20,6 +20,7 @@ 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"
@@ -51,6 +52,7 @@ 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 = (
@@ -102,6 +104,7 @@ 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 }}
@@ -187,6 +190,10 @@ 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 = (
@@ -200,7 +207,11 @@ export const PlaylistCard = memo(function PlaylistCard({
<Link.AppleZoom>
<View collapsable={false}>
<CoverImage
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
uri={playlistCoverUrl(
config.serverUrl,
playlist.id,
playlist.cover
)}
hasCover={playlist.cover != null}
style={
fluid
@@ -231,6 +242,7 @@ export const PlaylistCard = memo(function PlaylistCard({
return (
<MediaContextMenu
showFavorite={false}
downloaded={downloaded}
share={{
type: "playlist",
playlistId: playlist.id,
+30 -1
View File
@@ -33,7 +33,10 @@ export type MediaAction =
| "go-artist"
| "go-album"
| "remove-from-playlist"
| "change-cover"
| "delete-playlist"
| "download"
| "remove-download"
export type MediaNavigation = {
artist?: { id: string }
@@ -59,6 +62,8 @@ 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
}
@@ -86,6 +91,17 @@ const MEDIA_ACTION_ITEMS: {
`${playlistLabel}${countSuffix}`,
image: "text.badge.plus",
},
{
action: "download",
label: (countSuffix) => `Download${countSuffix}`,
image: "arrow.down.circle",
},
{
action: "remove-download",
label: (countSuffix) => `Remove Download${countSuffix}`,
image: "xmark.circle",
destructive: true,
},
{
action: "play-next",
label: (countSuffix) => `Play Next${countSuffix}`,
@@ -128,6 +144,11 @@ const MEDIA_ACTION_ITEMS: {
image: "minus.circle",
destructive: true,
},
{
action: "change-cover",
label: () => "Change Cover",
image: "photo",
},
{
action: "delete-playlist",
label: () => "Delete Playlist",
@@ -147,11 +168,19 @@ 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)
}
if (action === "delete-playlist") {
if (action === "delete-playlist" || action === "change-cover") {
return false
}
@@ -26,7 +26,10 @@ const actionIcons = {
"go-artist": "person-outline",
"go-album": "disc-outline",
"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
+28
View File
@@ -3,6 +3,12 @@ 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 } from "@otunes/convex/types"
import type { CoverPalette } from "@/lib/cover-palette"
@@ -33,6 +39,7 @@ export const SongRow = memo(function SongRow({
palette,
inset = false,
swipe,
downloadFrom,
}: {
song: BrowseSong
onPress?: () => void
@@ -50,9 +57,14 @@ 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
@@ -76,6 +88,14 @@ export const SongRow = memo(function SongRow({
{song.artist.name} · {song.album.title}
</Text>
</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>
@@ -109,6 +129,8 @@ 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}
@@ -155,6 +177,7 @@ export const SongListRow = memo(function SongListRow({
inset,
swipe,
removable,
downloadFrom,
onPlay,
onAction,
}: {
@@ -172,10 +195,13 @@ 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 (
@@ -184,6 +210,7 @@ export const SongListRow = memo(function SongListRow({
palette={palette}
inset={inset}
swipe={swipe}
downloadFrom={downloadFrom}
onPress={handlePress}
contextMenu={{
preview: config
@@ -198,6 +225,7 @@ export const SongListRow = memo(function SongListRow({
: undefined,
stationArtistId: song.artist.id,
favorited,
downloaded,
playlistLabel,
showRemoveFromPlaylist: removable,
navigation: {
+38 -14
View File
@@ -42,7 +42,8 @@ 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.
* Remove on the trailing side when `onRemove` is set, else Download. Download
* turns into a red Remove Download once `downloaded`.
*/
export function SongSwipeRow({
children,
@@ -53,6 +54,8 @@ export function SongSwipeRow({
onPlayNext,
onAddToQueue,
onRemove,
onDownload,
downloaded = false,
}: {
children: ReactNode
style?: StyleProp<ViewStyle>
@@ -62,6 +65,8 @@ 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
@@ -95,10 +100,10 @@ export function SongSwipeRow({
(side: number) => {
close()
if (side > 0) onAddToQueue()
// Without Remove, the trailing action is the Download placeholder.
else onRemove?.()
else if (onRemove) onRemove()
else onDownload?.()
},
[close, onAddToQueue, onRemove]
[close, onAddToQueue, onRemove, onDownload]
)
const tapRow = useCallback(() => {
if (open) close()
@@ -233,6 +238,7 @@ export function SongSwipeRow({
side={-1}
paired={hasRemove}
remove={hasRemove}
downloaded={downloaded}
x={x}
height={height}
progress={commitProgress}
@@ -244,11 +250,15 @@ export function SongSwipeRow({
side={-1}
secondary
paired
downloaded={downloaded}
x={x}
height={height}
progress={commitProgress}
open={open === -1}
onPress={close}
onPress={() => {
close()
onDownload?.()
}}
/>
)}
<GestureDetector gesture={gesture}>
@@ -259,7 +269,10 @@ export function SongSwipeRow({
accessibilityActions={[
{ name: "addToQueue", label: "Add to Queue" },
{ name: "playNext", label: "Play Next" },
{ name: "download", label: "Download" },
{
name: "download",
label: downloaded ? "Remove Download" : "Download",
},
...(hasRemove
? [{ name: "remove", label: "Remove from Playlist" }]
: []),
@@ -267,6 +280,10 @@ 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()
@@ -290,6 +307,7 @@ function SwipeAction({
secondary = false,
paired = side > 0,
remove = false,
downloaded = false,
x,
height,
progress,
@@ -300,6 +318,8 @@ 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>
@@ -370,6 +390,8 @@ function SwipeAction({
},
],
}))
const removesDownload = side < 0 && !remove && downloaded
const destructive = remove || removesDownload
return (
<Animated.View
pointerEvents={open ? "auto" : "none"}
@@ -386,11 +408,13 @@ function SwipeAction({
accessibilityLabel={
remove
? "Remove from Playlist"
: side > 0
? secondary
? "Play Next"
: "Add to Queue"
: "Download"
: removesDownload
? "Remove Download"
: side > 0
? secondary
? "Play Next"
: "Add to Queue"
: "Download"
}
onPress={onPress}
style={styles.actionButton}
@@ -399,7 +423,7 @@ function SwipeAction({
style={[
styles.pill,
{
backgroundColor: remove
backgroundColor: destructive
? IS_ANDROID
? "#d32f2f"
: "#ff3b30"
@@ -416,7 +440,7 @@ function SwipeAction({
{IS_ANDROID ? (
<Ionicons
name={
remove
destructive
? "trash-outline"
: side < 0
? "arrow-down"
@@ -430,7 +454,7 @@ function SwipeAction({
) : (
<SymbolView
name={
remove
destructive
? "trash"
: side > 0
? secondary
+34 -1
View File
@@ -1,13 +1,19 @@
import { useOpenSettings } from "@/hooks/use-open-settings"
import { requireNativeView } from "expo"
import { useIsFocused } from "expo-router"
import { useIsFocused, useRouter } from "expo-router"
import { useMemo } from "react"
import { Platform, type ViewProps } from "react-native"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { tabPath } from "@/lib/app-navigation"
import { initialsFromName } from "@/lib/format"
import { playlistCoverUrl } from "@/lib/urls"
import { api } from "@otunes/convex/_generated/api"
type SidebarPlaylist = { id: string; title: string; imageURL?: string }
const NativeSidebar =
Platform.OS === "ios"
? requireNativeView<
@@ -16,16 +22,39 @@ const NativeSidebar =
initials: string
imageURL?: string
active: boolean
playlists: SidebarPlaylist[]
onProfilePress: () => void
onPlaylistPress: (event: { nativeEvent: { id: string } }) => void
}
>("TabletSidebar")
: null
/** iPad sidebar extras: the account footer and a row per playlist with its cover. */
export function TabletSidebar() {
const user = useCachedQuery(api.auth.currentUser)
const sidebarPlaylists = useCachedQuery(api.playlists.listSidebarPlaylists)
const { config } = useServerConfig()
const imageUrl = useProfileImageUrl(user?.image)
const openSettings = useOpenSettings()
const router = useRouter()
const active = useIsFocused()
const serverUrl = config?.serverUrl
const playlists = useMemo(
() =>
[
...(sidebarPlaylists?.owned ?? []),
...(sidebarPlaylists?.subscribed ?? []),
].map((playlist): SidebarPlaylist => ({
id: playlist.id,
title: playlist.title,
imageURL:
serverUrl && playlist.cover
? playlistCoverUrl(serverUrl, playlist.id, playlist.cover, 64)
: undefined,
})),
[serverUrl, sidebarPlaylists]
)
if (!NativeSidebar) return null
return (
@@ -35,7 +64,11 @@ export function TabletSidebar() {
initials={initialsFromName(user?.name ?? "Me")}
imageURL={imageUrl}
active={active}
playlists={playlists}
onProfilePress={openSettings}
onPlaylistPress={({ nativeEvent }) =>
router.navigate(tabPath("(playlists)", `/playlist/${nativeEvent.id}`))
}
/>
)
}
+1 -1
View File
@@ -150,7 +150,7 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
{ artistId }
)
if (selectionRequestIdRef.current !== requestId) return
setPendingSongIds(songIds)
setPendingSongIds(songIds.flat())
setOpen(true)
} catch (error) {
if (selectionRequestIdRef.current !== requestId) return
+484
View File
@@ -0,0 +1,484 @@
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`
}
function DownloadQualitySheet({
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="slide"
transparent
onRequestClose={onClose}
>
<AndroidSheet>
<Pressable style={styles.overlay} onPress={onClose}>
<Pressable
style={[
styles.sheet,
{ backgroundColor: colors.card, borderColor: colors.border },
]}
onPress={(event) => event.stopPropagation()}
>
<View
style={[styles.grabber, { backgroundColor: colors.border }]}
/>
<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}
<DownloadQualitySheet
pending={pending}
onClose={() => setPending(null)}
onPick={handlePick}
/>
</DownloadsContext.Provider>
)
}
const styles = StyleSheet.create({
overlay: {
flex: 1,
backgroundColor: "rgba(0,0,0,0.45)",
justifyContent: "flex-end",
},
sheet: {
borderTopLeftRadius: 16,
borderTopRightRadius: 16,
borderWidth: 1,
paddingHorizontal: 16,
paddingTop: 8,
paddingBottom: 24,
},
grabber: {
width: 36,
height: 4,
borderRadius: 2,
alignSelf: "center",
marginBottom: 12,
},
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,
},
})
+3 -3
View File
@@ -100,15 +100,15 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
)
const songIds = useMemo(
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
() => new Set<string>(favorites?.favoriteSongs.flat()),
[favorites?.favoriteSongs]
)
const albumIds = useMemo(
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
() => new Set<string>(favorites?.favoriteAlbums.flat()),
[favorites?.favoriteAlbums]
)
const artistIds = useMemo(
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
() => new Set<string>(favorites?.favoriteArtists.flat()),
[favorites?.favoriteArtists]
)
const idsRef = useRef({ songIds, albumIds, artistIds })
+21 -12
View File
@@ -24,6 +24,7 @@ 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"
@@ -43,8 +44,9 @@ type PlaybackContextValue = {
seekTo: (seconds: number) => void
waitForPlaybackReady: (playing?: boolean) => Promise<void>
setIsPlaying: (playing: boolean) => void
playInOrder: (songIds: Id<"songs">[]) => Promise<void>
playShuffled: (songIds: Id<"songs">[]) => Promise<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>
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
playFromSong: (
@@ -245,6 +247,8 @@ 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
@@ -280,6 +284,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
repeatEnabled,
currentSong,
queueStartVersion,
fromDownloads,
})
const { resetProgress } = useProgressPersistence({
@@ -310,6 +315,7 @@ 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)
@@ -363,10 +369,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
)
const playSongs = useCallback(
(shuffled: boolean) => async (songIds: Id<"songs">[]) => {
(shuffled: boolean) => async (songIds: Id<"songs">[], origin?: string) => {
if (songIds.length === 0) return
startPlayback((state) =>
playbackQueue.startQueue(state, songIds, shuffled)
startPlayback(
(state) => playbackQueue.startQueue(state, songIds, shuffled),
{ origin }
)
},
[startPlayback]
@@ -401,7 +408,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId }
),
).then((chunks) => chunks.flat()),
recorded: { entity: { kind: "artist", id: artistId } },
}))
const playlist = collection(
@@ -482,12 +489,14 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
let songIds: Id<"songs">[]
try {
songIds = await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
songIds = (
await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
).flat()
} catch {
return
}
+5 -1
View File
@@ -83,7 +83,11 @@ export function createCoverPaletteSource<Swatches>({
const [waitedKey, setWaitedKey] = useState<string | null>(null)
const swatches =
resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
resolved.key === key
? resolved.swatches
: key
? cachedSwatches(key)
: null
useEffect(() => {
if (!key || hasCover === false) return
+70 -4
View File
@@ -2,7 +2,9 @@ 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"
@@ -48,6 +50,7 @@ export function useMediaMenuActions() {
} = useFavorites()
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
usePlaybackActions()
const { requestDownload, removeDownload } = useDownloads()
const runQueueAction = useCallback(
async (action: MediaAction, songIds: Id<"songs">[]) => {
@@ -71,8 +74,9 @@ 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) => {
async (song: BrowseSong, action: MediaAction, from?: DownloadSource) => {
const songIds = [song.id as Id<"songs">]
switch (action) {
case "create-station":
@@ -97,6 +101,19 @@ 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
}
@@ -107,6 +124,8 @@ export function useMediaMenuActions() {
runQueueAction,
toggleSongFavorite,
playArtistShuffled,
requestDownload,
removeDownload,
]
)
@@ -138,6 +157,25 @@ 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
}
@@ -151,6 +189,8 @@ export function useMediaMenuActions() {
push,
runQueueAction,
toggleAlbumFavorite,
requestDownload,
removeDownload,
]
)
@@ -173,7 +213,7 @@ export function useMediaMenuActions() {
api.playlists.getOrderedArtistSongIds,
{ artistId: artist.id as Id<"artists"> }
)
await runQueueAction(action, songIds)
await runQueueAction(action, songIds.flat())
break
}
default:
@@ -211,12 +251,38 @@ 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]
[
convex,
cacheScope,
openAddPlaylistToPlaylist,
runQueueAction,
requestDownload,
removeDownload,
]
)
const handleAlbumDetailAction = useCallback(
@@ -265,7 +331,7 @@ export function useMediaMenuActions() {
cover: album.cover,
},
}
await handleSongAction(song, action)
await handleSongAction(song, action, { kind: "album", id: album.id })
},
[handleSongAction]
)
+25 -2
View File
@@ -18,10 +18,12 @@ 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"
@@ -71,6 +73,7 @@ export function useNativePlaylistSync({
repeatEnabled,
currentSong,
queueStartVersion,
fromDownloads,
}: {
store: PlaybackStore
queueSongIds: Id<"songs">[]
@@ -78,6 +81,8 @@ 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()
@@ -459,7 +464,7 @@ export function useNativePlaylistSync({
}
if (!isCurrentLoad()) return
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${cookieHeader}`
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${fromDownloads}:${cookieHeader}`
const needsRebuild =
loadedLoadKeyRef.current !== loadKey ||
nativePlaylistNeedsRebuild(
@@ -493,7 +498,12 @@ export function useNativePlaylistSync({
}
const buildSources = async (songIds: Id<"songs">[]) => {
const songs = await loadPlaybackSongs(convex, cacheScope, songIds)
const [songs] = await Promise.all([
loadPlaybackSongs(convex, cacheScope, songIds),
downloadQueueFor(config)
.load()
.catch(() => {}),
])
const sources = new Map<Id<"songs">, AudioSource>()
for (const song of songs) {
if (!song) return null
@@ -502,6 +512,18 @@ 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(
@@ -628,6 +650,7 @@ export function useNativePlaylistSync({
currentSongId,
currentSongSyncKey,
destroyPlaylist,
fromDownloads,
ensurePlaylist,
handlePlaybackLoadFailure,
historySyncKey,
+1 -4
View File
@@ -1,9 +1,6 @@
import { ConvexError, type Value } from "convex/values"
const AUTH_ERROR_MESSAGES = new Set([
"Not authenticated",
"User not logged in",
])
const AUTH_ERROR_MESSAGES = new Set(["Not authenticated", "User not logged in"])
function matchesAuthMessage(message: string): boolean {
if (AUTH_ERROR_MESSAGES.has(message)) {
+3 -1
View File
@@ -37,7 +37,9 @@ export function authStorageKey(key: string, storageNamespace: string): string {
return `${key}_${escapedNamespace}`
}
export async function clearStoredAuthTokens(storageNamespace: string): Promise<void> {
export async function clearStoredAuthTokens(
storageNamespace: string
): Promise<void> {
await Promise.all(
AUTH_STORAGE_KEYS.map((key) =>
secureRemoveItem(authStorageKey(key, storageNamespace))
+15
View File
@@ -0,0 +1,15 @@
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
@@ -0,0 +1,229 @@
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)
}
+4 -1
View File
@@ -5,7 +5,10 @@ export function formatDuration(seconds: number): string {
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
}
export function formatRemainingDuration(current: number, total: number): string {
export function formatRemainingDuration(
current: number,
total: number
): string {
const remaining = Math.max(0, Math.floor(total) - Math.floor(current))
return `-${formatDuration(remaining)}`
}
+17 -5
View File
@@ -79,7 +79,9 @@ export function deriveCoverPalette(
secondaryForeground: toHex(secondaryForeground),
accent: toHex(accent),
accentForeground: toHex(accentForeground),
accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
accentText: toHex(
withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)
),
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
isDark: lightText,
@@ -94,7 +96,10 @@ function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
? withLightness(color, Math.min(lch.l, 0.86))
: withLightness(color, Math.max(lch.l, 0.2))
const y = luminance(clamped)
if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
if (
y <= DARK_BACKGROUND_MAX_LUMINANCE ||
y >= LIGHT_BACKGROUND_MIN_LUMINANCE
) {
return clamped
}
@@ -125,7 +130,10 @@ function pickAccent(candidates: string[], background: Rgb): Rgb | null {
}
function prefersLightText(background: Rgb) {
return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
return (
contrastRatio([255, 255, 255], background) >=
contrastRatio([0, 0, 0], background)
)
}
/** Moves `color`'s lightness away from `background` until it reaches `min`. */
@@ -180,7 +188,10 @@ function withLuminance(color: Rgb, target: number): Rgb {
high = mid
}
}
return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
return withLightness(
color,
target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high
)
}
/** `amount` of `color` over `base`. */
@@ -206,7 +217,8 @@ function toLinear(channel: number) {
}
function fromLinear(value: number) {
const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
const c =
value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
return c * 255
}
+2
View File
@@ -13,6 +13,8 @@ export const tabStackScreenTitles: Record<string, string> = {
"recently-played": "Recently Played",
"recently-added": "Recently Added",
settings: "Settings",
"downloads/index": "Downloads",
"downloads/other": "Other Downloaded Songs",
}
export function useStackScreenOptions(
+4 -1
View File
@@ -13,7 +13,10 @@ const SERVER_CONFIG_KEY = "otunes.server-config"
const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config"
function normalizeHostnameInput(input: string): string {
return input.trim().replace(/^https?:\/\//i, "").replace(/\/+$/, "")
return input
.trim()
.replace(/^https?:\/\//i, "")
.replace(/\/+$/, "")
}
function buildServerUrl(hostname: string): string {
+1
View File
@@ -7,6 +7,7 @@ export const tabletSections = [
{ name: "playlists", group: "(playlists)", title: "All Playlists" },
{ name: "favorites", group: "(favorites)", title: "Favorites" },
{ name: "recent", group: "(recent)", title: "Recently Played" },
{ name: "downloads", group: "(downloads)", title: "Downloads" },
] as const
export const TabletSectionContext = createContext<
+4 -1
View File
@@ -39,12 +39,15 @@ export function albumCoverUrl(
return sizedCoverUrl(`${serverUrl}/api/album/${albumId}/cover`, size)
}
/** `version` is the summary's `cover`; it changes with the artwork. */
export function playlistCoverUrl(
serverUrl: string,
playlistId: string,
version: string | null,
size?: CoverImageSize
) {
return sizedCoverUrl(`${serverUrl}/api/playlist/${playlistId}/cover`, size)
const uri = `${serverUrl}/api/playlist/${playlistId}/cover`
return sizedCoverUrl(version ? `${uri}?v=${version}` : uri, size)
}
export function songAudioSource(
+117 -1
View File
@@ -5,7 +5,11 @@ final class TabletSidebar: Module {
public func definition() -> ExpoModulesCore.ModuleDefinition {
Name("TabletSidebar")
View(TabletSidebarView.self) {
Events("onProfilePress")
Events("onProfilePress", "onPlaylistPress")
Prop("playlists") { (view: TabletSidebarView, value: [SidebarPlaylist]) in
view.playlists = value
view.configure()
}
Prop("accountName") { (view: TabletSidebarView, value: String) in
view.accountName = value
view.configure()
@@ -26,9 +30,23 @@ final class TabletSidebar: Module {
}
}
/// A playlist row under the sidebar's Playlists section.
struct SidebarPlaylist: Record {
@Field var id: String = ""
@Field var title: String = ""
/// Cover URL; changes whenever the artwork does. `nil` shows a list icon.
@Field var imageURL: String?
}
/// Adds UIKit sidebar features not yet exposed by Expo Router's native tabs.
final class TabletSidebarView: ExpoView {
let onProfilePress = EventDispatcher()
let onPlaylistPress = EventDispatcher()
var playlists: [SidebarPlaylist] = []
private let selectionProxy = SidebarSelectionProxy()
private var playlistTabs: [String: UITab] = [:]
private var coverImages: [String: UIImage] = [:]
private var coverTasks: [String: URLSessionDataTask] = [:]
var accountName = ""
var initials = ""
var imageURL: String?
@@ -82,11 +100,13 @@ final class TabletSidebarView: ExpoView {
deinit {
if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) }
coverTasks.values.forEach { $0.cancel() }
}
@available(iOS 18.0, *)
private func configure(_ controller: UITabBarController) {
configureGroups(controller)
configurePlaylists(controller)
let footer: SidebarAccountButton
if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton {
@@ -103,6 +123,7 @@ final class TabletSidebarView: ExpoView {
@available(iOS 18.0, *)
private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) {
let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children }
.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
let selected = destinations.first { $0 === controller.selectedTab }
let contextualTab = selected ?? footer.contextualTab ?? destinations.first
footer.contextualTab = contextualTab
@@ -160,6 +181,101 @@ final class TabletSidebarView: ExpoView {
}
}
private let playlistTabPrefix = "otunes.playlist."
private let playlistIconSize: CGFloat = 24
extension TabletSidebarView {
/// Lists each playlist under Playlists with its cover. Rows are never
/// selected natively: a tap opens the playlist in the All Playlists stack.
@available(iOS 18.0, *)
fileprivate func configurePlaylists(_ controller: UITabBarController) {
guard let group = controller.tabs.first(where: { $0.identifier == "otunes.playlists" })
as? UITabGroup else { return }
if !(controller.delegate is SidebarSelectionProxy) {
selectionProxy.original = controller.delegate
controller.delegate = selectionProxy
}
selectionProxy.onPlaylist = { [weak self] id in self?.onPlaylistPress(["id": id]) }
var rows: [UITab] = []
for playlist in playlists {
let identifier = playlistTabPrefix + playlist.id
let tab = playlistTabs[identifier] ?? UITab(
title: playlist.title, image: nil, identifier: identifier,
viewControllerProvider: { _ in UIViewController() })
playlistTabs[identifier] = tab
if tab.title != playlist.title { tab.title = playlist.title }
tab.preferredPlacement = .sidebarOnly
tab.image = playlistImage(identifier: identifier, url: playlist.imageURL)
rows.append(tab)
}
let ids = Set(rows.map(\.identifier))
playlistTabs = playlistTabs.filter { ids.contains($0.key) }
let fixed = group.children.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
let children = fixed + rows
if group.children.map(\.identifier) != children.map(\.identifier) {
group.children = children
}
}
/// The cached cover for `url`, starting a download on a miss.
@available(iOS 18.0, *)
private func playlistImage(identifier: String, url: String?) -> UIImage? {
let placeholder = UIImage(systemName: "music.note.list")
guard let url, let remote = URL(string: url) else { return placeholder }
if let image = coverImages[url] { return image }
if coverTasks[url] == nil {
let task = URLSession.shared.dataTask(with: remote) { [weak self] data, _, _ in
guard let data, let image = UIImage(data: data) else { return }
DispatchQueue.main.async {
guard let self else { return }
self.coverTasks[url] = nil
self.coverImages[url] = roundedIcon(image)
if let tab = self.playlistTabs[identifier] { tab.image = self.coverImages[url] }
}
}
coverTasks[url] = task
task.resume()
}
return placeholder
}
}
/// Square cover shrunk to sidebar icon size with rounded corners, drawn as is
/// rather than tinted like a symbol.
private func roundedIcon(_ image: UIImage) -> UIImage {
let size = CGSize(width: playlistIconSize, height: playlistIconSize)
let rendered = UIGraphicsImageRenderer(size: size).image { _ in
UIBezierPath(roundedRect: CGRect(origin: .zero, size: size), cornerRadius: 4).addClip()
image.draw(in: CGRect(origin: .zero, size: size))
}
return rendered.withRenderingMode(.alwaysOriginal)
}
/// Sits in front of the router's tab controller delegate. Taps on playlist
/// rows go to JS; everything else is forwarded untouched.
private final class SidebarSelectionProxy: NSObject, UITabBarControllerDelegate {
weak var original: UITabBarControllerDelegate?
var onPlaylist: ((String) -> Void)?
override func responds(to aSelector: Selector!) -> Bool {
super.responds(to: aSelector) || (original?.responds(to: aSelector) ?? false)
}
override func forwardingTarget(for aSelector: Selector!) -> Any? { original }
@available(iOS 18.0, *)
func tabBarController(_ tabBarController: UITabBarController, shouldSelectTab tab: UITab) -> Bool {
if tab.identifier.hasPrefix(playlistTabPrefix) {
onPlaylist?(String(tab.identifier.dropFirst(playlistTabPrefix.count)))
return false
}
return original?.tabBarController?(tabBarController, shouldSelectTab: tab) ?? true
}
}
@available(iOS 18.0, *)
private final class SidebarAccountButton: UIView {
var onPress: (() -> Void)?
+1
View File
@@ -29,6 +29,7 @@
"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",
+1 -1
View File
@@ -32,7 +32,7 @@ export default function Page() {
<ContentCarousel
title="Recently Added"
href="/recently-added"
content={recentlyAdded}
content={recentlyAdded.flat()}
/>
</div>
</div>
+15 -12
View File
@@ -1,4 +1,5 @@
import { AddToPlaylistProvider } from "@/components/add-to-playlist-provider"
import { DownloadsProvider } from "@/components/downloads-provider"
import { FavoritesProvider } from "@/components/favorites-provider"
import { PlaybackProvider } from "@/components/playback-provider"
import { PlayerBar } from "@/components/player-bar"
@@ -17,18 +18,20 @@ export default function AppLayout({
<SidebarProvider>
<PlaybackProvider>
<AddToPlaylistProvider>
<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>
<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>
</DownloadsProvider>
</AddToPlaylistProvider>
</PlaybackProvider>
</SidebarProvider>
+1 -1
View File
@@ -18,7 +18,7 @@ export default function Page() {
) : (
<div className="flex-1 overflow-y-auto p-6 pb-28">
<div className={albumGridClassName}>
{albums.map((album) => (
{albums.flat().map((album) => (
<AlbumCard key={album.id} album={album} />
))}
</div>
@@ -0,0 +1,7 @@
"use client"
import { OtherDownloadsView } from "@/components/other-downloads-view"
export default function Page() {
return <OtherDownloadsView />
}
@@ -0,0 +1,7 @@
"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 />
return <CollectionDetailSkeleton search />
}
@@ -1,5 +1,5 @@
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
export default function Loading() {
return <CollectionDetailSkeleton />
return <CollectionDetailSkeleton search />
}
+1 -1
View File
@@ -18,7 +18,7 @@ export default function Page() {
) : (
<div className="flex-1 overflow-y-auto p-6 pb-28">
<div className={albumGridClassName}>
{albums.map((album) => (
{albums.flat().map((album) => (
<AlbumCard key={album.id} album={album} />
))}
</div>
+1 -5
View File
@@ -8,11 +8,7 @@ import { albumGridClassName } from "@/lib/album-grid-classes"
import { api } from "@otunes/convex/_generated/api"
import type { BrowseAlbum, PlaylistSummary } from "@otunes/convex/types"
function RecentlyPlayedCard({
item,
}: {
item: BrowseAlbum | PlaylistSummary
}) {
function RecentlyPlayedCard({ item }: { item: BrowseAlbum | PlaylistSummary }) {
if ("owner" in item) {
return <PlaylistCard playlist={item} />
}
+5 -5
View File
@@ -9,7 +9,10 @@ import { ContentCarousel } from "@/components/content-carousel"
import { SearchResultsSkeleton } from "@/components/library-skeletons"
import { SearchPrompt } from "@/components/search-prompt"
import { SearchSongItem } from "@/components/search-song-item"
import { SearchTopResultCard, type TopResult } from "@/components/search-top-result-card"
import {
SearchTopResultCard,
type TopResult,
} from "@/components/search-top-result-card"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api"
@@ -107,10 +110,7 @@ function SearchResults({ query }: { query: string }) {
)}
{showPlaylists && (
<ContentCarousel
title="Playlists"
content={playlistResults ?? []}
/>
<ContentCarousel title="Playlists" content={playlistResults ?? []} />
)}
</div>
</div>
+104
View File
@@ -0,0 +1,104 @@
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" },
})
}
+11 -6
View File
@@ -1,18 +1,23 @@
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { getConvexClient } from "@/lib/convex-server"
import { serveCoverFile } from "@/lib/serve-cover"
import { fetchConvexStorageFile, getConvexClient } from "@/lib/convex-server"
import { serveCoverFile, serveStoredCover } from "@/lib/serve-cover"
/** Playlist artwork, drawn or uploaded ahead of time into Convex storage. */
export async function GET(
request: Request,
{ params }: { params: Promise<{ id: string }> }
) {
const { id } = await params
try {
const cover = await getConvexClient().query(api.library.getPlaylistCover, {
id: id as Id<"playlists">,
})
return serveCoverFile(cover, request)
const storageUrl = await getConvexClient().query(
api.library.getPlaylistCover,
{ id: id as Id<"playlists"> }
)
const image = storageUrl ? await fetchConvexStorageFile(storageUrl) : null
return image
? await serveStoredCover(image, request)
: await serveCoverFile(null, request)
} catch {
return new Response("Not found", { status: 404 })
}
@@ -0,0 +1,150 @@
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 { 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
),
})
}
/**
* Transcodes to an AAC .m4a with its index up front, so the saved file has a
* duration and seeks offline. The temporary file is removed once sent.
*/
async function transcodeResponse(
songId: string,
source: string,
kbps: number,
signal: AbortSignal
) {
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`,
"-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 })
}
}
+4 -9
View File
@@ -1,7 +1,7 @@
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import sharp from "sharp"
import { getConvexClient, getConvexServerUrl } from "@/lib/convex-server"
import { fetchConvexStorageFile, getConvexClient } from "@/lib/convex-server"
const AVATAR_SIZE = 256
@@ -24,17 +24,12 @@ export async function GET(
return new Response("Not found", { status: 404 })
}
// The backend builds storage URLs from its public origin, which may not
// be reachable from here. Fetch the same path from the internal URL.
const { pathname, search } = new URL(storageUrl)
const upstream = await fetch(
new URL(pathname + search, getConvexServerUrl())
)
if (!upstream.ok) {
const image = await fetchConvexStorageFile(storageUrl)
if (!image) {
return new Response("Not found", { status: 404 })
}
const data = await sharp(Buffer.from(await upstream.arrayBuffer()))
const data = await sharp(image)
.rotate()
.resize(AVATAR_SIZE, AVATAR_SIZE, {
fit: "cover",
@@ -42,7 +42,9 @@ function formatAddToPlaylistToast(
}
const addedLabel =
addedCount > 1 ? `Added ${addedCount} songs to ${title}` : `Added to ${title}`
addedCount > 1
? `Added ${addedCount} songs to ${title}`
: `Added to ${title}`
if (skippedCount === 0) {
return addedLabel
@@ -64,14 +66,15 @@ type AddToPlaylistContextValue = {
openCreatePlaylist: () => void
}
const AddToPlaylistContext = React.createContext<AddToPlaylistContextValue | null>(
null
)
const AddToPlaylistContext =
React.createContext<AddToPlaylistContextValue | null>(null)
export function useAddToPlaylist() {
const context = React.useContext(AddToPlaylistContext)
if (!context) {
throw new Error("useAddToPlaylist must be used within AddToPlaylistProvider")
throw new Error(
"useAddToPlaylist must be used within AddToPlaylistProvider"
)
}
return context
}
@@ -181,7 +184,7 @@ export function AddToPlaylistProvider({
}
)
if (requestId === selectionRequestRef.current) {
showAddToPlaylist(songIds)
showAddToPlaylist(songIds.flat())
}
} catch (error) {
if (requestId === selectionRequestRef.current) {
@@ -201,7 +204,10 @@ export function AddToPlaylistProvider({
setCreateOpen(true)
}, [])
async function handleAddToPlaylist(playlistId: Id<"playlists">, title: string) {
async function handleAddToPlaylist(
playlistId: Id<"playlists">,
title: string
) {
setIsSubmitting(true)
try {
const { addedCount, skippedCount } = await addSongs({
+22 -7
View File
@@ -14,6 +14,8 @@ 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"
@@ -50,6 +52,9 @@ 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
@@ -94,6 +99,20 @@ 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
}
}
}
@@ -104,10 +123,7 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
onMouseEnter={() => setHovered(true)}
onMouseLeave={() => setHovered(false)}
>
<Link
className="absolute inset-0"
href={"/album/" + album.id}
>
<Link className="absolute inset-0" href={"/album/" + album.id}>
<Image
src={albumCoverUrl(album.id)}
alt={album.title}
@@ -160,6 +176,7 @@ 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 }}
/>
@@ -176,9 +193,7 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
href={"/artist/" + album.artist.id}
className="text-muted-foreground decoration-muted-foreground hover:underline"
>
<p className="truncate text-xs">
{album.artist.name}
</p>
<p className="truncate text-xs">{album.artist.name}</p>
</Link>
</div>
</div>
+73 -13
View File
@@ -9,7 +9,14 @@ 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,
@@ -44,7 +51,10 @@ import { albumCoverUrl } from "@/lib/cover-urls"
import { sumDurationSeconds } from "@/lib/media-summary"
import { albumDetailSongs, rememberSongs } from "@/lib/song-cache"
function formatMetadata(genre: string | null, year: number | null): string | null {
function formatMetadata(
genre: string | null,
year: number | null
): string | null {
const parts: string[] = []
if (genre) {
parts.push(genre)
@@ -60,7 +70,9 @@ type AlbumTrackSection = {
tracks: BrowseAlbumTrack[]
}
function groupAlbumTracksByDisk(tracks: BrowseAlbumTrack[]): AlbumTrackSection[] {
function groupAlbumTracksByDisk(
tracks: BrowseAlbumTrack[]
): AlbumTrackSection[] {
const hasDiskNumbers = tracks.some((track) => track.diskNumber !== null)
if (!hasDiskNumbers) {
return [{ label: null, tracks }]
@@ -107,7 +119,13 @@ export function AlbumView({
toggleAlbumFavorite,
} = useFavorites()
const currentSongId = useCurrentSongId()
const { playFromSong, playAlbum, playAlbumShuffled } = usePlaybackActions()
const {
playFromSong,
playAlbum,
playAlbumShuffled,
playInOrder,
playShuffled,
} = usePlaybackActions()
const { runSongsAction } = useMediaActions()
const albumSongIds = React.useMemo(
() => album.tracks.map((track) => track.id as Id<"songs">),
@@ -138,7 +156,11 @@ export function AlbumView({
} = useTrackSelection(album.tracks, validHighlightedSongId)
const selectionPositions = React.useMemo(
() => getSelectionRangePositions(album.tracks.map((track) => track.id), selectedIds),
() =>
getSelectionRangePositions(
album.tracks.map((track) => track.id),
selectedIds
),
[album.tracks, selectedIds]
)
@@ -176,10 +198,30 @@ 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) => {
@@ -192,9 +234,9 @@ export function AlbumView({
const handleRowPlay = React.useCallback(
(index: number) => {
void playFromSong(album.tracks[index].id, albumSongIds, `album:${album.id}`)
void playFromSong(album.tracks[index].id, albumSongIds, playOrigin)
},
[album.tracks, album.id, albumSongIds, playFromSong]
[album.tracks, albumSongIds, playOrigin, playFromSong]
)
const handleToggleFavorite = React.useCallback(
@@ -207,6 +249,14 @@ 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)
}
@@ -215,7 +265,7 @@ export function AlbumView({
<PageHeader openApp />
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!">
<div className="pb-28">
<div className="mx-auto w-full min-w-0 max-w-9/10">
<div className="mx-auto w-full max-w-9/10 min-w-0">
<div className="flex flex-col gap-8 pt-6 pb-8 sm:flex-row sm:items-end">
<div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0">
<Image
@@ -258,6 +308,7 @@ export function AlbumView({
<AudioFormatBadge format="atmos" />
</>
) : null}
<DownloadedQuality collection={downloadRef} />
</div>
</div>
@@ -268,10 +319,12 @@ export function AlbumView({
className="rounded-full"
aria-label="Shuffle album"
onClick={() =>
void playAlbumShuffled(
album.id as Id<"albums">,
albumSongIds
)
void (fromDownloads
? playShuffled(albumSongIds, playOrigin)
: playAlbumShuffled(
album.id as Id<"albums">,
albumSongIds
))
}
>
<Shuffle />
@@ -280,7 +333,9 @@ 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 playAlbum(album.id as Id<"albums">, albumSongIds)
void (fromDownloads
? playInOrder(albumSongIds, playOrigin)
: playAlbum(album.id as Id<"albums">, albumSongIds))
}
>
<Play className="fill-current" />
@@ -294,6 +349,7 @@ export function AlbumView({
favoritedLabel={`Remove ${album.title} from favorites`}
unfavoritedLabel={`Favorite ${album.title}`}
/>
<DownloadButton target={downloadTarget} />
<Button
variant="secondary"
size="icon"
@@ -310,6 +366,7 @@ export function AlbumView({
onOpenMenu={() => {}}
onAction={handleAlbumMediaAction}
favorited={isAlbumFavorite(album.id)}
downloaded={albumDownloaded}
trackRowTrigger={false}
triggerVariant="secondary"
triggerClassName="rounded-full"
@@ -345,9 +402,12 @@ export function AlbumView({
song={trackSongs.get(track.id)!}
index={listIndex}
trackNumber={
track.track > 0 ? track.track : sectionTrackIndex + 1
track.track > 0
? track.track
: sectionTrackIndex + 1
}
subtitle={track.artists?.join(", ")}
downloadCollection={downloadRef}
isActive={track.id === activeTrackId}
selectionPosition={selectionPositions[listIndex]}
isFavorite={isSongFavorite(track.id)}
+24 -10
View File
@@ -1,6 +1,7 @@
"use client"
import {
ArrowDownToLine,
Disc3,
House,
LayoutGrid,
@@ -43,6 +44,7 @@ import Link from "next/link"
import { useTheme } from "next-themes"
import * as React from "react"
import { api } from "@otunes/convex/_generated/api"
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"
@@ -61,6 +63,7 @@ const library = [
{ title: "Albums", path: "/library/albums", icon: Disc3 },
{ title: "Artists", path: "/library/artists", icon: Mic },
{ title: "Songs", path: "/library/songs", icon: Music2 },
{ title: "Downloads", path: "/library/downloads", icon: ArrowDownToLine },
]
export function AppSidebar() {
@@ -86,17 +89,28 @@ export function AppSidebar() {
const isDark = mounted && resolvedTheme === "dark"
const playlistNav = [
{ title: "All Playlists", path: "/playlists", icon: LayoutGrid },
{ title: "Favorites", path: "/playlist/favorites", icon: Star },
...(sidebarPlaylists?.owned ?? []).map((playlist) => ({
{
title: "All Playlists",
path: "/playlists",
icon: <LayoutGrid />,
},
{ title: "Favorites", path: "/playlist/favorites", icon: <Star /> },
...[
...(sidebarPlaylists?.owned ?? []),
...(sidebarPlaylists?.subscribed ?? []),
].map((playlist) => ({
title: playlist.title,
path: `/playlist/${playlist.id}`,
icon: ListMusic,
})),
...(sidebarPlaylists?.subscribed ?? []).map((playlist) => ({
title: playlist.title,
path: `/playlist/${playlist.id}`,
icon: ListMusic,
icon: playlist.cover ? (
// eslint-disable-next-line @next/next/no-img-element -- versioned cover, already sized by the route
<img
src={playlistCoverUrl(playlist.id, playlist.cover, 64)}
alt=""
className="size-4 shrink-0 rounded-[3px] object-cover"
/>
) : (
<ListMusic />
),
})),
]
@@ -165,7 +179,7 @@ export function AppSidebar() {
<SidebarMenuItem key={item.path}>
<SidebarMenuButton isActive={pathname === item.path} asChild>
<Link href={item.path} onClick={() => setOpenMobile(false)}>
<item.icon />
{item.icon}
<span>{item.title}</span>
</Link>
</SidebarMenuButton>
+2 -2
View File
@@ -32,8 +32,8 @@ export function ArtistsPage() {
<ArtistsSkeleton />
) : (
<ArtistsView
artists={artists}
albums={albums}
artists={artists.flat()}
albums={albums.flat()}
artistId={artistIdFromPathname(pathname)}
onSelectArtist={selectArtist}
/>
+59 -54
View File
@@ -13,7 +13,12 @@ import {
CardHeader,
CardTitle,
} from "@/components/ui/card"
import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
import {
Field,
FieldError,
FieldGroup,
FieldLabel,
} from "@/components/ui/field"
import { Input } from "@/components/ui/input"
import { Spinner } from "@/components/ui/spinner"
@@ -101,64 +106,64 @@ export function AuthForm({
administrator if you need access.
</p>
) : (
<form onSubmit={handleSubmit}>
<FieldGroup>
{flow === "signUp" && (
<form onSubmit={handleSubmit}>
<FieldGroup>
{flow === "signUp" && (
<Field>
<FieldLabel htmlFor="name">Name</FieldLabel>
<Input
id="name"
name="name"
type="text"
autoComplete="name"
placeholder="Ada Lovelace"
required
/>
</Field>
)}
<Field>
<FieldLabel htmlFor="name">Name</FieldLabel>
<FieldLabel htmlFor="email">Email</FieldLabel>
<Input
id="name"
name="name"
type="text"
autoComplete="name"
placeholder="Ada Lovelace"
id="email"
name="email"
type="email"
autoComplete="email"
placeholder="you@example.com"
required
/>
</Field>
)}
<Field>
<FieldLabel htmlFor="email">Email</FieldLabel>
<Input
id="email"
name="email"
type="email"
autoComplete="email"
placeholder="you@example.com"
required
/>
</Field>
<Field>
<FieldLabel htmlFor="password">Password</FieldLabel>
<Input
id="password"
name="password"
type="password"
autoComplete={
flow === "signIn" ? "current-password" : "new-password"
}
required
/>
</Field>
{error && <FieldError>{error}</FieldError>}
<Field>
<Button type="submit" disabled={submitting}>
{submitting && <Spinner />}
{text.submit}
</Button>
</Field>
{!hideSignUpLink ? (
<p className="text-center text-sm text-muted-foreground">
{text.switchPrompt}{" "}
<Link
href={text.switchHref}
className="text-primary underline-offset-4 hover:underline"
>
{text.switchLabel}
</Link>
</p>
) : null}
</FieldGroup>
</form>
<Field>
<FieldLabel htmlFor="password">Password</FieldLabel>
<Input
id="password"
name="password"
type="password"
autoComplete={
flow === "signIn" ? "current-password" : "new-password"
}
required
/>
</Field>
{error && <FieldError>{error}</FieldError>}
<Field>
<Button type="submit" disabled={submitting}>
{submitting && <Spinner />}
{text.submit}
</Button>
</Field>
{!hideSignUpLink ? (
<p className="text-center text-sm text-muted-foreground">
{text.switchPrompt}{" "}
<Link
href={text.switchHref}
className="text-primary underline-offset-4 hover:underline"
>
{text.switchLabel}
</Link>
</p>
) : null}
</FieldGroup>
</form>
)}
</CardContent>
</Card>
@@ -39,6 +39,7 @@ export function ConvexClientProvider({
}) {
return (
<ConvexAuthNextjsProvider client={getConvexClient(convexUrl)}>
<PersistentCacheProvider>{children}</PersistentCacheProvider> </ConvexAuthNextjsProvider>
<PersistentCacheProvider>{children}</PersistentCacheProvider>{" "}
</ConvexAuthNextjsProvider>
)
}
+145
View File
@@ -0,0 +1,145 @@
"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>
)
}
+338
View File
@@ -0,0 +1,338 @@
"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,
registerDownloadsServiceWorker,
requestPersistentStorage,
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)
}
}, [])
}
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 />
<DownloadQualityDialog
pending={pending}
onClose={() => setPending(null)}
/>
</DownloadsContext.Provider>
)
}
+248
View File
@@ -0,0 +1,248 @@
"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>
)
}
+152
View File
@@ -0,0 +1,152 @@
"use client"
import * as React from "react"
import Image from "next/image"
import Link from "next/link"
import { Star } from "lucide-react"
import { FAVORITES_DOWNLOAD_ID } from "@/components/downloads-provider"
import { PageHeader } from "@/components/library-skeletons"
import {
FROM_DOWNLOADS_PARAM,
useDownloadsVersion,
} from "@/hooks/use-downloads"
import { albumGridClassName } from "@/lib/album-grid-classes"
import { albumCoverUrl, playlistCoverUrl } from "@/lib/cover-urls"
import { downloadQueue } from "@/lib/downloads"
import type { DownloadedCollection } from "@otunes/convex/client/download-queue"
import { formatBytes } from "@otunes/convex/download-quality"
export const OTHER_DOWNLOADS_PATH = "/library/downloads/other"
export const OTHER_DOWNLOADS_TITLE = "Other Downloaded Songs"
function collectionHref({ 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}`
}
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 (
<Link 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>
</Link>
)
}
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={collectionHref(collection)}
title={collection.title}
subtitle={`${collection.kind === "album" ? "Album" : "Playlist"} · ${formatBytes(bytes)}`}
cover={<CollectionCover collection={collection} />}
/>
))}
</div>
</div>
)}
</div>
)
}
@@ -29,7 +29,7 @@ export function FavoriteMediaButton({
className={cn(
"rounded-full",
!isFavorite &&
"hover:bg-primary hover:text-primary-foreground hover:border-transparent",
"hover:border-transparent hover:bg-primary hover:text-primary-foreground",
className
)}
aria-label={isFavorite ? favoritedLabel : unfavoritedLabel}
+3 -3
View File
@@ -86,15 +86,15 @@ export function FavoritesProvider({ children }: { children: React.ReactNode }) {
)
const songIds = React.useMemo(
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
() => new Set<string>(favorites?.favoriteSongs.flat()),
[favorites?.favoriteSongs]
)
const albumIds = React.useMemo(
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
() => new Set<string>(favorites?.favoriteAlbums.flat()),
[favorites?.favoriteAlbums]
)
const artistIds = React.useMemo(
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
() => new Set<string>(favorites?.favoriteArtists.flat()),
[favorites?.favoriteArtists]
)
+14 -2
View File
@@ -148,11 +148,23 @@ export function SongListSkeleton() {
)
}
/** Matches the header + track list layout of album and playlist pages. */
export function CollectionDetailSkeleton() {
/**
* 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
}) {
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" />
@@ -1,7 +1,4 @@
import {
formatMediaSummary,
formatReleaseDate,
} from "@/lib/media-summary"
import { formatMediaSummary, formatReleaseDate } from "@/lib/media-summary"
import { TRACK_ROW_PADDING } from "@/lib/selection-range-styles"
export function MediaCollectionFooter({
@@ -3,6 +3,8 @@
import * as React from "react"
import Link from "next/link"
import {
ArrowDownToLine,
CircleX,
GalleryVerticalEnd,
ListEnd,
ListPlus,
@@ -40,6 +42,8 @@ export type MediaContextAction =
| "shuffle"
| "create-station"
| "favorite"
| "download"
| "remove-download"
export type MediaContextNavigation = {
artist?: { id: string }
@@ -83,6 +87,7 @@ export function MediaContextMenuItems({
stationArtistId,
navigation,
share,
downloaded,
}: {
selectedCount: number
onAction: (action: MediaContextAction) => void
@@ -92,6 +97,8 @@ 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,6 +124,18 @@ export function MediaContextMenuItems({
{actionLabel(playlistLabel, selectedCount)}
<ListPlus />
</MediaMenuItem>
{downloaded !== undefined ? (
<MediaMenuItem
className="justify-between"
onClick={() => onAction(downloaded ? "remove-download" : "download")}
>
{actionLabel(
downloaded ? "Remove Download" : "Download",
selectedCount
)}
{downloaded ? <CircleX /> : <ArrowDownToLine />}
</MediaMenuItem>
) : null}
<MediaMenuSeparator />
<MediaMenuItem
className="justify-between"
@@ -222,6 +241,7 @@ 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
@@ -264,6 +284,7 @@ export function MediaContextMenuArea({
stationArtistId={menu.stationArtistId}
navigation={menu.navigation}
share={menu.share}
downloaded={menu.downloaded}
/>
{menu.children}
</MenuKindContext>
@@ -283,6 +304,7 @@ export function MediaContextMenu({
stationArtistId,
navigation,
share,
downloaded,
inSelectionRange = false,
trackRowTrigger = true,
triggerClassName,
@@ -324,6 +346,7 @@ export function MediaContextMenu({
stationArtistId={stationArtistId}
navigation={navigation}
share={share}
downloaded={downloaded}
/>
{children}
</DropdownMenuContent>
+15 -12
View File
@@ -1,12 +1,7 @@
"use client"
import { useAction, useMutation, useQuery } from "convex/react"
import {
MoreHorizontal,
Trash2,
Upload,
UserPlus,
} from "lucide-react"
import { MoreHorizontal, Trash2, Upload, UserPlus } from "lucide-react"
import { useCallback, useEffect, useRef, useState } from "react"
import { toast } from "sonner"
@@ -44,14 +39,15 @@ 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"
import type { PlaybackQuality } from "@otunes/convex/playback-stream"
import { resizeProfileImageToDataUrl } from "@/lib/resize-profile-image"
import { resizeProfileImageToDataUrl } from "@/lib/resize-image"
import { cn } from "@/lib/utils"
type Section = "profile" | "quality" | "users" | "library"
type Section = "profile" | "quality" | "downloads" | "users" | "library"
type CurrentUser = {
_id: Id<"users">
@@ -153,9 +149,7 @@ function UserAvatar({
key={user.image ?? "fallback"}
size={size === "sm" ? "sm" : "default"}
>
{user.image ? (
<AvatarImage src={user.image} alt={user.name} />
) : null}
{user.image ? <AvatarImage src={user.image} alt={user.name} /> : null}
<AvatarFallback>{initials}</AvatarFallback>
</Avatar>
)
@@ -691,7 +685,9 @@ function UserRowActions({
setAdmin({ userId: user._id, isAdmin: !user.isAdmin })
.then(() =>
toast.success(
user.isAdmin ? "Admin access removed" : "User is now admin"
user.isAdmin
? "Admin access removed"
: "User is now admin"
)
)
.catch((error: Error) => toast.error(error.message))
@@ -954,6 +950,12 @@ export function OptionsModal({
>
Quality
</NavButton>
<NavButton
active={activeSection === "downloads"}
onClick={() => setSection("downloads")}
>
Downloads
</NavButton>
</nav>
{isAdmin ? (
@@ -984,6 +986,7 @@ 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}
@@ -0,0 +1,158 @@
"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>
)
}
+224 -95
View File
@@ -35,6 +35,11 @@ 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"
@@ -61,8 +66,9 @@ type PlaybackContextValue = {
toggleQueueOpen: () => void
setIsPlaying: (playing: boolean) => void
setVolume: (volume: number) => void
playInOrder: (songIds: Id<"songs">[]) => Promise<void>
playShuffled: (songIds: Id<"songs">[]) => Promise<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>
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
playFromSong: (
@@ -189,28 +195,79 @@ type PlaybackLoadSettings = {
useHls: boolean
}
function playbackLoadSettings(
function userStreamPlan(
user: {
preferAtmos?: boolean
playbackQuality?: PlaybackQuality
},
dolbyAtmosSupported: boolean | null,
files: Record<string, unknown>
): PlaybackLoadSettings {
) {
const preferAtmos =
dolbyAtmosSupported === true && (user.preferAtmos ?? false)
const plan = playbackStreamPlan(files, user.playbackQuality, preferAtmos)
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" }
}
return {
preferAtmos: plan.preferAtmos,
playbackQuality: plan.playbackQuality,
useHls: plan.useHls,
kind: "stream",
settings: {
preferAtmos: plan.preferAtmos,
playbackQuality: plan.playbackQuality,
useHls: plan.useHls,
},
}
}
function songLoadKey(songId: string, settings: PlaybackLoadSettings) {
function songLoadKey(songId: string, source: AudioSourceChoice) {
if (source.kind === "download") {
return `${songId}:download`
}
const { settings } = source
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
@@ -242,21 +299,11 @@ function loadAudioSource(
audio: HTMLAudioElement,
hlsRef: RefObject<Hls | null>,
songId: string,
settings: PlaybackLoadSettings,
source: AudioSourceChoice,
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)
@@ -269,6 +316,48 @@ 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
@@ -302,16 +391,7 @@ function loadAudioSource(
loadDirectSource()
}
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
}
}
return cleanup
}
export function usePlayback() {
@@ -341,9 +421,7 @@ export function useIsPlaying() {
export function usePlaybackProgress() {
const context = useContext(PlaybackProgressContext)
if (!context) {
throw new Error(
"usePlaybackProgress must be used within PlaybackProvider"
)
throw new Error("usePlaybackProgress must be used within PlaybackProvider")
}
return context
}
@@ -366,11 +444,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
api.playback.getPlaybackState,
isSignedIn ? {} : "skip"
)
const syncPlaybackStateMutation = useMutation(
api.playback.syncPlaybackState
)
const syncPlaybackStateMutation = useMutation(api.playback.syncPlaybackState)
const recordPlayMutation = useMutation(api.playback.recordPlay)
const updateSongProgressMutation = useMutation(api.playback.updateSongProgress)
const updateSongProgressMutation = useMutation(
api.playback.updateSongProgress
)
useEffect(() => {
if (!isSignedIn) {
@@ -441,6 +519,17 @@ 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,
@@ -478,31 +567,27 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const isPlaybackActive = Boolean(currentSongId && isPlaying)
const repeatEnabled = playback.repeatEnabled
const queueLength = queueSongIds.length
const nextQueueSongId =
queueSongIds.length > 1 ? queueSongIds[1] : null
const nextQueueSongId = queueSongIds.length > 1 ? queueSongIds[1] : null
const nextQueueSongDoc = useCachedQuery(
api.library.getSongPlaybackInfo,
nextQueueSongId ? { id: nextQueueSongId } : "skip"
)
const seekTo = useCallback(
(seconds: number) => {
const audio = audioRef.current
if (!audio) {
return
}
const seekTo = useCallback((seconds: number) => {
const audio = audioRef.current
if (!audio) {
return
}
const maxDuration =
Number.isFinite(audio.duration) && audio.duration > 0
? audio.duration
: durationRef.current
const clamped = Math.max(0, Math.min(seconds, maxDuration || 0))
audio.currentTime = clamped
currentTimeRef.current = clamped
setCurrentTime(clamped)
},
[]
)
const maxDuration =
Number.isFinite(audio.duration) && audio.duration > 0
? audio.duration
: durationRef.current
const clamped = Math.max(0, Math.min(seconds, maxDuration || 0))
audio.currentTime = clamped
currentTimeRef.current = clamped
setCurrentTime(clamped)
}, [])
const saveProgress = useCallback(
(seconds: number) => {
@@ -765,18 +850,22 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
return
}
if (!user || !currentSongDoc) {
const source = audioSourceChoice(
currentSongId,
user ? { playbackQuality, preferAtmos } : null,
dolbyAtmosSupported,
currentSongDoc?.files,
fromDownloads
)
if (!source) {
return
}
const loadKey = songLoadKey(currentSongId, source)
const settings = playbackLoadSettings(
{ playbackQuality, preferAtmos },
dolbyAtmosSupported,
currentSongDoc.files
)
const loadKey = songLoadKey(currentSongId, settings)
if (loadedSongKeyRef.current === loadKey) {
if (
loadedSongKeyRef.current === loadKey ||
switchesDownloadSource(loadedSongKeyRef.current, currentSongId, source)
) {
return
}
@@ -817,7 +906,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
audio,
hlsRef,
currentSongId,
settings,
source,
requestPlay
)
@@ -832,6 +921,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
playbackQuality,
preferAtmos,
dolbyAtmosSupported,
downloadsVersion,
fromDownloads,
runWithoutAudioSync,
destroyHls,
clearPreload,
@@ -845,16 +936,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
return
}
if (!user || !nextQueueSongDoc) {
const source = audioSourceChoice(
nextQueueSongId,
user ? { playbackQuality, preferAtmos } : null,
dolbyAtmosSupported,
nextQueueSongDoc?.files,
fromDownloads
)
if (!source) {
return
}
const settings = playbackLoadSettings(
{ playbackQuality, preferAtmos },
dolbyAtmosSupported,
nextQueueSongDoc.files
)
const loadKey = songLoadKey(nextQueueSongId, settings)
const loadKey = songLoadKey(nextQueueSongId, source)
if (preloadedSongKeyRef.current === loadKey) {
return
@@ -873,7 +965,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
preloadAudio,
preloadHlsRef,
nextQueueSongId,
settings,
source,
onPreloadReady
)
@@ -894,6 +986,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
playbackQuality,
preferAtmos,
dolbyAtmosSupported,
downloadsVersion,
fromDownloads,
clearPreload,
destroyPreloadHls,
])
@@ -955,13 +1049,22 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
}
const preloadAudio = preloadAudioRef.current
if (shouldContinuePlaying && preloadAudio && nextQueueSongId && user && nextQueueSongDoc) {
const settings = playbackLoadSettings(
user,
dolbyAtmosSupported,
nextQueueSongDoc.files
)
const nextLoadKey = songLoadKey(nextQueueSongId, settings)
const nextSource = nextQueueSongId
? audioSourceChoice(
nextQueueSongId,
user ?? null,
dolbyAtmosSupported,
nextQueueSongDoc?.files,
fromDownloads
)
: null
if (
shouldContinuePlaying &&
preloadAudio &&
nextQueueSongId &&
nextSource
) {
const nextLoadKey = songLoadKey(nextQueueSongId, nextSource)
if (
preloadedSongKeyRef.current === nextLoadKey &&
@@ -1048,6 +1151,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
nextQueueSongDoc,
user,
dolbyAtmosSupported,
fromDownloads,
store,
destroyHls,
runWithoutAudioSync,
@@ -1109,6 +1213,7 @@ 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)
@@ -1161,21 +1266,26 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
)
const playInOrder = useCallback(
async (songIds: Id<"songs">[]) => {
async (songIds: Id<"songs">[], origin?: string) => {
if (songIds.length === 0) {
return
}
startPlayback((state) => playbackQueue.startQueue(state, songIds, false))
startPlayback(
(state) => playbackQueue.startQueue(state, songIds, false),
{ origin }
)
},
[startPlayback]
)
const playShuffled = useCallback(
async (songIds: Id<"songs">[]) => {
async (songIds: Id<"songs">[], origin?: string) => {
if (songIds.length === 0) {
return
}
startPlayback((state) => playbackQueue.startQueue(state, songIds, true))
startPlayback((state) => playbackQueue.startQueue(state, songIds, true), {
origin,
})
},
[startPlayback]
)
@@ -1233,12 +1343,14 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
let songIds: Id<"songs">[]
try {
songIds = await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
songIds = (
await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
).flat()
} catch {
return
}
@@ -1268,7 +1380,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId }
),
).then((chunks) => chunks.flat()),
[convex, cacheScope]
)
@@ -1391,8 +1503,25 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
skipPrevious,
})
const currentFormat =
currentSongDoc && user
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
? playbackFormat(
currentSongDoc.files,
user.playbackQuality,
+22 -2
View File
@@ -22,6 +22,8 @@ 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"
@@ -32,6 +34,9 @@ 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) {
@@ -52,6 +57,20 @@ 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
}
@@ -62,10 +81,10 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
<div className="group relative aspect-square overflow-hidden rounded-lg ring-1 ring-foreground/10">
<Link className="absolute inset-0" href={"/playlist/" + playlist.id}>
<Image
src={playlistCoverUrl(playlist.id)}
src={playlistCoverUrl(playlist.id, playlist.cover, 384)}
alt={playlist.title}
fill
sizes="(max-width: 640px) 50vw, (max-width: 1024px) 25vw, 16vw"
unoptimized
className="object-cover"
/>
</Link>
@@ -101,6 +120,7 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
<MediaContextMenuItems
selectedCount={1}
showFavorite={false}
downloaded={downloaded}
onAction={(action) => void handleCardAction(action)}
share={{ type: "playlist", playlistId: playlist.id }}
/>
@@ -0,0 +1,215 @@
"use client"
import * as React from "react"
import Image from "next/image"
import { useMutation } from "convex/react"
import { ArrowUp, Shuffle } from "lucide-react"
import { toast } from "sonner"
import { Button } from "@/components/ui/button"
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog"
import { albumCoverUrl, playlistCoverUrl } from "@/lib/cover-urls"
import { resizeImageToDataUrl } from "@/lib/resize-image"
import { cn } from "@/lib/utils"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import {
COVER_GRID_ALBUMS,
playlistCoverAlbums,
randomPlaylistCovers,
} from "@otunes/convex/client/playlist-cover"
import type { BrowseSong } from "@otunes/convex/types"
const UPLOAD_SIZE = 1024
/**
* Lets a playlist owner pick generated artwork (random 2x2 grids of the
* playlist's albums, reshuffled on demand) or upload an image. The current
* cover sits apart from the options so the owner can always keep it.
*/
export function PlaylistCoverDialog({
open,
onOpenChange,
playlistId,
title,
coverVersion,
songs,
}: {
open: boolean
onOpenChange: (open: boolean) => void
playlistId: Id<"playlists">
title: string
coverVersion: string | null
songs: BrowseSong[]
}) {
const setCoverAlbums = useMutation(api.playlists.setPlaylistCoverAlbums)
const uploadCover = useMutation(api.playlists.uploadPlaylistCover)
const fileInputRef = React.useRef<HTMLInputElement>(null)
const albums = React.useMemo(() => playlistCoverAlbums(songs), [songs])
const [options, setOptions] = React.useState<Id<"albums">[][]>([])
const canShuffle = albums.length >= COVER_GRID_ALBUMS
function shuffle() {
setOptions(randomPlaylistCovers(albums))
}
// Fresh options each time the dialog opens.
const [wasOpen, setWasOpen] = React.useState(false)
if (open !== wasOpen) {
setWasOpen(open)
if (open) shuffle()
}
async function pick(albumIds: Id<"albums">[]) {
onOpenChange(false)
try {
await setCoverAlbums({ playlistId, albumIds })
} catch (error) {
toast.error(
error instanceof Error ? error.message : "Failed to change cover"
)
}
}
async function upload(file: File) {
if (!file.type.startsWith("image/")) {
toast.error("Choose an image file")
return
}
onOpenChange(false)
try {
const image = await resizeImageToDataUrl(file, UPLOAD_SIZE)
await uploadCover({ playlistId, image })
} catch (error) {
toast.error(
error instanceof Error ? error.message : "Failed to upload cover"
)
}
}
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="sm:max-w-xl">
<DialogHeader>
<DialogTitle>Playlist Cover</DialogTitle>
</DialogHeader>
<div className="flex items-stretch gap-3">
{coverVersion ? (
<>
<CoverButton
label="Keep current cover"
selected
onClick={() => onOpenChange(false)}
>
<Image
src={playlistCoverUrl(playlistId, coverVersion, 256)}
alt={title}
fill
unoptimized
className="object-cover"
/>
</CoverButton>
<div className="w-px shrink-0 bg-border" />
</>
) : null}
<div className="grid flex-[4] grid-cols-4 gap-3">
{options.map((albumIds) => (
<CoverButton
key={albumIds.join(",")}
label="Use this cover"
onClick={() => void pick(albumIds)}
>
<AlbumGrid albumIds={albumIds} />
</CoverButton>
))}
</div>
</div>
{albums.length === 0 ? (
<p className="text-sm text-muted-foreground">
No album artwork in this playlist yet.
</p>
) : null}
<div className="flex gap-2">
{canShuffle ? (
<Button variant="secondary" onClick={shuffle}>
<Shuffle />
Shuffle
</Button>
) : null}
<Button
variant="secondary"
onClick={() => fileInputRef.current?.click()}
>
<ArrowUp />
Upload Image
</Button>
<input
ref={fileInputRef}
type="file"
accept="image/*"
className="hidden"
onChange={(event) => {
const file = event.target.files?.[0]
event.target.value = ""
if (file) void upload(file)
}}
/>
</div>
</DialogContent>
</Dialog>
)
}
function CoverButton({
label,
selected = false,
onClick,
children,
}: {
label: string
selected?: boolean
onClick: () => void
children: React.ReactNode
}) {
return (
<button
type="button"
aria-label={label}
onClick={onClick}
className={cn(
"relative aspect-square min-w-0 flex-1 overflow-hidden rounded-md ring-offset-2 ring-offset-background transition-shadow outline-none hover:ring-2 hover:ring-foreground/60 focus-visible:ring-2 focus-visible:ring-ring",
selected && "ring-2 ring-foreground hover:ring-foreground"
)}
>
{children}
</button>
)
}
/** Preview of a generated cover: one album alone, or four tiled 2x2. */
function AlbumGrid({ albumIds }: { albumIds: Id<"albums">[] }) {
const grid = albumIds.length > 1
return (
<div className={cn("grid size-full", grid && "grid-cols-2")}>
{albumIds.map((albumId) => (
<div key={albumId} className="relative">
<Image
src={albumCoverUrl(albumId)}
alt=""
fill
sizes={grid ? "64px" : "128px"}
className="object-cover"
/>
</div>
))}
</div>
)
}
+3 -1
View File
@@ -34,5 +34,7 @@ export function FavoritesPlaylistPage() {
return <PageMessage>Sign in to view your favorites.</PageMessage>
}
return <PlaylistView playlist={favorites} />
return (
<PlaylistView playlist={{ ...favorites, songs: favorites.songs.flat() }} />
)
}
+118 -29
View File
@@ -6,15 +6,35 @@ import * as React from "react"
import Image from "next/image"
import { useRouter } from "next/navigation"
import { useMutation } from "convex/react"
import { Play, SearchIcon, Share2, Shuffle, Star, Trash2 } from "lucide-react"
import {
ImageIcon,
Pencil,
Play,
SearchIcon,
Share2,
Shuffle,
Star,
Trash2,
} 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,
} from "@/components/playback-provider"
import { MediaCollectionFooter } from "@/components/media-collection-footer"
import { PlaylistCoverDialog } from "@/components/playlist-cover-dialog"
import {
MediaContextMenu,
type MediaContextAction,
@@ -97,6 +117,8 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
const [dragIndex, setDragIndex] = React.useState<number | null>(null)
const [isSubscribed, setIsSubscribed] = React.useState(playlist.isSubscribed)
const [subscriptionPending, setSubscriptionPending] = React.useState(false)
const [coverDialogOpen, setCoverDialogOpen] = React.useState(false)
const canEditCover = isOwner && !isFavorites && playlist.id !== null
if (syncedPlaylist !== playlist) {
setSyncedPlaylist(playlist)
@@ -135,8 +157,22 @@ 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 (playlist.id) {
if (fromDownloads) {
void (shuffled ? playShuffled : playInOrder)(playlistSongIds, playOrigin)
} else if (playlist.id) {
const play = shuffled ? playPlaylistShuffled : playPlaylist
void play(playlist.id, playlistSongIds)
} else {
@@ -144,9 +180,32 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
}
}
const handleMediaAction = useTrackListMediaAction({ selectedIds, songs })
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)
function handlePlaylistMediaAction(action: MediaContextAction) {
if (action === "download") {
void requestDownload(downloadTarget)
return
}
if (action === "remove-download") {
void removeDownload(downloadTarget)
return
}
runSongsAction(action, playlistSongIds)
}
@@ -159,11 +218,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
}
function handleRowPlay(index: number) {
void playFromSong(
filteredSongs[index].id,
playlistSongIds,
`playlist:${playlist.id}`
)
void playFromSong(filteredSongs[index].id, playlistSongIds, playOrigin)
}
function handleToggleFavorite(songId: string) {
@@ -287,25 +342,54 @@ 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">
<div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end">
<div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0">
<div className="group relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0">
{isFavorites ? (
<div className="flex size-full items-center justify-center bg-muted">
<Star className="size-16 fill-primary text-primary" />
</div>
) : (
<Image
src={playlistCoverUrl(playlist.id!)}
src={playlistCoverUrl(playlist.id!, playlist.cover, 512)}
alt={playlist.title}
fill
sizes="240px"
unoptimized
className="object-cover"
preload
/>
)}
{canEditCover ? (
<Button
variant="secondary"
size="icon"
className="absolute right-2 bottom-2 rounded-full opacity-0 shadow-md transition-opacity group-hover:opacity-100 focus-visible:opacity-100"
aria-label="Change cover"
onClick={() => setCoverDialogOpen(true)}
>
<Pencil />
</Button>
) : null}
</div>
<div className="flex min-w-0 flex-1 flex-col gap-4">
@@ -319,6 +403,9 @@ 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">
@@ -351,6 +438,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
{isSubscribed ? "Subscribed" : "Subscribe"}
</Button>
) : null}
<DownloadButton target={downloadTarget} />
{!isFavorites ? (
<Button
variant="secondary"
@@ -373,6 +461,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
onAction={handlePlaylistMediaAction}
playlistLabel={ADD_TO_ANOTHER_PLAYLIST}
showFavorite={!isFavorites}
downloaded={playlistDownloaded}
trackRowTrigger={false}
triggerVariant="secondary"
triggerClassName="rounded-full"
@@ -385,6 +474,13 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
{isOwner && !isFavorites ? (
<>
<DropdownMenuSeparator />
<DropdownMenuItem
className="justify-between"
onClick={() => setCoverDialogOpen(true)}
>
Change Cover
<ImageIcon />
</DropdownMenuItem>
<DropdownMenuItem
variant="destructive"
className="justify-between"
@@ -400,24 +496,6 @@ 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}
@@ -441,6 +519,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
selectedCount={selectedCount}
selectionStationArtistId={selectedStationArtistId}
playlistLabel={ADD_TO_ANOTHER_PLAYLIST}
downloadCollection={downloadRef}
showFavoriteInMenu={!isFavorites}
removeLabel={
isFavorites
@@ -476,6 +555,16 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
</div>
</div>
</ScrollArea>
{canEditCover ? (
<PlaylistCoverDialog
open={coverDialogOpen}
onOpenChange={setCoverDialogOpen}
playlistId={playlist.id!}
title={playlist.title}
coverVersion={playlist.cover}
songs={songs}
/>
) : null}
</div>
)
}
+10 -3
View File
@@ -66,7 +66,7 @@ function HistorySongRow({ song }: { song: HistorySong }) {
showAlbum={false}
/>
<span className="shrink-0 text-xs tabular-nums text-muted-foreground">
<span className="shrink-0 text-xs text-muted-foreground tabular-nums">
{formatDuration(song.durationSeconds)}
</span>
</div>
@@ -218,7 +218,11 @@ export function QueuePanel() {
(index) => selectableQueue[index].queueIndex
)
const targetQueueIndex = selectableQueue[targetLocalIndex].queueIndex
const next = moveQueueBlock(queueSongIds, fromQueueIndices, targetQueueIndex)
const next = moveQueueBlock(
queueSongIds,
fromQueueIndices,
targetQueueIndex
)
setDragIndex(null)
@@ -263,7 +267,10 @@ export function QueuePanel() {
{historySongs.length > 0 ? (
<ul className="flex flex-col border-b py-1">
{historySongs.map((song) => (
<HistorySongRow key={`history-${song.id}-${song.historyIndex}`} song={song} />
<HistorySongRow
key={`history-${song.id}-${song.historyIndex}`}
song={song}
/>
))}
</ul>
) : null}
Loaded 100 of 166 files, more files were not shown because too many files have changed in this diff. Show more