Compare commits
1
Commits
No files matched your search
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
-2
@@ -5,7 +5,6 @@ import Songs from "../home/browse/songs"
|
||||
import Playlists from "../home/browse/playlists"
|
||||
import Favorites from "../home/playlist/favorites"
|
||||
import RecentlyPlayed from "../home/recently-played"
|
||||
import Downloads from "../home/downloads"
|
||||
import { TabletSectionContext } from "@/lib/tablet-navigation"
|
||||
|
||||
const screens = {
|
||||
@@ -15,7 +14,6 @@ const screens = {
|
||||
playlists: Playlists,
|
||||
favorites: Favorites,
|
||||
recent: RecentlyPlayed,
|
||||
downloads: Downloads,
|
||||
}
|
||||
|
||||
export default function TabletSectionScreen() {
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../../home/downloads"
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../../home/downloads/other"
|
||||
@@ -217,14 +217,6 @@ 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}
|
||||
|
||||
@@ -22,18 +22,6 @@ 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 {
|
||||
@@ -70,17 +58,7 @@ export default function AlbumScreen() {
|
||||
api.library.browseAlbumDetail,
|
||||
typeof id === "string" ? { id: id as Id<"albums"> } : "skip"
|
||||
)
|
||||
const {
|
||||
playAlbum,
|
||||
playAlbumShuffled,
|
||||
playFromSong,
|
||||
playInOrder,
|
||||
playShuffled,
|
||||
} = usePlaybackActions()
|
||||
const fromDownloads = useOpenedFromDownloads()
|
||||
const playOrigin = fromDownloads
|
||||
? downloadsQueueOrigin(`album:${id}`)
|
||||
: `album:${id}`
|
||||
const { playAlbum, playAlbumShuffled, playFromSong } = usePlaybackActions()
|
||||
const { isAlbumFavorite, toggleAlbumFavorite, isSongFavorite } =
|
||||
useFavorites()
|
||||
const {
|
||||
@@ -103,17 +81,6 @@ export default function AlbumScreen() {
|
||||
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
|
||||
[album]
|
||||
)
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
const downloadTarget = useMemo(
|
||||
() => ({
|
||||
kind: "album" as const,
|
||||
id: typeof id === "string" ? id : "",
|
||||
title: album?.title ?? "",
|
||||
songIds,
|
||||
}),
|
||||
[album?.title, id, songIds]
|
||||
)
|
||||
const albumDownloaded = useIsCollectionDownloaded(downloadTarget)
|
||||
|
||||
useEffect(() => {
|
||||
if (album) {
|
||||
@@ -125,8 +92,8 @@ export default function AlbumScreen() {
|
||||
|
||||
const playTrack = useCallback(
|
||||
(songId: Id<"songs">, ids: Id<"songs">[]) =>
|
||||
playFromSong(songId, ids, playOrigin),
|
||||
[playOrigin, playFromSong]
|
||||
playFromSong(songId, ids, `album:${id}`),
|
||||
[id, playFromSong]
|
||||
)
|
||||
|
||||
const renderItem = useCallback(
|
||||
@@ -226,41 +193,28 @@ export default function AlbumScreen() {
|
||||
}
|
||||
: {}),
|
||||
headerRight: () => (
|
||||
<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>
|
||||
<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>
|
||||
),
|
||||
}}
|
||||
/>
|
||||
@@ -324,11 +278,7 @@ export default function AlbumScreen() {
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() =>
|
||||
void (fromDownloads
|
||||
? playInOrder(songIds, playOrigin)
|
||||
: playAlbum(album.id, songIds))
|
||||
}
|
||||
onPress={() => void playAlbum(album.id, songIds)}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
@@ -339,11 +289,7 @@ export default function AlbumScreen() {
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() =>
|
||||
void (fromDownloads
|
||||
? playShuffled(songIds, playOrigin)
|
||||
: playAlbumShuffled(album.id, songIds))
|
||||
}
|
||||
onPress={() => void playAlbumShuffled(album.id, songIds)}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
@@ -426,11 +372,6 @@ export default function AlbumScreen() {
|
||||
</>
|
||||
) : null}
|
||||
</View>
|
||||
<DownloadedQuality
|
||||
collection={downloadTarget}
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</CollectionHero>
|
||||
</MusicEntityView>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
@@ -510,13 +451,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
}) {
|
||||
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
|
||||
const { config } = useServerConfig()
|
||||
const downloadRef = useMemo(
|
||||
() => ({ kind: "album" as const, id: album.id }),
|
||||
[album.id]
|
||||
)
|
||||
const downloadState = useSongDownloadState(track.id, downloadRef)
|
||||
const downloaded = downloadState === "here"
|
||||
const toggleDownload = useToggleSongDownload()
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={
|
||||
@@ -533,7 +467,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
}
|
||||
stationArtistId={album.artist.id}
|
||||
favorited={favorited}
|
||||
downloaded={downloaded}
|
||||
navigation={{
|
||||
artist: { id: album.artist.id },
|
||||
album: { id: album.id },
|
||||
@@ -552,8 +485,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
backgroundColor={palette.background}
|
||||
onPlayNext={() => void onAction(track, album, "play-next")}
|
||||
onAddToQueue={() => void onAction(track, album, "play-last")}
|
||||
downloaded={downloaded}
|
||||
onDownload={() => toggleDownload(track, downloaded, downloadRef)}
|
||||
style={styles.trackRow}
|
||||
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
||||
>
|
||||
@@ -584,14 +515,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
{downloaded || downloadState === "device" ? (
|
||||
<Ionicons
|
||||
name="arrow-down-circle"
|
||||
size={14}
|
||||
color={palette.secondaryForeground}
|
||||
accessibilityLabel="Downloaded"
|
||||
/>
|
||||
) : null}
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{formatDuration(track.durationSeconds)}
|
||||
</Text>
|
||||
@@ -604,7 +527,6 @@ 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,
|
||||
|
||||
@@ -1,176 +0,0 @@
|
||||
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 },
|
||||
})
|
||||
@@ -1,152 +0,0 @@
|
||||
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" },
|
||||
})
|
||||
@@ -44,18 +44,6 @@ 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"
|
||||
@@ -188,17 +176,10 @@ function PlaylistContent({
|
||||
const router = useRouter()
|
||||
const isFocused = useIsFocused()
|
||||
const colors = useThemeColors()
|
||||
const {
|
||||
playPlaylist,
|
||||
playPlaylistShuffled,
|
||||
playFromSong,
|
||||
playInOrder,
|
||||
playShuffled,
|
||||
} = usePlaybackActions()
|
||||
const fromDownloads = useOpenedFromDownloads()
|
||||
const { playPlaylist, playPlaylistShuffled, playFromSong } =
|
||||
usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction, handlePlaylistDetailAction } = useMediaMenuActions()
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
const subscribe = useMutation(api.playlists.subscribeToPlaylist)
|
||||
const unsubscribe = useMutation(api.playlists.unsubscribeFromPlaylist)
|
||||
const deletePlaylist = useMutation(api.playlists.deletePlaylist)
|
||||
@@ -211,25 +192,11 @@ function PlaylistContent({
|
||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||
usePlaylistSearch(songs)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
const downloadRef = useMemo(
|
||||
() => ({
|
||||
kind: "playlist" as const,
|
||||
id: playlistId ?? FAVORITES_DOWNLOAD_ID,
|
||||
}),
|
||||
[playlistId]
|
||||
)
|
||||
const downloadTarget = useMemo(
|
||||
() => ({ ...downloadRef, title: playlist.title, songIds }),
|
||||
[downloadRef, playlist.title, songIds]
|
||||
)
|
||||
const playOrigin = fromDownloads
|
||||
? downloadsQueueOrigin(`playlist:${downloadRef.id}`)
|
||||
: `playlist:${playlistId}`
|
||||
const playlistDownloaded = useIsCollectionDownloaded(downloadTarget)
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
|
||||
[playFromSong, songIds, playOrigin]
|
||||
(song: BrowseSong) =>
|
||||
void playFromSong(song.id, songIds, `playlist:${playlistId}`),
|
||||
[playFromSong, songIds, playlistId]
|
||||
)
|
||||
|
||||
const handleRemoveSong = useCallback(
|
||||
@@ -253,34 +220,18 @@ function PlaylistContent({
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) => {
|
||||
if (action === "remove-from-playlist") void handleRemoveSong(song.id)
|
||||
else void handleSongAction(song, action, downloadRef)
|
||||
else void handleSongAction(song, action)
|
||||
},
|
||||
[downloadRef, handleRemoveSong, handleSongAction]
|
||||
[handleRemoveSong, handleSongAction]
|
||||
)
|
||||
|
||||
const handlePlay = useCallback(() => {
|
||||
if (fromDownloads) void playInOrder(songIds, playOrigin)
|
||||
else if (playlistId) void playPlaylist(playlistId, songIds)
|
||||
}, [
|
||||
fromDownloads,
|
||||
playInOrder,
|
||||
playOrigin,
|
||||
playPlaylist,
|
||||
playlistId,
|
||||
songIds,
|
||||
])
|
||||
if (playlistId) void playPlaylist(playlistId, songIds)
|
||||
}, [playPlaylist, playlistId, songIds])
|
||||
|
||||
const handleShuffle = useCallback(() => {
|
||||
if (fromDownloads) void playShuffled(songIds, playOrigin)
|
||||
else if (playlistId) void playPlaylistShuffled(playlistId, songIds)
|
||||
}, [
|
||||
fromDownloads,
|
||||
playShuffled,
|
||||
playOrigin,
|
||||
playPlaylistShuffled,
|
||||
playlistId,
|
||||
songIds,
|
||||
])
|
||||
if (playlistId) void playPlaylistShuffled(playlistId, songIds)
|
||||
}, [playPlaylistShuffled, playlistId, songIds])
|
||||
|
||||
const handleSubscribeToggle = useCallback(async () => {
|
||||
if (!playlistId) return
|
||||
@@ -324,14 +275,6 @@ function PlaylistContent({
|
||||
}
|
||||
return
|
||||
}
|
||||
if (action === "download") {
|
||||
void requestDownload(downloadTarget)
|
||||
return
|
||||
}
|
||||
if (action === "remove-download") {
|
||||
void removeDownload(downloadTarget)
|
||||
return
|
||||
}
|
||||
|
||||
void handlePlaylistDetailAction(songIds, action)
|
||||
}
|
||||
@@ -349,42 +292,31 @@ function PlaylistContent({
|
||||
}
|
||||
: {}),
|
||||
headerRight: () => (
|
||||
<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>
|
||||
<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>
|
||||
),
|
||||
}
|
||||
}, [
|
||||
canEdit,
|
||||
colors.foreground,
|
||||
deletePlaylist,
|
||||
downloadTarget,
|
||||
playlistDownloaded,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
handlePlaylistDetailAction,
|
||||
palette.foreground,
|
||||
palette.isDark,
|
||||
@@ -402,7 +334,6 @@ function PlaylistContent({
|
||||
removable={canEdit}
|
||||
palette={palette}
|
||||
swipeGroup={swipeGroup}
|
||||
downloadRef={downloadRef}
|
||||
onPlay={handlePlaySong}
|
||||
onAction={handleSongMenuAction}
|
||||
onRemove={handleRemoveSong}
|
||||
@@ -410,7 +341,6 @@ function PlaylistContent({
|
||||
),
|
||||
[
|
||||
canEdit,
|
||||
downloadRef,
|
||||
handlePlaySong,
|
||||
handleRemoveSong,
|
||||
handleSongMenuAction,
|
||||
@@ -465,7 +395,6 @@ function PlaylistContent({
|
||||
isSubscribed={isSubscribed}
|
||||
showSubscribe={!playlist.isOwner && playlistId !== null}
|
||||
onSubscribeToggle={handleSubscribeToggle}
|
||||
downloadRef={downloadRef}
|
||||
onPlay={handlePlay}
|
||||
onShuffle={handleShuffle}
|
||||
/>
|
||||
@@ -485,7 +414,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
removable,
|
||||
palette,
|
||||
swipeGroup,
|
||||
downloadRef,
|
||||
onPlay,
|
||||
onAction,
|
||||
onRemove,
|
||||
@@ -495,7 +423,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
removable: boolean
|
||||
palette: CoverPalette
|
||||
swipeGroup: SwipeRowGroup
|
||||
downloadRef: CollectionRef
|
||||
onPlay: (song: BrowseSong) => void
|
||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||
onRemove: (songId: Id<"songs">) => Promise<boolean>
|
||||
@@ -510,7 +437,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
palette={palette}
|
||||
inset
|
||||
removable={removable}
|
||||
downloadFrom={downloadRef}
|
||||
swipe={
|
||||
Platform.OS !== "web"
|
||||
? {
|
||||
@@ -576,11 +502,9 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
isSubscribed,
|
||||
showSubscribe = false,
|
||||
onSubscribeToggle,
|
||||
downloadRef,
|
||||
onPlay,
|
||||
onShuffle,
|
||||
}: {
|
||||
downloadRef: CollectionRef
|
||||
entityId: string
|
||||
coverUri: string
|
||||
hasCover: boolean
|
||||
@@ -687,11 +611,6 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
>
|
||||
{ownerName}
|
||||
</Text>
|
||||
<DownloadedQuality
|
||||
collection={downloadRef}
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</CollectionHero>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
</MusicEntityView>
|
||||
@@ -701,7 +620,6 @@ 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,13 +16,6 @@ import { CollectionDivider } from "@/components/collection-list"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
import {
|
||||
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"
|
||||
@@ -38,7 +31,6 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
|
||||
const DOWNLOAD_REF = { kind: "playlist", id: FAVORITES_DOWNLOAD_ID } as const
|
||||
|
||||
export default function FavoritesScreen() {
|
||||
const colors = useThemeColors()
|
||||
@@ -49,27 +41,6 @@ export default function FavoritesScreen() {
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const fromDownloads = useOpenedFromDownloads()
|
||||
const playOrigin = fromDownloads
|
||||
? downloadsQueueOrigin("playlist:favorites")
|
||||
: undefined
|
||||
const 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)
|
||||
|
||||
@@ -78,21 +49,21 @@ export default function FavoritesScreen() {
|
||||
}, [songs])
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
|
||||
[playFromSong, playOrigin, songIds]
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds),
|
||||
[playFromSong, songIds]
|
||||
)
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) =>
|
||||
void handleSongAction(song, action, DOWNLOAD_REF),
|
||||
void handleSongAction(song, action),
|
||||
[handleSongAction]
|
||||
)
|
||||
const handlePlay = useCallback(
|
||||
() => void playInOrder(songIds, playOrigin),
|
||||
[playInOrder, playOrigin, songIds]
|
||||
() => void playInOrder(songIds),
|
||||
[playInOrder, songIds]
|
||||
)
|
||||
const handleShuffle = useCallback(
|
||||
() => void playShuffled(songIds, playOrigin),
|
||||
[playShuffled, playOrigin, songIds]
|
||||
() => void playShuffled(songIds),
|
||||
[playShuffled, songIds]
|
||||
)
|
||||
|
||||
const renderItem = useCallback(
|
||||
@@ -102,7 +73,6 @@ export default function FavoritesScreen() {
|
||||
favorited={isSongFavorite(song.id)}
|
||||
playlistLabel="Add to Another Playlist"
|
||||
inset
|
||||
downloadFrom={DOWNLOAD_REF}
|
||||
onPlay={handlePlaySong}
|
||||
onAction={handleSongMenuAction}
|
||||
/>
|
||||
@@ -134,7 +104,7 @@ export default function FavoritesScreen() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={screenOptions} />
|
||||
<Stack.Screen options={SCREEN_OPTIONS} />
|
||||
<PlaylistSearchBar
|
||||
onQueryChange={onQueryChange}
|
||||
onSearchSubmit={onSearchSubmit}
|
||||
@@ -196,11 +166,6 @@ 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"
|
||||
|
||||
@@ -3,10 +3,9 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { useAction, useMutation, useQuery } from "convex/react"
|
||||
import { Image } from "expo-image"
|
||||
import * as ImagePicker from "expo-image-picker"
|
||||
import { useEffect, useMemo, useState } from "react"
|
||||
import { useState } from "react"
|
||||
import { router } from "expo-router"
|
||||
import {
|
||||
Alert,
|
||||
Platform,
|
||||
Pressable,
|
||||
ScrollView,
|
||||
@@ -17,20 +16,7 @@ import {
|
||||
} from "react-native"
|
||||
import type { StyleProp, ViewStyle } from "react-native"
|
||||
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
import { useDownloads, useDownloadsVersion } from "@/contexts/downloads"
|
||||
import {
|
||||
readRememberedDownloadQuality,
|
||||
writeRememberedDownloadQuality,
|
||||
} from "@/lib/downloads"
|
||||
import {
|
||||
DOWNLOAD_QUALITIES,
|
||||
DOWNLOAD_QUALITY_DETAILS,
|
||||
DOWNLOAD_QUALITY_LABELS,
|
||||
formatBytes,
|
||||
type DownloadQuality,
|
||||
} from "@otunes/convex/download-quality"
|
||||
import { Button, Input, LoadingView } from "@/components/ui/primitives"
|
||||
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
@@ -49,7 +35,7 @@ import type { PlaybackQuality } from "@otunes/convex/playback-stream"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
|
||||
type Section = "profile" | "quality" | "downloads" | "library" | "users"
|
||||
type Section = "profile" | "quality" | "library" | "users"
|
||||
|
||||
type CurrentUser = {
|
||||
_id: Id<"users">
|
||||
@@ -89,7 +75,6 @@ const QUALITY_OPTIONS: {
|
||||
const SECTIONS: SectionConfig[] = [
|
||||
{ id: "profile", label: "Profile", icon: "person-circle-outline" },
|
||||
{ id: "quality", label: "Playback", icon: "volume-high-outline" },
|
||||
{ id: "downloads", label: "Downloads", icon: "arrow-down-circle-outline" },
|
||||
{ id: "library", label: "Library", icon: "library-outline", admin: true },
|
||||
{ id: "users", label: "Users", icon: "people-outline", admin: true },
|
||||
]
|
||||
@@ -171,7 +156,6 @@ export default function SettingsScreen() {
|
||||
</>
|
||||
) : null}
|
||||
{section === "quality" ? <QualitySection user={user} /> : null}
|
||||
{section === "downloads" ? <DownloadsSection /> : null}
|
||||
{section === "library" && isAdmin ? <LibrarySection /> : null}
|
||||
{section === "users" && isAdmin && allUsers ? (
|
||||
<UsersSection users={allUsers} currentUserId={user._id} />
|
||||
@@ -448,298 +432,6 @@ function QualitySection({ user }: { user: CurrentUser }) {
|
||||
)
|
||||
}
|
||||
|
||||
/** Shades of the text color, faintest for the smallest files. */
|
||||
const QUALITY_OPACITY: Record<DownloadQuality, number> = {
|
||||
medium: 0.25,
|
||||
high: 0.45,
|
||||
lossless: 0.7,
|
||||
atmos: 1,
|
||||
}
|
||||
|
||||
function songCount(count: number) {
|
||||
return count === 1 ? "1 song" : `${count} songs`
|
||||
}
|
||||
|
||||
function QualityName({
|
||||
quality,
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
quality: DownloadQuality
|
||||
color: string
|
||||
backgroundColor: string
|
||||
}) {
|
||||
if (quality === "lossless" || quality === "atmos") {
|
||||
return (
|
||||
<AudioFormatBadge
|
||||
format={quality}
|
||||
color={color}
|
||||
backgroundColor={backgroundColor}
|
||||
/>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<Text style={{ color, fontSize: 13, fontWeight: "500" }}>
|
||||
{DOWNLOAD_QUALITY_LABELS[quality]}
|
||||
</Text>
|
||||
)
|
||||
}
|
||||
|
||||
function confirm(title: string, onConfirm: () => void) {
|
||||
Alert.alert(title, undefined, [
|
||||
{ text: "Cancel", style: "cancel" },
|
||||
{ text: "Remove", style: "destructive", onPress: onConfirm },
|
||||
])
|
||||
}
|
||||
|
||||
function RememberedQualityCard() {
|
||||
const colors = useThemeColors()
|
||||
// undefined until read; null means ask every time.
|
||||
const [remembered, setRemembered] = useState<DownloadQuality | null>()
|
||||
useEffect(() => {
|
||||
void readRememberedDownloadQuality().then((quality) =>
|
||||
setRemembered(quality ?? null)
|
||||
)
|
||||
}, [])
|
||||
const options: {
|
||||
value: DownloadQuality | null
|
||||
label: string
|
||||
detail: string
|
||||
}[] = [
|
||||
{ value: null, label: "Ask every time", detail: "Choose when downloading" },
|
||||
...DOWNLOAD_QUALITIES.map((quality) => ({
|
||||
value: quality,
|
||||
label: DOWNLOAD_QUALITY_LABELS[quality],
|
||||
detail: DOWNLOAD_QUALITY_DETAILS[quality],
|
||||
})),
|
||||
]
|
||||
|
||||
return (
|
||||
<SettingsCard title="Download Quality">
|
||||
{options.map((option) => {
|
||||
const selected = remembered === option.value
|
||||
return (
|
||||
<Pressable
|
||||
key={option.value ?? "ask"}
|
||||
accessibilityRole="button"
|
||||
accessibilityState={{ selected }}
|
||||
onPress={() => {
|
||||
setRemembered(option.value)
|
||||
void writeRememberedDownloadQuality(option.value ?? undefined)
|
||||
}}
|
||||
style={[
|
||||
styles.optionRow,
|
||||
{
|
||||
borderColor: selected ? colors.primary : colors.border,
|
||||
backgroundColor: selected ? colors.muted : colors.card,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<View style={styles.optionCopy}>
|
||||
<Text style={[styles.optionTitle, { color: colors.foreground }]}>
|
||||
{option.label}
|
||||
</Text>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
{option.detail}
|
||||
</Text>
|
||||
</View>
|
||||
{selected ? (
|
||||
<Ionicons
|
||||
name="checkmark-circle"
|
||||
size={22}
|
||||
color={colors.primary}
|
||||
/>
|
||||
) : null}
|
||||
</Pressable>
|
||||
)
|
||||
})}
|
||||
</SettingsCard>
|
||||
)
|
||||
}
|
||||
|
||||
function DownloadsSection() {
|
||||
const colors = useThemeColors()
|
||||
const { queue } = useDownloads()
|
||||
const version = useDownloadsVersion()
|
||||
const breakdown = useMemo(
|
||||
() => queue?.breakdown(),
|
||||
// version invalidates the breakdown when downloads change.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
[queue, version]
|
||||
)
|
||||
if (!queue || !breakdown) return null
|
||||
const qualities = breakdown.byQuality.filter((entry) => entry.songs > 0)
|
||||
|
||||
return (
|
||||
<>
|
||||
<SettingsCard title="Storage">
|
||||
<Text style={{ color: colors.foreground, fontSize: 15 }}>
|
||||
{formatBytes(breakdown.bytes)} · {songCount(breakdown.songs)}
|
||||
{breakdown.queued > 0 ? ` · ${breakdown.queued} downloading` : ""}
|
||||
</Text>
|
||||
{breakdown.songs > 0 ? (
|
||||
<>
|
||||
<View
|
||||
style={[styles.storageBar, { backgroundColor: colors.muted }]}
|
||||
>
|
||||
{qualities.map((entry) => (
|
||||
<View
|
||||
key={entry.quality}
|
||||
style={{
|
||||
flex: entry.bytes,
|
||||
backgroundColor: colors.foreground,
|
||||
opacity: QUALITY_OPACITY[entry.quality],
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
</View>
|
||||
{qualities.map((entry) => (
|
||||
<View key={entry.quality} style={styles.storageRow}>
|
||||
<View
|
||||
style={[
|
||||
styles.storageDot,
|
||||
{
|
||||
backgroundColor: colors.foreground,
|
||||
opacity: QUALITY_OPACITY[entry.quality],
|
||||
},
|
||||
]}
|
||||
/>
|
||||
<View style={{ flex: 1 }}>
|
||||
<QualityName
|
||||
quality={entry.quality}
|
||||
color={colors.foreground}
|
||||
backgroundColor={colors.card}
|
||||
/>
|
||||
</View>
|
||||
<Text style={{ color: colors.mutedForeground, fontSize: 13 }}>
|
||||
{songCount(entry.songs)}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.storageSize, { color: colors.foreground }]}
|
||||
>
|
||||
{formatBytes(entry.bytes)}
|
||||
</Text>
|
||||
</View>
|
||||
))}
|
||||
</>
|
||||
) : null}
|
||||
</SettingsCard>
|
||||
|
||||
<RememberedQualityCard />
|
||||
|
||||
{breakdown.collections.length > 0 ||
|
||||
breakdown.otherSongs.songIds.length > 0 ? (
|
||||
<SettingsCard title="Downloaded">
|
||||
{breakdown.collections.map(
|
||||
({ collection, bytes, status, fallbackCount }) => (
|
||||
<View
|
||||
key={`${collection.kind}:${collection.id}`}
|
||||
style={styles.storageRow}
|
||||
>
|
||||
<View style={styles.optionCopy}>
|
||||
<Text
|
||||
style={{ color: colors.foreground, fontSize: 15 }}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{collection.title}
|
||||
</Text>
|
||||
<View style={styles.collectionMeta}>
|
||||
<Text
|
||||
style={{ color: colors.mutedForeground, fontSize: 13 }}
|
||||
>
|
||||
{collection.kind === "album" ? "Album" : "Playlist"} ·
|
||||
</Text>
|
||||
<QualityName
|
||||
quality={collection.quality}
|
||||
color={colors.mutedForeground}
|
||||
backgroundColor={colors.card}
|
||||
/>
|
||||
{fallbackCount > 0 ? (
|
||||
<Text
|
||||
style={{ color: colors.mutedForeground, fontSize: 13 }}
|
||||
>
|
||||
({fallbackCount} in High)
|
||||
</Text>
|
||||
) : null}
|
||||
{status.downloaded < status.total ? (
|
||||
<Text
|
||||
style={{ color: colors.mutedForeground, fontSize: 13 }}
|
||||
>
|
||||
· {status.downloaded} of {status.total}
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
</View>
|
||||
<Text
|
||||
style={[styles.storageSize, { color: colors.foreground }]}
|
||||
>
|
||||
{formatBytes(bytes)}
|
||||
</Text>
|
||||
<Pressable
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={`Remove download of ${collection.title}`}
|
||||
onPress={() =>
|
||||
confirm(
|
||||
`Remove ${collection.title}?`,
|
||||
() => void queue.removeCollection(collection)
|
||||
)
|
||||
}
|
||||
>
|
||||
<Ionicons
|
||||
name="trash-outline"
|
||||
size={20}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
)}
|
||||
{breakdown.otherSongs.songIds.length > 0 ? (
|
||||
<View style={styles.storageRow}>
|
||||
<View style={styles.optionCopy}>
|
||||
<Text style={{ color: colors.foreground, fontSize: 15 }}>
|
||||
Other Downloaded Songs
|
||||
</Text>
|
||||
<Text style={{ color: colors.mutedForeground, fontSize: 13 }}>
|
||||
{songCount(breakdown.otherSongs.songIds.length)}
|
||||
</Text>
|
||||
</View>
|
||||
<Text style={[styles.storageSize, { color: colors.foreground }]}>
|
||||
{formatBytes(breakdown.otherSongs.bytes)}
|
||||
</Text>
|
||||
<Pressable
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Remove Other Downloaded Songs"
|
||||
onPress={() =>
|
||||
confirm(
|
||||
"Remove Other Downloaded Songs?",
|
||||
() => void queue.removeOtherSongs()
|
||||
)
|
||||
}
|
||||
>
|
||||
<Ionicons
|
||||
name="trash-outline"
|
||||
size={20}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
) : null}
|
||||
<Button
|
||||
title="Remove All Downloads"
|
||||
variant="destructive"
|
||||
onPress={() =>
|
||||
confirm("Remove all downloads?", () => void queue.removeAll())
|
||||
}
|
||||
/>
|
||||
</SettingsCard>
|
||||
) : null}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
function LibrarySection() {
|
||||
const updateLibrary = useAction(api.actions.updateLibrary)
|
||||
const cleanupHlsStreams = useAction(api.actions.adminCleanupHlsStreams)
|
||||
@@ -1182,31 +874,6 @@ const styles = StyleSheet.create({
|
||||
divider: {
|
||||
height: StyleSheet.hairlineWidth,
|
||||
},
|
||||
storageBar: {
|
||||
height: 8,
|
||||
borderRadius: 4,
|
||||
overflow: "hidden",
|
||||
flexDirection: "row",
|
||||
},
|
||||
storageRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.md,
|
||||
minHeight: 36,
|
||||
},
|
||||
storageDot: { width: 8, height: 8, borderRadius: 4 },
|
||||
storageSize: {
|
||||
minWidth: 56,
|
||||
textAlign: "right",
|
||||
fontSize: 13,
|
||||
fontVariant: ["tabular-nums"],
|
||||
},
|
||||
collectionMeta: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
flexWrap: "wrap",
|
||||
gap: 4,
|
||||
},
|
||||
optionRow: {
|
||||
borderWidth: 1,
|
||||
borderRadius: radius.lg,
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
export { default } from "../../home/downloads"
|
||||
@@ -1 +0,0 @@
|
||||
export { default } from "../../home/downloads/other"
|
||||
@@ -30,11 +30,6 @@ 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"] }) {
|
||||
@@ -56,7 +51,6 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
|
||||
clock: "time",
|
||||
sparkles: "sparkles",
|
||||
star: "star",
|
||||
"arrow.down.circle": "arrow-down-circle",
|
||||
}
|
||||
return (
|
||||
<Ionicons
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
export { default } from "../../home/downloads"
|
||||
@@ -1 +0,0 @@
|
||||
export { default } from "../../home/downloads/other"
|
||||
@@ -17,7 +17,6 @@ import { useEffect, useSyncExternalStore } from "react"
|
||||
import { AppIntentBridge } from "@/components/app-intent-bridge"
|
||||
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
|
||||
import { AddToPlaylistProvider } from "@/contexts/add-to-playlist"
|
||||
import { DownloadsProvider } from "@/contexts/downloads"
|
||||
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
||||
import { FavoritesProvider } from "@/contexts/favorites"
|
||||
import { PlaybackProvider } from "@/contexts/playback"
|
||||
@@ -76,70 +75,68 @@ export default function AppLayout() {
|
||||
<PlaybackProvider>
|
||||
<AppNavigationSync />
|
||||
<AddToPlaylistProvider>
|
||||
<DownloadsProvider>
|
||||
<FavoritesProvider>
|
||||
<AppIntentBridge />
|
||||
<Stack screenOptions={stackOptions}>
|
||||
<Stack.Screen
|
||||
name="(tabs)"
|
||||
options={{ headerShown: false, animation: "none" }}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="settings"
|
||||
options={{
|
||||
headerShown: Platform.OS === "android",
|
||||
title: "Settings",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="create-account"
|
||||
options={{
|
||||
title: "Create account",
|
||||
presentation: "modal",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="playlist-cover"
|
||||
options={{
|
||||
title: "Cover",
|
||||
headerTitleAlign: "center",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerShadowVisible: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="player"
|
||||
options={{
|
||||
headerShown: false,
|
||||
// Keep the library visible behind the custom swipe animation.
|
||||
presentation: "transparentModal",
|
||||
contentStyle: { backgroundColor: "transparent" },
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
fullScreenGestureEnabled: true,
|
||||
}}
|
||||
/>
|
||||
</Stack>
|
||||
</FavoritesProvider>
|
||||
</DownloadsProvider>
|
||||
<FavoritesProvider>
|
||||
<AppIntentBridge />
|
||||
<Stack screenOptions={stackOptions}>
|
||||
<Stack.Screen
|
||||
name="(tabs)"
|
||||
options={{ headerShown: false, animation: "none" }}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="settings"
|
||||
options={{
|
||||
headerShown: Platform.OS === "android",
|
||||
title: "Settings",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="create-account"
|
||||
options={{
|
||||
title: "Create account",
|
||||
presentation: "modal",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="playlist-cover"
|
||||
options={{
|
||||
title: "Cover",
|
||||
headerTitleAlign: "center",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerShadowVisible: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="player"
|
||||
options={{
|
||||
headerShown: false,
|
||||
// Keep the library visible behind the custom swipe animation.
|
||||
presentation: "transparentModal",
|
||||
contentStyle: { backgroundColor: "transparent" },
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
fullScreenGestureEnabled: true,
|
||||
}}
|
||||
/>
|
||||
</Stack>
|
||||
</FavoritesProvider>
|
||||
</AddToPlaylistProvider>
|
||||
</PlaybackProvider>
|
||||
</ConvexAuthRecovery>
|
||||
|
||||
@@ -11,7 +11,6 @@ import {
|
||||
} from "react-native"
|
||||
|
||||
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
|
||||
import { downloadedCoverUri } from "@/lib/downloads"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import {
|
||||
@@ -67,7 +66,6 @@ export const CoverImage = memo(function CoverImage({
|
||||
contentFit = "cover",
|
||||
blurRadius,
|
||||
placeholderVariant = "icon",
|
||||
placeholderIcon = "musical-note",
|
||||
}: {
|
||||
uri: string
|
||||
hasCover: boolean
|
||||
@@ -75,7 +73,6 @@ export const CoverImage = memo(function CoverImage({
|
||||
contentFit?: ImageContentFit
|
||||
blurRadius?: number
|
||||
placeholderVariant?: "icon" | "solid"
|
||||
placeholderIcon?: keyof typeof Ionicons.glyphMap
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const flatStyle = useMemo(() => StyleSheet.flatten(style) ?? {}, [style])
|
||||
@@ -84,12 +81,6 @@ export const CoverImage = memo(function CoverImage({
|
||||
[flatStyle, hasCover, uri]
|
||||
)
|
||||
const source = useMemo(() => ({ uri: sourceUri }), [sourceUri])
|
||||
// A downloaded cover shows while the network copy loads, and offline.
|
||||
const savedUri = hasCover ? downloadedCoverUri(uri) : null
|
||||
const placeholder = useMemo(
|
||||
() => (savedUri ? { uri: savedUri } : undefined),
|
||||
[savedUri]
|
||||
)
|
||||
|
||||
if (!hasCover) {
|
||||
return (
|
||||
@@ -102,7 +93,7 @@ export const CoverImage = memo(function CoverImage({
|
||||
>
|
||||
{placeholderVariant === "icon" ? (
|
||||
<Ionicons
|
||||
name={placeholderIcon}
|
||||
name="musical-note"
|
||||
size={placeholderIconSize(flatStyle)}
|
||||
color={colors.coverPlaceholderIcon}
|
||||
/>
|
||||
@@ -116,8 +107,6 @@ export const CoverImage = memo(function CoverImage({
|
||||
source={source}
|
||||
style={[style, { backgroundColor: colors.coverPlaceholder }]}
|
||||
contentFit={contentFit}
|
||||
placeholder={placeholder}
|
||||
placeholderContentFit={contentFit}
|
||||
transition={150}
|
||||
blurRadius={blurRadius}
|
||||
onLoad={
|
||||
|
||||
@@ -1,156 +0,0 @@
|
||||
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 },
|
||||
})
|
||||
@@ -20,7 +20,6 @@ import {
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { MediaContextMenu } from "@/components/media-context-menu"
|
||||
import { useIsCollectionDownloaded } from "@/contexts/downloads"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
@@ -52,7 +51,6 @@ export const AlbumCard = memo(function AlbumCard({
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
|
||||
const downloaded = useIsCollectionDownloaded({ kind: "album", id: album.id })
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
@@ -104,7 +102,6 @@ export const AlbumCard = memo(function AlbumCard({
|
||||
hasArtwork: album.cover != null,
|
||||
}}
|
||||
favorited={isAlbumFavorite(album.id)}
|
||||
downloaded={downloaded}
|
||||
stationArtistId={album.artist.id}
|
||||
navigation={{ artist: { id: album.artist.id } }}
|
||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||
@@ -190,10 +187,6 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handlePlaylistAction } = useMediaMenuActions()
|
||||
const downloaded = useIsCollectionDownloaded({
|
||||
kind: "playlist",
|
||||
id: playlist.id,
|
||||
})
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
@@ -242,7 +235,6 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
return (
|
||||
<MediaContextMenu
|
||||
showFavorite={false}
|
||||
downloaded={downloaded}
|
||||
share={{
|
||||
type: "playlist",
|
||||
playlistId: playlist.id,
|
||||
|
||||
@@ -35,8 +35,6 @@ export type MediaAction =
|
||||
| "remove-from-playlist"
|
||||
| "change-cover"
|
||||
| "delete-playlist"
|
||||
| "download"
|
||||
| "remove-download"
|
||||
|
||||
export type MediaNavigation = {
|
||||
artist?: { id: string }
|
||||
@@ -62,8 +60,6 @@ export type MediaMenuConfig = {
|
||||
stationArtistId?: string
|
||||
navigation?: MediaNavigation
|
||||
share?: MediaShareContext
|
||||
/** Shows Download, or Remove Download when true. Omit to hide both. */
|
||||
downloaded?: boolean
|
||||
includeActions?: MediaAction[]
|
||||
onAction: (action: MediaAction) => void
|
||||
}
|
||||
@@ -77,39 +73,33 @@ const QUEUE_ACTIONS: MediaAction[] = ["play-next", "play-last", "shuffle"]
|
||||
|
||||
const MEDIA_ACTION_ITEMS: {
|
||||
action: MediaAction
|
||||
label: (favorited: boolean | undefined, playlistLabel: string) => string
|
||||
label: (
|
||||
countSuffix: string,
|
||||
favorited: boolean | undefined,
|
||||
playlistLabel: string
|
||||
) => string
|
||||
image: NonNullable<MenuAction["image"]> & string
|
||||
destructive?: boolean
|
||||
}[] = [
|
||||
{
|
||||
action: "playlist",
|
||||
label: (_favorited, playlistLabel) => playlistLabel,
|
||||
label: (countSuffix, _favorited, playlistLabel) =>
|
||||
`${playlistLabel}${countSuffix}`,
|
||||
image: "text.badge.plus",
|
||||
},
|
||||
{
|
||||
action: "download",
|
||||
label: () => "Download",
|
||||
image: "arrow.down.circle",
|
||||
},
|
||||
{
|
||||
action: "remove-download",
|
||||
label: () => "Remove Download",
|
||||
image: "xmark.circle",
|
||||
destructive: true,
|
||||
},
|
||||
{
|
||||
action: "play-next",
|
||||
label: () => "Play Next",
|
||||
label: (countSuffix) => `Play Next${countSuffix}`,
|
||||
image: "text.line.first.and.arrowtriangle.forward",
|
||||
},
|
||||
{
|
||||
action: "play-last",
|
||||
label: () => "Play Last",
|
||||
label: (countSuffix) => `Play Last${countSuffix}`,
|
||||
image: "text.line.last.and.arrowtriangle.forward",
|
||||
},
|
||||
{
|
||||
action: "shuffle",
|
||||
label: () => "Shuffle",
|
||||
label: (countSuffix) => `Shuffle${countSuffix}`,
|
||||
image: "shuffle",
|
||||
},
|
||||
{
|
||||
@@ -129,7 +119,8 @@ const MEDIA_ACTION_ITEMS: {
|
||||
},
|
||||
{
|
||||
action: "favorite",
|
||||
label: (favorited) => (favorited ? "Unfavorite" : "Favorite"),
|
||||
label: (countSuffix, favorited) =>
|
||||
`${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`,
|
||||
image: "star",
|
||||
},
|
||||
{
|
||||
@@ -162,14 +153,6 @@ function isActionIncluded(
|
||||
return config.showRemoveFromPlaylist === true
|
||||
}
|
||||
|
||||
if (action === "download") {
|
||||
return config.downloaded === false
|
||||
}
|
||||
|
||||
if (action === "remove-download") {
|
||||
return config.downloaded === true
|
||||
}
|
||||
|
||||
if (config.includeActions) {
|
||||
return config.includeActions.includes(action)
|
||||
}
|
||||
@@ -200,7 +183,12 @@ function isActionIncluded(
|
||||
export function buildMediaMenuActions(
|
||||
config: Omit<MediaMenuConfig, "onAction">
|
||||
): MenuAction[] {
|
||||
const { favorited, playlistLabel = "Add to Playlist" } = config
|
||||
const {
|
||||
selectedCount = 1,
|
||||
favorited,
|
||||
playlistLabel = "Add to Playlist",
|
||||
} = config
|
||||
const countSuffix = selectedCount > 1 ? ` (${selectedCount})` : ""
|
||||
|
||||
const actions: MenuAction[] = []
|
||||
|
||||
@@ -219,7 +207,7 @@ export function buildMediaMenuActions(
|
||||
|
||||
actions.push({
|
||||
id: item.action,
|
||||
title: item.label(favorited, playlistLabel),
|
||||
title: item.label(countSuffix, favorited, playlistLabel),
|
||||
image: item.action === "favorite" && favorited ? "star.fill" : item.image,
|
||||
...(item.destructive ? { attributes: { destructive: true } } : {}),
|
||||
})
|
||||
|
||||
@@ -28,8 +28,6 @@ const actionIcons = {
|
||||
"remove-from-playlist": "remove-circle-outline",
|
||||
"change-cover": "image-outline",
|
||||
"delete-playlist": "trash-outline",
|
||||
download: "arrow-down-circle-outline",
|
||||
"remove-download": "close-circle-outline",
|
||||
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
|
||||
|
||||
// The community MenuView creates a dynamic-color Host internally. Own this
|
||||
|
||||
@@ -1,109 +0,0 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import {
|
||||
connectivityStore,
|
||||
type PlatformNetwork,
|
||||
} from "@otunes/convex/client/connectivity"
|
||||
import { useConvex } from "convex/react"
|
||||
import {
|
||||
addNetworkStateListener,
|
||||
getNetworkStateAsync,
|
||||
type NetworkState,
|
||||
} from "expo-network"
|
||||
import { useTheme } from "expo-router"
|
||||
import { useContext, useSyncExternalStore } from "react"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
import { TabletSectionContext } from "@/lib/tablet-navigation"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
let deviceOnline = true
|
||||
|
||||
/** The device's network state. Unknown reachability counts as online. */
|
||||
const deviceNetwork: PlatformNetwork = {
|
||||
isOnline: () => deviceOnline,
|
||||
subscribe(onChange) {
|
||||
const apply = (state: NetworkState) => {
|
||||
deviceOnline =
|
||||
state.isConnected !== false && state.isInternetReachable !== false
|
||||
onChange()
|
||||
}
|
||||
const subscription = addNetworkStateListener(apply)
|
||||
void getNetworkStateAsync().then(apply)
|
||||
return () => subscription.remove()
|
||||
},
|
||||
}
|
||||
|
||||
/** True while the device has no network or the server can't be reached. */
|
||||
export function useIsOffline() {
|
||||
const store = connectivityStore(useConvex(), deviceNetwork)
|
||||
return useSyncExternalStore(store.subscribe, store.getSnapshot)
|
||||
}
|
||||
|
||||
type ScreenRoute = { name: string; params?: object }
|
||||
|
||||
/** Downloads screens, and albums and playlists opened from them, stay usable offline. */
|
||||
function worksOffline(route: ScreenRoute, tabletSection: string | undefined) {
|
||||
if (route.name.startsWith("downloads/")) return true
|
||||
if (route.name === "index" && tabletSection === "downloads") return true
|
||||
// Settings stays reachable so an unreachable server can be changed.
|
||||
if (route.name === "settings") return true
|
||||
return (route.params as { from?: string } | undefined)?.from === "downloads"
|
||||
}
|
||||
|
||||
/**
|
||||
* Covers a tab screen with a no-connection message while offline. The screen
|
||||
* stays mounted underneath so it picks up where it was once the server is back.
|
||||
*/
|
||||
export function OfflineOverlay({ route }: { route: ScreenRoute }) {
|
||||
const offline = useIsOffline()
|
||||
const tabletSection = useContext(TabletSectionContext)?.name
|
||||
const { push } = useAppNavigation()
|
||||
const { colors: routerColors } = useTheme()
|
||||
const colors = useThemeColors()
|
||||
|
||||
if (!offline || worksOffline(route, tabletSection)) return null
|
||||
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
StyleSheet.absoluteFill,
|
||||
styles.overlay,
|
||||
{ backgroundColor: routerColors.background },
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
name="cloud-offline-outline"
|
||||
size={28}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
<Text style={[styles.title, { color: routerColors.text }]}>
|
||||
No connection
|
||||
</Text>
|
||||
<Text style={[styles.body, { color: colors.mutedForeground }]}>
|
||||
Your downloads still play.
|
||||
</Text>
|
||||
<Pressable
|
||||
accessibilityRole="link"
|
||||
hitSlop={spacing.sm}
|
||||
onPress={() => push("/downloads")}
|
||||
>
|
||||
<Text style={[styles.link, { color: colors.primary }]}>
|
||||
Go to Downloads
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
overlay: {
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: spacing.sm,
|
||||
padding: spacing.lg,
|
||||
},
|
||||
title: { fontSize: 17, fontWeight: "600", marginTop: spacing.xs },
|
||||
body: { fontSize: 15, textAlign: "center" },
|
||||
link: { fontSize: 15, fontWeight: "600", marginTop: spacing.xs },
|
||||
})
|
||||
@@ -3,12 +3,6 @@ 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"
|
||||
@@ -39,7 +33,6 @@ export const SongRow = memo(function SongRow({
|
||||
palette,
|
||||
inset = false,
|
||||
swipe,
|
||||
downloadFrom,
|
||||
}: {
|
||||
song: BrowseSong
|
||||
onPress?: () => void
|
||||
@@ -57,14 +50,9 @@ export const SongRow = memo(function SongRow({
|
||||
}
|
||||
/** Album/playlist layout: the divider starts at the title, not the artwork. */
|
||||
inset?: boolean
|
||||
/** The download this row belongs to; removing only takes it out of that. */
|
||||
downloadFrom?: DownloadSource
|
||||
}) {
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const downloadState = useSongDownloadState(song.id, downloadFrom)
|
||||
const downloaded = downloadState === "here"
|
||||
const toggleDownload = useToggleSongDownload()
|
||||
if (!config) return null
|
||||
|
||||
const foreground = palette?.foreground ?? colors.foreground
|
||||
@@ -88,14 +76,6 @@ 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>
|
||||
@@ -129,8 +109,6 @@ export const SongRow = memo(function SongRow({
|
||||
onPlayNext={swipe.onPlayNext}
|
||||
onAddToQueue={swipe.onAddToQueue}
|
||||
onRemove={swipe.onRemove}
|
||||
downloaded={downloaded}
|
||||
onDownload={() => toggleDownload(song, downloaded, downloadFrom)}
|
||||
backgroundColor={swipe.backgroundColor}
|
||||
onPress={onPress}
|
||||
style={rowStyle}
|
||||
@@ -177,7 +155,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
inset,
|
||||
swipe,
|
||||
removable,
|
||||
downloadFrom,
|
||||
onPlay,
|
||||
onAction,
|
||||
}: {
|
||||
@@ -195,13 +172,10 @@ export const SongListRow = memo(function SongListRow({
|
||||
}
|
||||
/** Shows "Remove from Playlist" in the context menu. */
|
||||
removable?: boolean
|
||||
/** The download this row belongs to; removing only takes it out of that. */
|
||||
downloadFrom?: DownloadSource
|
||||
onPlay: (song: BrowseSong) => void
|
||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||
}) {
|
||||
const { config } = useServerConfig()
|
||||
const downloaded = useSongDownloadState(song.id, downloadFrom) === "here"
|
||||
const handlePress = useCallback(() => onPlay(song), [onPlay, song])
|
||||
|
||||
return (
|
||||
@@ -210,7 +184,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
palette={palette}
|
||||
inset={inset}
|
||||
swipe={swipe}
|
||||
downloadFrom={downloadFrom}
|
||||
onPress={handlePress}
|
||||
contextMenu={{
|
||||
preview: config
|
||||
@@ -225,7 +198,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
: undefined,
|
||||
stationArtistId: song.artist.id,
|
||||
favorited,
|
||||
downloaded,
|
||||
playlistLabel,
|
||||
showRemoveFromPlaylist: removable,
|
||||
navigation: {
|
||||
|
||||
@@ -42,8 +42,7 @@ function impact() {
|
||||
/**
|
||||
* A tap competes with the swipe so dragging a moving row never starts playback.
|
||||
* A full swipe commits the outer action: Add to Queue on the leading side, and
|
||||
* Remove on the trailing side when `onRemove` is set, else Download. Download
|
||||
* turns into a red Remove Download once `downloaded`.
|
||||
* Remove on the trailing side when `onRemove` is set.
|
||||
*/
|
||||
export function SongSwipeRow({
|
||||
children,
|
||||
@@ -54,8 +53,6 @@ export function SongSwipeRow({
|
||||
onPlayNext,
|
||||
onAddToQueue,
|
||||
onRemove,
|
||||
onDownload,
|
||||
downloaded = false,
|
||||
}: {
|
||||
children: ReactNode
|
||||
style?: StyleProp<ViewStyle>
|
||||
@@ -65,8 +62,6 @@ export function SongSwipeRow({
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
onDownload?: () => void
|
||||
downloaded?: boolean
|
||||
}) {
|
||||
const hasRemove = !!onRemove
|
||||
const trailingWidth = hasRemove ? PAIRED_ACTION_WIDTH * 2 : ACTION_WIDTH
|
||||
@@ -100,10 +95,10 @@ export function SongSwipeRow({
|
||||
(side: number) => {
|
||||
close()
|
||||
if (side > 0) onAddToQueue()
|
||||
else if (onRemove) onRemove()
|
||||
else onDownload?.()
|
||||
// Without Remove, the trailing action is the Download placeholder.
|
||||
else onRemove?.()
|
||||
},
|
||||
[close, onAddToQueue, onRemove, onDownload]
|
||||
[close, onAddToQueue, onRemove]
|
||||
)
|
||||
const tapRow = useCallback(() => {
|
||||
if (open) close()
|
||||
@@ -238,7 +233,6 @@ export function SongSwipeRow({
|
||||
side={-1}
|
||||
paired={hasRemove}
|
||||
remove={hasRemove}
|
||||
downloaded={downloaded}
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
@@ -250,15 +244,11 @@ export function SongSwipeRow({
|
||||
side={-1}
|
||||
secondary
|
||||
paired
|
||||
downloaded={downloaded}
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => {
|
||||
close()
|
||||
onDownload?.()
|
||||
}}
|
||||
onPress={close}
|
||||
/>
|
||||
)}
|
||||
<GestureDetector gesture={gesture}>
|
||||
@@ -269,10 +259,7 @@ export function SongSwipeRow({
|
||||
accessibilityActions={[
|
||||
{ name: "addToQueue", label: "Add to Queue" },
|
||||
{ name: "playNext", label: "Play Next" },
|
||||
{
|
||||
name: "download",
|
||||
label: downloaded ? "Remove Download" : "Download",
|
||||
},
|
||||
{ name: "download", label: "Download" },
|
||||
...(hasRemove
|
||||
? [{ name: "remove", label: "Remove from Playlist" }]
|
||||
: []),
|
||||
@@ -280,10 +267,6 @@ export function SongSwipeRow({
|
||||
onAccessibilityAction={(event) => {
|
||||
if (event.nativeEvent.actionName === "remove") activate(-1)
|
||||
if (event.nativeEvent.actionName === "addToQueue") activate(1)
|
||||
if (event.nativeEvent.actionName === "download") {
|
||||
close()
|
||||
onDownload?.()
|
||||
}
|
||||
if (event.nativeEvent.actionName === "playNext") {
|
||||
close()
|
||||
onPlayNext()
|
||||
@@ -307,7 +290,6 @@ function SwipeAction({
|
||||
secondary = false,
|
||||
paired = side > 0,
|
||||
remove = false,
|
||||
downloaded = false,
|
||||
x,
|
||||
height,
|
||||
progress,
|
||||
@@ -318,8 +300,6 @@ function SwipeAction({
|
||||
secondary?: boolean
|
||||
paired?: boolean
|
||||
remove?: boolean
|
||||
/** Shows the download action as Remove Download. */
|
||||
downloaded?: boolean
|
||||
x: SharedValue<number>
|
||||
height: SharedValue<number>
|
||||
progress: SharedValue<number>
|
||||
@@ -390,8 +370,6 @@ function SwipeAction({
|
||||
},
|
||||
],
|
||||
}))
|
||||
const removesDownload = side < 0 && !remove && downloaded
|
||||
const destructive = remove || removesDownload
|
||||
return (
|
||||
<Animated.View
|
||||
pointerEvents={open ? "auto" : "none"}
|
||||
@@ -408,13 +386,11 @@ function SwipeAction({
|
||||
accessibilityLabel={
|
||||
remove
|
||||
? "Remove from Playlist"
|
||||
: removesDownload
|
||||
? "Remove Download"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "Play Next"
|
||||
: "Add to Queue"
|
||||
: "Download"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "Play Next"
|
||||
: "Add to Queue"
|
||||
: "Download"
|
||||
}
|
||||
onPress={onPress}
|
||||
style={styles.actionButton}
|
||||
@@ -423,7 +399,7 @@ function SwipeAction({
|
||||
style={[
|
||||
styles.pill,
|
||||
{
|
||||
backgroundColor: destructive
|
||||
backgroundColor: remove
|
||||
? IS_ANDROID
|
||||
? "#d32f2f"
|
||||
: "#ff3b30"
|
||||
@@ -440,7 +416,7 @@ function SwipeAction({
|
||||
{IS_ANDROID ? (
|
||||
<Ionicons
|
||||
name={
|
||||
destructive
|
||||
remove
|
||||
? "trash-outline"
|
||||
: side < 0
|
||||
? "arrow-down"
|
||||
@@ -454,7 +430,7 @@ function SwipeAction({
|
||||
) : (
|
||||
<SymbolView
|
||||
name={
|
||||
destructive
|
||||
remove
|
||||
? "trash"
|
||||
: side > 0
|
||||
? secondary
|
||||
|
||||
@@ -5,46 +5,16 @@ import type { ReactNode } from "react"
|
||||
|
||||
import { useTabletBackgroundStyle } from "@/contexts/android-tab-theme"
|
||||
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
|
||||
import { OfflineOverlay } from "@/components/offline-overlay"
|
||||
import { TabletSidebar } from "@/components/tablet-sidebar"
|
||||
|
||||
type ScreenRoute = { name: string; params?: object }
|
||||
|
||||
/**
|
||||
* Screen content with the no-connection overlay layered on top. A fragment
|
||||
* keeps the scroll view as the screen's first subview for large titles.
|
||||
*/
|
||||
function ScreenBody({
|
||||
route,
|
||||
children,
|
||||
}: {
|
||||
route: ScreenRoute
|
||||
children: ReactNode
|
||||
}) {
|
||||
return (
|
||||
<>
|
||||
{children}
|
||||
<OfflineOverlay route={route} />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
/** Apply sidebar insets natively, before Yoga measures the content pane. */
|
||||
export function TabScreenContent({
|
||||
route,
|
||||
children,
|
||||
}: {
|
||||
route: ScreenRoute
|
||||
children: ReactNode
|
||||
}) {
|
||||
export function TabScreenContent({ children }: { children: ReactNode }) {
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
if (Platform.OS !== "ios" || !Platform.isPad) {
|
||||
return <ScreenBody route={route}>{children}</ScreenBody>
|
||||
}
|
||||
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
|
||||
return (
|
||||
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||
<SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}>
|
||||
<ScreenBody route={route}>{children}</ScreenBody>
|
||||
{children}
|
||||
</SafeAreaView>
|
||||
<TabletSidebar />
|
||||
<TabletPlayerLayoutSync />
|
||||
@@ -52,13 +22,6 @@ export function TabScreenContent({
|
||||
)
|
||||
}
|
||||
|
||||
/** `screenLayout` for every tab stack. */
|
||||
export function renderTabScreenContent({
|
||||
route,
|
||||
children,
|
||||
}: {
|
||||
route: ScreenRoute
|
||||
children: ReactNode
|
||||
}) {
|
||||
return <TabScreenContent route={route}>{children}</TabScreenContent>
|
||||
export function renderTabScreenContent({ children }: { children: ReactNode }) {
|
||||
return <TabScreenContent>{children}</TabScreenContent>
|
||||
}
|
||||
@@ -1,484 +0,0 @@
|
||||
import { useConvex, useQuery } from "convex/react"
|
||||
import {
|
||||
createContext,
|
||||
useCallback,
|
||||
useContext,
|
||||
useEffect,
|
||||
useMemo,
|
||||
useState,
|
||||
useSyncExternalStore,
|
||||
type ReactNode,
|
||||
} from "react"
|
||||
import {
|
||||
Alert,
|
||||
Modal,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Switch,
|
||||
Text,
|
||||
View,
|
||||
} from "react-native"
|
||||
import { toast } from "sonner-native"
|
||||
|
||||
import { AndroidSheet } from "@/components/android-sheet"
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { useCacheScope } from "@/contexts/persistent-cache"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { getAuthCookieHeader } from "@/lib/auth-cookies"
|
||||
import {
|
||||
downloadQueueFor,
|
||||
readRememberedDownloadQuality,
|
||||
writeRememberedDownloadQuality,
|
||||
} from "@/lib/downloads"
|
||||
import { loadPlaybackSongs } from "@/lib/playback-files"
|
||||
import type { ServerConfig } from "@/lib/server-config"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type {
|
||||
CollectionRef,
|
||||
DownloadableSong,
|
||||
DownloadSource,
|
||||
DownloadQueue,
|
||||
SongDownloadState,
|
||||
} from "@otunes/convex/client/download-queue"
|
||||
import { FAVORITES_ID } from "@otunes/convex/client/download-queue"
|
||||
import {
|
||||
DOWNLOAD_OPTIONS_PATH,
|
||||
DOWNLOAD_QUALITY_DETAILS,
|
||||
DOWNLOAD_QUALITY_LABELS,
|
||||
formatBytes,
|
||||
type DownloadOptionsResponse,
|
||||
type DownloadQuality,
|
||||
type SizedDownloadOption,
|
||||
} from "@otunes/convex/download-quality"
|
||||
|
||||
/** Songs on their own, or an album or playlist that stays downloaded as a whole. */
|
||||
export type DownloadTarget =
|
||||
| {
|
||||
kind: "songs"
|
||||
songIds: string[]
|
||||
title: string
|
||||
/** Removing takes the songs out of only this download. */
|
||||
from?: DownloadSource
|
||||
}
|
||||
| (CollectionRef & { title: string; songIds: string[] })
|
||||
|
||||
/** The Favorites playlist has no ID, so downloads use this one. */
|
||||
export const FAVORITES_DOWNLOAD_ID = FAVORITES_ID
|
||||
|
||||
type DownloadsContextValue = {
|
||||
queue: DownloadQueue | null
|
||||
/** Asks for a quality (unless remembered) and starts downloading. */
|
||||
requestDownload: (target: DownloadTarget) => Promise<void>
|
||||
removeDownload: (target: DownloadTarget) => Promise<void>
|
||||
}
|
||||
|
||||
const DownloadsContext = createContext<DownloadsContextValue | null>(null)
|
||||
|
||||
export function useDownloads() {
|
||||
const context = useContext(DownloadsContext)
|
||||
if (!context) {
|
||||
throw new Error("useDownloads must be used within DownloadsProvider")
|
||||
}
|
||||
return context
|
||||
}
|
||||
|
||||
const noopSubscribe = () => () => {}
|
||||
|
||||
/** Re-renders on every download change. Prefer the narrower hooks in lists. */
|
||||
export function useDownloadsVersion() {
|
||||
const { queue } = useDownloads()
|
||||
return useSyncExternalStore(
|
||||
queue?.subscribe ?? noopSubscribe,
|
||||
() => queue?.getVersion() ?? 0
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* A song's download state as seen from `from` (see `downloadState`). Only
|
||||
* re-renders when that state changes.
|
||||
*/
|
||||
export function useSongDownloadState(
|
||||
songId: string,
|
||||
from?: DownloadSource
|
||||
): SongDownloadState {
|
||||
const { queue } = useDownloads()
|
||||
return useSyncExternalStore(
|
||||
queue?.subscribe ?? noopSubscribe,
|
||||
() => queue?.downloadState(songId, from) ?? "none"
|
||||
)
|
||||
}
|
||||
|
||||
/** Whether an album or playlist is downloaded. */
|
||||
export function useIsCollectionDownloaded(ref: CollectionRef) {
|
||||
const { queue } = useDownloads()
|
||||
return useSyncExternalStore(
|
||||
queue?.subscribe ?? noopSubscribe,
|
||||
() => queue?.getCollection(ref) !== undefined
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* For swipe actions: downloads a song, or asks before removing its download
|
||||
* (from `from` only, when given).
|
||||
*/
|
||||
export function useToggleSongDownload() {
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
return useCallback(
|
||||
(
|
||||
song: { id: string; title: string },
|
||||
downloaded: boolean,
|
||||
from?: DownloadSource
|
||||
) => {
|
||||
const target = {
|
||||
kind: "songs" as const,
|
||||
songIds: [song.id],
|
||||
title: song.title,
|
||||
from,
|
||||
}
|
||||
if (!downloaded) {
|
||||
void requestDownload(target)
|
||||
return
|
||||
}
|
||||
Alert.alert("Remove download?", song.title, [
|
||||
{ text: "Cancel", style: "cancel" },
|
||||
{
|
||||
text: "Remove",
|
||||
style: "destructive",
|
||||
onPress: () => void removeDownload(target),
|
||||
},
|
||||
])
|
||||
},
|
||||
[requestDownload, removeDownload]
|
||||
)
|
||||
}
|
||||
|
||||
async function fetchDownloadOptions(config: ServerConfig, songIds: string[]) {
|
||||
const cookieHeader = await getAuthCookieHeader(
|
||||
config.serverUrl,
|
||||
config.convexUrl
|
||||
)
|
||||
if (!cookieHeader) throw new Error("Sign in to download")
|
||||
const response = await fetch(`${config.serverUrl}${DOWNLOAD_OPTIONS_PATH}`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json", Cookie: cookieHeader },
|
||||
body: JSON.stringify({
|
||||
songIds,
|
||||
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
|
||||
}),
|
||||
})
|
||||
if (!response.ok) {
|
||||
throw new Error("Could not reach the server to download")
|
||||
}
|
||||
return (await response.json()) as DownloadOptionsResponse
|
||||
}
|
||||
|
||||
function startDownload(
|
||||
queue: DownloadQueue,
|
||||
target: DownloadTarget,
|
||||
songs: DownloadableSong[],
|
||||
quality: DownloadQuality
|
||||
) {
|
||||
if (target.kind === "songs") return queue.enqueue(songs, quality)
|
||||
return queue.downloadCollection(
|
||||
{ kind: target.kind, id: target.id, title: target.title, quality },
|
||||
songs
|
||||
)
|
||||
}
|
||||
|
||||
function optionDetail(option: SizedDownloadOption, songCount: number) {
|
||||
if (option.fallbackCount === 0) {
|
||||
return DOWNLOAD_QUALITY_DETAILS[option.quality]
|
||||
}
|
||||
const included = songCount - option.fallbackCount
|
||||
return `${included} of ${songCount} songs, ${option.fallbackCount} in High`
|
||||
}
|
||||
|
||||
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,
|
||||
},
|
||||
})
|
||||
@@ -24,7 +24,6 @@ import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
import * as playbackQueue from "@otunes/convex/client/playback-queue"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
import { getPlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import { isDownloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import { rememberSongs, useSong, useSongs } from "@/lib/song-cache"
|
||||
import { donateMusicPlay, type MusicEntityKind } from "@/lib/app-intents"
|
||||
import { showError } from "@/lib/toast"
|
||||
@@ -44,9 +43,8 @@ type PlaybackContextValue = {
|
||||
seekTo: (seconds: number) => void
|
||||
waitForPlaybackReady: (playing?: boolean) => Promise<void>
|
||||
setIsPlaying: (playing: boolean) => void
|
||||
/** An origin from `downloadsQueueOrigin` plays downloads in any quality. */
|
||||
playInOrder: (songIds: Id<"songs">[], origin?: string) => Promise<void>
|
||||
playShuffled: (songIds: Id<"songs">[], origin?: string) => Promise<void>
|
||||
playInOrder: (songIds: Id<"songs">[]) => Promise<void>
|
||||
playShuffled: (songIds: Id<"songs">[]) => Promise<void>
|
||||
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
|
||||
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
|
||||
playFromSong: (
|
||||
@@ -247,8 +245,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
const queueOriginRef = useRef<string | undefined>(undefined)
|
||||
const playRequestRef = useRef(0)
|
||||
const [queueStartVersion, setQueueStartVersion] = useState(0)
|
||||
// Queues started from the Downloads page play downloads in any quality.
|
||||
const [fromDownloads, setFromDownloads] = useState(false)
|
||||
|
||||
const queueSongIds = playback.queue
|
||||
const queueHistorySongIds = playback.history
|
||||
@@ -284,7 +280,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
repeatEnabled,
|
||||
currentSong,
|
||||
queueStartVersion,
|
||||
fromDownloads,
|
||||
})
|
||||
|
||||
const { resetProgress } = useProgressPersistence({
|
||||
@@ -315,7 +310,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
queueOriginRef.current =
|
||||
recorded.origin ??
|
||||
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
||||
setFromDownloads(isDownloadsQueueOrigin(recorded.origin))
|
||||
resetQueuePlayback()
|
||||
store.update(playbackQueue.clearQueue)
|
||||
store.update(recipe)
|
||||
@@ -369,11 +363,10 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
)
|
||||
|
||||
const playSongs = useCallback(
|
||||
(shuffled: boolean) => async (songIds: Id<"songs">[], origin?: string) => {
|
||||
(shuffled: boolean) => async (songIds: Id<"songs">[]) => {
|
||||
if (songIds.length === 0) return
|
||||
startPlayback(
|
||||
(state) => playbackQueue.startQueue(state, songIds, shuffled),
|
||||
{ origin }
|
||||
startPlayback((state) =>
|
||||
playbackQueue.startQueue(state, songIds, shuffled)
|
||||
)
|
||||
},
|
||||
[startPlayback]
|
||||
|
||||
@@ -2,9 +2,7 @@ import { useConvex } from "convex/react"
|
||||
import { useCallback } from "react"
|
||||
|
||||
import type { MediaAction } from "@/components/media-context-menu"
|
||||
import type { DownloadSource } from "@otunes/convex/client/download-queue"
|
||||
import { useAddToPlaylist } from "@/contexts/add-to-playlist"
|
||||
import { useDownloads } from "@/contexts/downloads"
|
||||
import { useCacheScope } from "@/contexts/persistent-cache"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions } from "@/contexts/playback"
|
||||
@@ -50,7 +48,6 @@ export function useMediaMenuActions() {
|
||||
} = useFavorites()
|
||||
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
|
||||
usePlaybackActions()
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
|
||||
const runQueueAction = useCallback(
|
||||
async (action: MediaAction, songIds: Id<"songs">[]) => {
|
||||
@@ -74,9 +71,8 @@ export function useMediaMenuActions() {
|
||||
[addToQueueLast, addToQueueNext, playShuffled]
|
||||
)
|
||||
|
||||
/** `from` limits removing a download to that album, playlist, or Other. */
|
||||
const handleSongAction = useCallback(
|
||||
async (song: BrowseSong, action: MediaAction, from?: DownloadSource) => {
|
||||
async (song: BrowseSong, action: MediaAction) => {
|
||||
const songIds = [song.id as Id<"songs">]
|
||||
switch (action) {
|
||||
case "create-station":
|
||||
@@ -101,19 +97,6 @@ export function useMediaMenuActions() {
|
||||
case "go-album":
|
||||
push(`/album/${song.album.id}`)
|
||||
break
|
||||
case "download":
|
||||
case "remove-download": {
|
||||
const target = {
|
||||
kind: "songs" as const,
|
||||
songIds,
|
||||
title: song.title,
|
||||
from,
|
||||
}
|
||||
await (action === "download"
|
||||
? requestDownload(target)
|
||||
: removeDownload(target))
|
||||
break
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
@@ -124,8 +107,6 @@ export function useMediaMenuActions() {
|
||||
runQueueAction,
|
||||
toggleSongFavorite,
|
||||
playArtistShuffled,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
]
|
||||
)
|
||||
|
||||
@@ -157,25 +138,6 @@ export function useMediaMenuActions() {
|
||||
case "go-artist":
|
||||
push(`/artist/${album.artist.id}`)
|
||||
break
|
||||
case "download":
|
||||
case "remove-download": {
|
||||
const songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: album.id as Id<"albums"> }
|
||||
)
|
||||
const target = {
|
||||
kind: "album" as const,
|
||||
id: album.id,
|
||||
title: album.title,
|
||||
songIds,
|
||||
}
|
||||
await (action === "download"
|
||||
? requestDownload(target)
|
||||
: removeDownload(target))
|
||||
break
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
@@ -189,8 +151,6 @@ export function useMediaMenuActions() {
|
||||
push,
|
||||
runQueueAction,
|
||||
toggleAlbumFavorite,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
]
|
||||
)
|
||||
|
||||
@@ -251,38 +211,12 @@ export function useMediaMenuActions() {
|
||||
await runQueueAction(action, songIds)
|
||||
break
|
||||
}
|
||||
case "download":
|
||||
case "remove-download": {
|
||||
const songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getPlaylistSongIds,
|
||||
{ playlistId: playlist.id as Id<"playlists"> }
|
||||
)
|
||||
const target = {
|
||||
kind: "playlist" as const,
|
||||
id: playlist.id,
|
||||
title: playlist.title,
|
||||
songIds,
|
||||
}
|
||||
await (action === "download"
|
||||
? requestDownload(target)
|
||||
: removeDownload(target))
|
||||
break
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
})
|
||||
},
|
||||
[
|
||||
convex,
|
||||
cacheScope,
|
||||
openAddPlaylistToPlaylist,
|
||||
runQueueAction,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
]
|
||||
[convex, cacheScope, openAddPlaylistToPlaylist, runQueueAction]
|
||||
)
|
||||
|
||||
const handleAlbumDetailAction = useCallback(
|
||||
@@ -331,7 +265,7 @@ export function useMediaMenuActions() {
|
||||
cover: album.cover,
|
||||
},
|
||||
}
|
||||
await handleSongAction(song, action, { kind: "album", id: album.id })
|
||||
await handleSongAction(song, action)
|
||||
},
|
||||
[handleSongAction]
|
||||
)
|
||||
|
||||
@@ -18,12 +18,10 @@ import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import { playbackStreamPlan } from "@otunes/convex/playback-stream"
|
||||
import { streamDownloadQuality } from "@otunes/convex/download-quality"
|
||||
import * as playbackQueue from "@otunes/convex/client/playback-queue"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
import type { PlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import { getAuthCookieHeader } from "@/lib/auth-cookies"
|
||||
import { downloadedAudioUri, downloadQueueFor } from "@/lib/downloads"
|
||||
import { loadPlaybackSongs } from "@/lib/playback-files"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { albumCoverUrl, songAudioSource } from "@/lib/urls"
|
||||
@@ -73,7 +71,6 @@ export function useNativePlaylistSync({
|
||||
repeatEnabled,
|
||||
currentSong,
|
||||
queueStartVersion,
|
||||
fromDownloads,
|
||||
}: {
|
||||
store: PlaybackStore
|
||||
queueSongIds: Id<"songs">[]
|
||||
@@ -81,8 +78,6 @@ export function useNativePlaylistSync({
|
||||
repeatEnabled: RepeatMode
|
||||
currentSong: BrowseSong | null
|
||||
queueStartVersion: number
|
||||
/** Plays downloads in any quality, for queues started from Downloads. */
|
||||
fromDownloads: boolean
|
||||
}) {
|
||||
const convex = useConvex()
|
||||
const { config } = useServerConfig()
|
||||
@@ -464,7 +459,7 @@ export function useNativePlaylistSync({
|
||||
}
|
||||
if (!isCurrentLoad()) return
|
||||
|
||||
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${fromDownloads}:${cookieHeader}`
|
||||
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${cookieHeader}`
|
||||
const needsRebuild =
|
||||
loadedLoadKeyRef.current !== loadKey ||
|
||||
nativePlaylistNeedsRebuild(
|
||||
@@ -498,12 +493,7 @@ export function useNativePlaylistSync({
|
||||
}
|
||||
|
||||
const buildSources = async (songIds: Id<"songs">[]) => {
|
||||
const [songs] = await Promise.all([
|
||||
loadPlaybackSongs(convex, cacheScope, songIds),
|
||||
downloadQueueFor(config)
|
||||
.load()
|
||||
.catch(() => {}),
|
||||
])
|
||||
const songs = await loadPlaybackSongs(convex, cacheScope, songIds)
|
||||
const sources = new Map<Id<"songs">, AudioSource>()
|
||||
for (const song of songs) {
|
||||
if (!song) return null
|
||||
@@ -512,18 +502,6 @@ export function useNativePlaylistSync({
|
||||
user.playbackQuality,
|
||||
atmosEnabled(user)
|
||||
)
|
||||
// Downloads stand in for streams in the same quality, and always
|
||||
// play in queues started from Downloads.
|
||||
const download = downloadQueueFor(config).getDownloaded(song.id)
|
||||
const localUri =
|
||||
download &&
|
||||
(fromDownloads || download.quality === streamDownloadQuality(plan))
|
||||
? downloadedAudioUri(config, song.id)
|
||||
: null
|
||||
if (localUri) {
|
||||
sources.set(song.id, { uri: localUri, name: song.title })
|
||||
continue
|
||||
}
|
||||
sources.set(
|
||||
song.id,
|
||||
songAudioSource(
|
||||
@@ -650,7 +628,6 @@ export function useNativePlaylistSync({
|
||||
currentSongId,
|
||||
currentSongSyncKey,
|
||||
destroyPlaylist,
|
||||
fromDownloads,
|
||||
ensurePlaylist,
|
||||
handlePlaybackLoadFailure,
|
||||
historySyncKey,
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
import { useLocalSearchParams } from "expo-router"
|
||||
|
||||
export const OTHER_DOWNLOADS_TITLE = "Other Downloaded Songs"
|
||||
|
||||
/** Route param marking album and playlist screens opened from Downloads. */
|
||||
export const FROM_DOWNLOADS_PARAM = "from=downloads"
|
||||
|
||||
/**
|
||||
* True on album and playlist screens opened from Downloads, where playback
|
||||
* uses the downloads whatever their quality.
|
||||
*/
|
||||
export function useOpenedFromDownloads() {
|
||||
const { from } = useLocalSearchParams<{ from?: string }>()
|
||||
return from === "downloads"
|
||||
}
|
||||
@@ -1,229 +0,0 @@
|
||||
import AsyncStorage from "@react-native-async-storage/async-storage"
|
||||
import { Directory, File, Paths } from "expo-file-system"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import {
|
||||
createDownloadQueue,
|
||||
type DownloadedCover,
|
||||
type DownloadedSong,
|
||||
type DownloadIndex,
|
||||
type DownloadQueue,
|
||||
type DownloadStorage,
|
||||
} from "@otunes/convex/client/download-queue"
|
||||
import {
|
||||
parseDownloadQuality,
|
||||
songDownloadPath,
|
||||
type DownloadQuality,
|
||||
} from "@otunes/convex/download-quality"
|
||||
import { getAuthCookieHeader } from "@/lib/auth-cookies"
|
||||
import type { ServerConfig } from "@/lib/server-config"
|
||||
|
||||
const REMEMBERED_QUALITY_KEY = "otunes.download-quality"
|
||||
const PARTIAL_SUFFIX = ".partial"
|
||||
|
||||
const COVERS_FOLDER = "covers"
|
||||
const COVER_SIZE = 1024
|
||||
|
||||
// Each song is a folder named `<songId>.<quality>.<albumId>` holding one audio
|
||||
// file, named by the server so it keeps the right extension. Folders end in
|
||||
// `.partial` until their download completes. Covers are files named
|
||||
// `<kind>-<id>` in the `covers` folder.
|
||||
function serverDirectory(config: ServerConfig) {
|
||||
const host = config.hostname.replace(/[^a-z0-9.-]/gi, "_")
|
||||
return new Directory(Paths.document, "downloads", host)
|
||||
}
|
||||
|
||||
function songFolderName(song: {
|
||||
songId: string
|
||||
quality: DownloadQuality
|
||||
albumId?: string
|
||||
}) {
|
||||
return [song.songId, song.quality, song.albumId].filter(Boolean).join(".")
|
||||
}
|
||||
|
||||
function parseSongFolder(name: string) {
|
||||
const [songId, rawQuality, albumId, ...rest] = name.split(".")
|
||||
const quality = parseDownloadQuality(rawQuality)
|
||||
if (!songId || !quality || rest.length > 0) return null
|
||||
return { songId, quality, albumId: albumId || undefined }
|
||||
}
|
||||
|
||||
function songFolders(root: Directory) {
|
||||
if (!root.exists) return []
|
||||
return root
|
||||
.list()
|
||||
.filter(
|
||||
(entry): entry is Directory =>
|
||||
entry instanceof Directory && entry.name !== COVERS_FOLDER
|
||||
)
|
||||
}
|
||||
|
||||
function coverFileName({ kind, id }: DownloadedCover) {
|
||||
return `${kind}-${id}`
|
||||
}
|
||||
|
||||
// Saved covers by their server URL, for `downloadedCoverUri`.
|
||||
const savedCoverUris = new Map<string, string>()
|
||||
|
||||
function coverUrl(config: ServerConfig, { kind, id }: DownloadedCover) {
|
||||
return `${config.serverUrl}/api/${kind}/${id}/cover`
|
||||
}
|
||||
|
||||
function audioFile(folder: Directory) {
|
||||
return folder.list().find((entry): entry is File => entry instanceof File)
|
||||
}
|
||||
|
||||
function createStorage(config: ServerConfig): DownloadStorage {
|
||||
const root = serverDirectory(config)
|
||||
const indexFile = new File(root, "index.json")
|
||||
const coversFolder = new Directory(root, COVERS_FOLDER)
|
||||
|
||||
// Remembers the covers saved in earlier launches.
|
||||
if (coversFolder.exists) {
|
||||
for (const entry of coversFolder.list()) {
|
||||
const dash = entry.name.indexOf("-")
|
||||
const kind = entry.name.slice(0, dash)
|
||||
if (entry instanceof File && (kind === "album" || kind === "playlist")) {
|
||||
const cover = { kind, id: entry.name.slice(dash + 1) } as const
|
||||
savedCoverUris.set(coverUrl(config, cover), entry.uri)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function foldersFor(songIds: ReadonlySet<string>) {
|
||||
return songFolders(root).filter((folder) => {
|
||||
const name = folder.name.replace(PARTIAL_SUFFIX, "")
|
||||
const parsed = parseSongFolder(name)
|
||||
return parsed !== null && songIds.has(parsed.songId)
|
||||
})
|
||||
}
|
||||
|
||||
return {
|
||||
async list() {
|
||||
const songs: DownloadedSong[] = []
|
||||
for (const folder of songFolders(root)) {
|
||||
const parsed = parseSongFolder(folder.name)
|
||||
const file = parsed ? audioFile(folder) : undefined
|
||||
if (!parsed || !file) {
|
||||
// Interrupted downloads from an earlier launch.
|
||||
folder.delete()
|
||||
continue
|
||||
}
|
||||
songs.push({ ...parsed, bytes: file.size ?? 0 })
|
||||
}
|
||||
return songs
|
||||
},
|
||||
async save({ songId, requested, quality, albumId }, signal) {
|
||||
const cookieHeader = await getAuthCookieHeader(
|
||||
config.serverUrl,
|
||||
config.convexUrl
|
||||
)
|
||||
if (!cookieHeader) throw new Error("Sign in to download")
|
||||
|
||||
root.create({ intermediates: true, idempotent: true })
|
||||
const name = songFolderName({ songId, quality, albumId })
|
||||
const partial = new Directory(root, `${name}${PARTIAL_SUFFIX}`)
|
||||
if (partial.exists) partial.delete()
|
||||
partial.create()
|
||||
try {
|
||||
const path = songDownloadPath(songId, requested, {
|
||||
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
|
||||
})
|
||||
const file = await File.downloadFileAsync(
|
||||
`${config.serverUrl}${path}`,
|
||||
partial,
|
||||
{ headers: { Cookie: cookieHeader }, signal }
|
||||
)
|
||||
signal.throwIfAborted()
|
||||
partial.rename(name)
|
||||
return file.size ?? 0
|
||||
} catch (error) {
|
||||
if (partial.exists) partial.delete()
|
||||
throw error
|
||||
}
|
||||
},
|
||||
async saveCover(cover) {
|
||||
const file = new File(coversFolder, coverFileName(cover))
|
||||
if (file.exists) return
|
||||
coversFolder.create({ intermediates: true, idempotent: true })
|
||||
const url = coverUrl(config, cover)
|
||||
await File.downloadFileAsync(`${url}?size=${COVER_SIZE}`, file)
|
||||
savedCoverUris.set(url, file.uri)
|
||||
},
|
||||
async pruneCovers(keep) {
|
||||
if (!coversFolder.exists) return
|
||||
const kept = new Set(keep.map(coverFileName))
|
||||
for (const entry of coversFolder.list()) {
|
||||
if (kept.has(entry.name)) continue
|
||||
entry.delete()
|
||||
for (const [url, uri] of savedCoverUris) {
|
||||
if (uri === entry.uri) savedCoverUris.delete(url)
|
||||
}
|
||||
}
|
||||
},
|
||||
async readIndex() {
|
||||
if (indexFile.exists) {
|
||||
try {
|
||||
return JSON.parse(await indexFile.text()) as DownloadIndex
|
||||
} catch {
|
||||
// An unreadable index starts empty.
|
||||
}
|
||||
}
|
||||
return { collections: [], otherSongIds: [] }
|
||||
},
|
||||
async writeIndex(index) {
|
||||
root.create({ intermediates: true, idempotent: true })
|
||||
if (!indexFile.exists) indexFile.create()
|
||||
await indexFile.write(JSON.stringify(index))
|
||||
},
|
||||
async remove(songIds) {
|
||||
for (const folder of foldersFor(new Set(songIds))) folder.delete()
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
const queues = new Map<string, DownloadQueue>()
|
||||
|
||||
/** Downloads are kept per server, since song IDs only mean something there. */
|
||||
export function downloadQueueFor(config: ServerConfig) {
|
||||
let queue = queues.get(config.hostname)
|
||||
if (!queue) {
|
||||
queue = createDownloadQueue(createStorage(config))
|
||||
queues.set(config.hostname, queue)
|
||||
}
|
||||
return queue
|
||||
}
|
||||
|
||||
/** The local file for a downloaded song, for the player to use offline. */
|
||||
export function downloadedAudioUri(config: ServerConfig, songId: string) {
|
||||
const song = downloadQueueFor(config).getDownloaded(songId)
|
||||
if (!song) return null
|
||||
const folder = new Directory(serverDirectory(config), songFolderName(song))
|
||||
return folder.exists ? (audioFile(folder)?.uri ?? null) : null
|
||||
}
|
||||
|
||||
/**
|
||||
* The saved copy of a cover URL (`albumCoverUrl` or `playlistCoverUrl`,
|
||||
* without size), for showing while the network copy loads or fails.
|
||||
*/
|
||||
export function downloadedCoverUri(url: string) {
|
||||
return savedCoverUris.get(url.split("?")[0]) ?? null
|
||||
}
|
||||
|
||||
export async function readRememberedDownloadQuality() {
|
||||
try {
|
||||
return parseDownloadQuality(
|
||||
await AsyncStorage.getItem(REMEMBERED_QUALITY_KEY)
|
||||
)
|
||||
} catch {
|
||||
return undefined
|
||||
}
|
||||
}
|
||||
|
||||
/** Pass undefined to ask every time again. */
|
||||
export async function writeRememberedDownloadQuality(
|
||||
quality: DownloadQuality | undefined
|
||||
) {
|
||||
if (quality) await AsyncStorage.setItem(REMEMBERED_QUALITY_KEY, quality)
|
||||
else await AsyncStorage.removeItem(REMEMBERED_QUALITY_KEY)
|
||||
}
|
||||
@@ -13,8 +13,6 @@ export const tabStackScreenTitles: Record<string, string> = {
|
||||
"recently-played": "Recently Played",
|
||||
"recently-added": "Recently Added",
|
||||
settings: "Settings",
|
||||
"downloads/index": "Downloads",
|
||||
"downloads/other": "Other Downloaded Songs",
|
||||
}
|
||||
|
||||
export function useStackScreenOptions(
|
||||
|
||||
@@ -7,7 +7,6 @@ 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<
|
||||
|
||||
@@ -44,9 +44,7 @@ final class TabletSidebarView: ExpoView {
|
||||
let onPlaylistPress = EventDispatcher()
|
||||
var playlists: [SidebarPlaylist] = []
|
||||
private let selectionProxy = SidebarSelectionProxy()
|
||||
/// Playlist rows by identifier. Typed loosely because stored properties
|
||||
/// can't be gated to iOS 18, where `UITab` arrives; values are always `UITab`.
|
||||
private var playlistTabs: [String: NSObject] = [:]
|
||||
private var playlistTabs: [String: UITab] = [:]
|
||||
private var coverImages: [String: UIImage] = [:]
|
||||
private var coverTasks: [String: URLSessionDataTask] = [:]
|
||||
var accountName = ""
|
||||
@@ -203,7 +201,7 @@ extension TabletSidebarView {
|
||||
var rows: [UITab] = []
|
||||
for playlist in playlists {
|
||||
let identifier = playlistTabPrefix + playlist.id
|
||||
let tab = playlistTabs[identifier] as? UITab ?? UITab(
|
||||
let tab = playlistTabs[identifier] ?? UITab(
|
||||
title: playlist.title, image: nil, identifier: identifier,
|
||||
viewControllerProvider: { _ in UIViewController() })
|
||||
playlistTabs[identifier] = tab
|
||||
@@ -235,7 +233,7 @@ extension TabletSidebarView {
|
||||
guard let self else { return }
|
||||
self.coverTasks[url] = nil
|
||||
self.coverImages[url] = roundedIcon(image)
|
||||
if let tab = self.playlistTabs[identifier] as? UITab { tab.image = self.coverImages[url] }
|
||||
if let tab = self.playlistTabs[identifier] { tab.image = self.coverImages[url] }
|
||||
}
|
||||
}
|
||||
coverTasks[url] = task
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
"expo-blur": "~58.0.5",
|
||||
"expo-constants": "~58.0.13",
|
||||
"expo-dev-client": "~58.0.14",
|
||||
"expo-file-system": "~58.0.10",
|
||||
"expo-font": "~58.0.9",
|
||||
"expo-glass-effect": "~58.0.5",
|
||||
"expo-haptics": "~58.0.7",
|
||||
@@ -37,7 +36,6 @@
|
||||
"expo-image-picker": "~58.0.10",
|
||||
"expo-linking": "~58.0.14",
|
||||
"expo-navigation-bar": "~58.0.4",
|
||||
"expo-network": "~58.0.5",
|
||||
"expo-router": "~58.0.25",
|
||||
"expo-secure-store": "~58.0.2",
|
||||
"expo-sharing": "~58.0.20",
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
import { AddToPlaylistProvider } from "@/components/add-to-playlist-provider"
|
||||
import { DownloadsProvider } from "@/components/downloads-provider"
|
||||
import { FavoritesProvider } from "@/components/favorites-provider"
|
||||
import { OfflineGate } from "@/components/offline-gate"
|
||||
import { PlaybackProvider } from "@/components/playback-provider"
|
||||
import { PlayerBar } from "@/components/player-bar"
|
||||
import { LazyQueuePanel } from "@/components/lazy-queue-panel"
|
||||
@@ -19,22 +17,18 @@ export default function AppLayout({
|
||||
<SidebarProvider>
|
||||
<PlaybackProvider>
|
||||
<AddToPlaylistProvider>
|
||||
<DownloadsProvider>
|
||||
<FavoritesProvider>
|
||||
<AppSidebar />
|
||||
<div className="flex min-h-svh min-w-0 flex-1">
|
||||
<SidebarInset className="min-w-0 flex-1">
|
||||
<Suspense>
|
||||
<ScrollRestoration>
|
||||
<OfflineGate>{children}</OfflineGate>
|
||||
</ScrollRestoration>
|
||||
</Suspense>
|
||||
</SidebarInset>
|
||||
<LazyQueuePanel />
|
||||
</div>
|
||||
<PlayerBar />
|
||||
</FavoritesProvider>
|
||||
</DownloadsProvider>
|
||||
<FavoritesProvider>
|
||||
<AppSidebar />
|
||||
<div className="flex min-h-svh min-w-0 flex-1">
|
||||
<SidebarInset className="min-w-0 flex-1">
|
||||
<Suspense>
|
||||
<ScrollRestoration>{children}</ScrollRestoration>
|
||||
</Suspense>
|
||||
</SidebarInset>
|
||||
<LazyQueuePanel />
|
||||
</div>
|
||||
<PlayerBar />
|
||||
</FavoritesProvider>
|
||||
</AddToPlaylistProvider>
|
||||
</PlaybackProvider>
|
||||
</SidebarProvider>
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import { OtherDownloadsView } from "@/components/other-downloads-view"
|
||||
|
||||
export default function Page() {
|
||||
return <OtherDownloadsView />
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import { DownloadsView } from "@/components/downloads-view"
|
||||
|
||||
export default function Page() {
|
||||
return <DownloadsView />
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
|
||||
|
||||
export default function Loading() {
|
||||
return <CollectionDetailSkeleton search />
|
||||
return <CollectionDetailSkeleton />
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
|
||||
|
||||
export default function Loading() {
|
||||
return <CollectionDetailSkeleton search />
|
||||
return <CollectionDetailSkeleton />
|
||||
}
|
||||
@@ -1,104 +0,0 @@
|
||||
import {
|
||||
DOWNLOAD_QUALITIES,
|
||||
downloadOptions,
|
||||
downloadPlan,
|
||||
estimatedAacBytes,
|
||||
type DownloadOptionsResponse,
|
||||
} from "@otunes/convex/download-quality"
|
||||
import { audioInfo } from "@/lib/server-audio-info"
|
||||
import { getSongSources } from "@/lib/server-song"
|
||||
import { NextRequest, NextResponse, userAgent } from "next/server"
|
||||
import fs from "node:fs/promises"
|
||||
|
||||
const MAX_SONGS = 5000
|
||||
|
||||
type FileSize = { bytes: number; estimated: boolean }
|
||||
|
||||
/**
|
||||
* Sizes every quality the songs can download in. Files sent as-is have exact
|
||||
* sizes; re-encodes (including ALAC to FLAC) are estimates.
|
||||
*/
|
||||
export async function POST(request: NextRequest) {
|
||||
const body = (await request.json().catch(() => null)) as {
|
||||
songIds?: unknown
|
||||
losslessFormat?: unknown
|
||||
} | null
|
||||
const songIds = body?.songIds
|
||||
if (
|
||||
!Array.isArray(songIds) ||
|
||||
songIds.length > MAX_SONGS ||
|
||||
!songIds.every((id) => typeof id === "string")
|
||||
) {
|
||||
return new Response("Expected songIds", { status: 400 })
|
||||
}
|
||||
const acceptsAlac =
|
||||
userAgent(request).browser.name === "Safari" ||
|
||||
body?.losslessFormat === "alac"
|
||||
|
||||
let songs: Awaited<ReturnType<typeof getSongSources>>
|
||||
try {
|
||||
songs = await getSongSources(songIds)
|
||||
} catch {
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
|
||||
const fileSizes = new Map<string, Promise<FileSize>>()
|
||||
const sizeOf = (path: string, source: string, seconds: number) => {
|
||||
let size = fileSizes.get(path)
|
||||
if (!size) {
|
||||
size = (async () => {
|
||||
const { size: bytes } = await fs.stat(path)
|
||||
if (source !== "lossless" || acceptsAlac) {
|
||||
return { bytes, estimated: false }
|
||||
}
|
||||
// ALAC is converted to FLAC for clients that cannot play it.
|
||||
const estimated = (await audioInfo(path)).codec === "ALAC"
|
||||
return { bytes, estimated }
|
||||
})().catch(() => ({
|
||||
bytes: estimatedAacBytes(seconds, 256),
|
||||
estimated: true,
|
||||
}))
|
||||
fileSizes.set(path, size)
|
||||
}
|
||||
return size
|
||||
}
|
||||
|
||||
const totals = await Promise.all(
|
||||
DOWNLOAD_QUALITIES.map(async (quality) => {
|
||||
const sizes = await Promise.all(
|
||||
songs.map((song) => {
|
||||
const plan = downloadPlan(song.files, quality)
|
||||
if (plan.kbps > 0) {
|
||||
return {
|
||||
bytes: estimatedAacBytes(song.length, plan.kbps),
|
||||
estimated: true,
|
||||
}
|
||||
}
|
||||
return sizeOf(song.files[plan.source], plan.source, song.length)
|
||||
})
|
||||
)
|
||||
return {
|
||||
quality,
|
||||
bytes: sizes.reduce((total, size) => total + size.bytes, 0),
|
||||
estimated: sizes.some((size) => size.estimated),
|
||||
}
|
||||
})
|
||||
)
|
||||
|
||||
const response: DownloadOptionsResponse = {
|
||||
songs: songs.map((song) => ({
|
||||
id: song._id,
|
||||
albumId: song.album,
|
||||
files: Object.fromEntries(
|
||||
Object.keys(song.files).map((codec) => [codec, true as const])
|
||||
),
|
||||
})),
|
||||
options: downloadOptions(songs.map((song) => song.files)).map((option) => {
|
||||
const total = totals.find(({ quality }) => quality === option.quality)!
|
||||
return { ...option, bytes: total.bytes, estimated: total.estimated }
|
||||
}),
|
||||
}
|
||||
return NextResponse.json(response, {
|
||||
headers: { "Cache-Control": "no-store" },
|
||||
})
|
||||
}
|
||||
@@ -1,150 +0,0 @@
|
||||
import {
|
||||
downloadPlan,
|
||||
parseDownloadQuality,
|
||||
} from "@otunes/convex/download-quality"
|
||||
import { audioContentTypeForPath } from "@/lib/audio-content-type"
|
||||
import { audioInfo } from "@/lib/server-audio-info"
|
||||
import { streamFile } from "@/lib/server-audio-stream"
|
||||
import { spawnFfmpeg } from "@/lib/server-ffmpeg"
|
||||
import { seekableLosslessFile } from "@/lib/server-lossless"
|
||||
import { 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 })
|
||||
}
|
||||
}
|
||||
@@ -14,8 +14,6 @@ import {
|
||||
type MediaContextAction,
|
||||
} from "@/components/media-context-menu"
|
||||
import { usePlaybackActions } from "@/components/playback-provider"
|
||||
import { useDownloads } from "@/components/downloads-provider"
|
||||
import { useIsCollectionDownloaded } from "@/hooks/use-downloads"
|
||||
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { Button } from "@/components/ui/button"
|
||||
@@ -52,9 +50,6 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
|
||||
const { isAlbumFavorite, toggleAlbumFavorite } = useFavorites()
|
||||
const { playAlbum } = usePlaybackActions()
|
||||
const { runQueueAction, createStation } = useQueueMediaActions()
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
const downloadRef = { kind: "album" as const, id: album.id }
|
||||
const downloaded = useIsCollectionDownloaded(downloadRef)
|
||||
const [menuOpen, setMenuOpen] = React.useState(false)
|
||||
const [hovered, setHovered] = React.useState(false)
|
||||
const showActions = hovered || menuOpen
|
||||
@@ -99,20 +94,6 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
|
||||
void runQueueAction(action, songIds)
|
||||
break
|
||||
}
|
||||
case "download":
|
||||
case "remove-download": {
|
||||
const songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: album.id as Id<"albums"> }
|
||||
)
|
||||
const target = { ...downloadRef, title: album.title, songIds }
|
||||
void (action === "download"
|
||||
? requestDownload(target)
|
||||
: removeDownload(target))
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -176,7 +157,6 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
|
||||
selectedCount={1}
|
||||
onAction={(action) => void handleCardAction(action)}
|
||||
favorited={isAlbumFavorite(album.id)}
|
||||
downloaded={downloaded}
|
||||
navigation={{ artist: { id: album.artist.id } }}
|
||||
share={{ type: "album", albumId: album.id }}
|
||||
/>
|
||||
|
||||
@@ -9,14 +9,7 @@ import { Play, Share2, Shuffle } from "lucide-react"
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { MediaCollectionFooter } from "@/components/media-collection-footer"
|
||||
|
||||
import { DownloadButton, DownloadedQuality } from "@/components/download-button"
|
||||
import { useDownloads } from "@/components/downloads-provider"
|
||||
import { FavoriteMediaButton } from "@/components/favorite-media-button"
|
||||
import {
|
||||
useIsCollectionDownloaded,
|
||||
useOpenedFromDownloads,
|
||||
} from "@/hooks/use-downloads"
|
||||
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import { useFavorites } from "@/components/favorites-provider"
|
||||
import {
|
||||
useCurrentSongId,
|
||||
@@ -119,13 +112,7 @@ export function AlbumView({
|
||||
toggleAlbumFavorite,
|
||||
} = useFavorites()
|
||||
const currentSongId = useCurrentSongId()
|
||||
const {
|
||||
playFromSong,
|
||||
playAlbum,
|
||||
playAlbumShuffled,
|
||||
playInOrder,
|
||||
playShuffled,
|
||||
} = usePlaybackActions()
|
||||
const { playFromSong, playAlbum, playAlbumShuffled } = usePlaybackActions()
|
||||
const { runSongsAction } = useMediaActions()
|
||||
const albumSongIds = React.useMemo(
|
||||
() => album.tracks.map((track) => track.id as Id<"songs">),
|
||||
@@ -198,30 +185,10 @@ export function AlbumView({
|
||||
[album.tracks, album.artist, album.id, album.title, album.cover]
|
||||
)
|
||||
|
||||
const downloadRef = React.useMemo(
|
||||
() => ({ kind: "album" as const, id: album.id }),
|
||||
[album.id]
|
||||
)
|
||||
const fromDownloads = useOpenedFromDownloads()
|
||||
const playOrigin = fromDownloads
|
||||
? downloadsQueueOrigin(`album:${album.id}`)
|
||||
: `album:${album.id}`
|
||||
const handleMediaAction = useTrackListMediaAction({
|
||||
selectedIds,
|
||||
artistId: album.artist.id,
|
||||
downloadFrom: downloadRef,
|
||||
})
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
const downloadTarget = React.useMemo(
|
||||
() => ({
|
||||
kind: "album" as const,
|
||||
id: album.id,
|
||||
title: album.title,
|
||||
songIds: albumSongIds,
|
||||
}),
|
||||
[album.id, album.title, albumSongIds]
|
||||
)
|
||||
const albumDownloaded = useIsCollectionDownloaded(downloadTarget)
|
||||
|
||||
const handleRowSelect = React.useCallback(
|
||||
(index: number, event: React.MouseEvent) => {
|
||||
@@ -234,9 +201,13 @@ export function AlbumView({
|
||||
|
||||
const handleRowPlay = React.useCallback(
|
||||
(index: number) => {
|
||||
void playFromSong(album.tracks[index].id, albumSongIds, playOrigin)
|
||||
void playFromSong(
|
||||
album.tracks[index].id,
|
||||
albumSongIds,
|
||||
`album:${album.id}`
|
||||
)
|
||||
},
|
||||
[album.tracks, albumSongIds, playOrigin, playFromSong]
|
||||
[album.tracks, album.id, albumSongIds, playFromSong]
|
||||
)
|
||||
|
||||
const handleToggleFavorite = React.useCallback(
|
||||
@@ -249,14 +220,6 @@ export function AlbumView({
|
||||
void toggleAlbumFavorite(album.id as Id<"albums">)
|
||||
return
|
||||
}
|
||||
if (action === "download") {
|
||||
void requestDownload(downloadTarget)
|
||||
return
|
||||
}
|
||||
if (action === "remove-download") {
|
||||
void removeDownload(downloadTarget)
|
||||
return
|
||||
}
|
||||
runSongsAction(action, albumSongIds, album.artist.id)
|
||||
}
|
||||
|
||||
@@ -308,7 +271,6 @@ export function AlbumView({
|
||||
<AudioFormatBadge format="atmos" />
|
||||
</>
|
||||
) : null}
|
||||
<DownloadedQuality collection={downloadRef} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -319,12 +281,10 @@ export function AlbumView({
|
||||
className="rounded-full"
|
||||
aria-label="Shuffle album"
|
||||
onClick={() =>
|
||||
void (fromDownloads
|
||||
? playShuffled(albumSongIds, playOrigin)
|
||||
: playAlbumShuffled(
|
||||
album.id as Id<"albums">,
|
||||
albumSongIds
|
||||
))
|
||||
void playAlbumShuffled(
|
||||
album.id as Id<"albums">,
|
||||
albumSongIds
|
||||
)
|
||||
}
|
||||
>
|
||||
<Shuffle />
|
||||
@@ -333,9 +293,7 @@ export function AlbumView({
|
||||
className="h-10 gap-2 rounded-full bg-foreground px-6 text-background hover:bg-foreground/90"
|
||||
aria-label={`Play ${album.title}`}
|
||||
onClick={() =>
|
||||
void (fromDownloads
|
||||
? playInOrder(albumSongIds, playOrigin)
|
||||
: playAlbum(album.id as Id<"albums">, albumSongIds))
|
||||
void playAlbum(album.id as Id<"albums">, albumSongIds)
|
||||
}
|
||||
>
|
||||
<Play className="fill-current" />
|
||||
@@ -349,7 +307,6 @@ export function AlbumView({
|
||||
favoritedLabel={`Remove ${album.title} from favorites`}
|
||||
unfavoritedLabel={`Favorite ${album.title}`}
|
||||
/>
|
||||
<DownloadButton target={downloadTarget} />
|
||||
<Button
|
||||
variant="secondary"
|
||||
size="icon"
|
||||
@@ -366,7 +323,6 @@ export function AlbumView({
|
||||
onOpenMenu={() => {}}
|
||||
onAction={handleAlbumMediaAction}
|
||||
favorited={isAlbumFavorite(album.id)}
|
||||
downloaded={albumDownloaded}
|
||||
trackRowTrigger={false}
|
||||
triggerVariant="secondary"
|
||||
triggerClassName="rounded-full"
|
||||
@@ -407,7 +363,6 @@ export function AlbumView({
|
||||
: sectionTrackIndex + 1
|
||||
}
|
||||
subtitle={track.artists?.join(", ")}
|
||||
downloadCollection={downloadRef}
|
||||
isActive={track.id === activeTrackId}
|
||||
selectionPosition={selectionPositions[listIndex]}
|
||||
isFavorite={isSongFavorite(track.id)}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
"use client"
|
||||
|
||||
import {
|
||||
ArrowDownToLine,
|
||||
Disc3,
|
||||
House,
|
||||
LayoutGrid,
|
||||
@@ -48,8 +47,6 @@ import { playlistCoverUrl } from "@/lib/cover-urls"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useMounted } from "@/hooks/use-mounted"
|
||||
import { clearPersistentCache } from "@/lib/persistent-cache"
|
||||
import { clearOfflinePages, DOWNLOADS_PATH } from "@/lib/downloads"
|
||||
import { OfflineLink } from "@/components/offline-gate"
|
||||
import { resetPlaybackStores } from "@otunes/convex/client/playback-store"
|
||||
|
||||
const OptionsModal = dynamic(() =>
|
||||
@@ -65,13 +62,6 @@ const library = [
|
||||
{ title: "Albums", path: "/library/albums", icon: Disc3 },
|
||||
{ title: "Artists", path: "/library/artists", icon: Mic },
|
||||
{ title: "Songs", path: "/library/songs", icon: Music2 },
|
||||
// Opens offline, so it uses OfflineLink.
|
||||
{
|
||||
title: "Downloads",
|
||||
path: DOWNLOADS_PATH,
|
||||
icon: ArrowDownToLine,
|
||||
worksOffline: true,
|
||||
},
|
||||
]
|
||||
|
||||
export function AppSidebar() {
|
||||
@@ -91,7 +81,6 @@ export function AppSidebar() {
|
||||
await signOut()
|
||||
resetPlaybackStores()
|
||||
await clearPersistentCache()
|
||||
await clearOfflinePages()
|
||||
router.push("/signin")
|
||||
}
|
||||
|
||||
@@ -169,23 +158,10 @@ export function AppSidebar() {
|
||||
}
|
||||
asChild
|
||||
>
|
||||
{item.worksOffline ? (
|
||||
<OfflineLink
|
||||
href={item.path}
|
||||
onClick={() => setOpenMobile(false)}
|
||||
>
|
||||
<item.icon />
|
||||
<span>{item.title}</span>
|
||||
</OfflineLink>
|
||||
) : (
|
||||
<Link
|
||||
href={item.path}
|
||||
onClick={() => setOpenMobile(false)}
|
||||
>
|
||||
<item.icon />
|
||||
<span>{item.title}</span>
|
||||
</Link>
|
||||
)}
|
||||
<Link href={item.path} onClick={() => setOpenMobile(false)}>
|
||||
<item.icon />
|
||||
<span>{item.title}</span>
|
||||
</Link>
|
||||
</SidebarMenuButton>
|
||||
</SidebarMenuItem>
|
||||
))}
|
||||
|
||||
@@ -1,145 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import * as React from "react"
|
||||
import { ArrowDownToLine, Check } from "lucide-react"
|
||||
|
||||
import {
|
||||
useDownloads,
|
||||
type DownloadTarget,
|
||||
} from "@/components/downloads-provider"
|
||||
import {
|
||||
AlertDialog,
|
||||
AlertDialogAction,
|
||||
AlertDialogCancel,
|
||||
AlertDialogContent,
|
||||
AlertDialogFooter,
|
||||
AlertDialogHeader,
|
||||
AlertDialogTitle,
|
||||
} from "@/components/ui/alert-dialog"
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import {
|
||||
useCollectionDownload,
|
||||
useIsCollectionDownloaded,
|
||||
} from "@/hooks/use-downloads"
|
||||
import { downloadQueue } from "@/lib/downloads"
|
||||
import type { CollectionRef } from "@otunes/convex/client/download-queue"
|
||||
import { DOWNLOAD_QUALITY_LABELS } from "@otunes/convex/download-quality"
|
||||
|
||||
const RING_RADIUS = 14
|
||||
const RING_LENGTH = 2 * Math.PI * RING_RADIUS
|
||||
|
||||
/** Static ring that fills as songs finish; a square in the middle means "tap to stop". */
|
||||
function ProgressRing({ fraction }: { fraction: number }) {
|
||||
return (
|
||||
<svg viewBox="0 0 36 36" className="size-6" aria-hidden>
|
||||
<circle
|
||||
cx="18"
|
||||
cy="18"
|
||||
r={RING_RADIUS}
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeOpacity={0.25}
|
||||
strokeWidth={3}
|
||||
/>
|
||||
<circle
|
||||
cx="18"
|
||||
cy="18"
|
||||
r={RING_RADIUS}
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth={3}
|
||||
strokeDasharray={RING_LENGTH}
|
||||
strokeDashoffset={RING_LENGTH * (1 - fraction)}
|
||||
transform="rotate(-90 18 18)"
|
||||
/>
|
||||
<rect x="14" y="14" width="8" height="8" fill="currentColor" />
|
||||
</svg>
|
||||
)
|
||||
}
|
||||
|
||||
/** Download, progress, and downloaded states for an album or playlist header. */
|
||||
export function DownloadButton({
|
||||
target,
|
||||
}: {
|
||||
target: Exclude<DownloadTarget, { kind: "songs" }>
|
||||
}) {
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
const { collection, status } = useCollectionDownload(target, target.songIds)
|
||||
const [confirmRemove, setConfirmRemove] = React.useState(false)
|
||||
|
||||
const inProgress = collection !== undefined && status.queued > 0
|
||||
const done = collection !== undefined && !inProgress && status.total > 0
|
||||
|
||||
let label = `Download ${target.title}`
|
||||
let icon: React.ReactNode = <ArrowDownToLine />
|
||||
if (inProgress) {
|
||||
label = `Stop downloading, ${status.downloaded} of ${status.total} done`
|
||||
icon = <ProgressRing fraction={status.downloaded / status.total} />
|
||||
} else if (done) {
|
||||
label = `Remove download of ${target.title}`
|
||||
icon = <Check />
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Button
|
||||
variant={done ? "default" : "secondary"}
|
||||
size="icon"
|
||||
className="rounded-full"
|
||||
aria-label={label}
|
||||
title={label}
|
||||
disabled={target.songIds.length === 0}
|
||||
onClick={() => {
|
||||
if (inProgress) void removeDownload(target)
|
||||
else if (done) setConfirmRemove(true)
|
||||
else void requestDownload(target)
|
||||
}}
|
||||
>
|
||||
{icon}
|
||||
</Button>
|
||||
<AlertDialog open={confirmRemove} onOpenChange={setConfirmRemove}>
|
||||
<AlertDialogContent size="sm">
|
||||
<AlertDialogHeader>
|
||||
<AlertDialogTitle>Remove download?</AlertDialogTitle>
|
||||
</AlertDialogHeader>
|
||||
<AlertDialogFooter>
|
||||
<AlertDialogCancel>Cancel</AlertDialogCancel>
|
||||
<AlertDialogAction
|
||||
variant="destructive"
|
||||
onClick={() => void removeDownload(target)}
|
||||
>
|
||||
Remove
|
||||
</AlertDialogAction>
|
||||
</AlertDialogFooter>
|
||||
</AlertDialogContent>
|
||||
</AlertDialog>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
/** The quality an album or playlist was downloaded in, once downloaded. */
|
||||
export function DownloadedQuality({
|
||||
collection,
|
||||
}: {
|
||||
collection: CollectionRef
|
||||
}) {
|
||||
const downloaded = useIsCollectionDownloaded(collection)
|
||||
const quality = downloaded
|
||||
? downloadQueue.getCollection(collection)?.quality
|
||||
: undefined
|
||||
if (!quality) return null
|
||||
return (
|
||||
<span
|
||||
className="inline-flex items-center gap-1"
|
||||
aria-label={`Downloaded in ${DOWNLOAD_QUALITY_LABELS[quality]}`}
|
||||
>
|
||||
<ArrowDownToLine className="size-3.5" aria-hidden />
|
||||
{quality === "lossless" || quality === "atmos" ? (
|
||||
<AudioFormatBadge format={quality} />
|
||||
) : (
|
||||
DOWNLOAD_QUALITY_LABELS[quality]
|
||||
)}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
@@ -1,364 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import * as React from "react"
|
||||
import { useConvex, useQuery } from "convex/react"
|
||||
import { toast } from "sonner"
|
||||
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { Checkbox } from "@/components/ui/checkbox"
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from "@/components/ui/dialog"
|
||||
import { Label } from "@/components/ui/label"
|
||||
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useDownloadsVersion } from "@/hooks/use-downloads"
|
||||
import {
|
||||
downloadQueue,
|
||||
readRememberedDownloadQuality,
|
||||
DOWNLOADS_PATH,
|
||||
downloadedCollectionPath,
|
||||
OTHER_DOWNLOADS_PATH,
|
||||
registerDownloadsServiceWorker,
|
||||
requestPersistentStorage,
|
||||
saveDownloadPagesForOffline,
|
||||
writeRememberedDownloadQuality,
|
||||
} from "@/lib/downloads"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type {
|
||||
CollectionRef,
|
||||
DownloadableSong,
|
||||
DownloadSource,
|
||||
} from "@otunes/convex/client/download-queue"
|
||||
import { FAVORITES_ID } from "@otunes/convex/client/download-queue"
|
||||
import {
|
||||
DOWNLOAD_OPTIONS_PATH,
|
||||
DOWNLOAD_QUALITY_DETAILS,
|
||||
DOWNLOAD_QUALITY_LABELS,
|
||||
formatBytes,
|
||||
type DownloadOptionsResponse,
|
||||
type DownloadQuality,
|
||||
type SizedDownloadOption,
|
||||
} from "@otunes/convex/download-quality"
|
||||
|
||||
/** Songs on their own, or an album or playlist that stays downloaded as a whole. */
|
||||
export type DownloadTarget =
|
||||
| {
|
||||
kind: "songs"
|
||||
songIds: string[]
|
||||
title: string
|
||||
/** Removing takes the songs out of only this download. */
|
||||
from?: DownloadSource
|
||||
}
|
||||
| (CollectionRef & { title: string; songIds: string[] })
|
||||
|
||||
/** The Favorites playlist has no ID, so downloads use this one. */
|
||||
export const FAVORITES_DOWNLOAD_ID = FAVORITES_ID
|
||||
|
||||
type DownloadsContextValue = {
|
||||
/** Asks for a quality (unless remembered) and starts downloading. */
|
||||
requestDownload: (target: DownloadTarget) => Promise<void>
|
||||
removeDownload: (target: DownloadTarget) => Promise<void>
|
||||
}
|
||||
|
||||
const DownloadsContext = React.createContext<DownloadsContextValue | null>(null)
|
||||
|
||||
export function useDownloads() {
|
||||
const context = React.useContext(DownloadsContext)
|
||||
if (!context) {
|
||||
throw new Error("useDownloads must be used within DownloadsProvider")
|
||||
}
|
||||
return context
|
||||
}
|
||||
|
||||
async function fetchDownloadOptions(songIds: string[]) {
|
||||
const response = await fetch(DOWNLOAD_OPTIONS_PATH, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ songIds }),
|
||||
})
|
||||
if (!response.ok) {
|
||||
throw new Error("Could not reach the server to download")
|
||||
}
|
||||
return (await response.json()) as DownloadOptionsResponse
|
||||
}
|
||||
|
||||
function startDownload(
|
||||
target: DownloadTarget,
|
||||
songs: DownloadableSong[],
|
||||
quality: DownloadQuality
|
||||
) {
|
||||
requestPersistentStorage()
|
||||
if (target.kind === "songs") {
|
||||
return downloadQueue.enqueue(songs, quality)
|
||||
}
|
||||
return downloadQueue.downloadCollection(
|
||||
{ kind: target.kind, id: target.id, title: target.title, quality },
|
||||
songs
|
||||
)
|
||||
}
|
||||
|
||||
function optionDetail(option: SizedDownloadOption, songCount: number) {
|
||||
if (option.fallbackCount === 0) {
|
||||
return DOWNLOAD_QUALITY_DETAILS[option.quality]
|
||||
}
|
||||
const included = songCount - option.fallbackCount
|
||||
return `${included} of ${songCount} songs, ${option.fallbackCount} in High`
|
||||
}
|
||||
|
||||
function QualityLabel({ quality }: { quality: DownloadQuality }) {
|
||||
if (quality === "lossless" || quality === "atmos") {
|
||||
return (
|
||||
<AudioFormatBadge format={quality} backgroundColor="var(--popover)" />
|
||||
)
|
||||
}
|
||||
return (
|
||||
<span className="text-[13px] font-medium">
|
||||
{DOWNLOAD_QUALITY_LABELS[quality]}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
|
||||
function DownloadQualityDialog({
|
||||
pending,
|
||||
onClose,
|
||||
}: {
|
||||
pending: { target: DownloadTarget; response: DownloadOptionsResponse } | null
|
||||
onClose: () => void
|
||||
}) {
|
||||
const [quality, setQuality] = React.useState<DownloadQuality>("high")
|
||||
const [remember, setRemember] = React.useState(false)
|
||||
const options = pending?.response.options ?? []
|
||||
const songCount = pending?.response.songs.length ?? 0
|
||||
|
||||
async function handleDownload() {
|
||||
if (!pending) return
|
||||
if (remember) writeRememberedDownloadQuality(quality)
|
||||
onClose()
|
||||
await startDownload(pending.target, pending.response.songs, quality)
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog open={pending !== null} onOpenChange={(open) => !open && onClose()}>
|
||||
<DialogContent className="gap-3 sm:max-w-sm">
|
||||
<DialogHeader>
|
||||
<DialogTitle className="truncate">
|
||||
Download “{pending?.target.title}”
|
||||
</DialogTitle>
|
||||
</DialogHeader>
|
||||
<RadioGroup
|
||||
value={quality}
|
||||
onValueChange={(value) => setQuality(value as DownloadQuality)}
|
||||
className="gap-0"
|
||||
>
|
||||
{options.map((option) => (
|
||||
<Label
|
||||
key={option.quality}
|
||||
htmlFor={`download-${option.quality}`}
|
||||
className="grid cursor-pointer grid-cols-[auto_1fr_auto] items-center gap-3 rounded-md px-1 py-2 font-normal has-data-[state=checked]:bg-muted"
|
||||
>
|
||||
<RadioGroupItem
|
||||
value={option.quality}
|
||||
id={`download-${option.quality}`}
|
||||
/>
|
||||
<span className="flex min-w-0 flex-col gap-0.5">
|
||||
<QualityLabel quality={option.quality} />
|
||||
<span className="text-xs text-muted-foreground">
|
||||
{optionDetail(option, songCount)}
|
||||
</span>
|
||||
</span>
|
||||
<span className="text-xs text-muted-foreground tabular-nums">
|
||||
{option.estimated ? "~" : ""}
|
||||
{formatBytes(option.bytes)}
|
||||
</span>
|
||||
</Label>
|
||||
))}
|
||||
</RadioGroup>
|
||||
<div className="flex items-center gap-2">
|
||||
<Checkbox
|
||||
id="download-remember"
|
||||
checked={remember}
|
||||
onCheckedChange={(checked) => setRemember(checked === true)}
|
||||
/>
|
||||
<Label htmlFor="download-remember" className="font-normal">
|
||||
Remember my choice
|
||||
</Label>
|
||||
</div>
|
||||
<DialogFooter>
|
||||
<Button variant="ghost" onClick={onClose}>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button onClick={() => void handleDownload()}>Download</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
|
||||
const SYNC_BATCH_SIZE = 200
|
||||
|
||||
/** Keeps a downloaded playlist's songs in step with the playlist. */
|
||||
function useSyncDownloadedPlaylist(
|
||||
id: string,
|
||||
songIds: readonly string[] | undefined
|
||||
) {
|
||||
const convex = useConvex()
|
||||
React.useEffect(() => {
|
||||
if (!songIds) return
|
||||
void downloadQueue
|
||||
.syncCollection({ kind: "playlist", id }, songIds, async (added) => {
|
||||
const songs: DownloadableSong[] = []
|
||||
for (let start = 0; start < added.length; start += SYNC_BATCH_SIZE) {
|
||||
const batch = await convex.query(api.library.getSongsForPlayback, {
|
||||
ids: added.slice(start, start + SYNC_BATCH_SIZE) as Id<"songs">[],
|
||||
})
|
||||
for (const song of batch) if (song) songs.push(song)
|
||||
}
|
||||
return songs
|
||||
})
|
||||
.catch(() => {})
|
||||
}, [convex, id, songIds])
|
||||
}
|
||||
|
||||
function PlaylistSync({ id }: { id: string }) {
|
||||
const songIds = useQuery(api.playlists.getPlaylistSongIds, {
|
||||
playlistId: id as Id<"playlists">,
|
||||
})
|
||||
useSyncDownloadedPlaylist(id, songIds)
|
||||
return null
|
||||
}
|
||||
|
||||
function FavoritesSync() {
|
||||
const favorites = useCachedQuery(api.favorites.getUserFavorites)
|
||||
const songIds = React.useMemo(
|
||||
() => favorites?.favoriteSongs.flat(),
|
||||
[favorites]
|
||||
)
|
||||
useSyncDownloadedPlaylist(FAVORITES_DOWNLOAD_ID, songIds)
|
||||
return null
|
||||
}
|
||||
|
||||
function DownloadSync() {
|
||||
useDownloadsVersion()
|
||||
return downloadQueue
|
||||
.collections()
|
||||
.filter((collection) => collection.kind === "playlist")
|
||||
.map((collection) =>
|
||||
collection.id === FAVORITES_DOWNLOAD_ID ? (
|
||||
<FavoritesSync key={collection.id} />
|
||||
) : (
|
||||
<PlaylistSync key={collection.id} id={collection.id} />
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
/** Reports failed songs once per burst instead of once per song. */
|
||||
function useFailureToasts() {
|
||||
React.useEffect(() => {
|
||||
let failed = 0
|
||||
let timer: ReturnType<typeof setTimeout> | null = null
|
||||
const unsubscribe = downloadQueue.onFailure(() => {
|
||||
failed += 1
|
||||
timer ??= setTimeout(() => {
|
||||
toast.error(
|
||||
failed === 1
|
||||
? "A song could not be downloaded"
|
||||
: `${failed} songs could not be downloaded`
|
||||
)
|
||||
failed = 0
|
||||
timer = null
|
||||
}, 1000)
|
||||
})
|
||||
return () => {
|
||||
unsubscribe()
|
||||
if (timer) clearTimeout(timer)
|
||||
}
|
||||
}, [])
|
||||
}
|
||||
|
||||
/** Keeps Downloads and each downloaded collection's page saved for offline. */
|
||||
function OfflinePagesSync() {
|
||||
useDownloadsVersion()
|
||||
const collectionPaths = downloadQueue
|
||||
.collections()
|
||||
.map(downloadedCollectionPath)
|
||||
const hasOtherSongs = downloadQueue.otherSongIds().length > 0
|
||||
// A string, so the effect reruns only when the saved set changes.
|
||||
const pathsKey = collectionPaths.join("\n")
|
||||
|
||||
React.useEffect(() => {
|
||||
if (!pathsKey && !hasOtherSongs) return
|
||||
saveDownloadPagesForOffline([
|
||||
DOWNLOADS_PATH,
|
||||
OTHER_DOWNLOADS_PATH,
|
||||
...(pathsKey ? pathsKey.split("\n") : []),
|
||||
])
|
||||
}, [pathsKey, hasOtherSongs])
|
||||
return null
|
||||
}
|
||||
|
||||
export function DownloadsProvider({ children }: { children: React.ReactNode }) {
|
||||
const [pending, setPending] = React.useState<{
|
||||
target: DownloadTarget
|
||||
response: DownloadOptionsResponse
|
||||
} | null>(null)
|
||||
|
||||
useFailureToasts()
|
||||
React.useEffect(() => {
|
||||
void downloadQueue.load().catch(() => {})
|
||||
registerDownloadsServiceWorker()
|
||||
}, [])
|
||||
|
||||
const requestDownload = React.useCallback(async (target: DownloadTarget) => {
|
||||
if (target.songIds.length === 0) return
|
||||
if (target.songIds.every((id) => downloadQueue.getDownloaded(id))) {
|
||||
// Already on this device: just give them back to their downloads.
|
||||
await downloadQueue.enqueue(
|
||||
target.songIds.map((id) => ({ id, files: {} })),
|
||||
"high"
|
||||
)
|
||||
return
|
||||
}
|
||||
try {
|
||||
const response = await fetchDownloadOptions(target.songIds)
|
||||
const remembered = readRememberedDownloadQuality()
|
||||
if (remembered) {
|
||||
await startDownload(target, response.songs, remembered)
|
||||
toast(`Downloading ${target.title}`)
|
||||
} else {
|
||||
setPending({ target, response })
|
||||
}
|
||||
} catch (error) {
|
||||
toast.error(error instanceof Error ? error.message : "Download failed")
|
||||
}
|
||||
}, [])
|
||||
|
||||
const removeDownload = React.useCallback(async (target: DownloadTarget) => {
|
||||
if (target.kind === "songs") {
|
||||
await downloadQueue.removeSongs(target.songIds, target.from)
|
||||
} else await downloadQueue.removeCollection(target)
|
||||
}, [])
|
||||
|
||||
const value = React.useMemo(
|
||||
() => ({ requestDownload, removeDownload }),
|
||||
[requestDownload, removeDownload]
|
||||
)
|
||||
|
||||
return (
|
||||
<DownloadsContext.Provider value={value}>
|
||||
{children}
|
||||
<DownloadSync />
|
||||
<OfflinePagesSync />
|
||||
<DownloadQualityDialog
|
||||
pending={pending}
|
||||
onClose={() => setPending(null)}
|
||||
/>
|
||||
</DownloadsContext.Provider>
|
||||
)
|
||||
}
|
||||
@@ -1,248 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import * as React from "react"
|
||||
import { Trash2 } from "lucide-react"
|
||||
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import {
|
||||
AlertDialog,
|
||||
AlertDialogAction,
|
||||
AlertDialogCancel,
|
||||
AlertDialogContent,
|
||||
AlertDialogFooter,
|
||||
AlertDialogHeader,
|
||||
AlertDialogTitle,
|
||||
AlertDialogTrigger,
|
||||
} from "@/components/ui/alert-dialog"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import {
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from "@/components/ui/select"
|
||||
import { useDownloadsVersion } from "@/hooks/use-downloads"
|
||||
import {
|
||||
downloadQueue,
|
||||
readRememberedDownloadQuality,
|
||||
writeRememberedDownloadQuality,
|
||||
} from "@/lib/downloads"
|
||||
import {
|
||||
DOWNLOAD_QUALITIES,
|
||||
DOWNLOAD_QUALITY_LABELS,
|
||||
formatBytes,
|
||||
type DownloadQuality,
|
||||
} from "@otunes/convex/download-quality"
|
||||
|
||||
const ASK_EVERY_TIME = "ask"
|
||||
|
||||
/** Shades of the text color, darkest for the smallest files. */
|
||||
const QUALITY_OPACITY: Record<DownloadQuality, number> = {
|
||||
medium: 0.25,
|
||||
high: 0.45,
|
||||
lossless: 0.7,
|
||||
atmos: 1,
|
||||
}
|
||||
|
||||
function QualityName({ quality }: { quality: DownloadQuality }) {
|
||||
if (quality === "lossless" || quality === "atmos") {
|
||||
return <AudioFormatBadge format={quality} />
|
||||
}
|
||||
return <span>{DOWNLOAD_QUALITY_LABELS[quality]}</span>
|
||||
}
|
||||
|
||||
function songCount(count: number) {
|
||||
return count === 1 ? "1 song" : `${count} songs`
|
||||
}
|
||||
|
||||
function RememberedQualitySelect() {
|
||||
const [value, setValue] = React.useState<string>(
|
||||
() => readRememberedDownloadQuality() ?? ASK_EVERY_TIME
|
||||
)
|
||||
return (
|
||||
<div className="flex items-center justify-between gap-4 text-sm">
|
||||
<span>Download quality</span>
|
||||
<Select
|
||||
value={value}
|
||||
onValueChange={(next) => {
|
||||
setValue(next)
|
||||
writeRememberedDownloadQuality(
|
||||
next === ASK_EVERY_TIME ? undefined : (next as DownloadQuality)
|
||||
)
|
||||
}}
|
||||
>
|
||||
<SelectTrigger className="w-40">
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value={ASK_EVERY_TIME}>Ask every time</SelectItem>
|
||||
{DOWNLOAD_QUALITIES.map((quality) => (
|
||||
<SelectItem key={quality} value={quality}>
|
||||
{DOWNLOAD_QUALITY_LABELS[quality]}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/** Storage used by downloads in this browser, by quality and by album or playlist. */
|
||||
export function DownloadsSettings() {
|
||||
const version = useDownloadsVersion()
|
||||
const breakdown = React.useMemo(
|
||||
() => downloadQueue.breakdown(),
|
||||
// version invalidates the breakdown when downloads change.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
[version]
|
||||
)
|
||||
const qualities = breakdown.byQuality.filter((entry) => entry.songs > 0)
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
<div className="flex items-baseline justify-between gap-4">
|
||||
<h3 className="text-base font-medium">Downloads</h3>
|
||||
<span className="text-sm text-muted-foreground tabular-nums">
|
||||
{formatBytes(breakdown.bytes)} · {songCount(breakdown.songs)}
|
||||
{breakdown.queued > 0 ? ` · ${breakdown.queued} downloading` : ""}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<RememberedQualitySelect />
|
||||
|
||||
{breakdown.songs > 0 ? (
|
||||
<div className="space-y-2">
|
||||
<div className="flex h-2 overflow-hidden rounded-full bg-muted">
|
||||
{qualities.map((entry) => (
|
||||
<div
|
||||
key={entry.quality}
|
||||
className="h-full bg-foreground"
|
||||
style={{
|
||||
width: `${(entry.bytes / breakdown.bytes) * 100}%`,
|
||||
opacity: QUALITY_OPACITY[entry.quality],
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
<div className="divide-y text-sm">
|
||||
{qualities.map((entry) => (
|
||||
<div
|
||||
key={entry.quality}
|
||||
className="flex items-center gap-3 py-1.5"
|
||||
>
|
||||
<span
|
||||
className="size-2 shrink-0 rounded-full bg-foreground"
|
||||
style={{ opacity: QUALITY_OPACITY[entry.quality] }}
|
||||
/>
|
||||
<span className="flex-1">
|
||||
<QualityName quality={entry.quality} />
|
||||
</span>
|
||||
<span className="text-muted-foreground tabular-nums">
|
||||
{songCount(entry.songs)}
|
||||
</span>
|
||||
<span className="w-16 text-right tabular-nums">
|
||||
{formatBytes(entry.bytes)}
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
{breakdown.collections.length > 0 ||
|
||||
breakdown.otherSongs.songIds.length > 0 ? (
|
||||
<div className="divide-y text-sm">
|
||||
{breakdown.collections.map(
|
||||
({ collection, bytes, status, fallbackCount }) => (
|
||||
<div
|
||||
key={`${collection.kind}:${collection.id}`}
|
||||
className="flex items-center gap-3 py-2"
|
||||
>
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="truncate">{collection.title}</p>
|
||||
<p className="flex flex-wrap items-center gap-x-1.5 text-xs text-muted-foreground">
|
||||
<span>
|
||||
{collection.kind === "album" ? "Album" : "Playlist"}
|
||||
</span>
|
||||
<span aria-hidden>·</span>
|
||||
<QualityName quality={collection.quality} />
|
||||
{fallbackCount > 0 ? (
|
||||
<span>({fallbackCount} in High)</span>
|
||||
) : null}
|
||||
{status.downloaded < status.total ? (
|
||||
<>
|
||||
<span aria-hidden>·</span>
|
||||
<span className="tabular-nums">
|
||||
{status.downloaded} of {status.total}
|
||||
</span>
|
||||
</>
|
||||
) : null}
|
||||
</p>
|
||||
</div>
|
||||
<span className="tabular-nums">{formatBytes(bytes)}</span>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon-sm"
|
||||
aria-label={`Remove download of ${collection.title}`}
|
||||
onClick={() =>
|
||||
void downloadQueue.removeCollection(collection)
|
||||
}
|
||||
>
|
||||
<Trash2 />
|
||||
</Button>
|
||||
</div>
|
||||
)
|
||||
)}
|
||||
{breakdown.otherSongs.songIds.length > 0 ? (
|
||||
<div className="flex items-center gap-3 py-2">
|
||||
<div className="min-w-0 flex-1">
|
||||
<p>Other Downloaded Songs</p>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{songCount(breakdown.otherSongs.songIds.length)}
|
||||
</p>
|
||||
</div>
|
||||
<span className="tabular-nums">
|
||||
{formatBytes(breakdown.otherSongs.bytes)}
|
||||
</span>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon-sm"
|
||||
aria-label="Remove Other Downloaded Songs"
|
||||
onClick={() => void downloadQueue.removeOtherSongs()}
|
||||
>
|
||||
<Trash2 />
|
||||
</Button>
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
) : (
|
||||
<p className="text-sm text-muted-foreground">
|
||||
Nothing downloaded in this browser.
|
||||
</p>
|
||||
)}
|
||||
|
||||
{breakdown.songs > 0 || breakdown.queued > 0 ? (
|
||||
<AlertDialog>
|
||||
<AlertDialogTrigger asChild>
|
||||
<Button variant="destructive">Remove all downloads</Button>
|
||||
</AlertDialogTrigger>
|
||||
<AlertDialogContent size="sm">
|
||||
<AlertDialogHeader>
|
||||
<AlertDialogTitle>Remove all downloads?</AlertDialogTitle>
|
||||
</AlertDialogHeader>
|
||||
<AlertDialogFooter>
|
||||
<AlertDialogCancel>Cancel</AlertDialogCancel>
|
||||
<AlertDialogAction
|
||||
variant="destructive"
|
||||
onClick={() => void downloadQueue.removeAll()}
|
||||
>
|
||||
Remove
|
||||
</AlertDialogAction>
|
||||
</AlertDialogFooter>
|
||||
</AlertDialogContent>
|
||||
</AlertDialog>
|
||||
) : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,144 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import * as React from "react"
|
||||
import Image from "next/image"
|
||||
import { Star } from "lucide-react"
|
||||
|
||||
import { FAVORITES_DOWNLOAD_ID } from "@/components/downloads-provider"
|
||||
import { PageHeader } from "@/components/library-skeletons"
|
||||
import { OfflineLink } from "@/components/offline-gate"
|
||||
import { useDownloadsVersion } from "@/hooks/use-downloads"
|
||||
import { albumGridClassName } from "@/lib/album-grid-classes"
|
||||
import { albumCoverUrl, playlistCoverUrl } from "@/lib/cover-urls"
|
||||
import {
|
||||
downloadedCollectionPath,
|
||||
downloadQueue,
|
||||
OTHER_DOWNLOADS_PATH,
|
||||
} from "@/lib/downloads"
|
||||
import type { DownloadedCollection } from "@otunes/convex/client/download-queue"
|
||||
import { formatBytes } from "@otunes/convex/download-quality"
|
||||
|
||||
export const OTHER_DOWNLOADS_TITLE = "Other Downloaded Songs"
|
||||
|
||||
function CollectionCover({ collection }: { collection: DownloadedCollection }) {
|
||||
if (collection.id === FAVORITES_DOWNLOAD_ID) {
|
||||
return (
|
||||
<div className="flex size-full items-center justify-center bg-muted">
|
||||
<Star className="size-1/4 fill-primary text-primary" />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<Image
|
||||
src={
|
||||
collection.kind === "album"
|
||||
? albumCoverUrl(collection.id)
|
||||
: playlistCoverUrl(collection.id, null)
|
||||
}
|
||||
alt={collection.title}
|
||||
fill
|
||||
sizes="(max-width: 640px) 50vw, (max-width: 1024px) 25vw, 16vw"
|
||||
className="object-cover"
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
function DownloadCard({
|
||||
href,
|
||||
title,
|
||||
subtitle,
|
||||
cover,
|
||||
}: {
|
||||
href: string
|
||||
title: string
|
||||
subtitle: string
|
||||
cover: React.ReactNode
|
||||
}) {
|
||||
return (
|
||||
<OfflineLink href={href} className="group flex flex-col gap-2">
|
||||
<div className="relative aspect-square overflow-hidden rounded-lg ring-1 ring-foreground/10">
|
||||
{cover}
|
||||
</div>
|
||||
<div className="min-w-0">
|
||||
<p className="truncate text-sm font-medium group-hover:underline">
|
||||
{title}
|
||||
</p>
|
||||
<p className="truncate text-xs text-muted-foreground tabular-nums">
|
||||
{subtitle}
|
||||
</p>
|
||||
</div>
|
||||
</OfflineLink>
|
||||
)
|
||||
}
|
||||
|
||||
function songCount(count: number) {
|
||||
return count === 1 ? "1 song" : `${count} songs`
|
||||
}
|
||||
|
||||
/** Downloaded albums and playlists, newest first, after Other Downloaded Songs. */
|
||||
export function DownloadsView() {
|
||||
const version = useDownloadsVersion()
|
||||
const { otherSongs, rows } = React.useMemo(() => {
|
||||
const breakdown = downloadQueue.breakdown()
|
||||
const bytesByCollection = new Map(
|
||||
breakdown.collections.map((row) => [row.collection, row.bytes])
|
||||
)
|
||||
return {
|
||||
otherSongs: breakdown.otherSongs,
|
||||
rows: downloadQueue
|
||||
.collections()
|
||||
.reverse()
|
||||
.map((collection) => ({
|
||||
collection,
|
||||
bytes: bytesByCollection.get(collection) ?? 0,
|
||||
})),
|
||||
}
|
||||
// version invalidates the lookup when downloads change.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [version])
|
||||
|
||||
const empty = rows.length === 0 && otherSongs.songIds.length === 0
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader title="Downloads" />
|
||||
{empty ? (
|
||||
<div className="flex flex-1 items-center justify-center p-6 pb-28">
|
||||
<p className="text-sm text-muted-foreground">
|
||||
Nothing downloaded in this browser.
|
||||
</p>
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex-1 overflow-y-auto p-6 pb-28">
|
||||
<div className={albumGridClassName}>
|
||||
{otherSongs.songIds.length > 0 ? (
|
||||
<DownloadCard
|
||||
href={OTHER_DOWNLOADS_PATH}
|
||||
title={OTHER_DOWNLOADS_TITLE}
|
||||
subtitle={`${songCount(otherSongs.songIds.length)} · ${formatBytes(otherSongs.bytes)}`}
|
||||
cover={
|
||||
<Image
|
||||
src="/placeholder-downloads.svg"
|
||||
alt=""
|
||||
fill
|
||||
className="object-cover"
|
||||
unoptimized
|
||||
/>
|
||||
}
|
||||
/>
|
||||
) : null}
|
||||
{rows.map(({ collection, bytes }) => (
|
||||
<DownloadCard
|
||||
key={`${collection.kind}:${collection.id}`}
|
||||
href={downloadedCollectionPath(collection)}
|
||||
title={collection.title}
|
||||
subtitle={`${collection.kind === "album" ? "Album" : "Playlist"} · ${formatBytes(bytes)}`}
|
||||
cover={<CollectionCover collection={collection} />}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -148,23 +148,11 @@ export function SongListSkeleton() {
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* Matches the header + track list layout of album and playlist pages.
|
||||
* Pass `search` on playlist pages to reserve the "Find in Playlist" toolbar row.
|
||||
*/
|
||||
export function CollectionDetailSkeleton({
|
||||
search = false,
|
||||
}: {
|
||||
search?: boolean
|
||||
}) {
|
||||
/** Matches the header + track list layout of album and playlist pages. */
|
||||
export function CollectionDetailSkeleton() {
|
||||
return (
|
||||
<LoadingRegion className="flex h-svh flex-col overflow-hidden pb-28">
|
||||
<PageHeader />
|
||||
{search ? (
|
||||
<div className="flex shrink-0 justify-end px-4 pt-3 pb-1">
|
||||
<Skeleton className="h-9 w-full rounded-full md:w-64" />
|
||||
</div>
|
||||
) : null}
|
||||
<div className="mx-auto w-full max-w-9/10 min-w-0">
|
||||
<div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end">
|
||||
<Skeleton className="mx-auto aspect-square w-full max-w-60 shrink-0 rounded-lg sm:mx-0" />
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
import * as React from "react"
|
||||
import Link from "next/link"
|
||||
import {
|
||||
ArrowDownToLine,
|
||||
CircleX,
|
||||
GalleryVerticalEnd,
|
||||
ListEnd,
|
||||
ListPlus,
|
||||
@@ -42,8 +40,6 @@ export type MediaContextAction =
|
||||
| "shuffle"
|
||||
| "create-station"
|
||||
| "favorite"
|
||||
| "download"
|
||||
| "remove-download"
|
||||
|
||||
export type MediaContextNavigation = {
|
||||
artist?: { id: string }
|
||||
@@ -74,6 +70,10 @@ export function MediaMenuSeparator() {
|
||||
)
|
||||
}
|
||||
|
||||
function actionLabel(base: string, selectedCount: number) {
|
||||
return selectedCount > 1 ? `${base} (${selectedCount})` : base
|
||||
}
|
||||
|
||||
export function MediaContextMenuItems({
|
||||
selectedCount,
|
||||
onAction,
|
||||
@@ -83,7 +83,6 @@ export function MediaContextMenuItems({
|
||||
stationArtistId,
|
||||
navigation,
|
||||
share,
|
||||
downloaded,
|
||||
}: {
|
||||
selectedCount: number
|
||||
onAction: (action: MediaContextAction) => void
|
||||
@@ -93,8 +92,6 @@ export function MediaContextMenuItems({
|
||||
stationArtistId?: string
|
||||
navigation?: MediaContextNavigation
|
||||
share?: MediaShareContext
|
||||
/** Shows Download, or Remove Download when true. Omit to hide both. */
|
||||
downloaded?: boolean
|
||||
}) {
|
||||
const { artist, album } = navigation ?? {}
|
||||
const showShare = shouldShowShare(share, selectedCount)
|
||||
@@ -117,38 +114,29 @@ export function MediaContextMenuItems({
|
||||
className="justify-between"
|
||||
onClick={() => onAction("playlist")}
|
||||
>
|
||||
{playlistLabel}
|
||||
{actionLabel(playlistLabel, selectedCount)}
|
||||
<ListPlus />
|
||||
</MediaMenuItem>
|
||||
{downloaded !== undefined ? (
|
||||
<MediaMenuItem
|
||||
className="justify-between"
|
||||
onClick={() => onAction(downloaded ? "remove-download" : "download")}
|
||||
>
|
||||
{downloaded ? "Remove Download" : "Download"}
|
||||
{downloaded ? <CircleX /> : <ArrowDownToLine />}
|
||||
</MediaMenuItem>
|
||||
) : null}
|
||||
<MediaMenuSeparator />
|
||||
<MediaMenuItem
|
||||
className="justify-between"
|
||||
onClick={() => onAction("play-next")}
|
||||
>
|
||||
Play Next
|
||||
{actionLabel("Play Next", selectedCount)}
|
||||
<ListStart />
|
||||
</MediaMenuItem>
|
||||
<MediaMenuItem
|
||||
className="justify-between"
|
||||
onClick={() => onAction("play-last")}
|
||||
>
|
||||
Play Last
|
||||
{actionLabel("Play Last", selectedCount)}
|
||||
<ListEnd />
|
||||
</MediaMenuItem>
|
||||
<MediaMenuItem
|
||||
className="justify-between"
|
||||
onClick={() => onAction("shuffle")}
|
||||
>
|
||||
Shuffle
|
||||
{actionLabel("Shuffle", selectedCount)}
|
||||
<Shuffle />
|
||||
</MediaMenuItem>
|
||||
{stationArtistId ? (
|
||||
@@ -189,7 +177,7 @@ export function MediaContextMenuItems({
|
||||
className="justify-between"
|
||||
onClick={() => onAction("favorite")}
|
||||
>
|
||||
{favorited ? "Unfavorite" : "Favorite"}
|
||||
{actionLabel(favorited ? "Unfavorite" : "Favorite", selectedCount)}
|
||||
<Star />
|
||||
</MediaMenuItem>
|
||||
</>
|
||||
@@ -234,7 +222,6 @@ export type MediaContextMenuProps = {
|
||||
stationArtistId?: string
|
||||
navigation?: MediaContextNavigation
|
||||
share?: MediaShareContext
|
||||
downloaded?: boolean
|
||||
inSelectionRange?: boolean
|
||||
/** When false, the trigger uses default button/dropdown styling (page headers). */
|
||||
trackRowTrigger?: boolean
|
||||
@@ -277,7 +264,6 @@ export function MediaContextMenuArea({
|
||||
stationArtistId={menu.stationArtistId}
|
||||
navigation={menu.navigation}
|
||||
share={menu.share}
|
||||
downloaded={menu.downloaded}
|
||||
/>
|
||||
{menu.children}
|
||||
</MenuKindContext>
|
||||
@@ -297,7 +283,6 @@ export function MediaContextMenu({
|
||||
stationArtistId,
|
||||
navigation,
|
||||
share,
|
||||
downloaded,
|
||||
inSelectionRange = false,
|
||||
trackRowTrigger = true,
|
||||
triggerClassName,
|
||||
@@ -339,7 +324,6 @@ export function MediaContextMenu({
|
||||
stationArtistId={stationArtistId}
|
||||
navigation={navigation}
|
||||
share={share}
|
||||
downloaded={downloaded}
|
||||
/>
|
||||
{children}
|
||||
</DropdownMenuContent>
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import { connectivityStore } from "@otunes/convex/client/connectivity"
|
||||
import { useConvex } from "convex/react"
|
||||
import { WifiOff } from "lucide-react"
|
||||
import Link from "next/link"
|
||||
import { usePathname, useSearchParams } from "next/navigation"
|
||||
import { useOffline } from "next/offline"
|
||||
import { useEffect, useRef, useSyncExternalStore } from "react"
|
||||
|
||||
import { PageHeader } from "@/components/library-skeletons"
|
||||
import { DOWNLOADS_PATH } from "@/lib/downloads"
|
||||
|
||||
/** How long an offline navigation may wait before loading the page in full. */
|
||||
const STALLED_NAVIGATION_MS = 1_500
|
||||
|
||||
/**
|
||||
* True while the browser is offline or the server can't be reached. Next's
|
||||
* `useOffline` covers the network and the web server (it needs
|
||||
* `experimental.useOffline`); the shared store covers the Convex backend.
|
||||
*/
|
||||
export function useIsOffline() {
|
||||
const nextOffline = useOffline()
|
||||
const store = connectivityStore(useConvex())
|
||||
const convexOffline = useSyncExternalStore(
|
||||
store.subscribe,
|
||||
store.getSnapshot,
|
||||
() => false
|
||||
)
|
||||
return nextOffline || convexOffline
|
||||
}
|
||||
|
||||
/**
|
||||
* Replaces page content with a no-connection message while offline. Downloads
|
||||
* pages, and albums and playlists opened from them, keep rendering so offline
|
||||
* playback stays reachable. Needs a Suspense boundary for `useSearchParams`.
|
||||
*/
|
||||
export function OfflineGate({ children }: { children: React.ReactNode }) {
|
||||
const offline = useIsOffline()
|
||||
const pathname = usePathname()
|
||||
const fromDownloads = useSearchParams().get("from") === "downloads"
|
||||
const isDownloadsPage =
|
||||
pathname === DOWNLOADS_PATH || pathname.startsWith(`${DOWNLOADS_PATH}/`)
|
||||
|
||||
if (!offline || isDownloadsPage || fromDownloads) return children
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader />
|
||||
<div className="flex flex-1 flex-col items-center justify-center gap-2 p-6 pb-28 text-center">
|
||||
<WifiOff className="mb-1 size-7 text-muted-foreground" />
|
||||
<p className="text-sm font-medium">No connection</p>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
Your downloads still play.
|
||||
</p>
|
||||
<OfflineLink
|
||||
href={DOWNLOADS_PATH}
|
||||
className="text-sm underline underline-offset-4"
|
||||
>
|
||||
Go to Downloads
|
||||
</OfflineLink>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* A fully prefetched link for pages that work offline. Offline, a page that
|
||||
* was never prefetched would wait for the connection, so after a moment it
|
||||
* loads in full instead and the service worker serves its saved copy.
|
||||
*/
|
||||
export function OfflineLink({
|
||||
href,
|
||||
onClick,
|
||||
...props
|
||||
}: React.ComponentProps<typeof Link> & { href: string }) {
|
||||
const offline = useIsOffline()
|
||||
const pathname = usePathname()
|
||||
const fallback = useRef<ReturnType<typeof setTimeout>>(undefined)
|
||||
|
||||
// Any completed navigation, or leaving the page, cancels the fallback.
|
||||
useEffect(() => () => clearTimeout(fallback.current), [pathname])
|
||||
|
||||
return (
|
||||
<Link
|
||||
href={href}
|
||||
prefetch
|
||||
onClick={(event) => {
|
||||
onClick?.(event)
|
||||
if (!offline || event.defaultPrevented) return
|
||||
if (event.metaKey || event.ctrlKey || event.shiftKey) return
|
||||
clearTimeout(fallback.current)
|
||||
fallback.current = setTimeout(
|
||||
() => window.location.assign(href),
|
||||
STALLED_NAVIGATION_MS
|
||||
)
|
||||
}}
|
||||
{...props}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -39,7 +39,6 @@ import {
|
||||
TableHeader,
|
||||
TableRow,
|
||||
} from "@/components/ui/table"
|
||||
import { DownloadsSettings } from "@/components/downloads-settings"
|
||||
import { usePlayback } from "@/components/playback-provider"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
@@ -47,7 +46,7 @@ import type { PlaybackQuality } from "@otunes/convex/playback-stream"
|
||||
import { resizeProfileImageToDataUrl } from "@/lib/resize-image"
|
||||
import { cn } from "@/lib/utils"
|
||||
|
||||
type Section = "profile" | "quality" | "downloads" | "users" | "library"
|
||||
type Section = "profile" | "quality" | "users" | "library"
|
||||
|
||||
type CurrentUser = {
|
||||
_id: Id<"users">
|
||||
@@ -950,12 +949,6 @@ export function OptionsModal({
|
||||
>
|
||||
Quality
|
||||
</NavButton>
|
||||
<NavButton
|
||||
active={activeSection === "downloads"}
|
||||
onClick={() => setSection("downloads")}
|
||||
>
|
||||
Downloads
|
||||
</NavButton>
|
||||
</nav>
|
||||
|
||||
{isAdmin ? (
|
||||
@@ -986,7 +979,6 @@ export function OptionsModal({
|
||||
<div className="p-6">
|
||||
{activeSection === "profile" && <ProfileSection user={user} />}
|
||||
{activeSection === "quality" && <QualitySection user={user} />}
|
||||
{activeSection === "downloads" && <DownloadsSettings />}
|
||||
{activeSection === "library" && isAdmin ? (
|
||||
<LibrarySection />
|
||||
) : null}
|
||||
|
||||
@@ -1,158 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import { useCallback, useMemo, type MouseEvent } from "react"
|
||||
import { Play, Shuffle } from "lucide-react"
|
||||
|
||||
import { OTHER_DOWNLOADS_TITLE } from "@/components/downloads-view"
|
||||
import { useFavorites } from "@/components/favorites-provider"
|
||||
import { PageHeader } from "@/components/library-skeletons"
|
||||
import { usePlaybackActions } from "@/components/playback-provider"
|
||||
import { LibraryTrackListHeader, TrackRow } from "@/components/track-row"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { ScrollArea } from "@/components/ui/scroll-area"
|
||||
import { VirtualList } from "@/components/virtual-list"
|
||||
import { useDownloadsVersion } from "@/hooks/use-downloads"
|
||||
import { useTrackListMediaAction } from "@/hooks/use-media-actions"
|
||||
import { useTrackSelection } from "@/hooks/use-track-selection"
|
||||
import { downloadQueue } from "@/lib/downloads"
|
||||
import { getSelectionRangePositions } from "@/lib/selection-range-styles"
|
||||
import { stationArtistId } from "@/lib/station-artist"
|
||||
import { useSongs } from "@/lib/song-cache"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
|
||||
const PLAY_ORIGIN = downloadsQueueOrigin("other")
|
||||
const estimateSongRowSize = () => 56
|
||||
|
||||
/** Songs downloaded on their own. Playback here always uses the downloads. */
|
||||
export function OtherDownloadsView() {
|
||||
const version = useDownloadsVersion()
|
||||
const songIds = useMemo(
|
||||
() =>
|
||||
downloadQueue
|
||||
.otherSongIds()
|
||||
.filter((songId) => downloadQueue.getDownloaded(songId))
|
||||
.reverse() as Id<"songs">[],
|
||||
// version invalidates the lookup when downloads change.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
[version]
|
||||
)
|
||||
const cachedSongs = useSongs(songIds)
|
||||
const songs = useMemo(
|
||||
() => cachedSongs.filter((song): song is BrowseSong => song !== undefined),
|
||||
[cachedSongs]
|
||||
)
|
||||
const playableIds = useMemo(
|
||||
() => songs.map((song) => song.id as Id<"songs">),
|
||||
[songs]
|
||||
)
|
||||
|
||||
const { isSongFavorite, toggleSongFavorite } = useFavorites()
|
||||
const { playFromSong, playInOrder, playShuffled } = usePlaybackActions()
|
||||
const {
|
||||
selectedIds,
|
||||
selectedCount,
|
||||
handleSelect,
|
||||
handlePointerDown,
|
||||
prepareContextMenu,
|
||||
clearSelection,
|
||||
} = useTrackSelection(songs)
|
||||
const selectedStationArtistId = useMemo(
|
||||
() => stationArtistId(songs, selectedIds),
|
||||
[songs, selectedIds]
|
||||
)
|
||||
const selectionPositions = useMemo(
|
||||
() =>
|
||||
getSelectionRangePositions(
|
||||
songs.map((song) => song.id),
|
||||
selectedIds
|
||||
),
|
||||
[songs, selectedIds]
|
||||
)
|
||||
const handleMediaAction = useTrackListMediaAction({
|
||||
selectedIds,
|
||||
songs,
|
||||
downloadFrom: "other",
|
||||
})
|
||||
const handleRowSelect = useCallback(
|
||||
(index: number, event: MouseEvent) =>
|
||||
handleSelect(songs[index].id, index, event),
|
||||
[songs, handleSelect]
|
||||
)
|
||||
const handleRowPlay = useCallback(
|
||||
(index: number) =>
|
||||
void playFromSong(songs[index].id, playableIds, PLAY_ORIGIN),
|
||||
[songs, playableIds, playFromSong]
|
||||
)
|
||||
const handleToggleFavorite = useCallback(
|
||||
(songId: string) => void toggleSongFavorite(songId as Id<"songs">),
|
||||
[toggleSongFavorite]
|
||||
)
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader title={OTHER_DOWNLOADS_TITLE} />
|
||||
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!">
|
||||
<div
|
||||
className="w-full pb-28"
|
||||
onClick={(event) => {
|
||||
if (event.target === event.currentTarget) clearSelection()
|
||||
}}
|
||||
>
|
||||
{songIds.length === 0 ? (
|
||||
<p className="p-6 text-sm text-muted-foreground">
|
||||
Songs you download on their own appear here.
|
||||
</p>
|
||||
) : (
|
||||
<>
|
||||
<div className="flex gap-2 px-6 py-4">
|
||||
<Button
|
||||
className="h-10 gap-2 rounded-full bg-foreground px-6 text-background hover:bg-foreground/90"
|
||||
onClick={() => void playInOrder(playableIds, PLAY_ORIGIN)}
|
||||
disabled={playableIds.length === 0}
|
||||
>
|
||||
<Play className="fill-current" />
|
||||
Play
|
||||
</Button>
|
||||
<Button
|
||||
variant="secondary"
|
||||
size="icon"
|
||||
className="rounded-full"
|
||||
aria-label="Shuffle"
|
||||
onClick={() => void playShuffled(playableIds, PLAY_ORIGIN)}
|
||||
disabled={playableIds.length === 0}
|
||||
>
|
||||
<Shuffle />
|
||||
</Button>
|
||||
</div>
|
||||
<LibraryTrackListHeader />
|
||||
<VirtualList
|
||||
count={songs.length}
|
||||
estimateSize={estimateSongRowSize}
|
||||
getItemKey={(index) => songs[index].id}
|
||||
renderItem={(index) => (
|
||||
<TrackRow
|
||||
variant="library"
|
||||
song={songs[index]}
|
||||
index={index}
|
||||
selectionPosition={selectionPositions[index]}
|
||||
isFavorite={isSongFavorite(songs[index].id)}
|
||||
selectedCount={selectedCount}
|
||||
selectionStationArtistId={selectedStationArtistId}
|
||||
onPointerDown={handlePointerDown}
|
||||
onSelect={handleRowSelect}
|
||||
onPlay={handleRowPlay}
|
||||
onToggleFavorite={handleToggleFavorite}
|
||||
onPrepareContextMenu={prepareContextMenu}
|
||||
onMediaAction={handleMediaAction}
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</ScrollArea>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -35,11 +35,6 @@ import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useMediaSession } from "@/hooks/use-media-session"
|
||||
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
import { supportsDolbyAtmosPlayback } from "@/lib/dolby-atmos-support"
|
||||
import { downloadedAudioUrl, downloadQueue } from "@/lib/downloads"
|
||||
import {
|
||||
isDownloadsQueueOrigin,
|
||||
streamDownloadQuality,
|
||||
} from "@otunes/convex/download-quality"
|
||||
import { flushPersistentCache } from "@/lib/persistent-cache"
|
||||
import * as playbackQueue from "@otunes/convex/client/playback-queue"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
@@ -66,9 +61,8 @@ type PlaybackContextValue = {
|
||||
toggleQueueOpen: () => void
|
||||
setIsPlaying: (playing: boolean) => void
|
||||
setVolume: (volume: number) => void
|
||||
/** An origin from `downloadsQueueOrigin` plays downloads in any quality. */
|
||||
playInOrder: (songIds: Id<"songs">[], origin?: string) => Promise<void>
|
||||
playShuffled: (songIds: Id<"songs">[], origin?: string) => Promise<void>
|
||||
playInOrder: (songIds: Id<"songs">[]) => Promise<void>
|
||||
playShuffled: (songIds: Id<"songs">[]) => Promise<void>
|
||||
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
|
||||
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
|
||||
playFromSong: (
|
||||
@@ -103,11 +97,8 @@ type PlaybackContextValue = {
|
||||
toggleShuffle: () => Promise<void>
|
||||
cycleRepeat: () => Promise<void>
|
||||
clearQueue: () => Promise<void>
|
||||
clearHistory: () => Promise<void>
|
||||
reorderQueue: (songIds: Id<"songs">[]) => Promise<void>
|
||||
skipToQueueIndex: (index: number) => Promise<void>
|
||||
/** Plays `history[index]`, moving it and every later song back into the queue. */
|
||||
skipToHistoryIndex: (index: number) => Promise<void>
|
||||
skipNext: () => Promise<void>
|
||||
skipPrevious: () => Promise<void>
|
||||
dolbyAtmosSupported: boolean | null
|
||||
@@ -198,79 +189,28 @@ type PlaybackLoadSettings = {
|
||||
useHls: boolean
|
||||
}
|
||||
|
||||
function userStreamPlan(
|
||||
function playbackLoadSettings(
|
||||
user: {
|
||||
preferAtmos?: boolean
|
||||
playbackQuality?: PlaybackQuality
|
||||
},
|
||||
dolbyAtmosSupported: boolean | null,
|
||||
files: Record<string, unknown>
|
||||
) {
|
||||
): PlaybackLoadSettings {
|
||||
const preferAtmos =
|
||||
dolbyAtmosSupported === true && (user.preferAtmos ?? false)
|
||||
return playbackStreamPlan(files, user.playbackQuality, preferAtmos)
|
||||
}
|
||||
|
||||
/** Where a song plays from: this device's download, or the server. */
|
||||
type AudioSourceChoice =
|
||||
{ kind: "download" } | { kind: "stream"; settings: PlaybackLoadSettings }
|
||||
|
||||
/**
|
||||
* Downloads stand in for streams in the same quality, and always play in
|
||||
* queues started from Downloads. Without the user or file info (offline),
|
||||
* any download plays.
|
||||
*/
|
||||
function audioSourceChoice(
|
||||
songId: string,
|
||||
user: { preferAtmos?: boolean; playbackQuality?: PlaybackQuality } | null,
|
||||
dolbyAtmosSupported: boolean | null,
|
||||
files: Record<string, unknown> | undefined,
|
||||
fromDownloads: boolean
|
||||
): AudioSourceChoice | null {
|
||||
const download = downloadQueue.getDownloaded(songId)
|
||||
if (!user || !files) {
|
||||
return download ? { kind: "download" } : null
|
||||
}
|
||||
const plan = userStreamPlan(user, dolbyAtmosSupported, files)
|
||||
if (
|
||||
download &&
|
||||
(fromDownloads || download.quality === streamDownloadQuality(plan))
|
||||
) {
|
||||
return { kind: "download" }
|
||||
}
|
||||
const plan = playbackStreamPlan(files, user.playbackQuality, preferAtmos)
|
||||
return {
|
||||
kind: "stream",
|
||||
settings: {
|
||||
preferAtmos: plan.preferAtmos,
|
||||
playbackQuality: plan.playbackQuality,
|
||||
useHls: plan.useHls,
|
||||
},
|
||||
preferAtmos: plan.preferAtmos,
|
||||
playbackQuality: plan.playbackQuality,
|
||||
useHls: plan.useHls,
|
||||
}
|
||||
}
|
||||
|
||||
function songLoadKey(songId: string, source: AudioSourceChoice) {
|
||||
if (source.kind === "download") {
|
||||
return `${songId}:download`
|
||||
}
|
||||
const { settings } = source
|
||||
function songLoadKey(songId: string, settings: PlaybackLoadSettings) {
|
||||
return `${songId}:${settings.preferAtmos}:${settings.playbackQuality}:${settings.useHls ? "hls" : "file"}`
|
||||
}
|
||||
|
||||
/**
|
||||
* True when `loadedKey` is this song from the other side of download vs
|
||||
* stream. Finishing or removing a download keeps the loaded audio playing.
|
||||
*/
|
||||
function switchesDownloadSource(
|
||||
loadedKey: string | null,
|
||||
songId: string,
|
||||
source: AudioSourceChoice
|
||||
) {
|
||||
if (!loadedKey?.startsWith(`${songId}:`)) {
|
||||
return false
|
||||
}
|
||||
return (source.kind === "download") !== loadedKey.endsWith(":download")
|
||||
}
|
||||
|
||||
function destroyHlsInstance(hlsRef: RefObject<Hls | null>) {
|
||||
hlsRef.current?.destroy()
|
||||
hlsRef.current = null
|
||||
@@ -302,11 +242,21 @@ function loadAudioSource(
|
||||
audio: HTMLAudioElement,
|
||||
hlsRef: RefObject<Hls | null>,
|
||||
songId: string,
|
||||
source: AudioSourceChoice,
|
||||
settings: PlaybackLoadSettings,
|
||||
onReady: () => void
|
||||
): AudioSourceCleanup {
|
||||
let disposed = false
|
||||
let hlsInstance: Hls | null = null
|
||||
const directUrl = songPlayPath(
|
||||
songId,
|
||||
settings.playbackQuality,
|
||||
settings.preferAtmos
|
||||
)
|
||||
const hlsUrl = songHlsPlaylistPath(
|
||||
songId,
|
||||
settings.playbackQuality,
|
||||
settings.preferAtmos
|
||||
)
|
||||
|
||||
const onReadyToPlay = () => {
|
||||
audio.removeEventListener("loadedmetadata", onReadyToPlay)
|
||||
@@ -319,48 +269,6 @@ function loadAudioSource(
|
||||
audio.addEventListener("loadeddata", onReadyToPlay)
|
||||
audio.addEventListener("canplay", onReadyToPlay)
|
||||
|
||||
const cleanup = () => {
|
||||
disposed = true
|
||||
audio.removeEventListener("loadedmetadata", onReadyToPlay)
|
||||
audio.removeEventListener("loadeddata", onReadyToPlay)
|
||||
audio.removeEventListener("canplay", onReadyToPlay)
|
||||
if (hlsInstance && hlsRef.current === hlsInstance) {
|
||||
hlsInstance.destroy()
|
||||
hlsRef.current = null
|
||||
}
|
||||
}
|
||||
|
||||
if (source.kind === "download") {
|
||||
void downloadedAudioUrl(songId)
|
||||
.catch(() => null)
|
||||
.then((url) => {
|
||||
if (disposed) {
|
||||
return
|
||||
}
|
||||
if (!url) {
|
||||
// Removed since it was chosen; the audio error handler reports it.
|
||||
audio.removeAttribute("src")
|
||||
audio.load()
|
||||
return
|
||||
}
|
||||
audio.src = url
|
||||
audio.load()
|
||||
})
|
||||
return cleanup
|
||||
}
|
||||
|
||||
const { settings } = source
|
||||
const directUrl = songPlayPath(
|
||||
songId,
|
||||
settings.playbackQuality,
|
||||
settings.preferAtmos
|
||||
)
|
||||
const hlsUrl = songHlsPlaylistPath(
|
||||
songId,
|
||||
settings.playbackQuality,
|
||||
settings.preferAtmos
|
||||
)
|
||||
|
||||
const loadDirectSource = () => {
|
||||
if (disposed) {
|
||||
return
|
||||
@@ -394,7 +302,16 @@ function loadAudioSource(
|
||||
loadDirectSource()
|
||||
}
|
||||
|
||||
return cleanup
|
||||
return () => {
|
||||
disposed = true
|
||||
audio.removeEventListener("loadedmetadata", onReadyToPlay)
|
||||
audio.removeEventListener("loadeddata", onReadyToPlay)
|
||||
audio.removeEventListener("canplay", onReadyToPlay)
|
||||
if (hlsInstance && hlsRef.current === hlsInstance) {
|
||||
hlsInstance.destroy()
|
||||
hlsRef.current = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export function usePlayback() {
|
||||
@@ -522,17 +439,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
getDolbyAtmosSnapshot,
|
||||
() => null
|
||||
)
|
||||
// Re-picks audio sources when songs finish downloading or are removed.
|
||||
const downloadsVersion = useSyncExternalStore(
|
||||
downloadQueue.subscribe,
|
||||
downloadQueue.getVersion,
|
||||
() => 0
|
||||
)
|
||||
useEffect(() => {
|
||||
void downloadQueue.load().catch(() => {})
|
||||
}, [])
|
||||
// Queues started from the Downloads page play downloads in any quality.
|
||||
const [fromDownloads, setFromDownloads] = useState(false)
|
||||
const volume = useSyncExternalStore(
|
||||
subscribeVolume,
|
||||
readStoredVolume,
|
||||
@@ -853,22 +759,18 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
return
|
||||
}
|
||||
|
||||
const source = audioSourceChoice(
|
||||
currentSongId,
|
||||
user ? { playbackQuality, preferAtmos } : null,
|
||||
dolbyAtmosSupported,
|
||||
currentSongDoc?.files,
|
||||
fromDownloads
|
||||
)
|
||||
if (!source) {
|
||||
if (!user || !currentSongDoc) {
|
||||
return
|
||||
}
|
||||
const loadKey = songLoadKey(currentSongId, source)
|
||||
|
||||
if (
|
||||
loadedSongKeyRef.current === loadKey ||
|
||||
switchesDownloadSource(loadedSongKeyRef.current, currentSongId, source)
|
||||
) {
|
||||
const settings = playbackLoadSettings(
|
||||
{ playbackQuality, preferAtmos },
|
||||
dolbyAtmosSupported,
|
||||
currentSongDoc.files
|
||||
)
|
||||
const loadKey = songLoadKey(currentSongId, settings)
|
||||
|
||||
if (loadedSongKeyRef.current === loadKey) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -909,7 +811,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
audio,
|
||||
hlsRef,
|
||||
currentSongId,
|
||||
source,
|
||||
settings,
|
||||
requestPlay
|
||||
)
|
||||
|
||||
@@ -924,8 +826,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
playbackQuality,
|
||||
preferAtmos,
|
||||
dolbyAtmosSupported,
|
||||
downloadsVersion,
|
||||
fromDownloads,
|
||||
runWithoutAudioSync,
|
||||
destroyHls,
|
||||
clearPreload,
|
||||
@@ -939,17 +839,16 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
return
|
||||
}
|
||||
|
||||
const source = audioSourceChoice(
|
||||
nextQueueSongId,
|
||||
user ? { playbackQuality, preferAtmos } : null,
|
||||
dolbyAtmosSupported,
|
||||
nextQueueSongDoc?.files,
|
||||
fromDownloads
|
||||
)
|
||||
if (!source) {
|
||||
if (!user || !nextQueueSongDoc) {
|
||||
return
|
||||
}
|
||||
const loadKey = songLoadKey(nextQueueSongId, source)
|
||||
|
||||
const settings = playbackLoadSettings(
|
||||
{ playbackQuality, preferAtmos },
|
||||
dolbyAtmosSupported,
|
||||
nextQueueSongDoc.files
|
||||
)
|
||||
const loadKey = songLoadKey(nextQueueSongId, settings)
|
||||
|
||||
if (preloadedSongKeyRef.current === loadKey) {
|
||||
return
|
||||
@@ -968,7 +867,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
preloadAudio,
|
||||
preloadHlsRef,
|
||||
nextQueueSongId,
|
||||
source,
|
||||
settings,
|
||||
onPreloadReady
|
||||
)
|
||||
|
||||
@@ -989,8 +888,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
playbackQuality,
|
||||
preferAtmos,
|
||||
dolbyAtmosSupported,
|
||||
downloadsVersion,
|
||||
fromDownloads,
|
||||
clearPreload,
|
||||
destroyPreloadHls,
|
||||
])
|
||||
@@ -1052,22 +949,19 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
}
|
||||
|
||||
const preloadAudio = preloadAudioRef.current
|
||||
const nextSource = nextQueueSongId
|
||||
? audioSourceChoice(
|
||||
nextQueueSongId,
|
||||
user ?? null,
|
||||
dolbyAtmosSupported,
|
||||
nextQueueSongDoc?.files,
|
||||
fromDownloads
|
||||
)
|
||||
: null
|
||||
if (
|
||||
shouldContinuePlaying &&
|
||||
preloadAudio &&
|
||||
nextQueueSongId &&
|
||||
nextSource
|
||||
user &&
|
||||
nextQueueSongDoc
|
||||
) {
|
||||
const nextLoadKey = songLoadKey(nextQueueSongId, nextSource)
|
||||
const settings = playbackLoadSettings(
|
||||
user,
|
||||
dolbyAtmosSupported,
|
||||
nextQueueSongDoc.files
|
||||
)
|
||||
const nextLoadKey = songLoadKey(nextQueueSongId, settings)
|
||||
|
||||
if (
|
||||
preloadedSongKeyRef.current === nextLoadKey &&
|
||||
@@ -1154,7 +1048,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
nextQueueSongDoc,
|
||||
user,
|
||||
dolbyAtmosSupported,
|
||||
fromDownloads,
|
||||
store,
|
||||
destroyHls,
|
||||
runWithoutAudioSync,
|
||||
@@ -1216,7 +1109,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
queueOriginRef.current =
|
||||
recorded.origin ??
|
||||
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
||||
setFromDownloads(isDownloadsQueueOrigin(recorded.origin))
|
||||
const previousSongId = store.getState().queue[0]
|
||||
store.update(playbackQueue.clearQueue)
|
||||
store.update(recipe)
|
||||
@@ -1269,26 +1161,21 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
)
|
||||
|
||||
const playInOrder = useCallback(
|
||||
async (songIds: Id<"songs">[], origin?: string) => {
|
||||
async (songIds: Id<"songs">[]) => {
|
||||
if (songIds.length === 0) {
|
||||
return
|
||||
}
|
||||
startPlayback(
|
||||
(state) => playbackQueue.startQueue(state, songIds, false),
|
||||
{ origin }
|
||||
)
|
||||
startPlayback((state) => playbackQueue.startQueue(state, songIds, false))
|
||||
},
|
||||
[startPlayback]
|
||||
)
|
||||
|
||||
const playShuffled = useCallback(
|
||||
async (songIds: Id<"songs">[], origin?: string) => {
|
||||
async (songIds: Id<"songs">[]) => {
|
||||
if (songIds.length === 0) {
|
||||
return
|
||||
}
|
||||
startPlayback((state) => playbackQueue.startQueue(state, songIds, true), {
|
||||
origin,
|
||||
})
|
||||
startPlayback((state) => playbackQueue.startQueue(state, songIds, true))
|
||||
},
|
||||
[startPlayback]
|
||||
)
|
||||
@@ -1458,10 +1345,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
setIsPlaying(false)
|
||||
}, [store])
|
||||
|
||||
const clearHistory = useCallback(async () => {
|
||||
store.update(playbackQueue.clearHistory)
|
||||
}, [store])
|
||||
|
||||
const reorderQueue = useCallback(
|
||||
async (songIds: Id<"songs">[]) => {
|
||||
store.update((state) => playbackQueue.reorderQueue(state, songIds))
|
||||
@@ -1476,13 +1359,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
[store]
|
||||
)
|
||||
|
||||
const skipToHistoryIndex = useCallback(
|
||||
async (index: number) => {
|
||||
store.update((state) => playbackQueue.skipToHistoryIndex(state, index))
|
||||
},
|
||||
[store]
|
||||
)
|
||||
|
||||
const skipNext = useCallback(async () => {
|
||||
const before = store.getState()
|
||||
if (before.repeatEnabled === "none" && before.queue.length <= 1) {
|
||||
@@ -1517,25 +1393,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
skipPrevious,
|
||||
})
|
||||
|
||||
const currentSource = currentSongId
|
||||
? audioSourceChoice(
|
||||
currentSongId,
|
||||
user ? { playbackQuality, preferAtmos } : null,
|
||||
dolbyAtmosSupported,
|
||||
currentSongDoc?.files,
|
||||
fromDownloads
|
||||
)
|
||||
: null
|
||||
const currentDownload =
|
||||
currentSource?.kind === "download" && currentSongId
|
||||
? downloadQueue.getDownloaded(currentSongId)
|
||||
: undefined
|
||||
const currentFormat = currentDownload
|
||||
? currentDownload.quality === "atmos" ||
|
||||
currentDownload.quality === "lossless"
|
||||
? currentDownload.quality
|
||||
: null
|
||||
: currentSongDoc && user
|
||||
const currentFormat =
|
||||
currentSongDoc && user
|
||||
? playbackFormat(
|
||||
currentSongDoc.files,
|
||||
user.playbackQuality,
|
||||
@@ -1564,10 +1423,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
toggleShuffle,
|
||||
cycleRepeat,
|
||||
clearQueue,
|
||||
clearHistory,
|
||||
reorderQueue,
|
||||
skipToQueueIndex,
|
||||
skipToHistoryIndex,
|
||||
skipNext,
|
||||
skipPrevious,
|
||||
}),
|
||||
@@ -1589,10 +1446,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
toggleShuffle,
|
||||
cycleRepeat,
|
||||
clearQueue,
|
||||
clearHistory,
|
||||
reorderQueue,
|
||||
skipToQueueIndex,
|
||||
skipToHistoryIndex,
|
||||
skipNext,
|
||||
skipPrevious,
|
||||
]
|
||||
|
||||
@@ -22,8 +22,6 @@ import {
|
||||
DropdownMenuContent,
|
||||
DropdownMenuTrigger,
|
||||
} from "@/components/ui/dropdown-menu"
|
||||
import { useDownloads } from "@/components/downloads-provider"
|
||||
import { useIsCollectionDownloaded } from "@/hooks/use-downloads"
|
||||
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
@@ -34,9 +32,6 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
|
||||
const { openAddPlaylistToPlaylist } = useAddToPlaylist()
|
||||
const { playPlaylist } = usePlaybackActions()
|
||||
const { runQueueAction } = useQueueMediaActions()
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
const downloadRef = { kind: "playlist" as const, id: playlist.id }
|
||||
const downloaded = useIsCollectionDownloaded(downloadRef)
|
||||
|
||||
async function handleCardAction(action: MediaContextAction) {
|
||||
switch (action) {
|
||||
@@ -57,20 +52,6 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
|
||||
void runQueueAction(action, songIds)
|
||||
break
|
||||
}
|
||||
case "download":
|
||||
case "remove-download": {
|
||||
const songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getPlaylistSongIds,
|
||||
{ playlistId: playlist.id as Id<"playlists"> }
|
||||
)
|
||||
const target = { ...downloadRef, title: playlist.title, songIds }
|
||||
void (action === "download"
|
||||
? requestDownload(target)
|
||||
: removeDownload(target))
|
||||
break
|
||||
}
|
||||
case "favorite":
|
||||
break
|
||||
}
|
||||
@@ -120,7 +101,6 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
|
||||
<MediaContextMenuItems
|
||||
selectedCount={1}
|
||||
showFavorite={false}
|
||||
downloaded={downloaded}
|
||||
onAction={(action) => void handleCardAction(action)}
|
||||
share={{ type: "playlist", playlistId: playlist.id }}
|
||||
/>
|
||||
|
||||
@@ -18,17 +18,7 @@ import {
|
||||
} from "lucide-react"
|
||||
import { toast } from "sonner"
|
||||
|
||||
import { DownloadButton, DownloadedQuality } from "@/components/download-button"
|
||||
import {
|
||||
FAVORITES_DOWNLOAD_ID,
|
||||
useDownloads,
|
||||
} from "@/components/downloads-provider"
|
||||
import { useFavorites } from "@/components/favorites-provider"
|
||||
import {
|
||||
useIsCollectionDownloaded,
|
||||
useOpenedFromDownloads,
|
||||
} from "@/hooks/use-downloads"
|
||||
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import {
|
||||
useCurrentSongId,
|
||||
usePlaybackActions,
|
||||
@@ -157,22 +147,8 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
rememberSongs(playlist.songs)
|
||||
}, [playlist.songs])
|
||||
|
||||
const downloadRef = React.useMemo(
|
||||
() => ({
|
||||
kind: "playlist" as const,
|
||||
id: playlist.id ?? FAVORITES_DOWNLOAD_ID,
|
||||
}),
|
||||
[playlist.id]
|
||||
)
|
||||
const fromDownloads = useOpenedFromDownloads()
|
||||
const playOrigin = fromDownloads
|
||||
? downloadsQueueOrigin(`playlist:${downloadRef.id}`)
|
||||
: `playlist:${playlist.id}`
|
||||
|
||||
function playAll(shuffled: boolean) {
|
||||
if (fromDownloads) {
|
||||
void (shuffled ? playShuffled : playInOrder)(playlistSongIds, playOrigin)
|
||||
} else if (playlist.id) {
|
||||
if (playlist.id) {
|
||||
const play = shuffled ? playPlaylistShuffled : playPlaylist
|
||||
void play(playlist.id, playlistSongIds)
|
||||
} else {
|
||||
@@ -180,32 +156,9 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
}
|
||||
}
|
||||
|
||||
const handleMediaAction = useTrackListMediaAction({
|
||||
selectedIds,
|
||||
songs,
|
||||
downloadFrom: downloadRef,
|
||||
})
|
||||
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
const downloadTarget = React.useMemo(
|
||||
() => ({
|
||||
...downloadRef,
|
||||
title: playlist.title,
|
||||
songIds: playlistSongIds,
|
||||
}),
|
||||
[downloadRef, playlist.title, playlistSongIds]
|
||||
)
|
||||
const playlistDownloaded = useIsCollectionDownloaded(downloadTarget)
|
||||
const handleMediaAction = useTrackListMediaAction({ selectedIds, songs })
|
||||
|
||||
function handlePlaylistMediaAction(action: MediaContextAction) {
|
||||
if (action === "download") {
|
||||
void requestDownload(downloadTarget)
|
||||
return
|
||||
}
|
||||
if (action === "remove-download") {
|
||||
void removeDownload(downloadTarget)
|
||||
return
|
||||
}
|
||||
runSongsAction(action, playlistSongIds)
|
||||
}
|
||||
|
||||
@@ -218,7 +171,11 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
}
|
||||
|
||||
function handleRowPlay(index: number) {
|
||||
void playFromSong(filteredSongs[index].id, playlistSongIds, playOrigin)
|
||||
void playFromSong(
|
||||
filteredSongs[index].id,
|
||||
playlistSongIds,
|
||||
`playlist:${playlist.id}`
|
||||
)
|
||||
}
|
||||
|
||||
function handleToggleFavorite(songId: string) {
|
||||
@@ -342,24 +299,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader openApp />
|
||||
<div className="flex shrink-0 justify-end px-4 pt-3 pb-1">
|
||||
<div className="relative w-full md:w-64">
|
||||
<SearchIcon className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
|
||||
<input
|
||||
type="search"
|
||||
aria-label="Find in playlist"
|
||||
placeholder="Find in Playlist"
|
||||
value={searchQuery}
|
||||
onChange={(event) => {
|
||||
setSearchQuery(event.target.value)
|
||||
clearSelection()
|
||||
setActiveTrackId("")
|
||||
setDragIndex(null)
|
||||
}}
|
||||
className="h-9 w-full min-w-0 rounded-full border border-input bg-input/30 pr-3 pl-9 text-sm text-foreground transition-colors outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/50"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<ScrollArea className="min-h-0 flex-1">
|
||||
<div className="pb-28">
|
||||
<div className="mx-auto w-full max-w-9/10 min-w-0">
|
||||
@@ -403,9 +342,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
<p className="text-lg font-semibold text-primary">
|
||||
{playlist.owner.name}
|
||||
</p>
|
||||
<p className="text-sm text-muted-foreground empty:hidden">
|
||||
<DownloadedQuality collection={downloadRef} />
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="flex flex-wrap items-center justify-center gap-2 sm:justify-start">
|
||||
@@ -438,7 +374,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
{isSubscribed ? "Subscribed" : "Subscribe"}
|
||||
</Button>
|
||||
) : null}
|
||||
<DownloadButton target={downloadTarget} />
|
||||
{!isFavorites ? (
|
||||
<Button
|
||||
variant="secondary"
|
||||
@@ -461,7 +396,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
onAction={handlePlaylistMediaAction}
|
||||
playlistLabel={ADD_TO_ANOTHER_PLAYLIST}
|
||||
showFavorite={!isFavorites}
|
||||
downloaded={playlistDownloaded}
|
||||
trackRowTrigger={false}
|
||||
triggerVariant="secondary"
|
||||
triggerClassName="rounded-full"
|
||||
@@ -496,6 +430,24 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="px-6 pb-4">
|
||||
<div className="relative max-w-sm">
|
||||
<SearchIcon className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
|
||||
<input
|
||||
type="search"
|
||||
aria-label="Search playlist"
|
||||
placeholder="Search playlist"
|
||||
value={searchQuery}
|
||||
onChange={(event) => {
|
||||
setSearchQuery(event.target.value)
|
||||
clearSelection()
|
||||
setActiveTrackId("")
|
||||
setDragIndex(null)
|
||||
}}
|
||||
className="h-10 w-full min-w-0 rounded-full border border-input bg-input/30 pr-3 pl-9 text-sm text-foreground transition-colors outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/50"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
{filteredSongs.length > 0 ? (
|
||||
<VirtualList
|
||||
count={filteredSongs.length}
|
||||
@@ -519,7 +471,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
selectedCount={selectedCount}
|
||||
selectionStationArtistId={selectedStationArtistId}
|
||||
playlistLabel={ADD_TO_ANOTHER_PLAYLIST}
|
||||
downloadCollection={downloadRef}
|
||||
showFavoriteInMenu={!isFavorites}
|
||||
removeLabel={
|
||||
isFavorites
|
||||
|
||||
+118
-178
@@ -5,11 +5,13 @@ import * as React from "react"
|
||||
import { PlaybackSongMeta } from "@/components/playback-song-meta"
|
||||
import { usePlayback } from "@/components/playback-provider"
|
||||
import { TrackCover, TrackRow } from "@/components/track-row"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { ScrollArea } from "@/components/ui/scroll-area"
|
||||
import { Skeleton } from "@/components/ui/skeleton"
|
||||
import { Spinner } from "@/components/ui/spinner"
|
||||
import { useTrackSelection } from "@/hooks/use-track-selection"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { BrowseSong, QueueSong } from "@otunes/convex/types"
|
||||
import type { BrowseSong, HistorySong, QueueSong } from "@otunes/convex/types"
|
||||
import {
|
||||
getContiguousSelectedIndices,
|
||||
moveQueueBlock,
|
||||
@@ -17,6 +19,7 @@ import {
|
||||
import { getSelectionRangePositions } from "@/lib/selection-range-styles"
|
||||
import { useSongs } from "@/lib/song-cache"
|
||||
import { cn } from "@/lib/utils"
|
||||
import { formatDuration } from "@/lib/format-duration"
|
||||
|
||||
const QUEUE_INITIAL_VISIBLE_COUNT = 100
|
||||
const QUEUE_PAGE_SIZE = 50
|
||||
@@ -29,13 +32,11 @@ type QueueItem = {
|
||||
song: QueueSelectable | null
|
||||
}
|
||||
|
||||
/** Upcoming songs only: queue index 0 is the current song, shown on its own. */
|
||||
function toSelectableQueue(
|
||||
songIds: Id<"songs">[],
|
||||
songs: (BrowseSong | undefined)[]
|
||||
): QueueItem[] {
|
||||
return songIds.slice(1).map((songId, offset) => {
|
||||
const queueIndex = offset + 1
|
||||
return songIds.map((songId, queueIndex) => {
|
||||
const selectionId = `${songId}-${queueIndex}`
|
||||
const song = songs[queueIndex]
|
||||
return {
|
||||
@@ -46,75 +47,57 @@ function toSelectableQueue(
|
||||
})
|
||||
}
|
||||
|
||||
/** A played song; clicking it plays it again from that point in history. */
|
||||
function HistorySongRow({
|
||||
song,
|
||||
historyIndex,
|
||||
onPlay,
|
||||
}: {
|
||||
song: BrowseSong | undefined
|
||||
historyIndex: number
|
||||
onPlay: (historyIndex: number) => void
|
||||
}) {
|
||||
if (!song) {
|
||||
return <QueueSongRowSkeleton />
|
||||
}
|
||||
|
||||
function HistorySongRow({ song }: { song: HistorySong }) {
|
||||
return (
|
||||
<li
|
||||
role="button"
|
||||
tabIndex={0}
|
||||
className="flex cursor-pointer items-center gap-3 px-4 py-2 text-sm hover:bg-foreground/5"
|
||||
onClick={() => onPlay(historyIndex)}
|
||||
onKeyDown={(event) => {
|
||||
if (event.key === "Enter" || event.key === " ") {
|
||||
event.preventDefault()
|
||||
onPlay(historyIndex)
|
||||
}
|
||||
}}
|
||||
>
|
||||
<TrackCover
|
||||
albumId={song.album.id}
|
||||
alt={song.album.title}
|
||||
inRange={false}
|
||||
/>
|
||||
<PlaybackSongMeta song={song} align="start" showAlbum={false} />
|
||||
<li className="relative w-full py-2 text-left text-sm opacity-60">
|
||||
<div className="relative z-10 flex items-center gap-3 px-2">
|
||||
<TrackCover
|
||||
albumId={song.album.id}
|
||||
alt={song.album.title}
|
||||
inRange={false}
|
||||
square
|
||||
/>
|
||||
|
||||
<PlaybackSongMeta
|
||||
song={song}
|
||||
isCurrent={false}
|
||||
inRange={false}
|
||||
align="start"
|
||||
showAlbum={false}
|
||||
/>
|
||||
|
||||
<span className="shrink-0 text-xs text-muted-foreground tabular-nums">
|
||||
{formatDuration(song.durationSeconds)}
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
)
|
||||
}
|
||||
|
||||
function QueueSongRowSkeleton() {
|
||||
return (
|
||||
<li className="flex items-center gap-3 px-4 py-2" aria-hidden>
|
||||
<Skeleton className="size-10 shrink-0 rounded" />
|
||||
<li className="flex items-center gap-3 px-2 py-2" aria-hidden>
|
||||
<Skeleton className="size-10 shrink-0 rounded-none" />
|
||||
<div className="flex min-w-0 flex-1 flex-col gap-1.5">
|
||||
<Skeleton className="h-3.5 w-3/4" />
|
||||
<Skeleton className="h-3 w-1/2" />
|
||||
</div>
|
||||
<Skeleton className="h-3 w-8 shrink-0" />
|
||||
</li>
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* The queue sidebar, laid out like the mobile now playing queue: history above
|
||||
* (scrolled out of view at first), then the current song and the upcoming
|
||||
* songs, which can be dragged to reorder. Shuffle and repeat live in the
|
||||
* player bar.
|
||||
*/
|
||||
export function QueuePanel() {
|
||||
const {
|
||||
queueSongIds,
|
||||
queueHistorySongIds,
|
||||
queueOpen,
|
||||
clearHistory,
|
||||
clearQueue,
|
||||
reorderQueue,
|
||||
skipToQueueIndex,
|
||||
skipToHistoryIndex,
|
||||
} = usePlayback()
|
||||
const loadMoreRef = React.useRef<HTMLDivElement>(null)
|
||||
const scrollRef = React.useRef<HTMLDivElement>(null)
|
||||
const currentRef = React.useRef<HTMLDivElement>(null)
|
||||
const nowPlayingRef = React.useRef<HTMLElement>(null)
|
||||
const [visibleCount, setVisibleCount] = React.useState(
|
||||
QUEUE_INITIAL_VISIBLE_COUNT
|
||||
)
|
||||
@@ -124,10 +107,15 @@ export function QueuePanel() {
|
||||
[queueSongIds, visibleCount]
|
||||
)
|
||||
const visibleQueueSongs = useSongs(visibleQueueIds)
|
||||
const historySongs = useSongs(queueHistorySongIds)
|
||||
const currentSong = visibleQueueSongs[0]
|
||||
const historySongMetadata = useSongs(queueHistorySongIds)
|
||||
const historySongs = React.useMemo(
|
||||
() =>
|
||||
historySongMetadata.flatMap((song, historyIndex) =>
|
||||
song ? [{ ...song, historyIndex }] : []
|
||||
),
|
||||
[historySongMetadata]
|
||||
)
|
||||
const hasMore = queueSongIds.length > visibleCount
|
||||
const hasUpcoming = queueSongIds.length > 1
|
||||
|
||||
const selectableQueue = React.useMemo(
|
||||
() => toSelectableQueue(visibleQueueIds, visibleQueueSongs),
|
||||
@@ -137,21 +125,17 @@ export function QueuePanel() {
|
||||
const [dragIndex, setDragIndex] = React.useState<number | null>(null)
|
||||
const currentQueueSongId = queueSongIds[0]
|
||||
|
||||
// Keep the current song at the top as playback moves through the queue:
|
||||
// jump there on open, then scroll smoothly as songs change.
|
||||
const hasScrolledRef = React.useRef(false)
|
||||
React.useLayoutEffect(() => {
|
||||
const scroller = scrollRef.current
|
||||
const current = currentRef.current
|
||||
if (!queueOpen || !scroller || !current) {
|
||||
React.useEffect(() => {
|
||||
if (!queueOpen || queueSongIds.length === 0) {
|
||||
return
|
||||
}
|
||||
scroller.scrollTo({
|
||||
top: current.offsetTop,
|
||||
behavior: hasScrolledRef.current ? "smooth" : "instant",
|
||||
|
||||
const frame = requestAnimationFrame(() => {
|
||||
nowPlayingRef.current?.scrollIntoView({ block: "center" })
|
||||
})
|
||||
hasScrolledRef.current = true
|
||||
}, [queueOpen, currentQueueSongId, queueHistorySongIds.length])
|
||||
|
||||
return () => cancelAnimationFrame(frame)
|
||||
}, [queueOpen, queueSongIds.length, currentQueueSongId])
|
||||
|
||||
React.useEffect(() => {
|
||||
if (!hasMore) {
|
||||
@@ -159,8 +143,12 @@ export function QueuePanel() {
|
||||
}
|
||||
|
||||
const sentinel = loadMoreRef.current
|
||||
const root = scrollRef.current
|
||||
if (!sentinel || !root) {
|
||||
if (!sentinel) {
|
||||
return
|
||||
}
|
||||
|
||||
const viewport = sentinel.closest('[data-slot="scroll-area-viewport"]')
|
||||
if (!viewport) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -170,7 +158,7 @@ export function QueuePanel() {
|
||||
setVisibleCount((count) => count + QUEUE_PAGE_SIZE)
|
||||
}
|
||||
},
|
||||
{ root, rootMargin: "240px" }
|
||||
{ root: viewport, rootMargin: "240px" }
|
||||
)
|
||||
|
||||
observer.observe(sentinel)
|
||||
@@ -198,11 +186,6 @@ export function QueuePanel() {
|
||||
[selectableQueue, skipToQueueIndex]
|
||||
)
|
||||
|
||||
const handleHistoryPlay = React.useCallback(
|
||||
(historyIndex: number) => void skipToHistoryIndex(historyIndex),
|
||||
[skipToHistoryIndex]
|
||||
)
|
||||
|
||||
const selectionPositions = React.useMemo(
|
||||
() =>
|
||||
getSelectionRangePositions(
|
||||
@@ -257,119 +240,76 @@ export function QueuePanel() {
|
||||
return (
|
||||
<aside
|
||||
className={cn(
|
||||
"relative flex h-svh w-72 shrink-0 flex-col border-l bg-background",
|
||||
"flex h-svh w-72 shrink-0 flex-col border-l bg-background",
|
||||
"max-md:fixed max-md:inset-y-0 max-md:right-0 max-md:z-20 max-md:shadow-xl"
|
||||
)}
|
||||
>
|
||||
<div
|
||||
ref={scrollRef}
|
||||
className="relative min-h-0 flex-1 [scrollbar-width:none] overflow-y-auto overscroll-contain"
|
||||
>
|
||||
{queueHistorySongIds.length > 0 ? (
|
||||
<section>
|
||||
<header className="flex items-center justify-between px-4 pt-3 pb-1">
|
||||
<h2 className="text-base font-bold">History</h2>
|
||||
<button
|
||||
type="button"
|
||||
className="text-sm text-muted-foreground hover:text-foreground"
|
||||
onClick={() => void clearHistory()}
|
||||
>
|
||||
Clear
|
||||
</button>
|
||||
</header>
|
||||
<ul className="flex flex-col">
|
||||
{queueHistorySongIds.map((songId, historyIndex) => (
|
||||
<HistorySongRow
|
||||
key={`history-${songId}-${historyIndex}`}
|
||||
song={historySongs[historyIndex]}
|
||||
historyIndex={historyIndex}
|
||||
onPlay={handleHistoryPlay}
|
||||
/>
|
||||
))}
|
||||
</ul>
|
||||
</section>
|
||||
) : null}
|
||||
<header className="flex items-center justify-between gap-2 border-b px-4 py-3">
|
||||
<h1 className="text-lg font-semibold">Up Next</h1>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
className="text-primary hover:text-primary"
|
||||
onClick={() => void clearQueue()}
|
||||
disabled={queueSongIds.length === 0}
|
||||
>
|
||||
Clear
|
||||
</Button>
|
||||
</header>
|
||||
|
||||
{/* Fills the viewport so the current song can always scroll to the top. */}
|
||||
<div ref={currentRef} className="flex min-h-full flex-col">
|
||||
{currentQueueSongId ? (
|
||||
<div className="flex items-center gap-3 px-4 py-3">
|
||||
{currentSong ? (
|
||||
<>
|
||||
<TrackCover
|
||||
albumId={currentSong.album.id}
|
||||
alt={currentSong.album.title}
|
||||
inRange={false}
|
||||
size="lg"
|
||||
<ScrollArea className="min-h-0 flex-1">
|
||||
{queueSongIds.length === 0 ? (
|
||||
<p className="px-4 py-8 text-sm text-muted-foreground">
|
||||
Nothing in the queue.
|
||||
</p>
|
||||
) : (
|
||||
<>
|
||||
{historySongs.length > 0 ? (
|
||||
<ul className="flex flex-col border-b py-1">
|
||||
{historySongs.map((song) => (
|
||||
<HistorySongRow
|
||||
key={`history-${song.id}-${song.historyIndex}`}
|
||||
song={song}
|
||||
/>
|
||||
<PlaybackSongMeta
|
||||
song={currentSong}
|
||||
align="start"
|
||||
showAlbum={false}
|
||||
/>
|
||||
</>
|
||||
) : (
|
||||
<Skeleton className="size-14 shrink-0 rounded-md" />
|
||||
)}
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
<header className="sticky top-0 z-20 flex items-center justify-between bg-background px-4 py-2">
|
||||
<h2 className="text-base font-bold">Continue Playing</h2>
|
||||
<button
|
||||
type="button"
|
||||
className="text-sm text-muted-foreground hover:text-foreground disabled:pointer-events-none disabled:opacity-50"
|
||||
onClick={() => void clearQueue()}
|
||||
disabled={queueSongIds.length === 0}
|
||||
>
|
||||
Clear
|
||||
</button>
|
||||
</header>
|
||||
|
||||
{hasUpcoming ? (
|
||||
<>
|
||||
<ul className="flex flex-col pb-8">
|
||||
{selectableQueue.map((item, index) =>
|
||||
item.song ? (
|
||||
<TrackRow
|
||||
key={item.selectionId}
|
||||
variant="queue"
|
||||
song={item.song}
|
||||
index={index}
|
||||
selectionPosition={selectionPositions[index]}
|
||||
isDragging={draggingIndices.has(index)}
|
||||
onPointerDown={handlePointerDown}
|
||||
onSelect={handleRowSelect}
|
||||
onPlay={handleRowPlay}
|
||||
onDragStart={setDragIndex}
|
||||
onDrop={handleDrop}
|
||||
/>
|
||||
) : (
|
||||
<QueueSongRowSkeleton key={item.selectionId} />
|
||||
)
|
||||
)}
|
||||
))}
|
||||
</ul>
|
||||
{hasMore ? (
|
||||
<div
|
||||
ref={loadMoreRef}
|
||||
className="flex items-center justify-center py-4"
|
||||
aria-hidden
|
||||
>
|
||||
<Spinner className="size-5 text-muted-foreground" />
|
||||
</div>
|
||||
) : null}
|
||||
</>
|
||||
) : (
|
||||
<p className="flex flex-1 items-center justify-center px-4 pb-24 text-center text-lg font-semibold text-muted-foreground">
|
||||
Nothing else is queued.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
aria-hidden
|
||||
className="pointer-events-none absolute inset-x-0 bottom-0 h-9 bg-linear-to-b from-transparent to-background"
|
||||
/>
|
||||
) : null}
|
||||
<ul className="flex flex-col py-1">
|
||||
{selectableQueue.map((item, index) =>
|
||||
item.song ? (
|
||||
<TrackRow
|
||||
key={item.selectionId}
|
||||
ref={item.queueIndex === 0 ? nowPlayingRef : undefined}
|
||||
variant="queue"
|
||||
song={item.song}
|
||||
index={index}
|
||||
isActive={item.queueIndex === 0}
|
||||
isNowPlaying={item.queueIndex === 0}
|
||||
selectionPosition={selectionPositions[index]}
|
||||
isDragging={draggingIndices.has(index)}
|
||||
onPointerDown={handlePointerDown}
|
||||
onSelect={handleRowSelect}
|
||||
onPlay={handleRowPlay}
|
||||
onDragStart={setDragIndex}
|
||||
onDrop={handleDrop}
|
||||
/>
|
||||
) : (
|
||||
<QueueSongRowSkeleton key={item.selectionId} />
|
||||
)
|
||||
)}
|
||||
</ul>
|
||||
{hasMore ? (
|
||||
<div
|
||||
ref={loadMoreRef}
|
||||
className="flex items-center justify-center py-4"
|
||||
aria-hidden
|
||||
>
|
||||
<Spinner className="size-5 text-muted-foreground" />
|
||||
</div>
|
||||
) : null}
|
||||
</>
|
||||
)}
|
||||
</ScrollArea>
|
||||
</aside>
|
||||
)
|
||||
}
|
||||
@@ -1,7 +1,5 @@
|
||||
"use client"
|
||||
|
||||
import { useDownloads } from "@/components/downloads-provider"
|
||||
import { useSongDownloadState } from "@/hooks/use-downloads"
|
||||
import Image from "next/image"
|
||||
import Link from "next/link"
|
||||
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
|
||||
@@ -22,13 +20,6 @@ export function SearchSongItem({ song }: { song: BrowseSong }) {
|
||||
const { isSongFavorite, toggleSongFavorite } = useFavorites()
|
||||
const { runQueueAction, createStation } = useQueueMediaActions()
|
||||
const songIds = [song.id as Id<"songs">]
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
const downloaded = useSongDownloadState(song.id) === "here"
|
||||
const downloadTarget = {
|
||||
kind: "songs" as const,
|
||||
songIds,
|
||||
title: song.title,
|
||||
}
|
||||
|
||||
function handleAction(action: MediaContextAction) {
|
||||
switch (action) {
|
||||
@@ -46,12 +37,6 @@ export function SearchSongItem({ song }: { song: BrowseSong }) {
|
||||
case "favorite":
|
||||
void toggleSongFavorite(song.id as Id<"songs">)
|
||||
break
|
||||
case "download":
|
||||
void requestDownload(downloadTarget)
|
||||
break
|
||||
case "remove-download":
|
||||
void removeDownload(downloadTarget)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,7 +47,6 @@ export function SearchSongItem({ song }: { song: BrowseSong }) {
|
||||
onOpenMenu: () => {},
|
||||
onAction: handleAction,
|
||||
favorited: isSongFavorite(song.id),
|
||||
downloaded,
|
||||
navigation: {
|
||||
artist: { id: song.artist.id },
|
||||
album: { id: song.album.id },
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
import * as React from "react"
|
||||
import Image from "next/image"
|
||||
import Link from "next/link"
|
||||
import { ArrowDownToLine, Menu, Music2, Play, Star, Trash2 } from "lucide-react"
|
||||
import { Music2, Play, Star, Trash2 } from "lucide-react"
|
||||
|
||||
import {
|
||||
MediaContextMenu,
|
||||
@@ -28,17 +28,15 @@ import {
|
||||
type SelectionRangePosition,
|
||||
} from "@/lib/selection-range-styles"
|
||||
import { formatDuration } from "@/lib/format-duration"
|
||||
import { useSongDownloadState } from "@/hooks/use-downloads"
|
||||
import { cn } from "@/lib/utils"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import type { DownloadSource } from "@otunes/convex/client/download-queue"
|
||||
|
||||
/**
|
||||
* - `library`: favorite star, cover with play overlay, title, artist and album
|
||||
* columns (use with `LibraryTrackListHeader`).
|
||||
* - `album`: favorite star, track number, title with optional credits.
|
||||
* - `playlist`: cover with favorite overlay, track number, title.
|
||||
* - `queue`: cover, title and artist, duration, and a reorder grip. No menu.
|
||||
* - `queue`: square cover, title and artist, no menu.
|
||||
*/
|
||||
export type TrackRowVariant = "library" | "album" | "playlist" | "queue"
|
||||
|
||||
@@ -51,8 +49,6 @@ export type TrackRowProps = {
|
||||
trackNumber?: number
|
||||
/** Secondary line under the title, e.g. album track credits. */
|
||||
subtitle?: string
|
||||
/** The download this row belongs to; defaults to Other Downloaded Songs. */
|
||||
downloadCollection?: DownloadSource
|
||||
selectionPosition: SelectionRangePosition
|
||||
isActive?: boolean
|
||||
isNowPlaying?: boolean
|
||||
@@ -89,14 +85,13 @@ export function TrackCover({
|
||||
albumId,
|
||||
alt,
|
||||
inRange,
|
||||
size = "md",
|
||||
square = false,
|
||||
children,
|
||||
}: {
|
||||
albumId: string | undefined
|
||||
alt: string
|
||||
inRange: boolean
|
||||
/** `lg` is the larger current-song cover in the queue. */
|
||||
size?: "md" | "lg"
|
||||
square?: boolean
|
||||
/** Overlay shown above the cover image. */
|
||||
children?: React.ReactNode
|
||||
}) {
|
||||
@@ -106,8 +101,8 @@ export function TrackCover({
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
"flex shrink-0 items-center justify-center bg-muted ring-1",
|
||||
size === "lg" ? "size-14 rounded-md" : "size-10 rounded",
|
||||
"flex size-10 shrink-0 items-center justify-center bg-muted ring-1",
|
||||
!square && "rounded",
|
||||
ringClass
|
||||
)}
|
||||
>
|
||||
@@ -119,8 +114,8 @@ export function TrackCover({
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
"group/cover relative shrink-0 overflow-hidden ring-1",
|
||||
size === "lg" ? "size-14 rounded-md" : "size-10 rounded",
|
||||
"group/cover relative size-10 shrink-0 overflow-hidden ring-1",
|
||||
!square && "rounded",
|
||||
ringClass
|
||||
)}
|
||||
>
|
||||
@@ -128,7 +123,7 @@ export function TrackCover({
|
||||
src={albumCoverUrl(albumId)}
|
||||
alt={alt}
|
||||
fill
|
||||
sizes={size === "lg" ? "56px" : "40px"}
|
||||
sizes="40px"
|
||||
className="object-cover"
|
||||
/>
|
||||
{children}
|
||||
@@ -253,7 +248,6 @@ function TrackRowComponent({
|
||||
index,
|
||||
trackNumber,
|
||||
subtitle,
|
||||
downloadCollection,
|
||||
selectionPosition,
|
||||
isActive = false,
|
||||
isNowPlaying = false,
|
||||
@@ -276,11 +270,6 @@ function TrackRowComponent({
|
||||
onDrop,
|
||||
}: TrackRowProps) {
|
||||
const inRange = isInSelectionRange(selectionPosition)
|
||||
const downloadState = useSongDownloadState(song.id, downloadCollection)
|
||||
const isDownloaded = downloadState === "here"
|
||||
// The queue row only shows the duration, like the mobile queue.
|
||||
const showDownloaded =
|
||||
variant !== "queue" && (isDownloaded || downloadState === "device")
|
||||
const flush = variant === "library" || variant === "queue"
|
||||
const play = () => onPlay(index)
|
||||
const toggleFavorite = () => onToggleFavorite?.(song.id)
|
||||
@@ -314,14 +303,11 @@ function TrackRowComponent({
|
||||
const duration = (
|
||||
<span
|
||||
className={cn(
|
||||
"flex shrink-0 items-center justify-end gap-2 tabular-nums",
|
||||
"shrink-0 text-right tabular-nums",
|
||||
variant === "queue" && "text-xs",
|
||||
inRange ? "text-primary-foreground" : "text-muted-foreground"
|
||||
)}
|
||||
>
|
||||
{showDownloaded ? (
|
||||
<ArrowDownToLine className="size-3.5" aria-label="Downloaded" />
|
||||
) : null}
|
||||
{formatDuration(song.durationSeconds)}
|
||||
</span>
|
||||
)
|
||||
@@ -343,7 +329,6 @@ function TrackRowComponent({
|
||||
album: { id: song.album.id },
|
||||
},
|
||||
share: { type: "song", albumId: song.album.id, songId: song.id },
|
||||
downloaded: isDownloaded,
|
||||
children:
|
||||
removeLabel && onRemove ? (
|
||||
<>
|
||||
@@ -462,11 +447,12 @@ function TrackRowComponent({
|
||||
break
|
||||
case "queue":
|
||||
content = (
|
||||
<div className="relative z-10 flex items-center gap-3 pr-2 pl-4">
|
||||
<div className="relative z-10 flex items-center gap-3 px-2">
|
||||
<TrackCover
|
||||
albumId={song.album.id}
|
||||
alt={song.album.title}
|
||||
inRange={inRange}
|
||||
square
|
||||
/>
|
||||
<PlaybackSongMeta
|
||||
song={song}
|
||||
@@ -476,13 +462,6 @@ function TrackRowComponent({
|
||||
showAlbum={false}
|
||||
/>
|
||||
{duration}
|
||||
<Menu
|
||||
aria-hidden
|
||||
className={cn(
|
||||
"size-4 shrink-0 cursor-grab",
|
||||
inRange ? "text-primary-foreground" : "text-muted-foreground"
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
break
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import { useMemo, useSyncExternalStore } from "react"
|
||||
|
||||
import type {
|
||||
CollectionRef,
|
||||
DownloadSource,
|
||||
SongDownloadState,
|
||||
} from "@otunes/convex/client/download-queue"
|
||||
import { downloadQueue } from "@/lib/downloads"
|
||||
|
||||
/** Re-renders on every download change. Prefer the narrower hooks in lists. */
|
||||
export function useDownloadsVersion() {
|
||||
return useSyncExternalStore(
|
||||
downloadQueue.subscribe,
|
||||
downloadQueue.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 {
|
||||
return useSyncExternalStore(
|
||||
downloadQueue.subscribe,
|
||||
() => downloadQueue.downloadState(songId, from),
|
||||
() => "none"
|
||||
)
|
||||
}
|
||||
|
||||
/** True when every song is downloaded. Re-renders only when that flips. */
|
||||
export function useAreSongsDownloaded(songIds: readonly string[]) {
|
||||
return useSyncExternalStore(
|
||||
downloadQueue.subscribe,
|
||||
() =>
|
||||
songIds.length > 0 &&
|
||||
songIds.every((songId) => downloadQueue.getDownloaded(songId)),
|
||||
() => false
|
||||
)
|
||||
}
|
||||
|
||||
/** A downloaded album or playlist and how far along its songs are. */
|
||||
export function useCollectionDownload(
|
||||
ref: CollectionRef,
|
||||
songIds?: readonly string[]
|
||||
) {
|
||||
const version = useDownloadsVersion()
|
||||
const { kind, id } = ref
|
||||
return useMemo(() => {
|
||||
const collection = downloadQueue.getCollection({ kind, id })
|
||||
return {
|
||||
collection,
|
||||
status: downloadQueue.status(songIds ?? collection?.songIds ?? []),
|
||||
}
|
||||
// version invalidates the lookup when downloads change.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [kind, id, songIds, version])
|
||||
}
|
||||
|
||||
/** Whether an album or playlist is downloaded, for menus that list many. */
|
||||
export function useIsCollectionDownloaded(ref: CollectionRef) {
|
||||
return useSyncExternalStore(
|
||||
downloadQueue.subscribe,
|
||||
() => downloadQueue.getCollection(ref) !== undefined,
|
||||
() => false
|
||||
)
|
||||
}
|
||||
|
||||
const noopSubscribe = () => () => {}
|
||||
|
||||
export { FROM_DOWNLOADS_PARAM } from "@/lib/downloads"
|
||||
|
||||
/**
|
||||
* True on album and playlist pages opened from Downloads, where playback uses
|
||||
* the downloads whatever their quality.
|
||||
*/
|
||||
export function useOpenedFromDownloads() {
|
||||
return useSyncExternalStore(
|
||||
noopSubscribe,
|
||||
() =>
|
||||
new URLSearchParams(window.location.search).get("from") === "downloads",
|
||||
() => false
|
||||
)
|
||||
}
|
||||
@@ -4,25 +4,14 @@ import * as React from "react"
|
||||
import { useConvex } from "convex/react"
|
||||
|
||||
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
|
||||
import { useDownloads } from "@/components/downloads-provider"
|
||||
import { useFavorites } from "@/components/favorites-provider"
|
||||
import type { MediaContextAction } from "@/components/media-context-menu"
|
||||
import { useCacheScope } from "@/components/persistent-cache-provider"
|
||||
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
|
||||
import { getCachedSong } from "@/lib/song-cache"
|
||||
import { stationArtistId } from "@/lib/station-artist"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
import type { DownloadSource } from "@otunes/convex/client/download-queue"
|
||||
|
||||
/** The song's title for one song, else a count. */
|
||||
function songsTitle(songIds: readonly string[]) {
|
||||
if (songIds.length === 1) {
|
||||
return getCachedSong(songIds[0])?.title ?? "1 song"
|
||||
}
|
||||
return `${songIds.length} songs`
|
||||
}
|
||||
|
||||
export function useMediaActions() {
|
||||
const { openAddToPlaylist, openAddArtistToPlaylist } = useAddToPlaylist()
|
||||
@@ -30,14 +19,12 @@ export function useMediaActions() {
|
||||
const { runQueueAction, createStation } = useQueueMediaActions()
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
|
||||
const runSongsAction = React.useCallback(
|
||||
(
|
||||
action: MediaContextAction,
|
||||
songIds: Id<"songs">[],
|
||||
stationArtist?: string,
|
||||
downloadFrom?: DownloadSource
|
||||
stationArtist?: string
|
||||
) => {
|
||||
switch (action) {
|
||||
case "create-station":
|
||||
@@ -54,31 +41,9 @@ export function useMediaActions() {
|
||||
case "shuffle":
|
||||
void runQueueAction(action, songIds)
|
||||
break
|
||||
case "download":
|
||||
void requestDownload({
|
||||
kind: "songs",
|
||||
songIds,
|
||||
title: songsTitle(songIds),
|
||||
})
|
||||
break
|
||||
case "remove-download":
|
||||
void removeDownload({
|
||||
kind: "songs",
|
||||
songIds,
|
||||
title: "",
|
||||
from: downloadFrom,
|
||||
})
|
||||
break
|
||||
}
|
||||
},
|
||||
[
|
||||
createStation,
|
||||
favoriteSongs,
|
||||
openAddToPlaylist,
|
||||
runQueueAction,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
]
|
||||
[createStation, favoriteSongs, openAddToPlaylist, runQueueAction]
|
||||
)
|
||||
|
||||
const runArtistAction = React.useCallback(
|
||||
@@ -125,13 +90,10 @@ export function useTrackListMediaAction({
|
||||
selectedIds,
|
||||
songs,
|
||||
artistId,
|
||||
downloadFrom,
|
||||
}: {
|
||||
selectedIds: ReadonlySet<string>
|
||||
songs?: { id: string; artist: { id: string } }[]
|
||||
artistId?: string
|
||||
/** Removing a download only takes it out of this one. */
|
||||
downloadFrom?: DownloadSource
|
||||
}) {
|
||||
const { runSongsAction } = useMediaActions()
|
||||
|
||||
@@ -142,13 +104,8 @@ export function useTrackListMediaAction({
|
||||
const stationArtist =
|
||||
artistId ??
|
||||
(songs ? stationArtistId(songs, new Set(targetIds)) : undefined)
|
||||
runSongsAction(
|
||||
action,
|
||||
targetIds as Id<"songs">[],
|
||||
stationArtist,
|
||||
downloadFrom
|
||||
)
|
||||
runSongsAction(action, targetIds as Id<"songs">[], stationArtist)
|
||||
},
|
||||
[selectedIds, songs, artistId, downloadFrom, runSongsAction]
|
||||
[selectedIds, songs, artistId, runSongsAction]
|
||||
)
|
||||
}
|
||||
@@ -1,239 +0,0 @@
|
||||
import {
|
||||
createDownloadQueue,
|
||||
FAVORITES_ID,
|
||||
type DownloadedCollection,
|
||||
type DownloadedCover,
|
||||
type DownloadedSong,
|
||||
type DownloadIndex,
|
||||
type DownloadStorage,
|
||||
} from "@otunes/convex/client/download-queue"
|
||||
import {
|
||||
parseDownloadQuality,
|
||||
songDownloadPath,
|
||||
type DownloadQuality,
|
||||
} from "@otunes/convex/download-quality"
|
||||
|
||||
// Like YouTube Music on the web, downloads live in this browser's IndexedDB
|
||||
// and only play inside the app. Clearing site data removes them.
|
||||
const DB_NAME = "otunes-downloads"
|
||||
const AUDIO_STORE = "audio"
|
||||
const SONG_STORE = "songs"
|
||||
const REMEMBERED_QUALITY_KEY = "otunes:download-quality"
|
||||
const INDEX_KEY = "otunes:download-index"
|
||||
|
||||
// Covers live in Cache Storage under their unsized path. The service worker
|
||||
// (public/downloads-sw.js) serves them only when the network fails, so
|
||||
// online browsing and new playlist artwork are unaffected.
|
||||
const COVER_CACHE = "otunes-download-covers"
|
||||
const COVER_SIZE = 512
|
||||
|
||||
function coverPath({ kind, id }: DownloadedCover) {
|
||||
return `/api/${kind}/${id}/cover`
|
||||
}
|
||||
|
||||
export const DOWNLOADS_PATH = "/library/downloads"
|
||||
export const OTHER_DOWNLOADS_PATH = "/library/downloads/other"
|
||||
|
||||
/** Search param marking album and playlist pages opened from Downloads. */
|
||||
export const FROM_DOWNLOADS_PARAM = "from=downloads"
|
||||
|
||||
export function downloadedCollectionPath({ kind, id }: DownloadedCollection) {
|
||||
if (kind === "album") return `/album/${id}?${FROM_DOWNLOADS_PARAM}`
|
||||
if (id === FAVORITES_ID) return `/playlist/favorites?${FROM_DOWNLOADS_PARAM}`
|
||||
return `/playlist/${id}?${FROM_DOWNLOADS_PARAM}`
|
||||
}
|
||||
|
||||
// Saved pages are specific to the signed-in user (public/downloads-sw.js).
|
||||
const OFFLINE_PAGE_CACHE = "otunes-offline-pages"
|
||||
|
||||
/**
|
||||
* Lets downloaded covers show offline. In production builds the worker also
|
||||
* keeps pages and app code so the app opens offline.
|
||||
*/
|
||||
export function registerDownloadsServiceWorker() {
|
||||
const url =
|
||||
process.env.NODE_ENV === "production"
|
||||
? "/downloads-sw.js?offline-app"
|
||||
: "/downloads-sw.js"
|
||||
void navigator.serviceWorker?.register(url, { scope: "/" }).catch(() => {})
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves the Downloads pages and every downloaded album and playlist page, so
|
||||
* they open even after a reload or launch without a connection.
|
||||
*/
|
||||
export function saveDownloadPagesForOffline(paths: string[]) {
|
||||
void navigator.serviceWorker?.ready
|
||||
.then((registration) =>
|
||||
registration.active?.postMessage({ type: "save-pages", paths })
|
||||
)
|
||||
.catch(() => {})
|
||||
}
|
||||
|
||||
/** Forgets saved pages, on sign-out. */
|
||||
export async function clearOfflinePages() {
|
||||
await globalThis.caches?.delete(OFFLINE_PAGE_CACHE).catch(() => false)
|
||||
}
|
||||
|
||||
let database: Promise<IDBDatabase> | null = null
|
||||
|
||||
function openDatabase() {
|
||||
database ??= new Promise<IDBDatabase>((resolve, reject) => {
|
||||
const request = indexedDB.open(DB_NAME, 1)
|
||||
request.onupgradeneeded = () => {
|
||||
request.result.createObjectStore(AUDIO_STORE)
|
||||
request.result.createObjectStore(SONG_STORE, { keyPath: "songId" })
|
||||
}
|
||||
request.onsuccess = () => resolve(request.result)
|
||||
request.onerror = () => {
|
||||
database = null
|
||||
reject(request.error)
|
||||
}
|
||||
})
|
||||
return database
|
||||
}
|
||||
|
||||
async function transaction(
|
||||
mode: IDBTransactionMode,
|
||||
run: (audio: IDBObjectStore, songs: IDBObjectStore) => void
|
||||
) {
|
||||
const db = await openDatabase()
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
const tx = db.transaction([AUDIO_STORE, SONG_STORE], mode)
|
||||
run(tx.objectStore(AUDIO_STORE), tx.objectStore(SONG_STORE))
|
||||
tx.oncomplete = () => resolve()
|
||||
tx.onerror = () => reject(tx.error)
|
||||
tx.onabort = () => reject(tx.error)
|
||||
})
|
||||
}
|
||||
|
||||
function readRequest<T>(store: IDBObjectStore, key?: string) {
|
||||
return new Promise<T>((resolve, reject) => {
|
||||
const request = key === undefined ? store.getAll() : store.get(key)
|
||||
request.onsuccess = () => resolve(request.result as T)
|
||||
request.onerror = () => reject(request.error)
|
||||
})
|
||||
}
|
||||
|
||||
const storage: DownloadStorage = {
|
||||
async list() {
|
||||
const db = await openDatabase()
|
||||
return readRequest<DownloadedSong[]>(
|
||||
db.transaction(SONG_STORE).objectStore(SONG_STORE)
|
||||
)
|
||||
},
|
||||
async save({ songId, requested, quality, albumId }, signal) {
|
||||
const response = await fetch(songDownloadPath(songId, requested), {
|
||||
signal,
|
||||
})
|
||||
if (!response.ok) {
|
||||
throw new Error(`Download failed with ${response.status}`)
|
||||
}
|
||||
const blob = await response.blob()
|
||||
signal.throwIfAborted()
|
||||
const entry: DownloadedSong = { songId, quality, bytes: blob.size, albumId }
|
||||
await transaction("readwrite", (audio, songs) => {
|
||||
audio.put(blob, songId)
|
||||
songs.put(entry)
|
||||
})
|
||||
return blob.size
|
||||
},
|
||||
async saveCover(cover) {
|
||||
const cache = await caches.open(COVER_CACHE)
|
||||
const key = coverPath(cover)
|
||||
if (await cache.match(key)) return
|
||||
const response = await fetch(`${key}?size=${COVER_SIZE}`)
|
||||
if (!response.ok) throw new Error(`Cover failed with ${response.status}`)
|
||||
await cache.put(key, response)
|
||||
},
|
||||
async pruneCovers(keep) {
|
||||
const cache = await caches.open(COVER_CACHE)
|
||||
const kept = new Set(keep.map(coverPath))
|
||||
for (const request of await cache.keys()) {
|
||||
if (!kept.has(new URL(request.url).pathname)) await cache.delete(request)
|
||||
}
|
||||
},
|
||||
async readIndex() {
|
||||
try {
|
||||
const raw = localStorage.getItem(INDEX_KEY)
|
||||
if (raw) return JSON.parse(raw) as DownloadIndex
|
||||
} catch {
|
||||
// A missing or unreadable index starts empty.
|
||||
}
|
||||
return { collections: [], otherSongIds: [] }
|
||||
},
|
||||
async writeIndex(index) {
|
||||
localStorage.setItem(INDEX_KEY, JSON.stringify(index))
|
||||
},
|
||||
async remove(songIds) {
|
||||
if (songIds.length === 0) return
|
||||
for (const songId of songIds) revokeAudioUrl(songId)
|
||||
await transaction("readwrite", (audio, songs) => {
|
||||
for (const songId of songIds) {
|
||||
audio.delete(songId)
|
||||
songs.delete(songId)
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
|
||||
export const downloadQueue = createDownloadQueue(storage)
|
||||
|
||||
/** Asks the browser not to evict downloads when storage runs low. */
|
||||
export function requestPersistentStorage() {
|
||||
void navigator.storage?.persist?.().catch(() => false)
|
||||
}
|
||||
|
||||
// Object URLs keep blobs alive, so only the few in use (playing and preloaded) stay open.
|
||||
const MAX_AUDIO_URLS = 3
|
||||
const audioUrls = new Map<string, string>()
|
||||
|
||||
function revokeAudioUrl(songId: string) {
|
||||
const url = audioUrls.get(songId)
|
||||
if (url) {
|
||||
URL.revokeObjectURL(url)
|
||||
audioUrls.delete(songId)
|
||||
}
|
||||
}
|
||||
|
||||
/** A playable URL for a downloaded song, or null when it is not downloaded. */
|
||||
export async function downloadedAudioUrl(songId: string) {
|
||||
const existing = audioUrls.get(songId)
|
||||
if (existing) {
|
||||
audioUrls.delete(songId)
|
||||
audioUrls.set(songId, existing)
|
||||
return existing
|
||||
}
|
||||
const db = await openDatabase()
|
||||
const blob = await readRequest<Blob | undefined>(
|
||||
db.transaction(AUDIO_STORE).objectStore(AUDIO_STORE),
|
||||
songId
|
||||
)
|
||||
if (!blob) return null
|
||||
const url = URL.createObjectURL(blob)
|
||||
audioUrls.set(songId, url)
|
||||
while (audioUrls.size > MAX_AUDIO_URLS) {
|
||||
revokeAudioUrl(audioUrls.keys().next().value!)
|
||||
}
|
||||
return url
|
||||
}
|
||||
|
||||
export function readRememberedDownloadQuality() {
|
||||
try {
|
||||
return parseDownloadQuality(localStorage.getItem(REMEMBERED_QUALITY_KEY))
|
||||
} catch {
|
||||
return undefined
|
||||
}
|
||||
}
|
||||
|
||||
/** Pass undefined to ask every time again. */
|
||||
export function writeRememberedDownloadQuality(
|
||||
quality: DownloadQuality | undefined
|
||||
) {
|
||||
try {
|
||||
if (quality) localStorage.setItem(REMEMBERED_QUALITY_KEY, quality)
|
||||
else localStorage.removeItem(REMEMBERED_QUALITY_KEY)
|
||||
} catch {
|
||||
// Without storage the prompt simply shows every time.
|
||||
}
|
||||
}
|
||||
@@ -69,16 +69,8 @@ function toWebStream(
|
||||
)
|
||||
}
|
||||
|
||||
/** Streams a file. `onClose` runs once it is fully sent or abandoned. */
|
||||
export function streamFile(
|
||||
path: string,
|
||||
range?: ByteRange,
|
||||
onClose?: () => void
|
||||
) {
|
||||
export function streamFile(path: string, range?: ByteRange) {
|
||||
const file = createReadStream(path, range)
|
||||
if (onClose) {
|
||||
file.once("close", onClose)
|
||||
}
|
||||
return toWebStream(file, { cancel: () => file.destroy() })
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { convexAuthNextjsToken } from "@convex-dev/auth/nextjs/server"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Doc, Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { fetchQuery } from "convex/nextjs"
|
||||
import { convexServerOptions } from "@/lib/convex-server"
|
||||
import type { SongSource } from "@/lib/server-hls"
|
||||
@@ -21,26 +21,3 @@ export async function getSongSource(id: string): Promise<SongSource> {
|
||||
}
|
||||
return song
|
||||
}
|
||||
|
||||
const SOURCE_BATCH_SIZE = 200
|
||||
|
||||
/** `getSongSource` for many songs, in batches. Missing songs are left out. */
|
||||
export async function getSongSources(
|
||||
ids: string[]
|
||||
): Promise<(SongSource & Pick<Doc<"songs">, "album">)[]> {
|
||||
const token = await convexAuthNextjsToken()
|
||||
const batches: string[][] = []
|
||||
for (let start = 0; start < ids.length; start += SOURCE_BATCH_SIZE) {
|
||||
batches.push(ids.slice(start, start + SOURCE_BATCH_SIZE))
|
||||
}
|
||||
const results = await Promise.all(
|
||||
batches.map((batch) =>
|
||||
fetchQuery(
|
||||
api.library.getSongSources,
|
||||
{ ids: batch as Id<"songs">[] },
|
||||
convexServerOptions(token)
|
||||
)
|
||||
)
|
||||
)
|
||||
return results.flat()
|
||||
}
|
||||
@@ -5,9 +5,6 @@ const nextConfig: NextConfig = {
|
||||
output: "standalone",
|
||||
outputFileTracingRoot: path.join(__dirname, "../../"),
|
||||
experimental: {
|
||||
// Failed navigations wait for the connection instead of reloading the
|
||||
// page, which would show the browser's offline page and stop playback.
|
||||
useOffline: true,
|
||||
// App pages render their data from the client cache, so reusing a visited
|
||||
// page's server payload is safe and skips a round trip on revisits.
|
||||
staleTimes: {
|
||||
|
||||
@@ -1,241 +0,0 @@
|
||||
// Keeps the app usable offline:
|
||||
// - Pages: network first, then the last good copy of each page. A page never
|
||||
// saved falls back to Downloads, which lib/downloads.ts saves ahead of time
|
||||
// with "save-pages".
|
||||
// - App code (/_next/static): saved on first load and served from the saved
|
||||
// copy. Names change on every deploy, so a saved copy is never stale. Code
|
||||
// unused for a month is deleted, so old deploys don't pile up.
|
||||
// - Covers of downloaded music, saved by lib/downloads.ts, served only when
|
||||
// the network fails. Any other cover falls back to the placeholder the
|
||||
// server would send for a missing cover.
|
||||
// Pages and app code are only handled in production builds (`?offline-app`),
|
||||
// where app code is content-hashed.
|
||||
const COVER_CACHE = "otunes-download-covers"
|
||||
const PLACEHOLDER_CACHE = "otunes-placeholders"
|
||||
const PLACEHOLDER_PATH = "/placeholder-album.svg"
|
||||
const PAGE_CACHE = "otunes-offline-pages"
|
||||
const STATIC_CACHE = "otunes-offline-static"
|
||||
const COVER_PATH = /^\/api\/(album|playlist|artist)\/[^/]+\/cover$/
|
||||
const DOWNLOADS_PATH = "/library/downloads"
|
||||
const AUTH_PATHS = new Set(["/signin", "/signup"])
|
||||
const PUBLIC_FILE = /\.(svg|png|ico|webmanifest)$/
|
||||
const STATIC_REFERENCE = /static\/(?:chunks|css|media)\/[^"'\\\s)]+/g
|
||||
const OFFLINE_APP = new URL(self.location.href).searchParams.has("offline-app")
|
||||
const DAY_MS = 24 * 60 * 60 * 1000
|
||||
const STATIC_MAX_UNUSED_MS = 30 * DAY_MS
|
||||
const USED_AT_HEADER = "X-Otunes-Used-At"
|
||||
|
||||
self.addEventListener("install", (event) => {
|
||||
self.skipWaiting()
|
||||
event.waitUntil(
|
||||
caches.open(PLACEHOLDER_CACHE).then((cache) => cache.add(PLACEHOLDER_PATH))
|
||||
)
|
||||
})
|
||||
self.addEventListener("activate", (event) =>
|
||||
event.waitUntil(Promise.all([self.clients.claim(), pruneStatic()]))
|
||||
)
|
||||
|
||||
/** Saves app code stamped with when it was last used. */
|
||||
async function putStatic(key, response) {
|
||||
const headers = new Headers(response.headers)
|
||||
headers.set(USED_AT_HEADER, String(Date.now()))
|
||||
const cache = await caches.open(STATIC_CACHE)
|
||||
await cache.put(
|
||||
key,
|
||||
new Response(await response.blob(), {
|
||||
status: response.status,
|
||||
statusText: response.statusText,
|
||||
headers,
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
function usedAt(response) {
|
||||
return Number(response.headers.get(USED_AT_HEADER)) || 0
|
||||
}
|
||||
|
||||
let lastPrune = 0
|
||||
|
||||
/** Deletes app code unused for a month. Runs at most once a day. */
|
||||
async function pruneStatic() {
|
||||
if (!OFFLINE_APP || Date.now() - lastPrune < DAY_MS) return
|
||||
lastPrune = Date.now()
|
||||
const cache = await caches.open(STATIC_CACHE)
|
||||
for (const request of await cache.keys()) {
|
||||
const response = await cache.match(request)
|
||||
if (response && Date.now() - usedAt(response) > STATIC_MAX_UNUSED_MS) {
|
||||
await cache.delete(request)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** The saved cover's key for a cover request, also through `/_next/image`. */
|
||||
function coverKey(url) {
|
||||
if (url.origin !== self.location.origin) return null
|
||||
if (url.pathname === "/_next/image") {
|
||||
const inner = url.searchParams.get("url")
|
||||
return inner ? coverKey(new URL(inner, self.location.origin)) : null
|
||||
}
|
||||
return COVER_PATH.test(url.pathname) ? url.pathname : null
|
||||
}
|
||||
|
||||
/** One key per page, whatever the request's headers. */
|
||||
function pageKey(url) {
|
||||
return url.pathname + url.search
|
||||
}
|
||||
|
||||
/** Chunk paths show up both URL-encoded and raw, so keys use the raw form. */
|
||||
function staticKey(url) {
|
||||
try {
|
||||
return decodeURI(url.pathname)
|
||||
} catch {
|
||||
return url.pathname
|
||||
}
|
||||
}
|
||||
|
||||
async function saved(cacheName, key) {
|
||||
const cache = await caches.open(cacheName)
|
||||
return cache.match(key, { ignoreVary: true, ignoreSearch: false })
|
||||
}
|
||||
|
||||
function isSavablePage(response, url) {
|
||||
return (
|
||||
response.ok &&
|
||||
!response.redirected &&
|
||||
!AUTH_PATHS.has(url.pathname) &&
|
||||
(response.headers.get("Content-Type") ?? "").includes("text/html")
|
||||
)
|
||||
}
|
||||
|
||||
async function savePage(url, response) {
|
||||
const cache = await caches.open(PAGE_CACHE)
|
||||
await cache.put(pageKey(url), response)
|
||||
}
|
||||
|
||||
/** Saves the app code a page references, so it renders offline. */
|
||||
async function saveStaticReferences(html) {
|
||||
const cache = await caches.open(STATIC_CACHE)
|
||||
const paths = new Set(
|
||||
Array.from(html.matchAll(STATIC_REFERENCE), ([path]) => `/_next/${path}`)
|
||||
)
|
||||
await Promise.all(
|
||||
[...paths].map(async (path) => {
|
||||
const key = staticKey(new URL(path, self.location.origin))
|
||||
if (await cache.match(key)) return
|
||||
const response = await fetch(path).catch(() => null)
|
||||
if (response?.ok) await putStatic(key, response)
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
async function handlePage(request, url) {
|
||||
void pruneStatic()
|
||||
try {
|
||||
const response = await fetch(request)
|
||||
if (isSavablePage(response, url)) await savePage(url, response.clone())
|
||||
return response
|
||||
} catch (error) {
|
||||
const page = await saved(PAGE_CACHE, pageKey(url))
|
||||
if (page) return page
|
||||
if (url.pathname !== DOWNLOADS_PATH && (await saved(PAGE_CACHE, DOWNLOADS_PATH))) {
|
||||
return Response.redirect(DOWNLOADS_PATH, 302)
|
||||
}
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
async function handleStatic(request, url) {
|
||||
const key = staticKey(url)
|
||||
const cached = await saved(STATIC_CACHE, key)
|
||||
if (cached) {
|
||||
// Refresh the stamp at most daily, so code in use is never pruned.
|
||||
if (Date.now() - usedAt(cached) > DAY_MS) {
|
||||
void putStatic(key, cached.clone())
|
||||
}
|
||||
return cached
|
||||
}
|
||||
const response = await fetch(request)
|
||||
if (response.ok) await putStatic(key, response.clone())
|
||||
return response
|
||||
}
|
||||
|
||||
/** The saved cover, else the placeholder. */
|
||||
async function savedCover(key) {
|
||||
return (
|
||||
(await saved(COVER_CACHE, key)) ??
|
||||
(await saved(PLACEHOLDER_CACHE, PLACEHOLDER_PATH))
|
||||
)
|
||||
}
|
||||
|
||||
async function handleCover(request, key) {
|
||||
try {
|
||||
const response = await fetch(request)
|
||||
return response.ok ? response : ((await savedCover(key)) ?? response)
|
||||
} catch (error) {
|
||||
const cover = await savedCover(key)
|
||||
if (cover) return cover
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
/** Network first for public files, saved as app code for offline. */
|
||||
async function handlePublicFile(request, key) {
|
||||
try {
|
||||
const response = await fetch(request)
|
||||
if (response.ok) await putStatic(key, response.clone())
|
||||
return response
|
||||
} catch (error) {
|
||||
const copy = await saved(STATIC_CACHE, key)
|
||||
if (copy) return copy
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
self.addEventListener("fetch", (event) => {
|
||||
const { request } = event
|
||||
if (request.method !== "GET") return
|
||||
const url = new URL(request.url)
|
||||
if (url.origin !== self.location.origin) return
|
||||
|
||||
if (OFFLINE_APP && request.mode === "navigate") {
|
||||
event.respondWith(handlePage(request, url))
|
||||
return
|
||||
}
|
||||
if (OFFLINE_APP && url.pathname.startsWith("/_next/static/")) {
|
||||
event.respondWith(handleStatic(request, url))
|
||||
return
|
||||
}
|
||||
const cover = coverKey(url)
|
||||
if (cover) {
|
||||
event.respondWith(handleCover(request, cover))
|
||||
return
|
||||
}
|
||||
if (OFFLINE_APP && PUBLIC_FILE.test(url.pathname)) {
|
||||
event.respondWith(handlePublicFile(request, url.pathname))
|
||||
}
|
||||
})
|
||||
|
||||
/** Saves pages not saved yet, with their app code, while online. */
|
||||
async function savePages(paths) {
|
||||
const cache = await caches.open(PAGE_CACHE)
|
||||
for (const path of paths) {
|
||||
const url = new URL(path, self.location.origin)
|
||||
if (await cache.match(pageKey(url), { ignoreVary: true })) continue
|
||||
const response = await fetch(url, { credentials: "same-origin" }).catch(
|
||||
() => null
|
||||
)
|
||||
if (!response || !isSavablePage(response, url)) continue
|
||||
await savePage(url, response.clone())
|
||||
await saveStaticReferences(await response.text())
|
||||
}
|
||||
}
|
||||
|
||||
self.addEventListener("message", (event) => {
|
||||
if (
|
||||
OFFLINE_APP &&
|
||||
event.data?.type === "save-pages" &&
|
||||
Array.isArray(event.data.paths)
|
||||
) {
|
||||
event.waitUntil(savePages(event.data.paths))
|
||||
}
|
||||
})
|
||||
@@ -1,13 +0,0 @@
|
||||
<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" width="100" height="100"><style>:root {
|
||||
--icon: rgba(60, 60, 67, 0.18);
|
||||
--bg: #e3e3e3;
|
||||
color-scheme: light dark;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
:root {
|
||||
--icon: rgba(235, 235, 245, 0.16);
|
||||
--bg: #323232;
|
||||
}
|
||||
}
|
||||
</style><path fill="var(--bg)" d="M0 0h100v100H0z"></path><path fill="none" stroke="var(--icon)" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" d="M50 27v38M33 49l17 17 17-17M31 75h38"></path></svg>
|
||||
|
Before Width: | Height: | Size: 614 B |
@@ -1,103 +0,0 @@
|
||||
import type { ConnectionState } from "convex/browser"
|
||||
|
||||
/** The part of `ConvexReactClient` connectivity needs. */
|
||||
export type ConnectionClient = {
|
||||
connectionState(): ConnectionState
|
||||
subscribeToConnectionState(cb: (state: ConnectionState) => void): () => void
|
||||
}
|
||||
|
||||
/** A platform reachability signal, such as `navigator.onLine` on web. */
|
||||
export type PlatformNetwork = {
|
||||
isOnline(): boolean
|
||||
subscribe(onChange: () => void): () => void
|
||||
}
|
||||
|
||||
/** Shaped for `useSyncExternalStore`; the snapshot is true while offline. */
|
||||
export type ConnectivityStore = {
|
||||
subscribe(onChange: () => void): () => void
|
||||
getSnapshot(): boolean
|
||||
}
|
||||
|
||||
/** How long the socket may stay down before the app counts as offline. */
|
||||
const DISCONNECT_GRACE_MS = 5_000
|
||||
|
||||
const stores = new WeakMap<ConnectionClient, ConnectivityStore>()
|
||||
|
||||
/**
|
||||
* Returns the shared offline store for a Convex client. The app is offline
|
||||
* when the platform reports no network, or when the server socket has stayed
|
||||
* closed past a short grace period (server down, requests timing out). It
|
||||
* comes back online as soon as the socket reconnects.
|
||||
*/
|
||||
export function connectivityStore(
|
||||
client: ConnectionClient,
|
||||
network?: PlatformNetwork
|
||||
): ConnectivityStore {
|
||||
let store = stores.get(client)
|
||||
if (!store) {
|
||||
store = createConnectivityStore(client, network)
|
||||
stores.set(client, store)
|
||||
}
|
||||
return store
|
||||
}
|
||||
|
||||
function createConnectivityStore(
|
||||
client: ConnectionClient,
|
||||
network: PlatformNetwork | undefined
|
||||
): ConnectivityStore {
|
||||
const listeners = new Set<() => void>()
|
||||
let offline = false
|
||||
let graceTimer: ReturnType<typeof setTimeout> | undefined
|
||||
let stop: (() => void) | undefined
|
||||
|
||||
function setOffline(next: boolean) {
|
||||
if (next === offline) return
|
||||
offline = next
|
||||
for (const listener of listeners) listener()
|
||||
}
|
||||
|
||||
function clearGrace() {
|
||||
clearTimeout(graceTimer)
|
||||
graceTimer = undefined
|
||||
}
|
||||
|
||||
function update() {
|
||||
if (network && !network.isOnline()) {
|
||||
clearGrace()
|
||||
setOffline(true)
|
||||
} else if (client.connectionState().isWebSocketConnected) {
|
||||
clearGrace()
|
||||
setOffline(false)
|
||||
} else if (!offline && graceTimer === undefined) {
|
||||
graceTimer = setTimeout(() => {
|
||||
graceTimer = undefined
|
||||
setOffline(true)
|
||||
}, DISCONNECT_GRACE_MS)
|
||||
}
|
||||
}
|
||||
|
||||
function start() {
|
||||
const stopClient = client.subscribeToConnectionState(update)
|
||||
const stopNetwork = network?.subscribe(update)
|
||||
update()
|
||||
return () => {
|
||||
stopClient()
|
||||
stopNetwork?.()
|
||||
clearGrace()
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
subscribe(onChange) {
|
||||
listeners.add(onChange)
|
||||
stop ??= start()
|
||||
return () => {
|
||||
listeners.delete(onChange)
|
||||
if (listeners.size > 0) return
|
||||
stop?.()
|
||||
stop = undefined
|
||||
}
|
||||
},
|
||||
getSnapshot: () => offline,
|
||||
}
|
||||
}
|
||||
@@ -1,561 +0,0 @@
|
||||
import {
|
||||
DOWNLOAD_QUALITIES,
|
||||
downloadPlan,
|
||||
type DownloadQuality,
|
||||
} from "../download-quality"
|
||||
|
||||
export type DownloadedSong = {
|
||||
songId: string
|
||||
/** The quality the file is in, after any fallback to High. */
|
||||
quality: DownloadQuality
|
||||
bytes: number
|
||||
/** Whose cover to keep for offline use. */
|
||||
albumId?: string
|
||||
}
|
||||
|
||||
/** Artwork kept on the device for downloaded songs and playlists. */
|
||||
export type DownloadedCover = { kind: "album" | "playlist"; id: string }
|
||||
|
||||
/**
|
||||
* An album or playlist downloaded as a whole. Playlists stay in sync: songs
|
||||
* added later download in `quality`, and songs taken out are removed.
|
||||
*/
|
||||
export type DownloadedCollection = {
|
||||
kind: "album" | "playlist"
|
||||
id: string
|
||||
title: string
|
||||
quality: DownloadQuality
|
||||
/** Every song in the album or playlist, for syncing. */
|
||||
songIds: string[]
|
||||
/** Songs whose download was removed from this collection only. */
|
||||
removedSongIds?: string[]
|
||||
}
|
||||
|
||||
export type CollectionRef = Pick<DownloadedCollection, "kind" | "id">
|
||||
|
||||
/** Where songs are removed from: one collection, or Other Downloaded Songs. */
|
||||
export type DownloadSource = CollectionRef | "other"
|
||||
|
||||
/** The songs a collection keeps downloaded. */
|
||||
export function collectionSongIds(collection: DownloadedCollection) {
|
||||
if (!collection.removedSongIds?.length) return collection.songIds
|
||||
const removed = new Set(collection.removedSongIds)
|
||||
return collection.songIds.filter((songId) => !removed.has(songId))
|
||||
}
|
||||
|
||||
/**
|
||||
* What a device remembers besides the audio: downloaded collections, and songs
|
||||
* downloaded on their own ("Other Downloaded Songs"). A song leaves the other
|
||||
* songs when its album is downloaded, but stays when a playlist holds it.
|
||||
*/
|
||||
export type DownloadIndex = {
|
||||
collections: DownloadedCollection[]
|
||||
otherSongIds: string[]
|
||||
}
|
||||
|
||||
/** Where a platform keeps downloaded audio. */
|
||||
export type DownloadStorage = {
|
||||
list(): Promise<DownloadedSong[]>
|
||||
/**
|
||||
* Fetches `requested` from the server and stores it, recording `quality`
|
||||
* (what the server falls back to). Returns the stored size. Must leave
|
||||
* nothing behind when it throws or `signal` aborts.
|
||||
*/
|
||||
save(
|
||||
song: {
|
||||
songId: string
|
||||
requested: DownloadQuality
|
||||
quality: DownloadQuality
|
||||
albumId?: string
|
||||
},
|
||||
signal: AbortSignal
|
||||
): Promise<number>
|
||||
/** Fetches and keeps a cover unless it is already kept. */
|
||||
saveCover(cover: DownloadedCover): Promise<void>
|
||||
/** Deletes every kept cover not in `keep`. */
|
||||
pruneCovers(keep: readonly DownloadedCover[]): Promise<void>
|
||||
remove(songIds: readonly string[]): Promise<void>
|
||||
readIndex(): Promise<DownloadIndex>
|
||||
writeIndex(index: DownloadIndex): Promise<void>
|
||||
}
|
||||
|
||||
export type DownloadableSong = {
|
||||
id: string
|
||||
files: Record<string, unknown>
|
||||
albumId?: string
|
||||
}
|
||||
|
||||
export type DownloadStatus = {
|
||||
downloaded: number
|
||||
queued: number
|
||||
total: number
|
||||
}
|
||||
|
||||
export type DownloadBreakdown = {
|
||||
bytes: number
|
||||
songs: number
|
||||
queued: number
|
||||
byQuality: { quality: DownloadQuality; bytes: number; songs: number }[]
|
||||
collections: {
|
||||
collection: DownloadedCollection
|
||||
bytes: number
|
||||
status: DownloadStatus
|
||||
/** Downloaded songs that fell back to High. */
|
||||
fallbackCount: number
|
||||
}[]
|
||||
/** Other Downloaded Songs: songs downloaded on their own. */
|
||||
otherSongs: { bytes: number; songIds: string[] }
|
||||
}
|
||||
|
||||
export type SongDownloadState = "here" | "device" | "removed" | "none"
|
||||
|
||||
export type DownloadQueue = ReturnType<typeof createDownloadQueue>
|
||||
|
||||
/** The Favorites playlist has no ID or cover; downloads use this one. */
|
||||
export const FAVORITES_ID = "favorites"
|
||||
|
||||
function collectionKey({ kind, id }: CollectionRef) {
|
||||
return `${kind}:${id}`
|
||||
}
|
||||
|
||||
/**
|
||||
* Downloads songs a few at a time and tracks which songs, albums, and
|
||||
* playlists are on this device. Read it from React with
|
||||
* `useSyncExternalStore(subscribe, getVersion)`.
|
||||
*/
|
||||
export function createDownloadQueue(
|
||||
storage: DownloadStorage,
|
||||
{ concurrency = 2 }: { concurrency?: number } = {}
|
||||
) {
|
||||
const downloaded = new Map<string, DownloadedSong>()
|
||||
const collections = new Map<string, DownloadedCollection>()
|
||||
const otherSongIds = new Set<string>()
|
||||
const waiting: { song: DownloadableSong; quality: DownloadQuality }[] = []
|
||||
const running = new Map<string, AbortController>()
|
||||
const listeners = new Set<() => void>()
|
||||
const failureListeners = new Set<(songId: string, error: unknown) => void>()
|
||||
let version = 0
|
||||
let loading: Promise<void> | null = null
|
||||
|
||||
function notify() {
|
||||
version += 1
|
||||
for (const listener of listeners) listener()
|
||||
}
|
||||
|
||||
function load() {
|
||||
loading ??= Promise.all([storage.list(), storage.readIndex()]).then(
|
||||
([songs, index]) => {
|
||||
for (const song of songs) downloaded.set(song.songId, song)
|
||||
for (const collection of index.collections) {
|
||||
collections.set(collectionKey(collection), collection)
|
||||
}
|
||||
// Songs still queued when the app closed were never downloaded.
|
||||
for (const songId of index.otherSongIds) {
|
||||
if (downloaded.has(songId)) otherSongIds.add(songId)
|
||||
}
|
||||
// Retries covers that failed before (say, offline) and drops strays.
|
||||
for (const cover of neededCovers()) saveCover(cover)
|
||||
pruneCovers()
|
||||
notify()
|
||||
},
|
||||
(error) => {
|
||||
loading = null
|
||||
throw error
|
||||
}
|
||||
)
|
||||
return loading
|
||||
}
|
||||
|
||||
function saveIndex() {
|
||||
return storage.writeIndex({
|
||||
collections: [...collections.values()],
|
||||
otherSongIds: [...otherSongIds],
|
||||
})
|
||||
}
|
||||
|
||||
function isQueued(songId: string) {
|
||||
return running.has(songId) || waiting.some(({ song }) => song.id === songId)
|
||||
}
|
||||
|
||||
function status(songIds: readonly string[]): DownloadStatus {
|
||||
let done = 0
|
||||
let queued = 0
|
||||
for (const songId of songIds) {
|
||||
if (downloaded.has(songId)) done += 1
|
||||
else if (isQueued(songId)) queued += 1
|
||||
}
|
||||
return { downloaded: done, queued, total: songIds.length }
|
||||
}
|
||||
|
||||
function pump() {
|
||||
while (running.size < concurrency && waiting.length > 0) {
|
||||
const { song, quality } = waiting.shift()!
|
||||
const controller = new AbortController()
|
||||
const actual = downloadPlan(song.files, quality).quality
|
||||
running.set(song.id, controller)
|
||||
void storage
|
||||
.save(
|
||||
{
|
||||
songId: song.id,
|
||||
requested: quality,
|
||||
quality: actual,
|
||||
albumId: song.albumId,
|
||||
},
|
||||
controller.signal
|
||||
)
|
||||
.then(
|
||||
(bytes) => {
|
||||
if (controller.signal.aborted) return
|
||||
downloaded.set(song.id, {
|
||||
songId: song.id,
|
||||
quality: actual,
|
||||
bytes,
|
||||
albumId: song.albumId,
|
||||
})
|
||||
if (song.albumId) {
|
||||
saveCover({ kind: "album", id: song.albumId })
|
||||
}
|
||||
},
|
||||
(error) => {
|
||||
if (controller.signal.aborted) return
|
||||
// Load drops it from the saved index, since it never downloaded.
|
||||
otherSongIds.delete(song.id)
|
||||
for (const listener of failureListeners) listener(song.id, error)
|
||||
}
|
||||
)
|
||||
.finally(() => {
|
||||
if (running.get(song.id) === controller) running.delete(song.id)
|
||||
notify()
|
||||
pump()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function enqueueLoaded(
|
||||
songs: readonly DownloadableSong[],
|
||||
quality: DownloadQuality
|
||||
) {
|
||||
for (const song of songs) {
|
||||
if (downloaded.has(song.id) || isQueued(song.id)) continue
|
||||
waiting.push({ song, quality })
|
||||
}
|
||||
}
|
||||
|
||||
/** Covers are best effort: a missing one falls back to the placeholder. */
|
||||
function saveCover(cover: DownloadedCover) {
|
||||
void storage.saveCover(cover).catch(() => {})
|
||||
}
|
||||
|
||||
/** Album covers of downloaded songs, and covers of downloaded playlists. */
|
||||
function neededCovers() {
|
||||
const covers = new Map<string, DownloadedCover>()
|
||||
for (const song of downloaded.values()) {
|
||||
if (song.albumId) {
|
||||
covers.set(`album:${song.albumId}`, { kind: "album", id: song.albumId })
|
||||
}
|
||||
}
|
||||
for (const collection of collections.values()) {
|
||||
if (collection.kind === "playlist" && collection.id !== FAVORITES_ID) {
|
||||
covers.set(`playlist:${collection.id}`, {
|
||||
kind: "playlist",
|
||||
id: collection.id,
|
||||
})
|
||||
}
|
||||
}
|
||||
return [...covers.values()]
|
||||
}
|
||||
|
||||
function pruneCovers() {
|
||||
void storage.pruneCovers(neededCovers()).catch(() => {})
|
||||
}
|
||||
|
||||
/** Cancels and deletes audio, leaving the index as it is. */
|
||||
async function deleteAudio(songIds: readonly string[]) {
|
||||
if (songIds.length === 0) return
|
||||
const ids = new Set(songIds)
|
||||
for (let index = waiting.length - 1; index >= 0; index -= 1) {
|
||||
if (ids.has(waiting[index].song.id)) waiting.splice(index, 1)
|
||||
}
|
||||
for (const songId of ids) {
|
||||
running.get(songId)?.abort()
|
||||
running.delete(songId)
|
||||
downloaded.delete(songId)
|
||||
}
|
||||
notify()
|
||||
await storage.remove([...ids])
|
||||
pruneCovers()
|
||||
pump()
|
||||
}
|
||||
|
||||
/** Song IDs kept by Other Downloaded Songs or a collection besides `except`. */
|
||||
function songsHeldElsewhere(except?: string) {
|
||||
const held = new Set(otherSongIds)
|
||||
for (const [key, collection] of collections) {
|
||||
if (key === except) continue
|
||||
for (const songId of collectionSongIds(collection)) held.add(songId)
|
||||
}
|
||||
return held
|
||||
}
|
||||
|
||||
/** Deletes the audio of songs nothing holds anymore. */
|
||||
async function deleteUnheld(songIds: readonly string[]) {
|
||||
const held = songsHeldElsewhere()
|
||||
await deleteAudio(songIds.filter((songId) => !held.has(songId)))
|
||||
}
|
||||
|
||||
/**
|
||||
* Gives songs back to collections they were removed from. Returns the songs
|
||||
* no collection took back.
|
||||
*/
|
||||
function restoreToCollections(songIds: readonly string[]) {
|
||||
const unclaimed = new Set(songIds)
|
||||
for (const [key, collection] of collections) {
|
||||
const removed = collection.removedSongIds
|
||||
if (!removed?.some((songId) => unclaimed.has(songId))) continue
|
||||
collections.set(key, {
|
||||
...collection,
|
||||
removedSongIds: removed.filter((songId) => !unclaimed.has(songId)),
|
||||
})
|
||||
for (const songId of removed) unclaimed.delete(songId)
|
||||
}
|
||||
return unclaimed
|
||||
}
|
||||
|
||||
/** Removes `songIds` from one collection's download. */
|
||||
function removeFromCollection(key: string, songIds: readonly string[]) {
|
||||
const collection = collections.get(key)
|
||||
if (!collection) return
|
||||
const members = new Set(collection.songIds)
|
||||
const removed = new Set(collection.removedSongIds)
|
||||
for (const songId of songIds) if (members.has(songId)) removed.add(songId)
|
||||
collections.set(key, { ...collection, removedSongIds: [...removed] })
|
||||
}
|
||||
|
||||
return {
|
||||
load,
|
||||
subscribe(listener: () => void) {
|
||||
listeners.add(listener)
|
||||
return () => {
|
||||
listeners.delete(listener)
|
||||
}
|
||||
},
|
||||
/** Changes whenever anything downloads, queues, or is removed. */
|
||||
getVersion: () => version,
|
||||
/** Called when a song fails to download; it is left undownloaded. */
|
||||
onFailure(listener: (songId: string, error: unknown) => void) {
|
||||
failureListeners.add(listener)
|
||||
return () => {
|
||||
failureListeners.delete(listener)
|
||||
}
|
||||
},
|
||||
getDownloaded: (songId: string) => downloaded.get(songId),
|
||||
getCollection: (ref: CollectionRef) => collections.get(collectionKey(ref)),
|
||||
/**
|
||||
* How a song is downloaded as seen from `from`. "here" means that download
|
||||
* holds it (outside a downloaded collection, Other Downloaded Songs does).
|
||||
* "device" means only another download holds it, and "removed" means it
|
||||
* was removed from the downloaded collection `from` but is still on the
|
||||
* device. Menus offer Remove only for "here"; the downloaded icon shows
|
||||
* for "here" and "device".
|
||||
*/
|
||||
downloadState(songId: string, from?: DownloadSource): SongDownloadState {
|
||||
if (!downloaded.has(songId)) return "none"
|
||||
const collection =
|
||||
from && from !== "other"
|
||||
? collections.get(collectionKey(from))
|
||||
: undefined
|
||||
if (collection) {
|
||||
return collection.removedSongIds?.includes(songId) ? "removed" : "here"
|
||||
}
|
||||
return otherSongIds.has(songId) ? "here" : "device"
|
||||
},
|
||||
collections: () => [...collections.values()],
|
||||
isQueued,
|
||||
status,
|
||||
|
||||
/** Songs downloaded on their own, in the order they were added. */
|
||||
otherSongIds: () => [...otherSongIds],
|
||||
|
||||
/**
|
||||
* Downloads songs on their own. Songs removed from a downloaded album or
|
||||
* playlist go back to it; the rest join Other Downloaded Songs, including
|
||||
* songs already on the device for another download.
|
||||
*/
|
||||
async enqueue(
|
||||
songs: readonly DownloadableSong[],
|
||||
quality: DownloadQuality
|
||||
) {
|
||||
await load()
|
||||
const unclaimed = restoreToCollections(songs.map((song) => song.id))
|
||||
for (const songId of unclaimed) otherSongIds.add(songId)
|
||||
enqueueLoaded(songs, quality)
|
||||
notify()
|
||||
pump()
|
||||
await saveIndex()
|
||||
},
|
||||
|
||||
/**
|
||||
* Downloads an album or playlist and remembers it for syncing. An album
|
||||
* takes its songs out of Other Downloaded Songs.
|
||||
*/
|
||||
async downloadCollection(
|
||||
collection: Omit<DownloadedCollection, "songIds">,
|
||||
songs: readonly DownloadableSong[]
|
||||
) {
|
||||
await load()
|
||||
if (collection.kind === "album") {
|
||||
for (const song of songs) otherSongIds.delete(song.id)
|
||||
}
|
||||
if (collection.kind === "playlist" && collection.id !== FAVORITES_ID) {
|
||||
saveCover({ kind: "playlist", id: collection.id })
|
||||
}
|
||||
collections.set(collectionKey(collection), {
|
||||
kind: collection.kind,
|
||||
id: collection.id,
|
||||
title: collection.title,
|
||||
quality: collection.quality,
|
||||
songIds: songs.map((song) => song.id),
|
||||
})
|
||||
enqueueLoaded(songs, collection.quality)
|
||||
notify()
|
||||
pump()
|
||||
await saveIndex()
|
||||
},
|
||||
|
||||
/**
|
||||
* Brings a downloaded playlist up to date with its current songs.
|
||||
* `loadSongs` fetches file info for the songs that were added.
|
||||
*/
|
||||
async syncCollection(
|
||||
ref: CollectionRef,
|
||||
songIds: readonly string[],
|
||||
loadSongs: (songIds: string[]) => Promise<DownloadableSong[]>
|
||||
) {
|
||||
await load()
|
||||
const key = collectionKey(ref)
|
||||
const collection = collections.get(key)
|
||||
if (!collection) return
|
||||
const before = new Set(collection.songIds)
|
||||
const after = new Set(songIds)
|
||||
const added = songIds.filter((songId) => !before.has(songId))
|
||||
const dropped = collection.songIds.filter((songId) => !after.has(songId))
|
||||
if (added.length === 0 && dropped.length === 0) return
|
||||
|
||||
collections.set(key, {
|
||||
...collection,
|
||||
songIds: [...songIds],
|
||||
removedSongIds: collection.removedSongIds?.filter((songId) =>
|
||||
after.has(songId)
|
||||
),
|
||||
})
|
||||
await saveIndex()
|
||||
await deleteUnheld(dropped)
|
||||
if (added.length > 0) {
|
||||
enqueueLoaded(await loadSongs(added), collection.quality)
|
||||
notify()
|
||||
pump()
|
||||
}
|
||||
},
|
||||
|
||||
/** Forgets a collection and removes its songs nothing else holds. */
|
||||
async removeCollection(ref: CollectionRef) {
|
||||
await load()
|
||||
const key = collectionKey(ref)
|
||||
const collection = collections.get(key)
|
||||
if (!collection) return
|
||||
collections.delete(key)
|
||||
await saveIndex()
|
||||
await deleteUnheld(collection.songIds)
|
||||
pruneCovers()
|
||||
},
|
||||
|
||||
/**
|
||||
* Removes song downloads from one download: `from` when it is a downloaded
|
||||
* collection, else Other Downloaded Songs. A song stays on the device while
|
||||
* anything else holds it.
|
||||
*/
|
||||
async removeSongs(songIds: readonly string[], from?: DownloadSource) {
|
||||
await load()
|
||||
if (from && from !== "other" && collections.has(collectionKey(from))) {
|
||||
removeFromCollection(collectionKey(from), songIds)
|
||||
} else {
|
||||
for (const songId of songIds) otherSongIds.delete(songId)
|
||||
}
|
||||
notify()
|
||||
await saveIndex()
|
||||
await deleteUnheld(songIds)
|
||||
},
|
||||
|
||||
/** Empties Other Downloaded Songs, keeping songs a collection holds. */
|
||||
async removeOtherSongs() {
|
||||
await load()
|
||||
const songIds = [...otherSongIds]
|
||||
otherSongIds.clear()
|
||||
await saveIndex()
|
||||
await deleteUnheld(songIds)
|
||||
},
|
||||
|
||||
async removeAll() {
|
||||
await load()
|
||||
collections.clear()
|
||||
otherSongIds.clear()
|
||||
await saveIndex()
|
||||
await deleteAudio([
|
||||
...downloaded.keys(),
|
||||
...running.keys(),
|
||||
...waiting.map(({ song }) => song.id),
|
||||
])
|
||||
},
|
||||
|
||||
/** Where download storage goes, for settings. */
|
||||
breakdown(): DownloadBreakdown {
|
||||
const byQuality = DOWNLOAD_QUALITIES.map((quality) => ({
|
||||
quality,
|
||||
bytes: 0,
|
||||
songs: 0,
|
||||
}))
|
||||
let bytes = 0
|
||||
for (const song of downloaded.values()) {
|
||||
const entry = byQuality.find(({ quality }) => quality === song.quality)!
|
||||
entry.bytes += song.bytes
|
||||
entry.songs += 1
|
||||
bytes += song.bytes
|
||||
}
|
||||
|
||||
const collectionRows = [...collections.values()].map((collection) => {
|
||||
let collectionBytes = 0
|
||||
let fallbackCount = 0
|
||||
const songIds = collectionSongIds(collection)
|
||||
for (const songId of songIds) {
|
||||
const song = downloaded.get(songId)
|
||||
if (!song) continue
|
||||
collectionBytes += song.bytes
|
||||
if (song.quality !== collection.quality) fallbackCount += 1
|
||||
}
|
||||
return {
|
||||
collection,
|
||||
bytes: collectionBytes,
|
||||
status: status(songIds),
|
||||
fallbackCount,
|
||||
}
|
||||
})
|
||||
|
||||
const otherSongs = { bytes: 0, songIds: [] as string[] }
|
||||
for (const songId of otherSongIds) {
|
||||
const song = downloaded.get(songId)
|
||||
if (!song) continue
|
||||
otherSongs.bytes += song.bytes
|
||||
otherSongs.songIds.push(songId)
|
||||
}
|
||||
|
||||
return {
|
||||
bytes,
|
||||
songs: downloaded.size,
|
||||
queued: running.size + waiting.length,
|
||||
byQuality,
|
||||
collections: collectionRows.sort((a, b) => b.bytes - a.bytes),
|
||||
otherSongs,
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -998,30 +998,6 @@ export const getSongSource = query({
|
||||
},
|
||||
})
|
||||
|
||||
/** Batch of `getSongSource` for download sizing. Missing songs are skipped. */
|
||||
export const getSongSources = query({
|
||||
args: { ids: v.array(v.id("songs")) },
|
||||
handler: async (ctx, args) => {
|
||||
await requireSignedIn(ctx)
|
||||
if (args.ids.length > MAX_SONGS_BY_IDS) {
|
||||
throw new ConvexError(`Request at most ${MAX_SONGS_BY_IDS} songs`)
|
||||
}
|
||||
const songs = await Promise.all(args.ids.map((id) => ctx.db.get(id)))
|
||||
return songs.flatMap((song) =>
|
||||
song
|
||||
? [
|
||||
{
|
||||
_id: song._id,
|
||||
files: song.files,
|
||||
length: song.length,
|
||||
album: song.album,
|
||||
},
|
||||
]
|
||||
: []
|
||||
)
|
||||
},
|
||||
})
|
||||
|
||||
function playbackCodecMap(files: Record<string, string>) {
|
||||
return Object.fromEntries(Object.keys(files).map((codec) => [codec, true]))
|
||||
}
|
||||
@@ -1062,7 +1038,6 @@ export const getSongsForPlayback = query({
|
||||
return {
|
||||
id: ids[index],
|
||||
title: song.name,
|
||||
albumId: song.album,
|
||||
files: playbackCodecMap(song.files),
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,178 +0,0 @@
|
||||
import type { PlaybackSource, PlaybackStreamPlan } from "./playback-stream"
|
||||
|
||||
/** Qualities a listener can pick when downloading, lowest first. */
|
||||
export const DOWNLOAD_QUALITIES = [
|
||||
"medium",
|
||||
"high",
|
||||
"lossless",
|
||||
"atmos",
|
||||
] as const
|
||||
|
||||
export type DownloadQuality = (typeof DOWNLOAD_QUALITIES)[number]
|
||||
|
||||
export const DOWNLOAD_QUALITY_LABELS: Record<DownloadQuality, string> = {
|
||||
medium: "Medium",
|
||||
high: "High",
|
||||
lossless: "Lossless",
|
||||
atmos: "Dolby Atmos",
|
||||
}
|
||||
|
||||
export const DOWNLOAD_QUALITY_DETAILS: Record<DownloadQuality, string> = {
|
||||
medium: "AAC 128 kbps",
|
||||
high: "AAC 256 kbps",
|
||||
lossless: "ALAC or FLAC",
|
||||
atmos: "Spatial audio",
|
||||
}
|
||||
|
||||
const MEDIUM_KBPS = 128
|
||||
const HIGH_KBPS = 256
|
||||
|
||||
export function parseDownloadQuality(
|
||||
value: string | null | undefined
|
||||
): DownloadQuality | undefined {
|
||||
return DOWNLOAD_QUALITIES.find((quality) => quality === value)
|
||||
}
|
||||
|
||||
export type DownloadPlan = {
|
||||
/** What the song actually downloads as after falling back. */
|
||||
quality: DownloadQuality
|
||||
source: PlaybackSource
|
||||
/** AAC bitrate to transcode to; 0 sends the source file as-is. */
|
||||
kbps: number
|
||||
}
|
||||
|
||||
function highPlan(files: Record<string, unknown>): DownloadPlan {
|
||||
if ("normal" in files) {
|
||||
return { quality: "high", source: "normal", kbps: 0 }
|
||||
}
|
||||
return {
|
||||
quality: "high",
|
||||
source: "lossless" in files ? "lossless" : "atmos",
|
||||
kbps: HIGH_KBPS,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Picks the file for one song. Lossless and Dolby Atmos fall back to High when
|
||||
* the song lacks them, and Medium is always transcoded.
|
||||
*/
|
||||
export function downloadPlan(
|
||||
files: Record<string, unknown>,
|
||||
quality: DownloadQuality
|
||||
): DownloadPlan {
|
||||
switch (quality) {
|
||||
case "medium":
|
||||
return {
|
||||
quality,
|
||||
source:
|
||||
"lossless" in files
|
||||
? "lossless"
|
||||
: "normal" in files
|
||||
? "normal"
|
||||
: "atmos",
|
||||
kbps: MEDIUM_KBPS,
|
||||
}
|
||||
case "high":
|
||||
return highPlan(files)
|
||||
case "lossless":
|
||||
case "atmos": {
|
||||
const source = quality === "lossless" ? "lossless" : "atmos"
|
||||
return source in files ? { quality, source, kbps: 0 } : highPlan(files)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The download quality holding the same audio a stream plan plays, so a
|
||||
* download can stand in for streaming. Low has no download equivalent.
|
||||
*/
|
||||
export function streamDownloadQuality(
|
||||
plan: PlaybackStreamPlan
|
||||
): DownloadQuality | undefined {
|
||||
if (plan.preferAtmos) return "atmos"
|
||||
if (!plan.transcodeNeeded) {
|
||||
return plan.source === "lossless" ? "lossless" : "high"
|
||||
}
|
||||
if (plan.kbps === HIGH_KBPS) return "high"
|
||||
if (plan.kbps === MEDIUM_KBPS) return "medium"
|
||||
return undefined
|
||||
}
|
||||
|
||||
/**
|
||||
* Queue origin for playback started from the Downloads page, where downloads
|
||||
* play whatever their quality. `list` keeps origins of different lists apart.
|
||||
*/
|
||||
export function downloadsQueueOrigin(list: string) {
|
||||
return `downloads:${list}`
|
||||
}
|
||||
|
||||
export function isDownloadsQueueOrigin(origin: string | undefined) {
|
||||
return origin?.startsWith("downloads:") ?? false
|
||||
}
|
||||
|
||||
export type DownloadOption = {
|
||||
quality: DownloadQuality
|
||||
/** How many of the songs fall back to High for this quality. */
|
||||
fallbackCount: number
|
||||
}
|
||||
|
||||
/**
|
||||
* The qualities to offer for a set of songs. Lossless and Dolby Atmos only
|
||||
* appear when at least one song has them.
|
||||
*/
|
||||
export function downloadOptions(
|
||||
songs: readonly Record<string, unknown>[]
|
||||
): DownloadOption[] {
|
||||
return DOWNLOAD_QUALITIES.flatMap((quality) => {
|
||||
const fallbackCount = songs.filter(
|
||||
(files) => downloadPlan(files, quality).quality !== quality
|
||||
).length
|
||||
if (
|
||||
fallbackCount === songs.length &&
|
||||
quality !== "medium" &&
|
||||
quality !== "high"
|
||||
) {
|
||||
return []
|
||||
}
|
||||
return [{ quality, fallbackCount }]
|
||||
})
|
||||
}
|
||||
|
||||
export type SizedDownloadOption = DownloadOption & {
|
||||
bytes: number
|
||||
/** True when part of the size is a guess because the server re-encodes. */
|
||||
estimated: boolean
|
||||
}
|
||||
|
||||
/** Server answer for a set of songs about to be downloaded. */
|
||||
export type DownloadOptionsResponse = {
|
||||
songs: { id: string; albumId: string; files: Record<string, true> }[]
|
||||
options: SizedDownloadOption[]
|
||||
}
|
||||
|
||||
/** POST `{ songIds, losslessFormat? }` here for `DownloadOptionsResponse`. */
|
||||
export const DOWNLOAD_OPTIONS_PATH = "/api/download/options"
|
||||
|
||||
/** Rough size of an AAC encode, including container overhead. */
|
||||
export function estimatedAacBytes(seconds: number, kbps: number) {
|
||||
return Math.round(((seconds * kbps * 1000) / 8) * 1.02)
|
||||
}
|
||||
|
||||
export function formatBytes(bytes: number) {
|
||||
if (bytes < 1000 * 1000) return `${Math.max(1, Math.round(bytes / 1000))} KB`
|
||||
if (bytes < 1000 * 1000 * 1000) return `${Math.round(bytes / 1000 / 1000)} MB`
|
||||
return `${(bytes / 1000 / 1000 / 1000).toFixed(1)} GB`
|
||||
}
|
||||
|
||||
/** Download route for one song. iOS asks for ALAC so it skips FLAC conversion. */
|
||||
export function songDownloadPath(
|
||||
songId: string,
|
||||
quality: DownloadQuality,
|
||||
options?: { losslessFormat?: "alac" }
|
||||
) {
|
||||
const params = new URLSearchParams({ quality })
|
||||
if (options?.losslessFormat) {
|
||||
params.set("losslessFormat", options.losslessFormat)
|
||||
}
|
||||
return `/api/song/${songId}/download?${params}`
|
||||
}
|
||||
@@ -15,10 +15,6 @@
|
||||
"types": "./convex/types.ts",
|
||||
"default": "./convex/types.ts"
|
||||
},
|
||||
"./download-quality": {
|
||||
"types": "./download-quality.ts",
|
||||
"default": "./download-quality.ts"
|
||||
},
|
||||
"./playback-stream": {
|
||||
"types": "./playback-stream.ts",
|
||||
"default": "./playback-stream.ts"
|
||||
@@ -39,14 +35,6 @@
|
||||
"types": "./client/cached-query.ts",
|
||||
"default": "./client/cached-query.ts"
|
||||
},
|
||||
"./client/connectivity": {
|
||||
"types": "./client/connectivity.ts",
|
||||
"default": "./client/connectivity.ts"
|
||||
},
|
||||
"./client/download-queue": {
|
||||
"types": "./client/download-queue.ts",
|
||||
"default": "./client/download-queue.ts"
|
||||
},
|
||||
"./client/favorites": {
|
||||
"types": "./client/favorites.ts",
|
||||
"default": "./client/favorites.ts"
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
diff --git a/build/useScreens.js b/build/useScreens.js
|
||||
index fec20121290650f18f39bc18cbb9e4a2a1626133..31c32ff23b36c43f1e98c58fdd7c1727c8a839df 100644
|
||||
--- a/build/useScreens.js
|
||||
+++ b/build/useScreens.js
|
||||
@@ -364,9 +364,6 @@ function getQualifiedRouteComponent(value) {
|
||||
/*#__PURE__*/ (0, _jsxruntime().jsxs)(_zoomtransitioncontextproviders.ZoomTransitionTargetContextProvider, {
|
||||
route: route,
|
||||
children: [
|
||||
- /*#__PURE__*/ (0, _jsxruntime().jsx)(_ZoomTransitionEnabler.ZoomTransitionEnabler, {
|
||||
- route: route
|
||||
- }),
|
||||
/*#__PURE__*/ (0, _jsxruntime().jsx)(_react().default.Suspense, {
|
||||
name: route ? `Route(${route.name})` : undefined,
|
||||
fallback: // `ResolvedSuspenseFallback` only selects between statically defined
|
||||
@@ -380,6 +377,12 @@ function getQualifiedRouteComponent(value) {
|
||||
hideWhenNestedAtLevel: activityThreshold,
|
||||
children: screenContent
|
||||
}) : screenContent
|
||||
+ }),
|
||||
+ // Render the enabler after the screen content so the screen's scroll
|
||||
+ // view stays its first descendant. react-native-screens only wires the
|
||||
+ // header search bar and content insets to the first descendant chain.
|
||||
+ /*#__PURE__*/ (0, _jsxruntime().jsx)(_ZoomTransitionEnabler.ZoomTransitionEnabler, {
|
||||
+ route: route
|
||||
})
|
||||
]
|
||||
})
|
||||
Generated
+4
-22
@@ -238,7 +238,6 @@ patchedDependencies:
|
||||
expo-audio@58.0.10: f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5
|
||||
expo-file-system@58.0.10: 8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c
|
||||
expo-modules-core@58.0.24: c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed
|
||||
expo-router@58.0.25: 9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c
|
||||
react-native-reanimated@4.7.1: badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3
|
||||
react-native-screens@4.30.0: f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d
|
||||
|
||||
@@ -306,9 +305,6 @@ importers:
|
||||
expo-dev-client:
|
||||
specifier: ~58.0.14
|
||||
version: 58.0.14(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))
|
||||
expo-file-system:
|
||||
specifier: ~58.0.10
|
||||
version: 58.0.10(patch_hash=8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))
|
||||
expo-font:
|
||||
specifier: ~58.0.9
|
||||
version: 58.0.9(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
|
||||
@@ -330,12 +326,9 @@ importers:
|
||||
expo-navigation-bar:
|
||||
specifier: ~58.0.4
|
||||
version: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)(supports-color@8.1.1)
|
||||
expo-network:
|
||||
specifier: ~58.0.5
|
||||
version: 58.0.5(expo@58.0.17)(react@19.3.0)
|
||||
expo-router:
|
||||
specifier: ~58.0.25
|
||||
version: 58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(1020a30be8093793eba026e7c3f3ca8b)
|
||||
version: 58.0.25(1020a30be8093793eba026e7c3f3ca8b)
|
||||
expo-secure-store:
|
||||
specifier: ~58.0.2
|
||||
version: 58.0.2(expo@58.0.17)
|
||||
@@ -4286,12 +4279,6 @@ packages:
|
||||
react: '*'
|
||||
react-native: '*'
|
||||
|
||||
expo-network@58.0.5:
|
||||
resolution: {integrity: sha512-/0F4WsFgJK9/wBzVd8ai/tUHpOROG3dbI4Azu89PQZnC7uohmm7/ruwK5VaTBumPh3hBMANXnww3WFAaMA1gOA==}
|
||||
peerDependencies:
|
||||
expo: '*'
|
||||
react: '*'
|
||||
|
||||
expo-router@58.0.25:
|
||||
resolution: {integrity: sha512-sFumF6yUbxcSfiYcd+5vJjjIbVN0wo5X0F9SEnoNlmmvzoI9jD6k9dcSMnoe5ywquWonUEAdcHcpfsa087/8sQ==}
|
||||
peerDependencies:
|
||||
@@ -7648,7 +7635,7 @@ snapshots:
|
||||
ws: 8.21.0
|
||||
zod: 4.6.7
|
||||
optionalDependencies:
|
||||
expo-router: 58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(1020a30be8093793eba026e7c3f3ca8b)
|
||||
expo-router: 58.0.25(1020a30be8093793eba026e7c3f3ca8b)
|
||||
react-native: 0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1)
|
||||
transitivePeerDependencies:
|
||||
- '@expo/dom-webview'
|
||||
@@ -7949,7 +7936,7 @@ snapshots:
|
||||
react: 19.3.0
|
||||
optionalDependencies:
|
||||
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
|
||||
expo-router: 58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(1020a30be8093793eba026e7c3f3ca8b)
|
||||
expo-router: 58.0.25(1020a30be8093793eba026e7c3f3ca8b)
|
||||
react-dom: 19.3.0(react@19.3.0)
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
@@ -11265,12 +11252,7 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
expo-network@58.0.5(expo@58.0.17)(react@19.3.0):
|
||||
dependencies:
|
||||
expo: 58.0.17(@babel/core@7.29.7(supports-color@8.1.1))(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)(supports-color@8.1.1)(typescript@6.0.3)
|
||||
react: 19.3.0
|
||||
|
||||
expo-router@58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(1020a30be8093793eba026e7c3f3ca8b):
|
||||
expo-router@58.0.25(1020a30be8093793eba026e7c3f3ca8b):
|
||||
dependencies:
|
||||
'@expo/log-box': 58.0.13(@expo/dom-webview@58.0.2)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
|
||||
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
|
||||
|
||||
@@ -8,7 +8,6 @@ patchedDependencies:
|
||||
'expo-modules-core@58.0.24': patches/expo-modules-core@58.0.24.patch
|
||||
'expo-file-system@58.0.10': patches/expo-file-system@58.0.10.patch
|
||||
'@react-native-community/slider@5.2.1': patches/@react-native-community__slider@5.2.1.patch
|
||||
'expo-router@58.0.25': patches/expo-router@58.0.25.patch
|
||||
allowBuilds:
|
||||
esbuild: true
|
||||
unrs-resolver: true
|
||||
|
||||
Reference in new issue
Block a user