chore: remove dead code and dedupe web formatDuration #94
No files matched your search
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../library/queue"
|
||||
@@ -35,7 +35,7 @@ import {
|
||||
MediaActionMenu,
|
||||
MediaContextMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-actions-sheet"
|
||||
} from "@/components/media-context-menu"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
|
||||
@@ -6,7 +6,7 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
|
||||
import { MediaGridList } from "@/components/media-cards"
|
||||
import { MediaActionMenu } from "@/components/media-actions-sheet"
|
||||
import { MediaActionMenu } from "@/components/media-context-menu"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
|
||||
@@ -46,7 +46,7 @@ import {
|
||||
import {
|
||||
MediaActionMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-actions-sheet"
|
||||
} from "@/components/media-context-menu"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
@@ -314,7 +314,6 @@ function PlaylistContent({
|
||||
deletePlaylist,
|
||||
handlePlaylistDetailAction,
|
||||
palette.foreground,
|
||||
palette.background,
|
||||
palette.isDark,
|
||||
playlistId,
|
||||
playlist?.title,
|
||||
|
||||
@@ -1,186 +0,0 @@
|
||||
import { Stack, useRouter } from "expo-router"
|
||||
import { memo, useCallback, useMemo } from "react"
|
||||
import { FlatList, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset, SongRow } from "@/components/player"
|
||||
import { SongRowSkeleton } from "@/components/skeletons"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { longListProps } from "@/lib/list"
|
||||
import { useSong, useSongs } from "@/lib/song-cache"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
/** `key` stays stable when earlier songs leave the queue, so rows are not remounted on skip. */
|
||||
type QueueItem = { songId: Id<"songs">; queueIndex: number; key: string }
|
||||
|
||||
function queueItemKey(item: QueueItem) {
|
||||
return item.key
|
||||
}
|
||||
|
||||
const QueueRow = memo(function QueueRow({
|
||||
songId,
|
||||
queueIndex,
|
||||
isLast,
|
||||
isCurrent,
|
||||
onSkipTo,
|
||||
onMove,
|
||||
}: Omit<QueueItem, "key"> & {
|
||||
isLast: boolean
|
||||
isCurrent: boolean
|
||||
onSkipTo: (index: number) => void
|
||||
onMove: (index: number, direction: -1 | 1) => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const song = useSong(songId)
|
||||
|
||||
return (
|
||||
<View>
|
||||
{song ? (
|
||||
<SongRow song={song} onPress={() => onSkipTo(queueIndex)} />
|
||||
) : (
|
||||
<SongRowSkeleton />
|
||||
)}
|
||||
<View style={styles.queueActions}>
|
||||
<Pressable
|
||||
disabled={queueIndex === 0}
|
||||
onPress={() => onMove(queueIndex, -1)}
|
||||
>
|
||||
<Text style={{ color: colors.foreground }}>Move up</Text>
|
||||
</Pressable>
|
||||
<Pressable disabled={isLast} onPress={() => onMove(queueIndex, 1)}>
|
||||
<Text style={{ color: colors.foreground }}>Move down</Text>
|
||||
</Pressable>
|
||||
{isCurrent ? (
|
||||
<Text style={{ color: colors.primary, fontWeight: "700" }}>
|
||||
Now playing
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
})
|
||||
|
||||
export default function QueueScreen() {
|
||||
const router = useRouter()
|
||||
const colors = useThemeColors()
|
||||
const { queueSongIds, queueHistorySongIds } = usePlaybackQueue()
|
||||
const { skipToQueueIndex, clearQueue, reorderQueue } = usePlaybackActions()
|
||||
const historySongs = useSongs(queueHistorySongIds)
|
||||
|
||||
const items = useMemo<QueueItem[]>(() => {
|
||||
const occurrences = new Map<string, number>()
|
||||
return queueSongIds.map((songId, queueIndex) => {
|
||||
const occurrence = occurrences.get(songId) ?? 0
|
||||
occurrences.set(songId, occurrence + 1)
|
||||
return { songId, queueIndex, key: `${songId}:${occurrence}` }
|
||||
})
|
||||
}, [queueSongIds])
|
||||
|
||||
const moveSong = useCallback(
|
||||
(fromIndex: number, direction: -1 | 1) => {
|
||||
const toIndex = fromIndex + direction
|
||||
if (toIndex < 0 || toIndex >= queueSongIds.length) return
|
||||
const next = [...queueSongIds]
|
||||
const [item] = next.splice(fromIndex, 1)
|
||||
next.splice(toIndex, 0, item)
|
||||
void reorderQueue(next)
|
||||
},
|
||||
[queueSongIds, reorderQueue]
|
||||
)
|
||||
|
||||
function handleClearQueue() {
|
||||
if (router.canGoBack()) {
|
||||
router.back()
|
||||
setTimeout(() => {
|
||||
void clearQueue()
|
||||
}, 0)
|
||||
return
|
||||
}
|
||||
|
||||
void clearQueue()
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen
|
||||
options={{
|
||||
headerRight: () =>
|
||||
queueSongIds.length > 0 ? (
|
||||
<Button
|
||||
title="Clear"
|
||||
variant="ghost"
|
||||
onPress={handleClearQueue}
|
||||
/>
|
||||
) : null,
|
||||
}}
|
||||
/>
|
||||
<FlatList
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
ListHeaderComponent={
|
||||
<View>
|
||||
<Text style={[styles.section, { color: colors.mutedForeground }]}>
|
||||
Up Next
|
||||
</Text>
|
||||
{queueSongIds.length === 0 ? (
|
||||
<Text style={[styles.empty, { color: colors.mutedForeground }]}>
|
||||
Queue is empty
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
}
|
||||
{...longListProps}
|
||||
data={items}
|
||||
keyExtractor={queueItemKey}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
renderItem={({ item }) => (
|
||||
<QueueRow
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
isLast={item.queueIndex === queueSongIds.length - 1}
|
||||
isCurrent={item.queueIndex === 0}
|
||||
onSkipTo={skipToQueueIndex}
|
||||
onMove={moveSong}
|
||||
/>
|
||||
)}
|
||||
ListFooterComponent={
|
||||
queueHistorySongIds.length > 0 ? (
|
||||
<View style={styles.history}>
|
||||
<Text style={[styles.section, { color: colors.mutedForeground }]}>
|
||||
History
|
||||
</Text>
|
||||
{historySongs.map((song, index) =>
|
||||
song ? (
|
||||
<SongRow key={`${song.id}-${index}`} song={song} />
|
||||
) : (
|
||||
<SongRowSkeleton
|
||||
key={`${queueHistorySongIds[index]}-${index}`}
|
||||
/>
|
||||
)
|
||||
)}
|
||||
</View>
|
||||
) : undefined
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
section: {
|
||||
paddingHorizontal: spacing.lg,
|
||||
paddingTop: spacing.md,
|
||||
fontSize: 12,
|
||||
fontWeight: "700",
|
||||
textTransform: "uppercase",
|
||||
},
|
||||
empty: { padding: spacing.lg },
|
||||
queueActions: {
|
||||
flexDirection: "row",
|
||||
gap: spacing.lg,
|
||||
paddingHorizontal: spacing.lg,
|
||||
paddingBottom: spacing.sm,
|
||||
},
|
||||
history: { marginTop: spacing.lg },
|
||||
})
|
||||
@@ -1 +0,0 @@
|
||||
export { default } from "../home/queue"
|
||||
@@ -1 +0,0 @@
|
||||
export { default } from "../home/queue"
|
||||
@@ -39,7 +39,7 @@ import { MarqueeText } from "@/components/marquee-text"
|
||||
import {
|
||||
MediaActionMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-actions-sheet"
|
||||
} from "@/components/media-context-menu"
|
||||
import {
|
||||
NowPlayingQueue,
|
||||
QUEUE_HORIZONTAL_INSET,
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
export type { MediaAction, MediaMenuConfig, MediaNavigation } from "@/components/media-context-menu"
|
||||
export type { MediaShareContext } from "@/lib/media-links"
|
||||
export {
|
||||
buildMediaMenuActions,
|
||||
MediaActionMenu,
|
||||
MediaContextMenu,
|
||||
} from "@/components/media-context-menu"
|
||||
@@ -18,7 +18,7 @@ import {
|
||||
import { useTabletPlayerInsets } from "@/contexts/tablet-player-layout"
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { MediaActionMenu } from "@/components/media-actions-sheet"
|
||||
import { MediaActionMenu } from "@/components/media-context-menu"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
import { createContext, useContext, type ReactNode } from "react"
|
||||
import { createContext, useContext, useMemo, type ReactNode } from "react"
|
||||
|
||||
type ConvexAuthSessionContextValue = {
|
||||
invalidateSession: () => Promise<void>
|
||||
}
|
||||
|
||||
const ConvexAuthSessionContext = createContext<ConvexAuthSessionContextValue | null>(
|
||||
null
|
||||
)
|
||||
const ConvexAuthSessionContext =
|
||||
createContext<ConvexAuthSessionContextValue | null>(null)
|
||||
|
||||
export function ConvexAuthSessionProvider({
|
||||
children,
|
||||
@@ -15,8 +14,9 @@ export function ConvexAuthSessionProvider({
|
||||
children: ReactNode
|
||||
invalidateSession: () => Promise<void>
|
||||
}) {
|
||||
const value = useMemo(() => ({ invalidateSession }), [invalidateSession])
|
||||
return (
|
||||
<ConvexAuthSessionContext.Provider value={{ invalidateSession }}>
|
||||
<ConvexAuthSessionContext.Provider value={value}>
|
||||
{children}
|
||||
</ConvexAuthSessionContext.Provider>
|
||||
)
|
||||
@@ -25,7 +25,9 @@ export function ConvexAuthSessionProvider({
|
||||
export function useInvalidateAuthSession() {
|
||||
const context = useContext(ConvexAuthSessionContext)
|
||||
if (!context) {
|
||||
throw new Error("useInvalidateAuthSession must be used within ConvexAppProvider")
|
||||
throw new Error(
|
||||
"useInvalidateAuthSession must be used within ConvexAuthSessionProvider"
|
||||
)
|
||||
}
|
||||
return context
|
||||
}
|
||||
@@ -44,12 +44,7 @@ import {
|
||||
import { albumCoverUrl } from "@/lib/cover-urls"
|
||||
import { sumDurationSeconds } from "@/lib/media-summary"
|
||||
import { albumDetailSongs, rememberSongs } from "@/lib/song-cache"
|
||||
|
||||
function formatDuration(seconds: number): string {
|
||||
const minutes = Math.floor(seconds / 60)
|
||||
const remainingSeconds = seconds % 60
|
||||
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
|
||||
}
|
||||
import { formatDuration } from "@/lib/format-duration"
|
||||
|
||||
function formatMetadata(genre: string | null, year: number | null): string | null {
|
||||
const parts: string[] = []
|
||||
|
||||
@@ -31,13 +31,7 @@ import { Slider } from "@/components/ui/slider"
|
||||
import { useSidebar } from "@/components/ui/sidebar"
|
||||
import { albumCoverUrl } from "@/lib/cover-urls"
|
||||
import { cn } from "@/lib/utils"
|
||||
|
||||
function formatDuration(seconds: number): string {
|
||||
const total = Math.max(0, Math.floor(seconds))
|
||||
const minutes = Math.floor(total / 60)
|
||||
const remainingSeconds = total % 60
|
||||
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
|
||||
}
|
||||
import { formatDuration } from "@/lib/format-duration"
|
||||
|
||||
export function PlayerBar() {
|
||||
const {
|
||||
|
||||
@@ -46,15 +46,10 @@ import {
|
||||
TRACK_ROW_PADDING,
|
||||
type SelectionRangePosition,
|
||||
} from "@/lib/selection-range-styles"
|
||||
import { formatDuration } from "@/lib/format-duration"
|
||||
|
||||
const ADD_TO_ANOTHER_PLAYLIST = "Add to Another Playlist"
|
||||
|
||||
function formatDuration(seconds: number): string {
|
||||
const minutes = Math.floor(seconds / 60)
|
||||
const remainingSeconds = seconds % 60
|
||||
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
|
||||
}
|
||||
|
||||
function PlaylistSongCover({
|
||||
song,
|
||||
inRange,
|
||||
|
||||
@@ -28,6 +28,7 @@ import {
|
||||
} 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
|
||||
@@ -40,12 +41,6 @@ type QueueItem = {
|
||||
song: QueueSelectable | null
|
||||
}
|
||||
|
||||
function formatDuration(seconds: number): string {
|
||||
const minutes = Math.floor(seconds / 60)
|
||||
const remainingSeconds = seconds % 60
|
||||
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
|
||||
}
|
||||
|
||||
function toSelectableQueue(
|
||||
songIds: Id<"songs">[],
|
||||
songs: (BrowseSong | undefined)[]
|
||||
|
||||
@@ -52,6 +52,7 @@ import {
|
||||
TRACK_ROW_PADDING,
|
||||
type SelectionRangePosition,
|
||||
} from "@/lib/selection-range-styles"
|
||||
import { formatDuration } from "@/lib/format-duration"
|
||||
|
||||
type SortKey = "title" | "artist" | "album"
|
||||
type SortDirection = "asc" | "desc"
|
||||
@@ -64,12 +65,6 @@ const nameColumnLayout =
|
||||
"grid grid-cols-[2rem_2.5rem_minmax(0,10rem)] items-center gap-x-2"
|
||||
const songColumnClass = "w-36 shrink-0 truncate"
|
||||
|
||||
function formatDuration(seconds: number): string {
|
||||
const minutes = Math.floor(seconds / 60)
|
||||
const remainingSeconds = seconds % 60
|
||||
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
|
||||
}
|
||||
|
||||
function SongCover({
|
||||
song,
|
||||
inRange,
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
import { exportJWK, exportPKCS8, generateKeyPair } from "jose";
|
||||
|
||||
const keys = await generateKeyPair("RS256", {
|
||||
extractable: true,
|
||||
});
|
||||
const privateKey = await exportPKCS8(keys.privateKey);
|
||||
const publicKey = await exportJWK(keys.publicKey);
|
||||
const jwks = JSON.stringify({ keys: [{ use: "sig", ...publicKey }] });
|
||||
|
||||
process.stdout.write(
|
||||
`JWT_PRIVATE_KEY="${privateKey.trimEnd().replace(/\n/g, " ")}"`,
|
||||
);
|
||||
process.stdout.write("\n");
|
||||
process.stdout.write(`JWKS=${jwks}`);
|
||||
process.stdout.write("\n");
|
||||
@@ -1,9 +1,3 @@
|
||||
/** Shared layout for album grids and carousel slides (gap-x-6 = 1.5rem). */
|
||||
/** Shared layout for album grids. */
|
||||
export const albumGridClassName =
|
||||
"grid grid-cols-2 gap-x-6 gap-y-8 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 xl:grid-cols-6"
|
||||
|
||||
/** Slide width matches one cell of `albumGridClassName` inside an `@container` ancestor. */
|
||||
export const albumGridCarouselSlideClassName =
|
||||
"w-[calc((100cqw-1.5rem)/2)] shrink-0 grow-0 basis-auto pl-6 sm:w-[calc((100cqw-3rem)/3)] md:w-[calc((100cqw-4.5rem)/4)] lg:w-[calc((100cqw-6rem)/5)] xl:w-[calc((100cqw-7.5rem)/6)]"
|
||||
|
||||
export const albumGridCarouselContentClassName = "-ml-6"
|
||||
@@ -1,19 +0,0 @@
|
||||
import type {
|
||||
BrowseAlbum,
|
||||
BrowseAlbumDetail,
|
||||
BrowseAlbumTrack,
|
||||
BrowseArtist,
|
||||
BrowsePlaylistDetail,
|
||||
BrowsePlaylistOwner,
|
||||
BrowseSong,
|
||||
PlaylistSummary,
|
||||
} from "@otunes/convex/types"
|
||||
|
||||
export type Artist = BrowseArtist
|
||||
export type Album = BrowseAlbum
|
||||
export type Song = BrowseSong
|
||||
export type Playlist = PlaylistSummary
|
||||
export type PlaylistOwner = BrowsePlaylistOwner
|
||||
export type PlaylistDetail = BrowsePlaylistDetail
|
||||
export type AlbumTrack = BrowseAlbumTrack
|
||||
export type AlbumDetail = BrowseAlbumDetail
|
||||
@@ -0,0 +1,7 @@
|
||||
/** Formats seconds as `m:ss`, flooring fractional and negative input. */
|
||||
export function formatDuration(seconds: number): string {
|
||||
const total = Math.max(0, Math.floor(seconds))
|
||||
const minutes = Math.floor(total / 60)
|
||||
const remainingSeconds = total % 60
|
||||
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
|
||||
}
|
||||
@@ -13,15 +13,15 @@ function mediaOrigin() {
|
||||
return window.location.origin
|
||||
}
|
||||
|
||||
export function albumShareUrl(albumId: string) {
|
||||
function albumShareUrl(albumId: string) {
|
||||
return `${mediaOrigin()}/album/${albumId}`
|
||||
}
|
||||
|
||||
export function songShareUrl(albumId: string, songId: string) {
|
||||
function songShareUrl(albumId: string, songId: string) {
|
||||
return `${mediaOrigin()}/album/${albumId}?s=${songId}`
|
||||
}
|
||||
|
||||
export function playlistShareUrl(
|
||||
function playlistShareUrl(
|
||||
playlistId: string,
|
||||
options?: { isFavorites?: boolean }
|
||||
) {
|
||||
@@ -31,11 +31,11 @@ export function playlistShareUrl(
|
||||
return `${mediaOrigin()}/playlist/${playlistId}`
|
||||
}
|
||||
|
||||
export function artistShareUrl(artistId: string) {
|
||||
function artistShareUrl(artistId: string) {
|
||||
return `${mediaOrigin()}/artist/${artistId}`
|
||||
}
|
||||
|
||||
export function mediaShareUrl(share: MediaShareContext) {
|
||||
function mediaShareUrl(share: MediaShareContext) {
|
||||
switch (share.type) {
|
||||
case "album":
|
||||
return albumShareUrl(share.albumId)
|
||||
@@ -50,7 +50,7 @@ export function mediaShareUrl(share: MediaShareContext) {
|
||||
}
|
||||
}
|
||||
|
||||
export async function copyTextToClipboard(text: string) {
|
||||
async function copyTextToClipboard(text: string) {
|
||||
await navigator.clipboard.writeText(text)
|
||||
toast.success("Link Copied")
|
||||
}
|
||||
@@ -63,10 +63,6 @@ export async function copyAlbumLink(albumId: string) {
|
||||
await copyMediaShareLink({ type: "album", albumId })
|
||||
}
|
||||
|
||||
export async function copySongLink(albumId: string, songId: string) {
|
||||
await copyMediaShareLink({ type: "song", albumId, songId })
|
||||
}
|
||||
|
||||
export async function copyPlaylistLink(
|
||||
playlistId: string,
|
||||
options?: { isFavorites?: boolean }
|
||||
@@ -77,7 +73,3 @@ export async function copyPlaylistLink(
|
||||
isFavorites: options?.isFavorites,
|
||||
})
|
||||
}
|
||||
|
||||
export async function copyArtistLink(artistId: string) {
|
||||
await copyMediaShareLink({ type: "artist", artistId })
|
||||
}
|
||||
@@ -46,7 +46,7 @@ export function getSelectionRangePositions(
|
||||
return positions
|
||||
}
|
||||
|
||||
export function selectionHighlightRadiusClass(
|
||||
function selectionHighlightRadiusClass(
|
||||
position: SelectionRangePosition
|
||||
) {
|
||||
switch (position) {
|
||||
@@ -61,7 +61,7 @@ export function selectionHighlightRadiusClass(
|
||||
}
|
||||
}
|
||||
|
||||
export const TRACK_ROW_HIGHLIGHT_INSET = "absolute inset-y-0 left-2 right-2"
|
||||
const TRACK_ROW_HIGHLIGHT_INSET = "absolute inset-y-0 left-2 right-2"
|
||||
|
||||
export function SelectionRangeHighlight({
|
||||
position,
|
||||
@@ -117,7 +117,7 @@ export const TRACK_ROW_PADDING = "pl-8 pr-10"
|
||||
export const TRACK_LIST_CONTAINER = "mx-auto w-full max-w-9/10"
|
||||
|
||||
/** Full-width highlight for library song rows (no horizontal inset). */
|
||||
export const SONGS_ROW_HIGHLIGHT_INSET = "absolute inset-0"
|
||||
const SONGS_ROW_HIGHLIGHT_INSET = "absolute inset-0"
|
||||
|
||||
export function SongsSelectionRangeHighlight({
|
||||
position,
|
||||
@@ -162,7 +162,7 @@ export function isInSelectionRange(position: SelectionRangePosition) {
|
||||
}
|
||||
|
||||
/** Full-width, square-corner highlights for the queue sidebar. */
|
||||
export const QUEUE_ROW_HIGHLIGHT_INSET = "absolute inset-0"
|
||||
const QUEUE_ROW_HIGHLIGHT_INSET = "absolute inset-0"
|
||||
|
||||
export function QueueSelectionRangeHighlight({
|
||||
position,
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
import assert from "node:assert/strict"
|
||||
import test from "node:test"
|
||||
|
||||
import { stationArtistId } from "./station-artist.ts"
|
||||
|
||||
const songs = [
|
||||
{ id: "song-a", artist: { id: "artist-a" } },
|
||||
{ id: "song-b", artist: { id: "artist-a" } },
|
||||
{ id: "song-c", artist: { id: "artist-b" } },
|
||||
]
|
||||
|
||||
test("a single song or a selection sharing one artist can create a station", () => {
|
||||
assert.equal(stationArtistId(songs, new Set(["song-c"])), "artist-b")
|
||||
assert.equal(
|
||||
stationArtistId(songs, new Set(["song-a", "song-b"])),
|
||||
"artist-a"
|
||||
)
|
||||
})
|
||||
|
||||
test("mixed artists cannot create a station", () => {
|
||||
assert.equal(stationArtistId(songs, new Set(["song-a", "song-c"])), undefined)
|
||||
})
|
||||
|
||||
test("empty or partially missing selections cannot create a station", () => {
|
||||
assert.equal(stationArtistId(songs, new Set()), undefined)
|
||||
assert.equal(
|
||||
stationArtistId(songs, new Set(["song-a", "missing"])),
|
||||
undefined
|
||||
)
|
||||
})
|
||||
@@ -578,13 +578,6 @@ export const updateLibrary = action({
|
||||
},
|
||||
})
|
||||
|
||||
export const cleanupHlsStreams = internalAction({
|
||||
args: {},
|
||||
handler: async () => {
|
||||
return await cleanHlsStreamsOlderThan(HLS_MAX_IDLE_MS)
|
||||
},
|
||||
})
|
||||
|
||||
export const adminCleanupHlsStreams = action({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import { getAuthUserId } from "@convex-dev/auth/server"
|
||||
import { ConvexError, v } from "convex/values"
|
||||
import { paginationOptsValidator } from "convex/server"
|
||||
import type { Doc, Id } from "./_generated/dataModel"
|
||||
import type { MutationCtx, QueryCtx } from "./_generated/server"
|
||||
import { mutation, query } from "./_generated/server"
|
||||
import type { BrowsePlaylistDetail, BrowsePlaylistSummary } from "./library"
|
||||
import { browseSongsFromIds, paginateSlice } from "./library"
|
||||
import { browseSongsFromIds } from "./library"
|
||||
|
||||
function uniqueIds<T extends string>(ids: T[]): T[] {
|
||||
return [...new Set(ids)]
|
||||
@@ -181,11 +180,6 @@ async function browseFavoritesSummaryHandler(
|
||||
}
|
||||
}
|
||||
|
||||
export const browseFavoritesSummary = query({
|
||||
args: {},
|
||||
handler: async (ctx) => browseFavoritesSummaryHandler(ctx),
|
||||
})
|
||||
|
||||
export const browseFavoritesPlaylistDetail = query({
|
||||
args: {},
|
||||
handler: async (ctx): Promise<BrowsePlaylistDetail | null> => {
|
||||
@@ -209,24 +203,6 @@ export const browseFavoritesPlaylistDetail = query({
|
||||
},
|
||||
})
|
||||
|
||||
export const browseFavoritesSongsPaginated = query({
|
||||
args: { paginationOpts: paginationOptsValidator },
|
||||
handler: async (ctx, args) => {
|
||||
const summary = await browseFavoritesSummaryHandler(ctx)
|
||||
if (!summary) {
|
||||
return { page: [], isDone: true, continueCursor: "" }
|
||||
}
|
||||
|
||||
const slice = paginateSlice(summary.songIds, args.paginationOpts)
|
||||
const page = await browseSongsFromIds(ctx, slice.page)
|
||||
|
||||
return {
|
||||
...slice,
|
||||
page,
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
export const favoriteSong = mutation({
|
||||
args: { songId: v.id("songs") },
|
||||
handler: async (ctx, { songId }) => {
|
||||
|
||||
@@ -8,7 +8,6 @@ import type { PaginationOptions, PaginationResult } from "convex/server"
|
||||
import type {
|
||||
BrowseAlbum,
|
||||
BrowseAlbumDetail,
|
||||
BrowseAlbumSummary,
|
||||
BrowseAlbumTrack,
|
||||
BrowseArtist,
|
||||
BrowseArtistDetail,
|
||||
@@ -26,7 +25,6 @@ import type {
|
||||
export type {
|
||||
BrowseAlbum,
|
||||
BrowseAlbumDetail,
|
||||
BrowseAlbumSummary,
|
||||
BrowseAlbumTrack,
|
||||
BrowseArtist,
|
||||
BrowseArtistDetail,
|
||||
@@ -224,7 +222,7 @@ export const browseArtists = query({
|
||||
},
|
||||
})
|
||||
|
||||
export function paginateSlice<T>(
|
||||
function paginateSlice<T>(
|
||||
items: T[],
|
||||
paginationOpts: PaginationOptions
|
||||
): PaginationResult<T> {
|
||||
@@ -280,27 +278,6 @@ export const browseAlbumsPaginated = query({
|
||||
},
|
||||
})
|
||||
|
||||
export const browseSongs = query({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
const artistMap = await loadArtistMap(ctx)
|
||||
const albums = await ctx.db.query("albums").collect()
|
||||
const albumMap = new Map(albums.map((album) => [album._id, album]))
|
||||
const songs = await ctx.db.query("songs").collect()
|
||||
|
||||
return songs
|
||||
.flatMap((song) => {
|
||||
const album = albumMap.get(song.album)
|
||||
const albumArtist = artistMap.get(song.albumArtist)
|
||||
if (!album || !albumArtist) {
|
||||
return []
|
||||
}
|
||||
return [toBrowseSong(song, album, albumArtist)]
|
||||
})
|
||||
.sort((a, b) => a.title.localeCompare(b.title))
|
||||
},
|
||||
})
|
||||
|
||||
export const songsSortKeyValidator = v.union(
|
||||
v.literal("title"),
|
||||
v.literal("artist"),
|
||||
@@ -545,72 +522,6 @@ export const browseAlbumDetail = query({
|
||||
},
|
||||
})
|
||||
|
||||
async function browseAlbumSummaryHandler(
|
||||
ctx: QueryCtx,
|
||||
albumId: Id<"albums">
|
||||
): Promise<BrowseAlbumSummary | null> {
|
||||
const album = await ctx.db.get("albums", albumId)
|
||||
if (!album) {
|
||||
return null
|
||||
}
|
||||
|
||||
const artist = await ctx.db.get("artists", album.artist)
|
||||
if (!artist) {
|
||||
return null
|
||||
}
|
||||
|
||||
const songs = await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_album", (q) => q.eq("album", albumId))
|
||||
.collect()
|
||||
|
||||
songs.sort(compareAlbumSongs)
|
||||
const primarySong = songs[0]
|
||||
|
||||
return {
|
||||
...toBrowseAlbum(album, artist),
|
||||
year: primarySong?.year ?? null,
|
||||
genre: primarySong?.genres[0] ?? null,
|
||||
releaseDate: album.date,
|
||||
hasLossless: songs.some((song) => "lossless" in song.files),
|
||||
hasAtmos: songs.some((song) => "atmos" in song.files),
|
||||
trackCount: songs.length,
|
||||
}
|
||||
}
|
||||
|
||||
export const browseAlbumSummary = query({
|
||||
args: { id: v.id("albums") },
|
||||
handler: async (ctx, args) => browseAlbumSummaryHandler(ctx, args.id),
|
||||
})
|
||||
|
||||
export const browseAlbumTracksPaginated = query({
|
||||
args: {
|
||||
albumId: v.id("albums"),
|
||||
paginationOpts: paginationOptsValidator,
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
const album = await ctx.db.get("albums", args.albumId)
|
||||
if (!album) {
|
||||
return { page: [], isDone: true, continueCursor: "" }
|
||||
}
|
||||
|
||||
const artist = await ctx.db.get("artists", album.artist)
|
||||
if (!artist) {
|
||||
return { page: [], isDone: true, continueCursor: "" }
|
||||
}
|
||||
|
||||
const songs = await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_album", (q) => q.eq("album", args.albumId))
|
||||
.collect()
|
||||
|
||||
songs.sort(compareAlbumSongs)
|
||||
|
||||
const tracks = songs.map((song) => toBrowseAlbumTrack(song, artist.name))
|
||||
return paginateSlice(tracks, args.paginationOpts)
|
||||
},
|
||||
})
|
||||
|
||||
export const browseArtistDetail = query({
|
||||
args: { id: v.id("artists") },
|
||||
handler: async (ctx, args) => {
|
||||
@@ -908,16 +819,6 @@ export const getAlbums = internalQuery({
|
||||
},
|
||||
})
|
||||
|
||||
export const getAlbumsInArtist = internalQuery({
|
||||
args: { artistID: v.id("artists") },
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db
|
||||
.query("albums")
|
||||
.withIndex("by_artist", (q) => q.eq("artist", args.artistID))
|
||||
.collect()
|
||||
},
|
||||
})
|
||||
|
||||
export const getSongs = internalQuery({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
@@ -925,26 +826,6 @@ export const getSongs = internalQuery({
|
||||
},
|
||||
})
|
||||
|
||||
export const getSongsInArtist = internalQuery({
|
||||
args: { artistID: v.id("artists") },
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_artist", (q) => q.eq("albumArtist", args.artistID))
|
||||
.collect()
|
||||
},
|
||||
})
|
||||
|
||||
export const getSongsInAlbum = internalQuery({
|
||||
args: { albumID: v.id("albums") },
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_album", (q) => q.eq("album", args.albumID))
|
||||
.collect()
|
||||
},
|
||||
})
|
||||
|
||||
export const getArtist = query({
|
||||
args: { id: v.id("artists") },
|
||||
handler: async (ctx, args) => {
|
||||
@@ -952,16 +833,6 @@ export const getArtist = query({
|
||||
},
|
||||
})
|
||||
|
||||
export const getArtistByName = internalQuery({
|
||||
args: { name: v.string() },
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db
|
||||
.query("artists")
|
||||
.withIndex("by_name", (q) => q.eq("name", args.name))
|
||||
.first()
|
||||
},
|
||||
})
|
||||
|
||||
export const getAlbum = query({
|
||||
args: { id: v.id("albums") },
|
||||
handler: async (ctx, args) => {
|
||||
@@ -969,28 +840,6 @@ export const getAlbum = query({
|
||||
},
|
||||
})
|
||||
|
||||
export const getAlbumByName = internalQuery({
|
||||
args: { name: v.string() },
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db
|
||||
.query("albums")
|
||||
.withIndex("by_name", (q) => q.eq("name", args.name))
|
||||
.first()
|
||||
},
|
||||
})
|
||||
|
||||
export const getAlbumByAll = internalQuery({
|
||||
args: { folder: v.string(), artist: v.id("artists") },
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db
|
||||
.query("albums")
|
||||
.withIndex("by_all", (q) =>
|
||||
q.eq("artist", args.artist).eq("folder", args.folder)
|
||||
)
|
||||
.first()
|
||||
},
|
||||
})
|
||||
|
||||
export const getPlaylist = query({
|
||||
args: { id: v.id("playlists") },
|
||||
handler: async (ctx, args) => {
|
||||
@@ -1175,49 +1024,6 @@ export const intentCatalogPage = query({
|
||||
},
|
||||
})
|
||||
|
||||
export const getSongByName = internalQuery({
|
||||
args: { name: v.string() },
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_name", (q) => q.eq("name", args.name))
|
||||
.first()
|
||||
},
|
||||
})
|
||||
|
||||
export const getSongByAll = internalQuery({
|
||||
args: {
|
||||
name: v.string(),
|
||||
albumArtist: v.id("artists"),
|
||||
album: v.id("albums"),
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_all", (q) =>
|
||||
q
|
||||
.eq("name", args.name)
|
||||
.eq("albumArtist", args.albumArtist)
|
||||
.eq("album", args.album)
|
||||
)
|
||||
.first()
|
||||
},
|
||||
})
|
||||
|
||||
export const createArtist = internalMutation({
|
||||
args: { name: v.string(), folder: v.string(), cover: v.nullable(v.string()) },
|
||||
handler: async (ctx, args) => {
|
||||
const existing = await ctx.db
|
||||
.query("artists")
|
||||
.withIndex("by_folder", (q) => q.eq("folder", args.folder))
|
||||
.first()
|
||||
if (existing) {
|
||||
return existing._id
|
||||
}
|
||||
return await ctx.db.insert("artists", args)
|
||||
},
|
||||
})
|
||||
|
||||
export const createArtists = internalMutation({
|
||||
args: {
|
||||
artists: v.array(
|
||||
@@ -1242,29 +1048,6 @@ export const createArtists = internalMutation({
|
||||
},
|
||||
})
|
||||
|
||||
export const createAlbum = internalMutation({
|
||||
args: {
|
||||
name: v.string(),
|
||||
folder: v.string(),
|
||||
cover: v.nullable(v.string()),
|
||||
year: v.number(),
|
||||
date: v.string(),
|
||||
artist: v.id("artists"),
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
const existing = await ctx.db
|
||||
.query("albums")
|
||||
.withIndex("by_all", (q) =>
|
||||
q.eq("artist", args.artist).eq("folder", args.folder)
|
||||
)
|
||||
.first()
|
||||
if (existing) {
|
||||
return existing._id
|
||||
}
|
||||
return await ctx.db.insert("albums", args)
|
||||
},
|
||||
})
|
||||
|
||||
export const createAlbums = internalMutation({
|
||||
args: {
|
||||
albums: v.array(
|
||||
@@ -1294,50 +1077,6 @@ export const createAlbums = internalMutation({
|
||||
},
|
||||
})
|
||||
|
||||
export const updateAlbumName = internalMutation({
|
||||
args: {
|
||||
id: v.id("albums"),
|
||||
newName: v.string(),
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db.patch("albums", args.id, { name: args.newName })
|
||||
},
|
||||
})
|
||||
|
||||
export const createSong = internalMutation({
|
||||
args: {
|
||||
name: v.string(),
|
||||
files: v.record(v.string(), v.string()),
|
||||
album: v.id("albums"),
|
||||
artist: v.union(v.string(), v.array(v.string())),
|
||||
albumArtist: v.id("artists"),
|
||||
length: v.number(),
|
||||
diskNumber: v.nullable(v.number()),
|
||||
track: v.number(),
|
||||
year: v.number(),
|
||||
date: v.string(),
|
||||
genres: v.array(v.string()),
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
const existing = await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_all", (q) =>
|
||||
q
|
||||
.eq("name", args.name)
|
||||
.eq("albumArtist", args.albumArtist)
|
||||
.eq("album", args.album)
|
||||
)
|
||||
.first()
|
||||
if (existing) {
|
||||
await ctx.db.patch(existing._id, {
|
||||
files: { ...existing.files, ...args.files },
|
||||
})
|
||||
return existing._id
|
||||
}
|
||||
return await ctx.db.insert("songs", args)
|
||||
},
|
||||
})
|
||||
|
||||
export const createSongs = internalMutation({
|
||||
args: {
|
||||
songs: v.array(
|
||||
@@ -1485,13 +1224,6 @@ export const purgeArtistsFromUsers = internalMutation({
|
||||
},
|
||||
})
|
||||
|
||||
export const removeArtist = internalMutation({
|
||||
args: { id: v.id("artists") },
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db.delete("artists", args.id)
|
||||
},
|
||||
})
|
||||
|
||||
export const removeArtists = internalMutation({
|
||||
args: { ids: v.array(v.id("artists")) },
|
||||
handler: async (ctx, args) => {
|
||||
@@ -1501,13 +1233,6 @@ export const removeArtists = internalMutation({
|
||||
},
|
||||
})
|
||||
|
||||
export const removeAlbum = internalMutation({
|
||||
args: { id: v.id("albums") },
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db.delete("albums", args.id)
|
||||
},
|
||||
})
|
||||
|
||||
export const removeAlbums = internalMutation({
|
||||
args: { ids: v.array(v.id("albums")) },
|
||||
handler: async (ctx, args) => {
|
||||
@@ -1517,20 +1242,6 @@ export const removeAlbums = internalMutation({
|
||||
},
|
||||
})
|
||||
|
||||
export const removeSong = internalMutation({
|
||||
args: { id: v.id("songs") },
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db.delete("songs", args.id)
|
||||
},
|
||||
})
|
||||
|
||||
export const changeFilesForSong = internalMutation({
|
||||
args: { id: v.id("songs"), files: v.record(v.string(), v.string()) },
|
||||
handler: async (ctx, args) => {
|
||||
return await ctx.db.patch("songs", args.id, { files: args.files })
|
||||
},
|
||||
})
|
||||
|
||||
export const changeFilesForSongs = internalMutation({
|
||||
args: {
|
||||
songs: v.array(
|
||||
|
||||
@@ -1,17 +1,9 @@
|
||||
import { getAuthUserId } from "@convex-dev/auth/server"
|
||||
import { paginationOptsValidator } from "convex/server"
|
||||
import { ConvexError, v } from "convex/values"
|
||||
import type { Doc, Id } from "./_generated/dataModel"
|
||||
import type { MutationCtx } from "./_generated/server"
|
||||
import { mutation, query } from "./_generated/server"
|
||||
import type { QueueSong } from "./types"
|
||||
import {
|
||||
browseSongsFromIds,
|
||||
compareAlbumSongs,
|
||||
getSortedLibrarySongIds,
|
||||
songsSortDirectionValidator,
|
||||
songsSortKeyValidator,
|
||||
} from "./library"
|
||||
import { browseSongsFromIds } from "./library"
|
||||
|
||||
export type { HistorySong, QueueSong } from "./types"
|
||||
|
||||
@@ -59,35 +51,6 @@ async function recordRecentlyPlayedFromSong(
|
||||
await recordRecentlyPlayed(ctx, userId, song.album)
|
||||
}
|
||||
|
||||
async function recordPlaybackStart(
|
||||
ctx: MutationCtx,
|
||||
userId: Id<"users">,
|
||||
options: {
|
||||
songIds: Id<"songs">[]
|
||||
playlistId?: Id<"playlists">
|
||||
}
|
||||
) {
|
||||
if (options.songIds.length === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
if (options.playlistId) {
|
||||
await recordRecentlyPlayed(ctx, userId, options.playlistId)
|
||||
return
|
||||
}
|
||||
|
||||
await recordRecentlyPlayedFromSong(ctx, userId, options.songIds[0])
|
||||
}
|
||||
|
||||
function shuffleArray<T>(items: T[]): T[] {
|
||||
const next = [...items]
|
||||
for (let i = next.length - 1; i > 0; i--) {
|
||||
const j = Math.floor(Math.random() * (i + 1))
|
||||
;[next[i], next[j]] = [next[j], next[i]]
|
||||
}
|
||||
return next
|
||||
}
|
||||
|
||||
async function requireAuth(ctx: MutationCtx) {
|
||||
const userId = await getAuthUserId(ctx)
|
||||
if (userId === null) {
|
||||
@@ -96,54 +59,6 @@ async function requireAuth(ctx: MutationCtx) {
|
||||
return userId
|
||||
}
|
||||
|
||||
function uniqueSongIds(songIds: Id<"songs">[]) {
|
||||
return [...new Set(songIds)]
|
||||
}
|
||||
|
||||
function haveSameSongCounts(first: Id<"songs">[], second: Id<"songs">[]) {
|
||||
if (first.length !== second.length) {
|
||||
return false
|
||||
}
|
||||
const counts = new Map<Id<"songs">, number>()
|
||||
for (const songId of first) {
|
||||
counts.set(songId, (counts.get(songId) ?? 0) + 1)
|
||||
}
|
||||
for (const songId of second) {
|
||||
const count = counts.get(songId)
|
||||
if (!count) {
|
||||
return false
|
||||
}
|
||||
if (count === 1) {
|
||||
counts.delete(songId)
|
||||
} else {
|
||||
counts.set(songId, count - 1)
|
||||
}
|
||||
}
|
||||
return counts.size === 0
|
||||
}
|
||||
|
||||
function appendToQueueHistory(
|
||||
history: Id<"songs">[],
|
||||
songId: Id<"songs">
|
||||
): Id<"songs">[] {
|
||||
const next = [...history, songId]
|
||||
if (next.length <= MAX_QUEUE_HISTORY) {
|
||||
return next
|
||||
}
|
||||
return next.slice(next.length - MAX_QUEUE_HISTORY)
|
||||
}
|
||||
|
||||
function appendManyToQueueHistory(
|
||||
history: Id<"songs">[],
|
||||
songIds: Id<"songs">[]
|
||||
): Id<"songs">[] {
|
||||
let next = history
|
||||
for (const songId of songIds) {
|
||||
next = appendToQueueHistory(next, songId)
|
||||
}
|
||||
return next
|
||||
}
|
||||
|
||||
async function patchPlayback(
|
||||
ctx: MutationCtx,
|
||||
userId: Id<"users">,
|
||||
@@ -168,26 +83,6 @@ async function patchPlayback(
|
||||
return playbackRevision
|
||||
}
|
||||
|
||||
async function setQueueState(
|
||||
ctx: MutationCtx,
|
||||
userId: Id<"users">,
|
||||
patch: {
|
||||
songQueue: Id<"songs">[]
|
||||
shuffleEnabled?: boolean
|
||||
currentSongProgress?: number
|
||||
resetHistory?: boolean
|
||||
}
|
||||
) {
|
||||
await patchPlayback(ctx, userId, {
|
||||
songQueue: patch.songQueue,
|
||||
currentSongProgress: patch.currentSongProgress ?? 0,
|
||||
...(patch.resetHistory ? { queueHistory: [] } : {}),
|
||||
...(patch.shuffleEnabled !== undefined
|
||||
? { shuffleEnabled: patch.shuffleEnabled }
|
||||
: {}),
|
||||
})
|
||||
}
|
||||
|
||||
export const getPlaybackState = query({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
@@ -264,554 +159,6 @@ export const recordPlay = mutation({
|
||||
},
|
||||
})
|
||||
|
||||
export const getQueueHistory = query({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
const userId = await getAuthUserId(ctx)
|
||||
if (userId === null) {
|
||||
return []
|
||||
}
|
||||
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
return []
|
||||
}
|
||||
|
||||
const songIds = user.queueHistory ?? []
|
||||
const songs = await browseSongsFromIds(ctx, songIds)
|
||||
|
||||
return songs.map((song, index) => ({
|
||||
...song,
|
||||
historyIndex: index,
|
||||
}))
|
||||
},
|
||||
})
|
||||
|
||||
export const getQueuePaginated = query({
|
||||
args: {
|
||||
paginationOpts: paginationOptsValidator,
|
||||
queueVersion: v.string(),
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
const userId = await getAuthUserId(ctx)
|
||||
if (userId === null) {
|
||||
return { page: [], isDone: true, continueCursor: "" }
|
||||
}
|
||||
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
return { page: [], isDone: true, continueCursor: "" }
|
||||
}
|
||||
|
||||
const songIds = user.songQueue ?? []
|
||||
const startIndex = args.paginationOpts.cursor
|
||||
? Number.parseInt(args.paginationOpts.cursor, 10)
|
||||
: 0
|
||||
const endIndex = Math.min(
|
||||
startIndex + args.paginationOpts.numItems,
|
||||
songIds.length
|
||||
)
|
||||
const pageIds = songIds.slice(startIndex, endIndex)
|
||||
const songs = await browseSongsFromIds(ctx, pageIds)
|
||||
|
||||
const page: QueueSong[] = songs.map((song, index) => ({
|
||||
...song,
|
||||
queueIndex: startIndex + index,
|
||||
}))
|
||||
|
||||
const isDone = endIndex >= songIds.length
|
||||
|
||||
return {
|
||||
page,
|
||||
isDone,
|
||||
continueCursor: isDone ? "" : String(endIndex),
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
export const playInOrder = mutation({
|
||||
args: {
|
||||
songIds: v.array(v.id("songs")),
|
||||
playlistId: v.optional(v.id("playlists")),
|
||||
},
|
||||
handler: async (ctx, { songIds, playlistId }) => {
|
||||
const userId = await requireAuth(ctx)
|
||||
const queue = uniqueSongIds(songIds)
|
||||
await setQueueState(ctx, userId, {
|
||||
songQueue: queue,
|
||||
shuffleEnabled: false,
|
||||
resetHistory: true,
|
||||
})
|
||||
await recordPlaybackStart(ctx, userId, { songIds: queue, playlistId })
|
||||
},
|
||||
})
|
||||
|
||||
export const playShuffled = mutation({
|
||||
args: {
|
||||
songIds: v.array(v.id("songs")),
|
||||
playlistId: v.optional(v.id("playlists")),
|
||||
},
|
||||
handler: async (ctx, { songIds, playlistId }) => {
|
||||
const userId = await requireAuth(ctx)
|
||||
const queue = shuffleArray(uniqueSongIds(songIds))
|
||||
await setQueueState(ctx, userId, {
|
||||
songQueue: queue,
|
||||
shuffleEnabled: true,
|
||||
resetHistory: true,
|
||||
})
|
||||
await recordPlaybackStart(ctx, userId, { songIds: queue, playlistId })
|
||||
},
|
||||
})
|
||||
|
||||
function orderSongsForInsert(
|
||||
songIds: Id<"songs">[],
|
||||
shuffleEnabled: boolean
|
||||
): Id<"songs">[] {
|
||||
return shuffleEnabled ? shuffleArray(songIds) : songIds
|
||||
}
|
||||
|
||||
export const addToQueueNext = mutation({
|
||||
args: { songIds: v.array(v.id("songs")) },
|
||||
handler: async (ctx, { songIds }) => {
|
||||
if (songIds.length === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
const userId = await requireAuth(ctx)
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
throw new ConvexError("User not found")
|
||||
}
|
||||
|
||||
const toAdd = orderSongsForInsert(songIds, user.shuffleEnabled ?? false)
|
||||
const queue = user.songQueue ?? []
|
||||
|
||||
if (queue.length === 0) {
|
||||
await setQueueState(ctx, userId, { songQueue: toAdd })
|
||||
return
|
||||
}
|
||||
|
||||
const [current, ...rest] = queue
|
||||
await setQueueState(ctx, userId, {
|
||||
songQueue: [current, ...toAdd, ...rest],
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const addToQueueLast = mutation({
|
||||
args: { songIds: v.array(v.id("songs")) },
|
||||
handler: async (ctx, { songIds }) => {
|
||||
if (songIds.length === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
const userId = await requireAuth(ctx)
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
throw new ConvexError("User not found")
|
||||
}
|
||||
|
||||
const toAdd = orderSongsForInsert(songIds, user.shuffleEnabled ?? false)
|
||||
const queue = user.songQueue ?? []
|
||||
|
||||
await setQueueState(ctx, userId, {
|
||||
songQueue: queue.length === 0 ? toAdd : [...queue, ...toAdd],
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const playFromSong = mutation({
|
||||
args: {
|
||||
songId: v.id("songs"),
|
||||
songIds: v.array(v.id("songs")),
|
||||
},
|
||||
handler: async (ctx, { songId, songIds }) => {
|
||||
const userId = await requireAuth(ctx)
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
throw new ConvexError("User not found")
|
||||
}
|
||||
|
||||
const index = songIds.indexOf(songId)
|
||||
const rest = user.shuffleEnabled
|
||||
? uniqueSongIds(songIds).filter((id) => id !== songId)
|
||||
: index === -1
|
||||
? []
|
||||
: songIds.slice(index + 1)
|
||||
const queueRest = user.shuffleEnabled ? shuffleArray(rest) : rest
|
||||
|
||||
await setQueueState(ctx, userId, {
|
||||
songQueue: [songId, ...queueRest],
|
||||
resetHistory: true,
|
||||
})
|
||||
await recordRecentlyPlayedFromSong(ctx, userId, songId)
|
||||
},
|
||||
})
|
||||
|
||||
async function albumSongIds(ctx: MutationCtx, albumId: Id<"albums">) {
|
||||
const songs = await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_album", (q) => q.eq("album", albumId))
|
||||
.collect()
|
||||
songs.sort(compareAlbumSongs)
|
||||
return songs.map((song) => song._id)
|
||||
}
|
||||
|
||||
async function orderedArtistSongIds(
|
||||
ctx: MutationCtx,
|
||||
artistId: Id<"artists">
|
||||
) {
|
||||
const songs = await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_artist", (q) => q.eq("albumArtist", artistId))
|
||||
.collect()
|
||||
|
||||
const albums = await ctx.db
|
||||
.query("albums")
|
||||
.withIndex("by_artist", (q) => q.eq("artist", artistId))
|
||||
.collect()
|
||||
const albumMap = new Map(albums.map((album) => [album._id, album]))
|
||||
|
||||
songs.sort((a, b) => {
|
||||
const albumA = albumMap.get(a.album)?.name ?? ""
|
||||
const albumB = albumMap.get(b.album)?.name ?? ""
|
||||
if (albumA !== albumB) {
|
||||
return albumA.localeCompare(albumB)
|
||||
}
|
||||
if (a.track !== b.track) {
|
||||
return a.track - b.track
|
||||
}
|
||||
return a.name.localeCompare(b.name)
|
||||
})
|
||||
|
||||
return songs.map((song) => song._id)
|
||||
}
|
||||
|
||||
async function playCollection(
|
||||
ctx: MutationCtx,
|
||||
options: {
|
||||
songIds: Id<"songs">[]
|
||||
shuffled: boolean
|
||||
playlistId?: Id<"playlists">
|
||||
}
|
||||
) {
|
||||
const userId = await requireAuth(ctx)
|
||||
const unique = uniqueSongIds(options.songIds)
|
||||
if (unique.length === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
const queue = options.shuffled ? shuffleArray(unique) : unique
|
||||
await setQueueState(ctx, userId, {
|
||||
songQueue: queue,
|
||||
shuffleEnabled: options.shuffled,
|
||||
resetHistory: true,
|
||||
})
|
||||
await recordPlaybackStart(ctx, userId, {
|
||||
songIds: queue,
|
||||
playlistId: options.playlistId,
|
||||
})
|
||||
}
|
||||
|
||||
export const playAlbum = mutation({
|
||||
args: { albumId: v.id("albums") },
|
||||
handler: async (ctx, { albumId }) => {
|
||||
await playCollection(ctx, {
|
||||
songIds: await albumSongIds(ctx, albumId),
|
||||
shuffled: false,
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const playAlbumShuffled = mutation({
|
||||
args: { albumId: v.id("albums") },
|
||||
handler: async (ctx, { albumId }) => {
|
||||
await playCollection(ctx, {
|
||||
songIds: await albumSongIds(ctx, albumId),
|
||||
shuffled: true,
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const playArtist = mutation({
|
||||
args: { artistId: v.id("artists") },
|
||||
handler: async (ctx, { artistId }) => {
|
||||
await playCollection(ctx, {
|
||||
songIds: await orderedArtistSongIds(ctx, artistId),
|
||||
shuffled: false,
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const playArtistShuffled = mutation({
|
||||
args: { artistId: v.id("artists") },
|
||||
handler: async (ctx, { artistId }) => {
|
||||
await playCollection(ctx, {
|
||||
songIds: await orderedArtistSongIds(ctx, artistId),
|
||||
shuffled: true,
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const playPlaylist = mutation({
|
||||
args: { playlistId: v.id("playlists") },
|
||||
handler: async (ctx, { playlistId }) => {
|
||||
const playlist = await ctx.db.get("playlists", playlistId)
|
||||
await playCollection(ctx, {
|
||||
songIds: playlist?.songs ?? [],
|
||||
shuffled: false,
|
||||
playlistId,
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const playPlaylistShuffled = mutation({
|
||||
args: { playlistId: v.id("playlists") },
|
||||
handler: async (ctx, { playlistId }) => {
|
||||
const playlist = await ctx.db.get("playlists", playlistId)
|
||||
await playCollection(ctx, {
|
||||
songIds: playlist?.songs ?? [],
|
||||
shuffled: true,
|
||||
playlistId,
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const playFromLibrarySong = mutation({
|
||||
args: {
|
||||
songId: v.id("songs"),
|
||||
sortKey: songsSortKeyValidator,
|
||||
sortDirection: songsSortDirectionValidator,
|
||||
},
|
||||
handler: async (ctx, { songId, sortKey, sortDirection }) => {
|
||||
const userId = await requireAuth(ctx)
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
throw new ConvexError("User not found")
|
||||
}
|
||||
|
||||
const songIds = await getSortedLibrarySongIds(ctx, sortKey, sortDirection)
|
||||
const index = songIds.indexOf(songId)
|
||||
const rest = user.shuffleEnabled
|
||||
? uniqueSongIds(songIds).filter((id) => id !== songId)
|
||||
: index === -1
|
||||
? []
|
||||
: songIds.slice(index + 1)
|
||||
const queueRest = user.shuffleEnabled ? shuffleArray(rest) : rest
|
||||
|
||||
await setQueueState(ctx, userId, {
|
||||
songQueue: [songId, ...queueRest],
|
||||
resetHistory: true,
|
||||
})
|
||||
await recordRecentlyPlayedFromSong(ctx, userId, songId)
|
||||
},
|
||||
})
|
||||
|
||||
export const toggleShuffle = mutation({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
const userId = await requireAuth(ctx)
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
throw new ConvexError("User not found")
|
||||
}
|
||||
|
||||
const shuffleEnabled = !(user.shuffleEnabled ?? false)
|
||||
const queue = user.songQueue ?? []
|
||||
|
||||
if (shuffleEnabled && queue.length > 1) {
|
||||
const [current, ...upNext] = queue
|
||||
await patchPlayback(ctx, userId, {
|
||||
shuffleEnabled: true,
|
||||
songQueue: [current, ...shuffleArray(upNext)],
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
await patchPlayback(ctx, userId, { shuffleEnabled })
|
||||
},
|
||||
})
|
||||
|
||||
export const cycleRepeat = mutation({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
const userId = await requireAuth(ctx)
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
throw new ConvexError("User not found")
|
||||
}
|
||||
|
||||
const current = user.repeatEnabled ?? "none"
|
||||
const next =
|
||||
current === "none" ? "once" : current === "once" ? "always" : "none"
|
||||
|
||||
await patchPlayback(ctx, userId, { repeatEnabled: next })
|
||||
},
|
||||
})
|
||||
|
||||
export const clearQueue = mutation({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
const userId = await requireAuth(ctx)
|
||||
await patchPlayback(ctx, userId, {
|
||||
songQueue: [],
|
||||
queueHistory: [],
|
||||
currentSongProgress: 0,
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const reorderQueue = mutation({
|
||||
args: { songIds: v.array(v.id("songs")) },
|
||||
handler: async (ctx, { songIds }) => {
|
||||
const userId = await requireAuth(ctx)
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
throw new ConvexError("User not found")
|
||||
}
|
||||
|
||||
const queue = user.songQueue ?? []
|
||||
if (!haveSameSongCounts(queue, songIds)) {
|
||||
throw new ConvexError("Invalid queue order")
|
||||
}
|
||||
const currentSongChanged = songIds.length > 0 && songIds[0] !== queue[0]
|
||||
const history =
|
||||
currentSongChanged && queue.length > 0
|
||||
? appendToQueueHistory(user.queueHistory ?? [], queue[0])
|
||||
: (user.queueHistory ?? [])
|
||||
|
||||
await patchPlayback(ctx, userId, {
|
||||
songQueue: songIds,
|
||||
queueHistory: history,
|
||||
...(currentSongChanged ? { currentSongProgress: 0 } : {}),
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const skipToQueueIndex = mutation({
|
||||
args: { index: v.number() },
|
||||
handler: async (ctx, { index }) => {
|
||||
const userId = await requireAuth(ctx)
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
throw new ConvexError("User not found")
|
||||
}
|
||||
|
||||
const queue = user.songQueue ?? []
|
||||
if (index < 0 || index >= queue.length || index === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
const skipped = queue.slice(0, index)
|
||||
const history = appendManyToQueueHistory(user.queueHistory ?? [], skipped)
|
||||
|
||||
await patchPlayback(ctx, userId, {
|
||||
songQueue: queue.slice(index),
|
||||
queueHistory: history,
|
||||
currentSongProgress: 0,
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const skipNext = mutation({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
const userId = await requireAuth(ctx)
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
throw new ConvexError("User not found")
|
||||
}
|
||||
|
||||
const queue = user.songQueue ?? []
|
||||
if (queue.length === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
const repeat = user.repeatEnabled ?? "none"
|
||||
|
||||
if (repeat === "once") {
|
||||
await patchPlayback(ctx, userId, { currentSongProgress: 0 })
|
||||
return
|
||||
}
|
||||
|
||||
const [current, ...rest] = queue
|
||||
|
||||
if (repeat === "always") {
|
||||
await patchPlayback(ctx, userId, {
|
||||
songQueue: [...rest, current],
|
||||
currentSongProgress: 0,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
if (rest.length === 0) {
|
||||
await patchPlayback(ctx, userId, {
|
||||
songQueue: [current],
|
||||
currentSongProgress: 0,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
const history = appendToQueueHistory(user.queueHistory ?? [], current)
|
||||
|
||||
await patchPlayback(ctx, userId, {
|
||||
songQueue: rest,
|
||||
queueHistory: history,
|
||||
currentSongProgress: 0,
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const skipPrevious = mutation({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
const userId = await requireAuth(ctx)
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
throw new ConvexError("User not found")
|
||||
}
|
||||
|
||||
const queue = user.songQueue ?? []
|
||||
const history = user.queueHistory ?? []
|
||||
|
||||
if (queue.length === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
if (history.length === 0) {
|
||||
await patchPlayback(ctx, userId, { currentSongProgress: 0 })
|
||||
return
|
||||
}
|
||||
|
||||
const [current, ...rest] = queue
|
||||
const previous = history[history.length - 1]
|
||||
const newHistory = history.slice(0, -1)
|
||||
|
||||
await patchPlayback(ctx, userId, {
|
||||
songQueue: [previous, current, ...rest],
|
||||
queueHistory: newHistory,
|
||||
currentSongProgress: 0,
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
export const getSongProgress = query({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
const userId = await getAuthUserId(ctx)
|
||||
if (userId === null) {
|
||||
throw new ConvexError("User not logged in")
|
||||
}
|
||||
|
||||
const user = await ctx.db.get(userId)
|
||||
if (!user) {
|
||||
throw new ConvexError("User not found")
|
||||
}
|
||||
|
||||
return user.currentSongProgress ?? 0
|
||||
},
|
||||
})
|
||||
|
||||
export const updateSongProgress = mutation({
|
||||
args: {
|
||||
songId: v.id("songs"),
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { paginationOptsValidator } from "convex/server"
|
||||
import { getAuthUserId } from "@convex-dev/auth/server"
|
||||
import { ConvexError, v } from "convex/values"
|
||||
import type { Doc, Id } from "./_generated/dataModel"
|
||||
@@ -11,7 +10,7 @@ import type {
|
||||
PlaylistSummary,
|
||||
SidebarPlaylists,
|
||||
} from "./library"
|
||||
import { browseSongsFromIds, compareAlbumSongs, paginateSlice } from "./library"
|
||||
import { browseSongsFromIds, compareAlbumSongs } from "./library"
|
||||
|
||||
function toPlaylistSummary(
|
||||
playlist: Doc<"playlists">,
|
||||
@@ -109,23 +108,15 @@ async function browsePlaylistSummaryHandler(
|
||||
}
|
||||
}
|
||||
|
||||
export const browsePlaylistSummary = query({
|
||||
args: { id: v.id("playlists") },
|
||||
handler: async (ctx, args) => browsePlaylistSummaryHandler(ctx, args.id),
|
||||
})
|
||||
|
||||
export const browsePlaylistDetail = query({
|
||||
args: { id: v.id("playlists"), includeSongs: v.optional(v.boolean()) },
|
||||
args: { id: v.id("playlists") },
|
||||
handler: async (ctx, args): Promise<BrowsePlaylistDetail | null> => {
|
||||
const summary = await browsePlaylistSummaryHandler(ctx, args.id)
|
||||
if (!summary) {
|
||||
return null
|
||||
}
|
||||
|
||||
const songs =
|
||||
(args.includeSongs ?? true)
|
||||
? await browseSongsFromIds(ctx, summary.songIds)
|
||||
: []
|
||||
const songs = await browseSongsFromIds(ctx, summary.songIds)
|
||||
|
||||
return {
|
||||
id: summary.id,
|
||||
@@ -139,27 +130,6 @@ export const browsePlaylistDetail = query({
|
||||
},
|
||||
})
|
||||
|
||||
export const browsePlaylistSongsPaginated = query({
|
||||
args: {
|
||||
id: v.id("playlists"),
|
||||
paginationOpts: paginationOptsValidator,
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
const playlist = await ctx.db.get("playlists", args.id)
|
||||
if (!playlist) {
|
||||
return { page: [], isDone: true, continueCursor: "" }
|
||||
}
|
||||
|
||||
const slice = paginateSlice(playlist.songs, args.paginationOpts)
|
||||
const page = await browseSongsFromIds(ctx, slice.page)
|
||||
|
||||
return {
|
||||
...slice,
|
||||
page,
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
export const listOwnedPlaylists = query({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
|
||||
@@ -41,10 +41,6 @@ export type BrowseAlbumDetail = BrowseAlbum & {
|
||||
tracks: BrowseAlbumTrack[]
|
||||
}
|
||||
|
||||
export type BrowseAlbumSummary = Omit<BrowseAlbumDetail, "tracks"> & {
|
||||
trackCount: number
|
||||
}
|
||||
|
||||
export type BrowseArtistDetail = {
|
||||
artist: BrowseArtist
|
||||
albums: BrowseAlbum[]
|
||||
|
||||
Reference in new issue
Block a user