Compare commits
No files matched your search
@@ -54,7 +54,6 @@
|
||||
"expo-status-bar",
|
||||
"expo-app-intents",
|
||||
"./plugins/with-android-colors",
|
||||
"./plugins/with-android-fast-fade",
|
||||
[
|
||||
"expo-navigation-bar",
|
||||
{
|
||||
|
||||
@@ -6,8 +6,8 @@ import { NavigationBar } from "expo-navigation-bar"
|
||||
import {
|
||||
ScreenPaletteProvider,
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabHasArtworkPalette,
|
||||
useTabletBackgroundStyle,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidNativeTabColors,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
@@ -46,13 +46,12 @@ function useRouterTheme() {
|
||||
}
|
||||
|
||||
function useNativeTabColors() {
|
||||
// These props initialize native tabs; the worklet owns subsequent colors.
|
||||
const selectedColor = colors.dark.primary
|
||||
const themeIsDark = useIsDark()
|
||||
const androidPalette = useAndroidTabPalette()
|
||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||
const selectedColor = hasArtworkPalette
|
||||
? androidPalette.foreground
|
||||
: androidPalette.accentText
|
||||
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
|
||||
const androidPalette = colors.dark
|
||||
const artworkPalette = useAndroidTabPalette()
|
||||
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
|
||||
const inactive = appleMusic.tabInactive
|
||||
|
||||
const iconColor =
|
||||
@@ -62,14 +61,14 @@ function useNativeTabColors() {
|
||||
selected: appleMusic.pink,
|
||||
}
|
||||
: {
|
||||
default: androidPalette.secondaryForeground,
|
||||
default: androidPalette.mutedForeground,
|
||||
selected: selectedColor,
|
||||
}
|
||||
|
||||
const labelColor =
|
||||
Platform.OS === "ios"
|
||||
? DynamicColorIOS({ dark: inactive, light: "#636366" })
|
||||
: androidPalette.secondaryForeground
|
||||
: androidPalette.mutedForeground
|
||||
|
||||
return {
|
||||
isDark,
|
||||
@@ -86,17 +85,20 @@ function useNativeTabColors() {
|
||||
blurEffect: isDark
|
||||
? "systemChromeMaterialDark"
|
||||
: "systemChromeMaterialLight",
|
||||
backgroundColor:
|
||||
Platform.OS === "ios" ? undefined : androidPalette.background,
|
||||
// Reveal the shared UI-thread background beneath the native tab bar.
|
||||
backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
|
||||
}
|
||||
}
|
||||
|
||||
function TabsContent() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const homeColors = useAndroidNativeTabColors()
|
||||
const libraryColors = useAndroidNativeTabColors()
|
||||
const searchColors = useAndroidNativeTabColors()
|
||||
const keyboardVisible = useAndroidKeyboardVisible()
|
||||
const routerTheme = useRouterTheme()
|
||||
const tabColors = useNativeTabColors()
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
const { currentSong, queueSongIds } = usePlaybackQueue()
|
||||
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
||||
|
||||
@@ -138,6 +140,9 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="home"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? homeColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -147,6 +152,9 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="library"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? libraryColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -161,6 +169,9 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="search"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? searchColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
|
||||
@@ -7,14 +7,21 @@ import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
PaletteText,
|
||||
PaletteIcon,
|
||||
renderArtworkBackButton,
|
||||
} from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import {
|
||||
renderAndroidArtworkBackground,
|
||||
useScreenPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
|
||||
import {
|
||||
CollectionDivider,
|
||||
@@ -135,7 +142,10 @@ export default function AlbumScreen() {
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
@@ -163,9 +173,9 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
Album not found.
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
@@ -186,7 +196,10 @@ export default function AlbumScreen() {
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
@@ -208,7 +221,8 @@ export default function AlbumScreen() {
|
||||
}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
@@ -269,7 +283,8 @@ export default function AlbumScreen() {
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone={favorited ? "accent" : "foreground"}
|
||||
name={favorited ? "star" : "star-outline"}
|
||||
size={24}
|
||||
color={favorited ? palette.accent : palette.foreground}
|
||||
@@ -295,7 +310,8 @@ export default function AlbumScreen() {
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
@@ -304,7 +320,8 @@ export default function AlbumScreen() {
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
@@ -312,12 +329,13 @@ export default function AlbumScreen() {
|
||||
]}
|
||||
>
|
||||
{album.title}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
<Pressable
|
||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||
style={styles.artistPressable}
|
||||
>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="accentText"
|
||||
style={[
|
||||
styles.artist,
|
||||
heroLayout.landscape && styles.artistLandscape,
|
||||
@@ -325,7 +343,7 @@ export default function AlbumScreen() {
|
||||
]}
|
||||
>
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</Pressable>
|
||||
<View
|
||||
style={{
|
||||
@@ -339,18 +357,25 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
>
|
||||
{metadata ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
{metadata}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
) : null}
|
||||
{album.hasLossless ? (
|
||||
<>
|
||||
{metadata ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
·
|
||||
</Text>
|
||||
</PaletteText>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="lossless"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
@@ -360,11 +385,15 @@ export default function AlbumScreen() {
|
||||
{album.hasAtmos ? (
|
||||
<>
|
||||
{metadata || album.hasLossless ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
·
|
||||
</Text>
|
||||
</PaletteText>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="atmos"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
@@ -488,11 +517,12 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
style={styles.trackRow}
|
||||
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
||||
>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
||||
>
|
||||
{number}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
<View
|
||||
style={[
|
||||
styles.trackContent,
|
||||
@@ -500,24 +530,29 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
]}
|
||||
>
|
||||
<View style={styles.trackMeta}>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[styles.trackTitle, { color: palette.foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.title}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
{track.artists ? (
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.artists.join(", ")}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
) : null}
|
||||
</View>
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
{formatDuration(track.durationSeconds)}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
</Row>
|
||||
</MusicEntityView>
|
||||
|
||||
@@ -2,12 +2,20 @@ import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
PaletteText,
|
||||
PaletteIcon,
|
||||
renderArtworkBackButton,
|
||||
} from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
PlaylistSearchBar,
|
||||
usePlaylistSearch,
|
||||
} from "@/components/playlist-search-bar"
|
||||
import { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import {
|
||||
renderAndroidArtworkBackground,
|
||||
useScreenPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { useMutation } from "convex/react"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
@@ -23,12 +31,10 @@ import {
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
|
||||
import { CollectionDivider } from "@/components/collection-list"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
@@ -105,7 +111,10 @@ export default function PlaylistScreen() {
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
@@ -133,9 +142,9 @@ export default function PlaylistScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
Playlist not found.
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
@@ -193,6 +202,12 @@ function PlaylistContent({
|
||||
[playFromSong, songIds, playlistId]
|
||||
)
|
||||
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) =>
|
||||
void handleSongAction(song, action),
|
||||
[handleSongAction]
|
||||
)
|
||||
|
||||
const handleRemoveSong = useCallback(
|
||||
async (songId: Id<"songs">) => {
|
||||
if (!playlistId) return false
|
||||
@@ -211,14 +226,6 @@ function PlaylistContent({
|
||||
[playlistId, removeSongs]
|
||||
)
|
||||
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) => {
|
||||
if (action === "remove-from-playlist") void handleRemoveSong(song.id)
|
||||
else void handleSongAction(song, action)
|
||||
},
|
||||
[handleRemoveSong, handleSongAction]
|
||||
)
|
||||
|
||||
const handlePlay = useCallback(() => {
|
||||
if (playlistId) void playPlaylist(playlistId, songIds)
|
||||
}, [playPlaylist, playlistId, songIds])
|
||||
@@ -270,7 +277,10 @@ function PlaylistContent({
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
@@ -289,7 +299,8 @@ function PlaylistContent({
|
||||
onAction={handlePlaylistMenuAction}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
@@ -359,14 +370,15 @@ function PlaylistContent({
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
ListEmptyComponent={
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={[
|
||||
styles.emptyResults,
|
||||
{ color: palette.secondaryForeground },
|
||||
]}
|
||||
>
|
||||
{songs.length ? "No songs found." : "No songs in this playlist."}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
}
|
||||
ListHeaderComponent={
|
||||
<PlaylistHero
|
||||
@@ -420,7 +432,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
playlistLabel={PLAYLIST_LABEL}
|
||||
palette={palette}
|
||||
inset
|
||||
removable={removable}
|
||||
swipe={
|
||||
Platform.OS !== "web"
|
||||
? {
|
||||
@@ -428,7 +439,12 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
backgroundColor: palette.background,
|
||||
onPlayNext: () => onAction(song, "play-next"),
|
||||
onAddToQueue: () => onAction(song, "play-last"),
|
||||
onRemove: removable ? () => void handleRemove() : undefined,
|
||||
onRemove:
|
||||
Platform.OS === "android" && removable
|
||||
? () => {
|
||||
void onRemove(song.id)
|
||||
}
|
||||
: undefined,
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
@@ -459,15 +475,19 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
}}
|
||||
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
||||
>
|
||||
<Ionicons name="trash" size={22} color={colors.primaryForeground} />
|
||||
<Text
|
||||
<PaletteIcon
|
||||
name="trash"
|
||||
size={22}
|
||||
color={colors.primaryForeground}
|
||||
/>
|
||||
<PaletteText
|
||||
style={[
|
||||
styles.removeActionText,
|
||||
{ color: colors.primaryForeground },
|
||||
]}
|
||||
>
|
||||
Remove
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</Pressable>
|
||||
)}
|
||||
>
|
||||
@@ -547,7 +567,8 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone={isSubscribed ? "foreground" : "accentForeground"}
|
||||
name={isSubscribed ? "checkmark" : "add"}
|
||||
size={24}
|
||||
color={
|
||||
@@ -573,12 +594,18 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
onPress={onShuffle}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={palette.foreground} />
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
@@ -586,15 +613,16 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
]}
|
||||
>
|
||||
{title}
|
||||
</Text>
|
||||
<Text
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={{
|
||||
color: palette.foreground,
|
||||
fontSize: heroLayout.landscape ? 22 : 16,
|
||||
}}
|
||||
>
|
||||
{ownerName}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</CollectionHero>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
</MusicEntityView>
|
||||
|
||||
@@ -26,7 +26,6 @@ import {
|
||||
} from "@/lib/artwork-color-preference"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { clearCoverPaletteCache } from "@/hooks/use-cover-palette"
|
||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||
import { changeServer, signOut } from "@/lib/session"
|
||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
@@ -186,7 +185,6 @@ function AppearanceSection() {
|
||||
setSaving(true)
|
||||
try {
|
||||
await setArtworkColorsEnabled(checked)
|
||||
clearCoverPaletteCache()
|
||||
} catch {
|
||||
showError("Could not save artwork colors preference.")
|
||||
} finally {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
import Svg, { G, Path } from "react-native-svg"
|
||||
|
||||
import {
|
||||
@@ -68,10 +69,12 @@ function LosslessMark({
|
||||
|
||||
/** The Dolby Atmos or Lossless label shown under the progress bar. */
|
||||
export function AudioFormatBadge({
|
||||
artwork = false,
|
||||
format,
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
artwork?: boolean
|
||||
format: PlaybackFormat
|
||||
color: string
|
||||
backgroundColor: string
|
||||
@@ -84,7 +87,12 @@ export function AudioFormatBadge({
|
||||
) : (
|
||||
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
||||
)}
|
||||
<Text style={[styles.label, { color }]}>{label}</Text>
|
||||
<PaletteText
|
||||
tone={artwork ? "secondaryForeground" : undefined}
|
||||
style={[styles.label, { color }]}
|
||||
>
|
||||
{label}
|
||||
</PaletteText>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { memo } from "react"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
|
||||
@@ -25,9 +26,12 @@ export const DiscHeader = memo(function DiscHeader({
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
|
||||
<PaletteText
|
||||
tone={color ? "foreground" : undefined}
|
||||
style={[styles.discHeader, { color: color ?? colors.foreground }]}
|
||||
>
|
||||
{label}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
)
|
||||
})
|
||||
|
||||
|
||||
@@ -32,7 +32,6 @@ export type MediaAction =
|
||||
| "favorite"
|
||||
| "go-artist"
|
||||
| "go-album"
|
||||
| "remove-from-playlist"
|
||||
| "delete-playlist"
|
||||
|
||||
export type MediaNavigation = {
|
||||
@@ -55,7 +54,6 @@ export type MediaMenuConfig = {
|
||||
playlistLabel?: string
|
||||
favorited?: boolean
|
||||
showFavorite?: boolean
|
||||
showRemoveFromPlaylist?: boolean
|
||||
stationArtistId?: string
|
||||
navigation?: MediaNavigation
|
||||
share?: MediaShareContext
|
||||
@@ -78,7 +76,6 @@ const MEDIA_ACTION_ITEMS: {
|
||||
playlistLabel: string
|
||||
) => string
|
||||
image: NonNullable<MenuAction["image"]> & string
|
||||
destructive?: boolean
|
||||
}[] = [
|
||||
{
|
||||
action: "playlist",
|
||||
@@ -122,12 +119,6 @@ const MEDIA_ACTION_ITEMS: {
|
||||
`${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`,
|
||||
image: "star",
|
||||
},
|
||||
{
|
||||
action: "remove-from-playlist",
|
||||
label: () => "Remove from Playlist",
|
||||
image: "minus.circle",
|
||||
destructive: true,
|
||||
},
|
||||
{
|
||||
action: "delete-playlist",
|
||||
label: () => "Delete Playlist",
|
||||
@@ -143,10 +134,6 @@ function isActionIncluded(
|
||||
return false
|
||||
}
|
||||
|
||||
if (action === "remove-from-playlist") {
|
||||
return config.showRemoveFromPlaylist === true
|
||||
}
|
||||
|
||||
if (config.includeActions) {
|
||||
return config.includeActions.includes(action)
|
||||
}
|
||||
@@ -203,7 +190,6 @@ export function buildMediaMenuActions(
|
||||
id: item.action,
|
||||
title: item.label(countSuffix, favorited, playlistLabel),
|
||||
image: item.action === "favorite" && favorited ? "star.fill" : item.image,
|
||||
...(item.destructive ? { attributes: { destructive: true } } : {}),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -338,7 +324,6 @@ const NativeContextMenuAction: ComponentType<{
|
||||
identifier: string
|
||||
title: string
|
||||
icon?: string
|
||||
destructive?: boolean
|
||||
onSelected: () => void
|
||||
}> | null =
|
||||
Platform.OS === "ios"
|
||||
@@ -392,7 +377,6 @@ function NativeMediaContextMenu({
|
||||
identifier={action.id ?? action.title}
|
||||
title={action.title}
|
||||
icon={typeof action.image === "string" ? action.image : undefined}
|
||||
destructive={action.attributes?.destructive}
|
||||
onSelected={() => handleAction(action.id as MediaAction)}
|
||||
/>
|
||||
))}
|
||||
|
||||
@@ -25,7 +25,6 @@ const actionIcons = {
|
||||
favorite: "star-outline",
|
||||
"go-artist": "person-outline",
|
||||
"go-album": "disc-outline",
|
||||
"remove-from-playlist": "remove-circle-outline",
|
||||
"delete-playlist": "trash-outline",
|
||||
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidTabHasArtworkPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
import { useRouter } from "expo-router"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
|
||||
@@ -65,7 +67,8 @@ function MiniPlayerContent({
|
||||
<View
|
||||
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
||||
>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -73,7 +76,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
<Pressable
|
||||
style={styles.controlButton}
|
||||
@@ -83,7 +86,8 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={20}
|
||||
color={colors.foreground}
|
||||
@@ -101,7 +105,8 @@ function MiniPlayerContent({
|
||||
style={artworkStyle}
|
||||
/>
|
||||
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -109,8 +114,9 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</Text>
|
||||
<Text
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={[
|
||||
isAccessory ? styles.accessoryArtist : styles.artist,
|
||||
{ color: colors.mutedForeground },
|
||||
@@ -118,7 +124,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.artist.name}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
<View style={styles.controls}>
|
||||
{Platform.OS === "android" && !isAccessory ? (
|
||||
@@ -132,7 +138,12 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons name="play-back" size={24} color={colors.foreground} />
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-back"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Pressable
|
||||
@@ -143,7 +154,8 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
@@ -157,7 +169,12 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons name="play-forward" size={24} color={colors.foreground} />
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-forward"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
</Pressable>
|
||||
@@ -167,9 +184,10 @@ function MiniPlayerContent({
|
||||
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
const palette = useAndroidTabPalette()
|
||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
|
||||
return (
|
||||
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
|
||||
<Animated.View style={[styles.androidBar, backgroundStyle]}>
|
||||
{children}
|
||||
{hasArtworkPalette ? (
|
||||
<View
|
||||
@@ -187,7 +205,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import type { ComponentProps } from "react"
|
||||
import { Pressable, type TextProps } from "react-native"
|
||||
import { useRouter } from "expo-router"
|
||||
import Animated from "react-native-reanimated"
|
||||
|
||||
import {
|
||||
useAnimatedPaletteColor,
|
||||
type PaletteColor,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
|
||||
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
|
||||
|
||||
/** Keep artwork text colors on the same UI-thread animation as the background. */
|
||||
export function PaletteText({
|
||||
tone,
|
||||
style,
|
||||
...props
|
||||
}: TextProps & { tone?: PaletteColor }) {
|
||||
const colorStyle = useAnimatedPaletteColor(tone)
|
||||
return <Animated.Text {...props} style={[style, colorStyle]} />
|
||||
}
|
||||
|
||||
export function PaletteIcon({
|
||||
tone,
|
||||
style,
|
||||
...props
|
||||
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
|
||||
const colorStyle = useAnimatedPaletteColor(tone)
|
||||
return <AnimatedIcon {...props} style={[style, colorStyle]} />
|
||||
}
|
||||
|
||||
function ArtworkBackButton() {
|
||||
const router = useRouter()
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Navigate up"
|
||||
hitSlop={8}
|
||||
onPress={() => router.back()}
|
||||
>
|
||||
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
export function renderArtworkBackButton() {
|
||||
return <ArtworkBackButton />
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { collectionInset } from "@/components/collection-list"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
@@ -15,7 +16,7 @@ import {
|
||||
useThemeColors,
|
||||
} from "@/lib/theme"
|
||||
import { memo, useCallback } from "react"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
|
||||
import {
|
||||
MediaContextMenu,
|
||||
@@ -63,22 +64,27 @@ export const SongRow = memo(function SongRow({
|
||||
const content = (
|
||||
<>
|
||||
<View style={styles.rowMeta}>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone={palette ? "foreground" : undefined}
|
||||
style={[styles.rowTitle, { color: foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.title}
|
||||
</Text>
|
||||
<Text
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.artist.name} · {song.album.title}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
style={[styles.duration, { color: secondaryForeground }]}
|
||||
>
|
||||
{formatDuration(song.durationSeconds)}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
{trailing}
|
||||
</>
|
||||
)
|
||||
@@ -154,7 +160,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
palette,
|
||||
inset,
|
||||
swipe,
|
||||
removable,
|
||||
onPlay,
|
||||
onAction,
|
||||
}: {
|
||||
@@ -170,8 +175,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
onRemove?: () => void
|
||||
backgroundColor: string
|
||||
}
|
||||
/** Shows "Remove from Playlist" in the context menu. */
|
||||
removable?: boolean
|
||||
onPlay: (song: BrowseSong) => void
|
||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||
}) {
|
||||
@@ -199,7 +202,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
stationArtistId: song.artist.id,
|
||||
favorited,
|
||||
playlistLabel,
|
||||
showRemoveFromPlaylist: removable,
|
||||
navigation: {
|
||||
artist: { id: song.artist.id },
|
||||
album: { id: song.album.id },
|
||||
|
||||
@@ -31,19 +31,14 @@ import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
const IS_ANDROID = Platform.OS === "android"
|
||||
|
||||
const ACTION_WIDTH = 82
|
||||
/** Width of each action when two share a side. */
|
||||
const PAIRED_ACTION_WIDTH = 72
|
||||
const LEADING_ACTION_WIDTH = 72
|
||||
const SPRING = { duration: 450, dampingRatio: 1 }
|
||||
|
||||
function impact() {
|
||||
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium)
|
||||
}
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
/** A tap competes with the swipe so dragging a moving row never starts playback. */
|
||||
export function SongSwipeRow({
|
||||
children,
|
||||
style,
|
||||
@@ -63,8 +58,7 @@ export function SongSwipeRow({
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
}) {
|
||||
const hasRemove = !!onRemove
|
||||
const trailingWidth = hasRemove ? PAIRED_ACTION_WIDTH * 2 : ACTION_WIDTH
|
||||
const hasRemove = IS_ANDROID && !!onRemove
|
||||
const x = useSharedValue(0)
|
||||
const startX = useSharedValue(0)
|
||||
const width = useSharedValue(0)
|
||||
@@ -95,10 +89,9 @@ export function SongSwipeRow({
|
||||
(side: number) => {
|
||||
close()
|
||||
if (side > 0) onAddToQueue()
|
||||
// Without Remove, the trailing action is the Download placeholder.
|
||||
else onRemove?.()
|
||||
// Download is intentionally a placeholder.
|
||||
},
|
||||
[close, onAddToQueue, onRemove]
|
||||
[close, onAddToQueue]
|
||||
)
|
||||
const tapRow = useCallback(() => {
|
||||
if (open) close()
|
||||
@@ -124,7 +117,9 @@ export function SongSwipeRow({
|
||||
const commit =
|
||||
Math.abs(x.value) >
|
||||
Math.max(
|
||||
x.value > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth,
|
||||
x.value > 0
|
||||
? LEADING_ACTION_WIDTH * 2
|
||||
: ACTION_WIDTH * (hasRemove ? 2 : 1),
|
||||
width.value * 0.55
|
||||
)
|
||||
if (commit !== committed.value) {
|
||||
@@ -146,7 +141,10 @@ export function SongSwipeRow({
|
||||
? side
|
||||
: 0
|
||||
x.value = withSpring(
|
||||
target * (target > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth),
|
||||
target *
|
||||
(target > 0
|
||||
? LEADING_ACTION_WIDTH * 2
|
||||
: ACTION_WIDTH * (hasRemove ? 2 : 1)),
|
||||
{
|
||||
...SPRING,
|
||||
velocity: event.velocityX,
|
||||
@@ -169,6 +167,7 @@ export function SongSwipeRow({
|
||||
return Gesture.Exclusive(pan, tap)
|
||||
}, [
|
||||
activate,
|
||||
hasRemove,
|
||||
begin,
|
||||
close,
|
||||
commitProgress,
|
||||
@@ -176,7 +175,6 @@ export function SongSwipeRow({
|
||||
settle,
|
||||
startX,
|
||||
tapRow,
|
||||
trailingWidth,
|
||||
width,
|
||||
x,
|
||||
])
|
||||
@@ -229,28 +227,31 @@ export function SongSwipeRow({
|
||||
onPlayNext()
|
||||
}}
|
||||
/>
|
||||
{hasRemove && (
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
secondary
|
||||
paired
|
||||
remove
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => {
|
||||
close()
|
||||
onRemove?.()
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
paired={hasRemove}
|
||||
remove={hasRemove}
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => activate(-1)}
|
||||
/>
|
||||
{hasRemove && (
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
secondary
|
||||
paired
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={close}
|
||||
/>
|
||||
)}
|
||||
<GestureDetector gesture={gesture}>
|
||||
<Animated.View
|
||||
accessible
|
||||
@@ -265,7 +266,10 @@ export function SongSwipeRow({
|
||||
: []),
|
||||
]}
|
||||
onAccessibilityAction={(event) => {
|
||||
if (event.nativeEvent.actionName === "remove") activate(-1)
|
||||
if (event.nativeEvent.actionName === "remove" && hasRemove) {
|
||||
close()
|
||||
onRemove?.()
|
||||
}
|
||||
if (event.nativeEvent.actionName === "addToQueue") activate(1)
|
||||
if (event.nativeEvent.actionName === "playNext") {
|
||||
close()
|
||||
@@ -333,10 +337,10 @@ function SwipeAction({
|
||||
const resting = Math.max(
|
||||
0,
|
||||
Math.min(
|
||||
revealed - (paired ? 10 : 20),
|
||||
revealed - (side > 0 ? 10 : 20),
|
||||
interpolate(
|
||||
revealed,
|
||||
[24, paired ? PAIRED_ACTION_WIDTH : ACTION_WIDTH, 220],
|
||||
[24, side > 0 ? LEADING_ACTION_WIDTH : ACTION_WIDTH, 220],
|
||||
[0, 62, 200]
|
||||
)
|
||||
)
|
||||
@@ -400,9 +404,7 @@ function SwipeAction({
|
||||
styles.pill,
|
||||
{
|
||||
backgroundColor: remove
|
||||
? IS_ANDROID
|
||||
? "#d32f2f"
|
||||
: "#ff3b30"
|
||||
? "#d32f2f"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "#6b5bff"
|
||||
@@ -430,13 +432,11 @@ function SwipeAction({
|
||||
) : (
|
||||
<SymbolView
|
||||
name={
|
||||
remove
|
||||
? "trash"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "text.line.first.and.arrowtriangle.forward"
|
||||
: "text.line.last.and.arrowtriangle.forward"
|
||||
: "arrow.down"
|
||||
side > 0
|
||||
? secondary
|
||||
? "text.line.first.and.arrowtriangle.forward"
|
||||
: "text.line.last.and.arrowtriangle.forward"
|
||||
: "arrow.down"
|
||||
}
|
||||
size={22}
|
||||
tintColor="white"
|
||||
|
||||
@@ -3,13 +3,13 @@ import { SafeAreaView } from "react-native-safe-area-context"
|
||||
import { Platform } from "react-native"
|
||||
import type { ReactNode } from "react"
|
||||
|
||||
import { useTabletBackgroundStyle } from "@/contexts/android-tab-theme"
|
||||
import { useAndroidTabBackgroundStyle } from "@/contexts/android-tab-theme"
|
||||
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
|
||||
import { TabletSidebar } from "@/components/tablet-sidebar"
|
||||
|
||||
/** Apply sidebar insets natively, before Yoga measures the content pane. */
|
||||
export function TabScreenContent({ children }: { children: ReactNode }) {
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
|
||||
return (
|
||||
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import {
|
||||
ActivityIndicator,
|
||||
Platform,
|
||||
@@ -73,8 +74,20 @@ export function Button({
|
||||
<ActivityIndicator color={textColor} />
|
||||
) : (
|
||||
<View style={styles.buttonContent}>
|
||||
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null}
|
||||
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text>
|
||||
{icon ? (
|
||||
<PaletteIcon
|
||||
tone={tint ? "accentForeground" : undefined}
|
||||
name={icon}
|
||||
size={18}
|
||||
color={textColor}
|
||||
/>
|
||||
) : null}
|
||||
<PaletteText
|
||||
tone={tint ? "accentForeground" : undefined}
|
||||
style={[styles.buttonText, { color: textColor }]}
|
||||
>
|
||||
{title}
|
||||
</PaletteText>
|
||||
</View>
|
||||
)}
|
||||
</Pressable>
|
||||
|
||||
@@ -14,10 +14,14 @@ import {
|
||||
useState,
|
||||
type PropsWithChildren,
|
||||
} from "react"
|
||||
import { Platform } from "react-native"
|
||||
import {
|
||||
import { Platform, StyleSheet, type HostInstance } from "react-native"
|
||||
import Reanimated, {
|
||||
useSharedValue,
|
||||
useAnimatedStyle,
|
||||
useAnimatedReaction,
|
||||
useAnimatedRef,
|
||||
setNativeProps,
|
||||
processColor,
|
||||
withTiming,
|
||||
type SharedValue,
|
||||
} from "react-native-reanimated"
|
||||
@@ -25,17 +29,19 @@ import {
|
||||
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
|
||||
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||
|
||||
export type PaletteColor = Exclude<keyof CoverPalette, "isDark">
|
||||
type PaletteColors = Pick<CoverPalette, PaletteColor> & {
|
||||
selectedColor: string
|
||||
}
|
||||
|
||||
type TabTheme = {
|
||||
palette: CoverPalette
|
||||
colors: SharedValue<PaletteColors>
|
||||
hasArtworkPalette: boolean
|
||||
tabletBackground: SharedValue<string>
|
||||
setPalette: (palette: CoverPalette | null, owner: string) => void
|
||||
}
|
||||
const AndroidTabTheme = createContext<TabTheme | null>(null)
|
||||
|
||||
const isTablet = Platform.OS === "ios" && Platform.isPad
|
||||
const sharesPalette = Platform.OS === "android" || isTablet
|
||||
|
||||
function useDefaultPalette() {
|
||||
const theme = useThemeColors()
|
||||
const isDark = useIsDark()
|
||||
@@ -54,37 +60,52 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||
palette.foreground !== defaultPalette.foreground ||
|
||||
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
|
||||
palette.accent !== defaultPalette.accent
|
||||
const tabletBackground = useSharedValue(defaultPalette.background)
|
||||
const { isDark: _defaultIsDark, ...defaultColors } = defaultPalette
|
||||
const animatedColors = useSharedValue<PaletteColors>({
|
||||
...defaultColors,
|
||||
selectedColor: defaultPalette.accentText,
|
||||
})
|
||||
useLayoutEffect(() => {
|
||||
if (!isTablet) return
|
||||
tabletBackground.value = withTiming(palette.background, {
|
||||
duration: TABLET_FADE_MS,
|
||||
})
|
||||
}, [tabletBackground, palette.background])
|
||||
const { isDark: _isDark, ...colors } = palette
|
||||
animatedColors.value = withTiming(
|
||||
{
|
||||
...colors,
|
||||
selectedColor: hasArtwork
|
||||
? palette.foreground
|
||||
: defaultPalette.accentText,
|
||||
},
|
||||
{ duration: PALETTE_FADE_MS }
|
||||
)
|
||||
}, [animatedColors, palette, defaultPalette, hasArtwork])
|
||||
const paletteOwner = useRef<string | null>(null)
|
||||
const setPalette = useCallback(
|
||||
(palette: CoverPalette | null, owner: string) => {
|
||||
if (!palette && paletteOwner.current !== owner) return
|
||||
paletteOwner.current = palette ? owner : null
|
||||
if (isTablet) {
|
||||
// React may defer commits while the iPad stack is animating.
|
||||
tabletBackground.value = withTiming(
|
||||
(palette ?? defaultPalette).background,
|
||||
{ duration: TABLET_FADE_MS }
|
||||
)
|
||||
}
|
||||
// Start on the UI thread immediately. React may defer commits while
|
||||
// the native stack is animating, including transitionStart state updates.
|
||||
const target = palette ?? defaultPalette
|
||||
const { isDark: _isDark, ...colors } = target
|
||||
animatedColors.value = withTiming(
|
||||
{
|
||||
...colors,
|
||||
selectedColor: palette ? target.foreground : target.accentText,
|
||||
},
|
||||
{ duration: PALETTE_FADE_MS }
|
||||
)
|
||||
setScreen(palette ? { palette, owner } : null)
|
||||
},
|
||||
[tabletBackground, defaultPalette]
|
||||
[animatedColors, defaultPalette]
|
||||
)
|
||||
const artworkPalette = hasArtwork ? palette : null
|
||||
const value = useMemo(
|
||||
() => ({
|
||||
palette: hasArtwork ? palette : defaultPalette,
|
||||
hasArtworkPalette: hasArtwork,
|
||||
tabletBackground,
|
||||
palette: artworkPalette ?? defaultPalette,
|
||||
colors: animatedColors,
|
||||
hasArtworkPalette: artworkPalette !== null,
|
||||
setPalette,
|
||||
}),
|
||||
[defaultPalette, hasArtwork, palette, setPalette, tabletBackground]
|
||||
[defaultPalette, artworkPalette, setPalette, animatedColors]
|
||||
)
|
||||
return (
|
||||
<AndroidTabTheme.Provider value={value}>
|
||||
@@ -93,6 +114,50 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* NativeTabs forwards raw screen props to its Fabric screen. Bind that host
|
||||
* directly so appearance updates stay on the UI thread with the page colors.
|
||||
*/
|
||||
export function useAndroidNativeTabColors() {
|
||||
const colors = useContext(AndroidTabTheme)?.colors
|
||||
const ref = useAnimatedRef<HostInstance>()
|
||||
const mounted = useSharedValue(false)
|
||||
const attach = useCallback(
|
||||
(host: HostInstance | null) => {
|
||||
if (host) ref(host)
|
||||
mounted.value = host !== null
|
||||
},
|
||||
[ref, mounted]
|
||||
)
|
||||
|
||||
useAnimatedReaction(
|
||||
() => ({ colors: colors?.value, mounted: mounted.value }),
|
||||
({ colors: palette, mounted: ready }) => {
|
||||
if (Platform.OS !== "android" || !ready || !palette) return
|
||||
const normal = processColor(palette.secondaryForeground)
|
||||
const selected = processColor(palette.selectedColor)
|
||||
setNativeProps(ref, {
|
||||
standardAppearance: {
|
||||
tabBarBackgroundColor: processColor("transparent"),
|
||||
tabBarItemRippleColor: selected,
|
||||
tabBarItemActiveIndicatorEnabled: false,
|
||||
tabBarItemTitleSmallLabelFontSize: 10,
|
||||
tabBarItemTitleLargeLabelFontSize: 10,
|
||||
normal: {
|
||||
tabBarItemTitleFontColor: normal,
|
||||
tabBarItemIconColor: normal,
|
||||
},
|
||||
selected: {
|
||||
tabBarItemTitleFontColor: selected,
|
||||
tabBarItemIconColor: selected,
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
)
|
||||
return { ref: attach, style: { backgroundColor: "transparent" } }
|
||||
}
|
||||
|
||||
export function useAndroidTabPalette() {
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const defaultPalette = useDefaultPalette()
|
||||
@@ -103,29 +168,53 @@ export function useAndroidTabHasArtworkPalette() {
|
||||
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
||||
}
|
||||
|
||||
/** iPad fades the sidebar and content pane together; other layouts skip it. */
|
||||
export function useTabletBackgroundStyle() {
|
||||
const background = useContext(AndroidTabTheme)?.tabletBackground
|
||||
export function useAndroidTabBackgroundStyle() {
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const fallback = useDefaultPalette().background
|
||||
const colors = theme?.colors
|
||||
return useAnimatedStyle(() =>
|
||||
isTablet && background ? { backgroundColor: background.value } : {}
|
||||
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
||||
? { backgroundColor: colors?.value.background ?? fallback }
|
||||
: {}
|
||||
)
|
||||
}
|
||||
|
||||
const TABLET_FADE_MS = 400
|
||||
/** Color tokens share the background's UI-thread timing. */
|
||||
export function useAnimatedPaletteColor(tone: PaletteColor | undefined) {
|
||||
const colors = useContext(AndroidTabTheme)?.colors
|
||||
return useAnimatedStyle(() =>
|
||||
Platform.OS === "android" && tone && colors
|
||||
? { color: colors.value[tone] }
|
||||
: {}
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* Artwork screens always paint their own palette so it slides with the page.
|
||||
* Shared chrome (tab bar, mini player) switches when the transition starts.
|
||||
*/
|
||||
/** Native headers draw this same UI-thread background as the page and bars. */
|
||||
function AndroidArtworkBackground() {
|
||||
const style = useAndroidTabBackgroundStyle()
|
||||
return <Reanimated.View style={[StyleSheet.absoluteFill, style]} />
|
||||
}
|
||||
|
||||
export function renderAndroidArtworkBackground() {
|
||||
return <AndroidArtworkBackground />
|
||||
}
|
||||
|
||||
const PALETTE_FADE_MS = 400
|
||||
|
||||
/** The focused artwork screen selects the shared background for page and bars. */
|
||||
export function useScreenPalette(palette: CoverPalette) {
|
||||
const isFocused = useIsFocused()
|
||||
const isTablet = Platform.OS === "ios" && Platform.isPad
|
||||
const sharesPalette =
|
||||
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
||||
const owner = useRoute().key
|
||||
const navigation =
|
||||
useNavigation<NativeStackNavigationProp<Record<string, undefined>>>()
|
||||
const [laidOut, setLaidOut] = useState(false)
|
||||
const [closing, setClosing] = useState(false)
|
||||
const onLayout = useCallback(() => setLaidOut(true), [])
|
||||
const setPalette = useContext(AndroidTabTheme)?.setPalette
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const setPalette = theme?.setPalette
|
||||
useLayoutEffect(() => {
|
||||
if (!sharesPalette) return
|
||||
const start = navigation.addListener("transitionStart", ({ data }) => {
|
||||
@@ -141,18 +230,20 @@ export function useScreenPalette(palette: CoverPalette) {
|
||||
start()
|
||||
cancel()
|
||||
}
|
||||
}, [navigation, setPalette, owner, palette])
|
||||
}, [navigation, sharesPalette, setPalette, owner, palette])
|
||||
const defaultPalette = useDefaultPalette()
|
||||
const ready = laidOut || isTablet
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
const target = isFocused && ready && !closing ? palette : defaultPalette
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
|
||||
setPalette(palette, owner)
|
||||
return () => setPalette(null, owner)
|
||||
}, [closing, ready, isFocused, owner, palette, setPalette])
|
||||
}, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
|
||||
|
||||
return {
|
||||
palette,
|
||||
palette: Platform.OS === "android" ? target : palette,
|
||||
backgroundStyle,
|
||||
onLayout: sharesPalette ? onLayout : undefined,
|
||||
}
|
||||
|
||||
@@ -134,13 +134,7 @@ export function createCoverPaletteSource<Swatches>({
|
||||
}
|
||||
}
|
||||
|
||||
/** Forget in-memory swatches so covers are re-extracted. */
|
||||
function clear() {
|
||||
swatchesByKey.clear()
|
||||
pending.clear()
|
||||
}
|
||||
|
||||
return { prefetch, usePalette, clear }
|
||||
return { prefetch, usePalette }
|
||||
}
|
||||
|
||||
function sameSwatches(a: unknown, b: unknown) {
|
||||
|
||||
@@ -3,7 +3,6 @@ import {
|
||||
type CoverPaletteResult,
|
||||
} from "@/hooks/cover-palette-source"
|
||||
import {
|
||||
clearLegacyCoverPaletteCache,
|
||||
prefetchLegacyCoverPalette,
|
||||
useLegacyCoverPalette,
|
||||
} from "@/hooks/use-legacy-cover-palette"
|
||||
@@ -13,7 +12,6 @@ import {
|
||||
} from "@/lib/artwork-color-preference"
|
||||
import { extractCoverSwatches } from "@/lib/artwork-colors"
|
||||
import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette"
|
||||
import { clearCachePrefix } from "@/lib/persistent-cache"
|
||||
|
||||
export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source"
|
||||
|
||||
@@ -23,16 +21,6 @@ const region = createCoverPaletteSource<CoverSwatches>({
|
||||
derive: (swatches) => deriveCoverPalette(swatches),
|
||||
})
|
||||
|
||||
/**
|
||||
* Forget every extracted palette, in memory and on device, so covers are
|
||||
* re-extracted. Both pipelines share the `palette:` cache prefix.
|
||||
*/
|
||||
export function clearCoverPaletteCache() {
|
||||
region.clear()
|
||||
clearLegacyCoverPaletteCache()
|
||||
clearCachePrefix("palette")
|
||||
}
|
||||
|
||||
/** Warm visible artwork colors before a detail page is pushed. */
|
||||
export function prefetchCoverPalette(uri: string) {
|
||||
void loadArtworkColorsEnabled().then((enabled) =>
|
||||
|
||||
@@ -65,5 +65,3 @@ export const prefetchLegacyCoverPalette = legacy.prefetch
|
||||
|
||||
/** `react-native-image-colors` pipeline used when new artwork colors are off. */
|
||||
export const useLegacyCoverPalette = legacy.usePalette
|
||||
|
||||
export const clearLegacyCoverPaletteCache = legacy.clear
|
||||
@@ -28,7 +28,7 @@ export function useStackScreenOptions(
|
||||
headerBackButtonDisplayMode: "minimal",
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
animation: "fade",
|
||||
animation: "slide_from_right",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: theme.background },
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
const fs = require("fs")
|
||||
const path = require("path")
|
||||
const { withDangerousMod } = require("expo/config-plugins")
|
||||
|
||||
// Overrides react-native-screens' 150ms crossfade for `animation: "fade"`.
|
||||
// App resources win over library resources with the same name, so the stack
|
||||
// fades through black in 100ms: the old page out, then the new page in.
|
||||
const anims = {
|
||||
"rns_fade_out.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:fromAlpha="1.0"
|
||||
android:toAlpha="0.0"
|
||||
android:duration="50" />
|
||||
`,
|
||||
"rns_fade_in.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:fromAlpha="0.0"
|
||||
android:toAlpha="1.0"
|
||||
android:startOffset="50"
|
||||
android:duration="50" />
|
||||
`,
|
||||
}
|
||||
|
||||
module.exports = (config) =>
|
||||
withDangerousMod(config, [
|
||||
"android",
|
||||
(config) => {
|
||||
const dir = path.join(
|
||||
config.modRequest.platformProjectRoot,
|
||||
"app/src/main/res/anim"
|
||||
)
|
||||
fs.mkdirSync(dir, { recursive: true })
|
||||
for (const [name, xml] of Object.entries(anims)) {
|
||||
fs.writeFileSync(path.join(dir, name), `<?xml version="1.0" encoding="utf-8"?>\n${xml}`)
|
||||
}
|
||||
return config
|
||||
},
|
||||
])
|
||||
@@ -198,15 +198,6 @@ export async function clearPersistentCache() {
|
||||
}
|
||||
}
|
||||
|
||||
/** Deletes every entry whose key starts with `<prefix>:`. */
|
||||
export function clearCachePrefix(prefix: string) {
|
||||
for (const key of [...memory.keys()]) {
|
||||
if (entryPrefix(key) !== prefix) continue
|
||||
removeFromMemory(key)
|
||||
scheduleWrite(key, null)
|
||||
}
|
||||
}
|
||||
|
||||
export function subscribeCache(key: string, listener: () => void) {
|
||||
let keyListeners = listeners.get(key)
|
||||
if (!keyListeners) {
|
||||
|
||||
+482
-470
@@ -61,494 +61,512 @@ async function cleanHlsStreamsOlderThan(maxIdleMs: number) {
|
||||
return { checked, removed, failed }
|
||||
}
|
||||
|
||||
const SCAN_PAGE_SIZE = 2000
|
||||
/** Outlives the 10 minute action timeout so a crashed scan frees the lock. */
|
||||
const SCAN_LOCK_LEASE_MS = 15 * 60 * 1000
|
||||
/** New files left unparsed after this are picked up by the next scan. */
|
||||
const SCAN_PARSE_BUDGET_MS = 6 * 60 * 1000
|
||||
const SCAN_BATCH_SIZE = 200
|
||||
const FS_CONCURRENCY = 16
|
||||
|
||||
type Page<T> = { page: T[]; isDone: boolean; continueCursor: string }
|
||||
|
||||
/** Reads every page of an internal paginated query. */
|
||||
async function collectPages<T>(
|
||||
load: (cursor: string | null) => Promise<Page<T>>
|
||||
): Promise<T[]> {
|
||||
const items: T[] = []
|
||||
let cursor: string | null = null
|
||||
for (;;) {
|
||||
const result = await load(cursor)
|
||||
items.push(...result.page)
|
||||
if (result.isDone) {
|
||||
return items
|
||||
}
|
||||
cursor = result.continueCursor
|
||||
}
|
||||
async function coverPathIfExists(path: string): Promise<string | null> {
|
||||
return fs
|
||||
.access(path)
|
||||
.then(() => path)
|
||||
.catch(() => null)
|
||||
}
|
||||
|
||||
/** Like `Promise.all(items.map(fn))` with at most `limit` calls in flight. */
|
||||
async function mapLimit<T, R>(
|
||||
items: T[],
|
||||
limit: number,
|
||||
fn: (item: T) => Promise<R>
|
||||
): Promise<R[]> {
|
||||
const results = new Array<R>(items.length)
|
||||
let next = 0
|
||||
const worker = async () => {
|
||||
while (next < items.length) {
|
||||
const index = next++
|
||||
results[index] = await fn(items[index])
|
||||
}
|
||||
}
|
||||
await Promise.all(
|
||||
Array.from({ length: Math.min(limit, items.length) }, worker)
|
||||
)
|
||||
return results
|
||||
}
|
||||
|
||||
function chunk<T>(items: T[], size: number): T[][] {
|
||||
const chunks: T[][] = []
|
||||
for (let i = 0; i < items.length; i += size) {
|
||||
chunks.push(items.slice(i, i + size))
|
||||
}
|
||||
return chunks
|
||||
}
|
||||
|
||||
async function readDirents(dir: string): Promise<fsSync.Dirent[]> {
|
||||
try {
|
||||
return await fs.readdir(dir, { withFileTypes: true })
|
||||
} catch (error) {
|
||||
if ((error as NodeJS.ErrnoException).code === "ENOENT") {
|
||||
return []
|
||||
}
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
type DiskAlbum = {
|
||||
codec: string
|
||||
artistFolder: string
|
||||
albumFolder: string
|
||||
files: string[]
|
||||
}
|
||||
|
||||
type DiskLibrary = {
|
||||
/** Every audio file path. */
|
||||
files: Set<string>
|
||||
/** Every `folder.jpg` / `cover.jpg` path. */
|
||||
covers: Set<string>
|
||||
albums: DiskAlbum[]
|
||||
}
|
||||
|
||||
/** Lists `DATA_DIR/<codec>/<artist>/<album>/<file>` with one readdir per directory. */
|
||||
async function walkLibrary(codecs: string[]): Promise<DiskLibrary> {
|
||||
const files = new Set<string>()
|
||||
const covers = new Set<string>()
|
||||
|
||||
const artistDirs = (
|
||||
await Promise.all(
|
||||
codecs.map(async (codec) =>
|
||||
(await readDirents(`${DATA_DIR}/${codec}`))
|
||||
.filter((dirent) => dirent.isDirectory())
|
||||
.map((dirent) => ({ codec, artistFolder: dirent.name }))
|
||||
)
|
||||
)
|
||||
).flat()
|
||||
|
||||
const albumDirs = (
|
||||
await mapLimit(
|
||||
artistDirs,
|
||||
FS_CONCURRENCY,
|
||||
async ({ codec, artistFolder }) => {
|
||||
const artistPath = `${DATA_DIR}/${codec}/${artistFolder}`
|
||||
const dirents = await readDirents(artistPath)
|
||||
if (dirents.some((d) => !d.isDirectory() && d.name === "folder.jpg")) {
|
||||
covers.add(`${artistPath}/folder.jpg`)
|
||||
}
|
||||
return dirents
|
||||
.filter((dirent) => dirent.isDirectory())
|
||||
.map((dirent) => ({ codec, artistFolder, albumFolder: dirent.name }))
|
||||
}
|
||||
)
|
||||
).flat()
|
||||
|
||||
const albums = await mapLimit(albumDirs, FS_CONCURRENCY, async (album) => {
|
||||
const albumPath = `${DATA_DIR}/${album.codec}/${album.artistFolder}/${album.albumFolder}`
|
||||
const albumFiles: string[] = []
|
||||
for (const dirent of await readDirents(albumPath)) {
|
||||
if (dirent.isDirectory()) {
|
||||
continue
|
||||
}
|
||||
const filePath = `${albumPath}/${dirent.name}`
|
||||
if (dirent.name === "cover.jpg") {
|
||||
covers.add(filePath)
|
||||
} else {
|
||||
files.add(filePath)
|
||||
albumFiles.push(filePath)
|
||||
}
|
||||
}
|
||||
return { ...album, files: albumFiles }
|
||||
})
|
||||
|
||||
return { files, covers, albums }
|
||||
}
|
||||
|
||||
/**
|
||||
* Keeps the current cover while its file exists, otherwise the first codec's
|
||||
* cover on disk. Covers outside the data directory are left alone.
|
||||
*/
|
||||
function pickCover(
|
||||
current: string | null,
|
||||
candidates: string[],
|
||||
covers: Set<string>
|
||||
): string | null {
|
||||
if (
|
||||
current !== null &&
|
||||
(covers.has(current) || !current.startsWith(`${DATA_DIR}/`))
|
||||
) {
|
||||
return current
|
||||
}
|
||||
return candidates.find((candidate) => covers.has(candidate)) ?? null
|
||||
}
|
||||
|
||||
/** Untagged years are stored as 0 / "", which both clients treat as unknown. */
|
||||
function releaseDate(common: music.ICommonTagsResult) {
|
||||
if (common.date) {
|
||||
return common.date
|
||||
}
|
||||
return common.year ? `01-01-${common.year}` : ""
|
||||
}
|
||||
|
||||
type NewSong = {
|
||||
name: string
|
||||
files: Record<string, string>
|
||||
artist: string | string[]
|
||||
length: number
|
||||
diskNumber: number | null
|
||||
track: number
|
||||
year: number
|
||||
date: string
|
||||
genres: string[]
|
||||
}
|
||||
|
||||
type ImportEntry = {
|
||||
artist: { name: string; folder: string; cover: string | null }
|
||||
album: {
|
||||
name: string
|
||||
folder: string
|
||||
cover: string | null
|
||||
year: number
|
||||
date: string
|
||||
}
|
||||
songs: Map<string, NewSong>
|
||||
}
|
||||
|
||||
/**
|
||||
* Reconciles the database with the files on disk. Reads the library once in
|
||||
* pages, walks the disk once, parses only untracked files and writes only
|
||||
* what changed, so re-scanning an unchanged library makes no writes.
|
||||
*/
|
||||
async function scanLibrary(ctx: ActionCtx) {
|
||||
const startedAt = Date.now()
|
||||
const codecs = (await fs.readdir(DATA_DIR, { withFileTypes: true }))
|
||||
.filter((dirent) => dirent.isDirectory())
|
||||
.map((dirent) => dirent.name)
|
||||
|
||||
const [artists, albums, songs, disk] = await Promise.all([
|
||||
collectPages((cursor) =>
|
||||
ctx.runQuery(internal.library.scanArtistsPage, {
|
||||
paginationOpts: { numItems: SCAN_PAGE_SIZE, cursor },
|
||||
async function syncArtistCover(
|
||||
ctx: ActionCtx,
|
||||
codec: string,
|
||||
dbCover: string | null,
|
||||
diskPath: string,
|
||||
id: Id<"artists">
|
||||
) {
|
||||
const onDisk = await coverPathIfExists(diskPath)
|
||||
if (onDisk !== null) {
|
||||
if (dbCover !== onDisk) {
|
||||
await ctx.runMutation(internal.library.updateArtistCover, {
|
||||
id,
|
||||
cover: onDisk,
|
||||
})
|
||||
),
|
||||
collectPages((cursor) =>
|
||||
ctx.runQuery(internal.library.scanAlbumsPage, {
|
||||
paginationOpts: { numItems: SCAN_PAGE_SIZE, cursor },
|
||||
})
|
||||
),
|
||||
collectPages((cursor) =>
|
||||
ctx.runQuery(internal.library.scanSongsPage, {
|
||||
paginationOpts: { numItems: SCAN_PAGE_SIZE, cursor },
|
||||
})
|
||||
),
|
||||
walkLibrary(codecs),
|
||||
])
|
||||
|
||||
if (disk.files.size === 0 && songs.length > 0) {
|
||||
throw new Error(
|
||||
`No audio files found under ${DATA_DIR}; refusing to empty the library`
|
||||
)
|
||||
}
|
||||
|
||||
// Drop file paths that are gone from disk (including removed codecs). Songs
|
||||
// left without files are deleted below unless a new file matches them.
|
||||
const songFiles = new Map<Id<"songs">, Record<string, string>>()
|
||||
const changedSongs = new Set<Id<"songs">>()
|
||||
const songsByAlbum = new Map<Id<"albums">, Map<string, Id<"songs">>>()
|
||||
const tracked = new Set<string>()
|
||||
for (const song of songs) {
|
||||
const entries = Object.entries(song.files)
|
||||
const kept = entries.filter(([, filePath]) => disk.files.has(filePath))
|
||||
if (kept.length !== entries.length) {
|
||||
changedSongs.add(song._id)
|
||||
}
|
||||
songFiles.set(song._id, Object.fromEntries(kept))
|
||||
for (const [, filePath] of kept) {
|
||||
tracked.add(filePath)
|
||||
}
|
||||
const byName = songsByAlbum.get(song.album) ?? new Map()
|
||||
if (!byName.has(song.name)) {
|
||||
byName.set(song.name, song._id)
|
||||
}
|
||||
songsByAlbum.set(song.album, byName)
|
||||
}
|
||||
|
||||
// Parse untracked files only.
|
||||
const untracked = disk.albums.flatMap((album) =>
|
||||
album.files
|
||||
.filter((filePath) => !tracked.has(filePath))
|
||||
.map((filePath) => ({ ...album, filePath }))
|
||||
)
|
||||
const deadline = startedAt + SCAN_PARSE_BUDGET_MS
|
||||
const parsed = await mapLimit(untracked, FS_CONCURRENCY, async (file) => {
|
||||
if (Date.now() > deadline) {
|
||||
return null
|
||||
}
|
||||
try {
|
||||
const metadata = await music.parseFile(file.filePath, {
|
||||
skipCovers: true,
|
||||
})
|
||||
return { ...file, metadata }
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
})
|
||||
const skipped = parsed.filter((file) => file === null).length
|
||||
|
||||
const artistByFolder = new Map(
|
||||
artists.map((artist) => [artist.folder, artist])
|
||||
)
|
||||
const albumByKey = new Map(
|
||||
albums.map((album) => [`${album.artist}/${album.folder}`, album])
|
||||
)
|
||||
const imports = new Map<string, ImportEntry>()
|
||||
for (const file of parsed) {
|
||||
if (file === null) {
|
||||
continue
|
||||
}
|
||||
const { codec, artistFolder, albumFolder, filePath, metadata } = file
|
||||
const common = metadata.common
|
||||
const title = common.title || path.parse(filePath).name
|
||||
|
||||
const dbArtist = artistByFolder.get(artistFolder)
|
||||
const dbAlbum = dbArtist
|
||||
? albumByKey.get(`${dbArtist._id}/${albumFolder}`)
|
||||
: undefined
|
||||
const existingId = dbAlbum && songsByAlbum.get(dbAlbum._id)?.get(title)
|
||||
if (existingId) {
|
||||
// A same-titled sibling must not steal a path that still exists.
|
||||
const files = songFiles.get(existingId)!
|
||||
if (!(codec in files)) {
|
||||
songFiles.set(existingId, { ...files, [codec]: filePath })
|
||||
changedSongs.add(existingId)
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
const key = `${artistFolder}/${albumFolder}`
|
||||
let entry = imports.get(key)
|
||||
if (!entry) {
|
||||
entry = {
|
||||
artist: {
|
||||
name: common.albumartist || artistFolder,
|
||||
folder: artistFolder,
|
||||
cover: pickCover(
|
||||
null,
|
||||
codecs.map((c) => `${DATA_DIR}/${c}/${artistFolder}/folder.jpg`),
|
||||
disk.covers
|
||||
),
|
||||
},
|
||||
album: {
|
||||
name: common.album || albumFolder,
|
||||
folder: albumFolder,
|
||||
cover: pickCover(
|
||||
null,
|
||||
codecs.map(
|
||||
(c) => `${DATA_DIR}/${c}/${artistFolder}/${albumFolder}/cover.jpg`
|
||||
),
|
||||
disk.covers
|
||||
),
|
||||
year: common.year || 0,
|
||||
date: releaseDate(common),
|
||||
},
|
||||
songs: new Map(),
|
||||
}
|
||||
imports.set(key, entry)
|
||||
}
|
||||
|
||||
const pending = entry.songs.get(title)
|
||||
if (pending) {
|
||||
pending.files[codec] ??= filePath
|
||||
continue
|
||||
}
|
||||
entry.songs.set(title, {
|
||||
name: title,
|
||||
files: { [codec]: filePath },
|
||||
artist:
|
||||
common.artist ?? common.artists ?? dbArtist?.name ?? entry.artist.name,
|
||||
length: Math.round(metadata.format.duration || 0),
|
||||
diskNumber: common.disk.of === 1 ? null : common.disk.no,
|
||||
track: common.track.no || 0,
|
||||
year: common.year || 0,
|
||||
date: releaseDate(common),
|
||||
genres: common.genre || [],
|
||||
} else if (dbCover !== null && dbCover.includes(codec)) {
|
||||
await ctx.runMutation(internal.library.updateArtistCover, {
|
||||
id,
|
||||
cover: null,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const deletedSongs = songs.flatMap((song) =>
|
||||
Object.keys(songFiles.get(song._id)!).length === 0 ? [song._id] : []
|
||||
)
|
||||
const deletedSongSet = new Set(deletedSongs)
|
||||
const updatedSongs = [...changedSongs].filter((id) => !deletedSongSet.has(id))
|
||||
async function syncAlbumCover(
|
||||
ctx: ActionCtx,
|
||||
codec: string,
|
||||
dbCover: string | null,
|
||||
diskPath: string,
|
||||
id: Id<"albums">
|
||||
) {
|
||||
const onDisk = await coverPathIfExists(diskPath)
|
||||
if (onDisk !== null) {
|
||||
if (dbCover !== onDisk) {
|
||||
await ctx.runMutation(internal.library.updateAlbumCover, {
|
||||
id,
|
||||
cover: onDisk,
|
||||
})
|
||||
}
|
||||
} else if (dbCover !== null && dbCover.includes(codec)) {
|
||||
await ctx.runMutation(internal.library.updateAlbumCover, {
|
||||
id,
|
||||
cover: null,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
async function purgeRemovedSongs(ctx: ActionCtx, ids: Id<"songs">[]) {
|
||||
if (ids.length === 0) {
|
||||
return
|
||||
}
|
||||
await ctx.runMutation(internal.library.purgeSongsFromUsersAndPlaylists, {
|
||||
ids,
|
||||
})
|
||||
}
|
||||
|
||||
async function purgeRemovedAlbums(ctx: ActionCtx, ids: Id<"albums">[]) {
|
||||
if (ids.length === 0) {
|
||||
return
|
||||
}
|
||||
await ctx.runMutation(internal.library.purgeAlbumsFromUsers, { ids })
|
||||
}
|
||||
|
||||
async function purgeRemovedArtists(ctx: ActionCtx, ids: Id<"artists">[]) {
|
||||
if (ids.length === 0) {
|
||||
return
|
||||
}
|
||||
await ctx.runMutation(internal.library.purgeArtistsFromUsers, { ids })
|
||||
}
|
||||
|
||||
async function removeCodecFromDatabase(ctx: ActionCtx, codec: string) {
|
||||
const allSongs = await ctx.runQuery(internal.library.getSongs)
|
||||
|
||||
const songsToRemove: Id<"songs">[] = []
|
||||
const songsToUpdate: { id: Id<"songs">; files: Record<string, string> }[] = []
|
||||
for (const song of allSongs) {
|
||||
if (!(codec in song.files)) {
|
||||
continue
|
||||
}
|
||||
|
||||
const { [codec]: _, ...update } = song.files
|
||||
if (Object.keys(update).length === 0) {
|
||||
songsToRemove.push(song._id)
|
||||
} else {
|
||||
songsToUpdate.push({
|
||||
id: song._id,
|
||||
files: update,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
await ctx.runMutation(internal.library.changeFilesForSongs, {
|
||||
songs: songsToUpdate,
|
||||
})
|
||||
await purgeRemovedSongs(ctx, songsToRemove)
|
||||
await ctx.runMutation(internal.library.removeSongs, { ids: songsToRemove })
|
||||
|
||||
const allAlbums = await ctx.runQuery(internal.library.getAlbums)
|
||||
const removedSongIds = new Set(songsToRemove)
|
||||
const albumsWithSongs = new Set(
|
||||
songs.flatMap((song) => (deletedSongSet.has(song._id) ? [] : [song.album]))
|
||||
allSongs.flatMap((song) =>
|
||||
removedSongIds.has(song._id) ? [] : [song.album]
|
||||
)
|
||||
)
|
||||
const emptyAlbums = albums
|
||||
const albumsToRemove = allAlbums
|
||||
.filter((album) => !albumsWithSongs.has(album._id))
|
||||
.map((album) => album._id)
|
||||
const emptyAlbumSet = new Set(emptyAlbums)
|
||||
await purgeRemovedAlbums(ctx, albumsToRemove)
|
||||
await ctx.runMutation(internal.library.removeAlbums, { ids: albumsToRemove })
|
||||
|
||||
const allArtists = await ctx.runQuery(internal.library.getArtists)
|
||||
const removedAlbumIds = new Set(albumsToRemove)
|
||||
const artistsWithAlbums = new Set(
|
||||
albums.flatMap((album) =>
|
||||
emptyAlbumSet.has(album._id) ? [] : [album.artist]
|
||||
allAlbums.flatMap((album) =>
|
||||
removedAlbumIds.has(album._id) ? [] : [album.artist]
|
||||
)
|
||||
)
|
||||
const emptyArtists = artists
|
||||
const artistsToRemove = allArtists
|
||||
.filter((artist) => !artistsWithAlbums.has(artist._id))
|
||||
.map((artist) => artist._id)
|
||||
const emptyArtistSet = new Set(emptyArtists)
|
||||
|
||||
// Albums and artists about to be deleted keep their cover.
|
||||
const artistById = new Map(artists.map((artist) => [artist._id, artist]))
|
||||
const artistCovers = artists.flatMap((artist) => {
|
||||
if (emptyArtistSet.has(artist._id)) {
|
||||
return []
|
||||
}
|
||||
const cover = pickCover(
|
||||
artist.cover,
|
||||
codecs.map((c) => `${DATA_DIR}/${c}/${artist.folder}/folder.jpg`),
|
||||
disk.covers
|
||||
)
|
||||
return cover === artist.cover ? [] : [{ id: artist._id, cover }]
|
||||
await purgeRemovedArtists(ctx, artistsToRemove)
|
||||
await ctx.runMutation(internal.library.removeArtists, {
|
||||
ids: artistsToRemove,
|
||||
})
|
||||
const albumCovers = albums.flatMap((album) => {
|
||||
const artist = artistById.get(album.artist)
|
||||
if (!artist || emptyAlbumSet.has(album._id)) {
|
||||
return []
|
||||
}
|
||||
const cover = pickCover(
|
||||
album.cover,
|
||||
codecs.map(
|
||||
(c) => `${DATA_DIR}/${c}/${artist.folder}/${album.folder}/cover.jpg`
|
||||
),
|
||||
disk.covers
|
||||
)
|
||||
return cover === album.cover ? [] : [{ id: album._id, cover }]
|
||||
})
|
||||
|
||||
// Writes. Imports run before the empty-album/artist sweeps, and those
|
||||
// mutations re-check emptiness, so nothing that gained songs is deleted.
|
||||
for (const batch of chunk(updatedSongs, SCAN_BATCH_SIZE)) {
|
||||
await ctx.runMutation(internal.library.changeFilesForSongs, {
|
||||
songs: batch.map((id) => ({ id, files: songFiles.get(id)! })),
|
||||
})
|
||||
}
|
||||
for (const batch of chunk(deletedSongs, SCAN_BATCH_SIZE)) {
|
||||
await ctx.runMutation(internal.library.deleteSongs, { ids: batch })
|
||||
}
|
||||
|
||||
let importBatch: ImportEntry[] = []
|
||||
let importBatchSongs = 0
|
||||
const flushImports = async () => {
|
||||
if (importBatch.length === 0) {
|
||||
return
|
||||
}
|
||||
await ctx.runMutation(internal.library.importAlbums, {
|
||||
albums: importBatch.map((entry) => ({
|
||||
...entry,
|
||||
songs: [...entry.songs.values()],
|
||||
})),
|
||||
})
|
||||
importBatch = []
|
||||
importBatchSongs = 0
|
||||
}
|
||||
for (const entry of imports.values()) {
|
||||
importBatch.push(entry)
|
||||
importBatchSongs += entry.songs.size
|
||||
if (importBatchSongs >= SCAN_BATCH_SIZE) {
|
||||
await flushImports()
|
||||
}
|
||||
}
|
||||
await flushImports()
|
||||
|
||||
for (const batch of chunk(artistCovers, SCAN_BATCH_SIZE)) {
|
||||
await ctx.runMutation(internal.library.updateArtistCovers, {
|
||||
artists: batch,
|
||||
})
|
||||
}
|
||||
for (const batch of chunk(albumCovers, SCAN_BATCH_SIZE)) {
|
||||
await ctx.runMutation(internal.library.updateAlbumCovers, {
|
||||
albums: batch,
|
||||
})
|
||||
}
|
||||
|
||||
let removedAlbums = 0
|
||||
for (const batch of chunk(emptyAlbums, SCAN_BATCH_SIZE)) {
|
||||
removedAlbums += await ctx.runMutation(internal.library.deleteEmptyAlbums, {
|
||||
ids: batch,
|
||||
})
|
||||
}
|
||||
|
||||
let removedArtists = 0
|
||||
for (const batch of chunk(emptyArtists, SCAN_BATCH_SIZE)) {
|
||||
removedArtists += await ctx.runMutation(
|
||||
internal.library.deleteEmptyArtists,
|
||||
{ ids: batch }
|
||||
)
|
||||
}
|
||||
|
||||
const importedSongs = [...imports.values()].reduce(
|
||||
(total, entry) => total + entry.songs.size,
|
||||
0
|
||||
)
|
||||
const summary =
|
||||
`songs: ${importedSongs} added, ${updatedSongs.length} updated, ` +
|
||||
`${deletedSongs.length} removed; albums removed: ${removedAlbums}; ` +
|
||||
`artists removed: ${removedArtists}; covers updated: ` +
|
||||
`${artistCovers.length + albumCovers.length}; ` +
|
||||
`files deferred: ${skipped}; ${Date.now() - startedAt}ms`
|
||||
console.log(`library scan: ${summary}`)
|
||||
return summary
|
||||
}
|
||||
|
||||
/** Runs one scan under the library scan lock; `null` if one is already running. */
|
||||
export const scheduledUpdateLibrary = internalAction({
|
||||
args: {},
|
||||
handler: async (ctx): Promise<string | null> => {
|
||||
const token = crypto.randomUUID()
|
||||
const acquired: boolean = await ctx.runMutation(
|
||||
internal.library.acquireLibraryScanLock,
|
||||
{ token, leaseMs: SCAN_LOCK_LEASE_MS }
|
||||
handler: async (ctx) => {
|
||||
const codecs = (await fs.readdir(DATA_DIR, { withFileTypes: true }))
|
||||
.filter((dirent) => dirent.isDirectory())
|
||||
.map((dirent) => dirent.name)
|
||||
|
||||
const dbCodecs = Array.from(
|
||||
new Map(
|
||||
(await ctx.runQuery(internal.library.getSongs))
|
||||
.map((song) => {
|
||||
return Object.keys(song.files)
|
||||
})
|
||||
.flat()
|
||||
.map((codec) => [codec, codec])
|
||||
).values()
|
||||
)
|
||||
if (!acquired) {
|
||||
console.log("library scan: already running, skipped")
|
||||
return null
|
||||
|
||||
for (const dbCodec of dbCodecs) {
|
||||
if (!codecs.includes(dbCodec)) {
|
||||
await removeCodecFromDatabase(ctx, dbCodec)
|
||||
}
|
||||
}
|
||||
try {
|
||||
return await scanLibrary(ctx)
|
||||
} finally {
|
||||
await ctx.runMutation(internal.library.releaseLibraryScanLock, { token })
|
||||
|
||||
// Removals
|
||||
for (const codec of codecs) {
|
||||
const dbArtists = await ctx.runQuery(internal.library.getArtists)
|
||||
const dbAlbums = await ctx.runQuery(internal.library.getAlbums)
|
||||
const dbSongs = await ctx.runQuery(internal.library.getSongs)
|
||||
|
||||
const dirtySongs = dbSongs
|
||||
.filter((song) => {
|
||||
return codec in song.files && !fsSync.existsSync(song.files[codec])
|
||||
})
|
||||
.map((song) => {
|
||||
const { [codec]: _, ...update } = song.files
|
||||
return { id: song._id, files: update }
|
||||
})
|
||||
|
||||
const songsToDelete = dirtySongs.filter(
|
||||
(song) => Object.keys(song.files).length === 0
|
||||
)
|
||||
const songsToUpdate = dirtySongs.filter(
|
||||
(song) => Object.keys(song.files).length !== 0
|
||||
)
|
||||
const songsToDeleteIDs = songsToDelete.map((song) => song.id)
|
||||
|
||||
await purgeRemovedSongs(ctx, songsToDeleteIDs)
|
||||
await ctx.runMutation(internal.library.removeSongs, {
|
||||
ids: songsToDeleteIDs,
|
||||
})
|
||||
await ctx.runMutation(internal.library.changeFilesForSongs, {
|
||||
songs: songsToUpdate,
|
||||
})
|
||||
|
||||
const deletedSongIds = new Set(songsToDeleteIDs)
|
||||
const albumsWithSongs = new Set(
|
||||
dbSongs.flatMap((song) =>
|
||||
deletedSongIds.has(song._id) ? [] : [song.album]
|
||||
)
|
||||
)
|
||||
const albumsToDelete = dbAlbums
|
||||
.filter((album) => !albumsWithSongs.has(album._id))
|
||||
.map((album) => album._id)
|
||||
await purgeRemovedAlbums(ctx, albumsToDelete)
|
||||
await ctx.runMutation(internal.library.removeAlbums, {
|
||||
ids: albumsToDelete,
|
||||
})
|
||||
|
||||
const deletedAlbumIds = new Set(albumsToDelete)
|
||||
const artistsWithAlbums = new Set(
|
||||
dbAlbums.flatMap((album) =>
|
||||
deletedAlbumIds.has(album._id) ? [] : [album.artist]
|
||||
)
|
||||
)
|
||||
const artistsToDelete = dbArtists
|
||||
.filter((artist) => !artistsWithAlbums.has(artist._id))
|
||||
.map((artist) => artist._id)
|
||||
await purgeRemovedArtists(ctx, artistsToDelete)
|
||||
await ctx.runMutation(internal.library.removeArtists, {
|
||||
ids: artistsToDelete,
|
||||
})
|
||||
}
|
||||
|
||||
// Additions
|
||||
for (const codec of codecs) {
|
||||
// Artists
|
||||
console.log(`${codec}: artists`)
|
||||
let dbArtists = await ctx.runQuery(internal.library.getArtists)
|
||||
const dbArtistFolders = dbArtists.map((artist) => artist.folder)
|
||||
const artists = (
|
||||
await fs.readdir(`${DATA_DIR}/${codec}`, { withFileTypes: true })
|
||||
)
|
||||
.filter((dirent) => dirent.isDirectory())
|
||||
.map((dirent) => dirent.name)
|
||||
const potentialArtists = artists.filter(
|
||||
(artist) => !dbArtistFolders.includes(artist)
|
||||
)
|
||||
|
||||
const newArtists = []
|
||||
for (const folder of potentialArtists) {
|
||||
const albums = (
|
||||
await fs.readdir(`${DATA_DIR}/${codec}/${folder}`, {
|
||||
withFileTypes: true,
|
||||
})
|
||||
)
|
||||
.filter((dirent) => dirent.isDirectory())
|
||||
.map((dirent) => dirent.name)
|
||||
|
||||
if (albums.length === 0) {
|
||||
continue
|
||||
}
|
||||
|
||||
for (let i = 0; i < albums.length; i++) {
|
||||
const songs = (
|
||||
await fs.readdir(`${DATA_DIR}/${codec}/${folder}/${albums[i]}`, {
|
||||
withFileTypes: true,
|
||||
})
|
||||
)
|
||||
.filter(
|
||||
(dirent) => !dirent.isDirectory() && dirent.name !== "cover.jpg"
|
||||
)
|
||||
.map((dirent) => dirent.name)
|
||||
|
||||
if (songs.length === 0) {
|
||||
continue
|
||||
}
|
||||
|
||||
try {
|
||||
const metadata = await music.parseFile(
|
||||
`${DATA_DIR}/${codec}/${folder}/${albums[i]}/${songs[0]}`,
|
||||
{ skipCovers: true }
|
||||
)
|
||||
|
||||
const artistCoverPath = `${DATA_DIR}/${codec}/${folder}/folder.jpg`
|
||||
const cover = await coverPathIfExists(artistCoverPath)
|
||||
|
||||
newArtists.push({
|
||||
name: metadata.common.albumartist || folder,
|
||||
folder,
|
||||
cover,
|
||||
})
|
||||
break
|
||||
} catch {}
|
||||
}
|
||||
}
|
||||
await ctx.runMutation(internal.library.createArtists, {
|
||||
artists: newArtists,
|
||||
})
|
||||
dbArtists = await ctx.runQuery(internal.library.getArtists)
|
||||
|
||||
// Albums
|
||||
console.log(`${codec}: albums`)
|
||||
let dbAlbums = await ctx.runQuery(internal.library.getAlbums)
|
||||
const newAlbums = []
|
||||
for (const dbArtist of dbArtists) {
|
||||
const dbAlbumsInArtist = dbAlbums.filter(
|
||||
(album) => album.artist === dbArtist._id
|
||||
)
|
||||
const dbAlbumFolders = dbAlbumsInArtist.map((album) => album.folder)
|
||||
|
||||
if (!fsSync.existsSync(`${DATA_DIR}/${codec}/${dbArtist.folder}`)) {
|
||||
continue
|
||||
}
|
||||
|
||||
const albums = (
|
||||
await fs.readdir(`${DATA_DIR}/${codec}/${dbArtist.folder}`, {
|
||||
withFileTypes: true,
|
||||
})
|
||||
)
|
||||
.filter((dirent) => dirent.isDirectory())
|
||||
.map((dirent) => dirent.name)
|
||||
const potentialAlbums = albums.filter(
|
||||
(album) => !dbAlbumFolders.includes(album)
|
||||
)
|
||||
|
||||
for (const potentialAlbum of potentialAlbums) {
|
||||
const potentialAlbumPath = `${DATA_DIR}/${codec}/${dbArtist.folder}/${potentialAlbum}`
|
||||
if (!fsSync.existsSync(potentialAlbumPath)) {
|
||||
continue
|
||||
}
|
||||
|
||||
const songs = (
|
||||
await fs.readdir(potentialAlbumPath, {
|
||||
withFileTypes: true,
|
||||
})
|
||||
)
|
||||
.filter(
|
||||
(dirent) => !dirent.isDirectory() && dirent.name !== "cover.jpg"
|
||||
)
|
||||
.map((dirent) => dirent.name)
|
||||
|
||||
if (songs.length === 0) {
|
||||
continue
|
||||
}
|
||||
|
||||
try {
|
||||
const metadata = await music.parseFile(
|
||||
`${potentialAlbumPath}/${songs[0]}`,
|
||||
{ skipCovers: true }
|
||||
)
|
||||
|
||||
const albumCoverPath = `${DATA_DIR}/${codec}/${dbArtist.folder}/${potentialAlbum}/cover.jpg`
|
||||
const cover = await coverPathIfExists(albumCoverPath)
|
||||
|
||||
newAlbums.push({
|
||||
name: metadata.common.album || potentialAlbum,
|
||||
folder: potentialAlbum,
|
||||
cover,
|
||||
year: metadata.common.year || 2026,
|
||||
date:
|
||||
metadata.common.date || `01-01-${metadata.common.year || 2026}`,
|
||||
artist: dbArtist._id,
|
||||
})
|
||||
} catch {}
|
||||
}
|
||||
}
|
||||
await ctx.runMutation(internal.library.createAlbums, {
|
||||
albums: newAlbums,
|
||||
})
|
||||
dbAlbums = await ctx.runQuery(internal.library.getAlbums)
|
||||
const dbSongs = await ctx.runQuery(internal.library.getSongs)
|
||||
|
||||
const dbAlbumsArtists = dbAlbums.map((album) => {
|
||||
return {
|
||||
...album,
|
||||
artist: dbArtists.find((artist) => artist._id === album.artist)!,
|
||||
}
|
||||
})
|
||||
|
||||
// Covers
|
||||
console.log(`${codec}: covers`)
|
||||
for (const dbArtist of dbArtists) {
|
||||
const artistPath = `${DATA_DIR}/${codec}/${dbArtist.folder}`
|
||||
if (!fsSync.existsSync(artistPath)) {
|
||||
continue
|
||||
}
|
||||
await syncArtistCover(
|
||||
ctx,
|
||||
codec,
|
||||
dbArtist.cover,
|
||||
`${artistPath}/folder.jpg`,
|
||||
dbArtist._id
|
||||
)
|
||||
}
|
||||
|
||||
for (const dbAlbum of dbAlbumsArtists) {
|
||||
const artistPath = `${DATA_DIR}/${codec}/${dbAlbum.artist.folder}`
|
||||
const albumPath = `${artistPath}/${dbAlbum.folder}`
|
||||
if (!fsSync.existsSync(artistPath) || !fsSync.existsSync(albumPath)) {
|
||||
continue
|
||||
}
|
||||
await syncAlbumCover(
|
||||
ctx,
|
||||
codec,
|
||||
dbAlbum.cover,
|
||||
`${albumPath}/cover.jpg`,
|
||||
dbAlbum._id
|
||||
)
|
||||
}
|
||||
|
||||
// Songs
|
||||
console.log(`${codec}: songs`)
|
||||
|
||||
const newSongs = []
|
||||
const updateSongs = []
|
||||
for (const dbAlbum of dbAlbumsArtists) {
|
||||
const dbSongsInAlbum = dbSongs.filter(
|
||||
(song) => song.album === dbAlbum._id
|
||||
)
|
||||
const dbAlreadyTracked = dbSongsInAlbum
|
||||
.filter((song) => codec in song.files)
|
||||
.map((song) => song.files[codec])
|
||||
|
||||
const artistPath = `${DATA_DIR}/${codec}/${dbAlbum.artist.folder}`
|
||||
const albumPath = `${artistPath}/${dbAlbum.folder}`
|
||||
if (!fsSync.existsSync(artistPath) || !fsSync.existsSync(albumPath)) {
|
||||
continue
|
||||
}
|
||||
|
||||
const songs = (await fs.readdir(albumPath, { withFileTypes: true }))
|
||||
.filter(
|
||||
(dirent) => !dirent.isDirectory() && dirent.name !== "cover.jpg"
|
||||
)
|
||||
.map((dirent) => dirent.name)
|
||||
.filter((song) => !dbAlreadyTracked.includes(`${albumPath}/${song}`))
|
||||
|
||||
for (const song of songs) {
|
||||
try {
|
||||
const path = `${DATA_DIR}/${codec}/${dbAlbum.artist.folder}/${dbAlbum.folder}/${song}`
|
||||
const metadata = await music.parseFile(path, { skipCovers: true })
|
||||
|
||||
if (!metadata.common.title) {
|
||||
continue
|
||||
}
|
||||
|
||||
const existingSong = dbSongsInAlbum.find(
|
||||
(dbSong) => dbSong.name === metadata.common.title
|
||||
)
|
||||
|
||||
if (existingSong) {
|
||||
if (
|
||||
!(codec in existingSong.files) ||
|
||||
existingSong.files[codec] !== path
|
||||
) {
|
||||
const update = { [codec]: path, ...existingSong.files }
|
||||
updateSongs.push({
|
||||
id: existingSong._id,
|
||||
files: update,
|
||||
})
|
||||
}
|
||||
} else {
|
||||
let files = { [codec]: path }
|
||||
|
||||
if (codec !== "atmos") {
|
||||
const artistPath = `${DATA_DIR}/atmos/${dbAlbum.artist.folder}`
|
||||
const albumPath = `${artistPath}/${dbAlbum.folder}`
|
||||
const path = `${albumPath}/${song}`
|
||||
|
||||
if (fsSync.existsSync(path)) {
|
||||
files = { atmos: path, ...files }
|
||||
}
|
||||
}
|
||||
if (codec !== "lossless") {
|
||||
const artistPath = `${DATA_DIR}/lossless/${dbAlbum.artist.folder}`
|
||||
const albumPath = `${artistPath}/${dbAlbum.folder}`
|
||||
const path = `${albumPath}/${song}`
|
||||
|
||||
if (fsSync.existsSync(path)) {
|
||||
files = { lossless: path, ...files }
|
||||
}
|
||||
}
|
||||
if (codec !== "normal") {
|
||||
const artistPath = `${DATA_DIR}/normal/${dbAlbum.artist.folder}`
|
||||
const albumPath = `${artistPath}/${dbAlbum.folder}`
|
||||
const path = `${albumPath}/${song}`
|
||||
|
||||
if (fsSync.existsSync(path)) {
|
||||
files = { normal: path, ...files }
|
||||
}
|
||||
}
|
||||
|
||||
newSongs.push({
|
||||
name: metadata.common.title,
|
||||
files,
|
||||
album: dbAlbum._id,
|
||||
artist:
|
||||
metadata.common.artist ??
|
||||
metadata.common.artists ??
|
||||
dbAlbum.artist.name,
|
||||
albumArtist: dbAlbum.artist._id,
|
||||
length: Math.round(metadata.format.duration || 0),
|
||||
diskNumber:
|
||||
metadata.common.disk.of === 1
|
||||
? null
|
||||
: metadata.common.disk.no,
|
||||
track: metadata.common.track.no || 0,
|
||||
year: metadata.common.year || 2026,
|
||||
date:
|
||||
metadata.common.date ||
|
||||
`01-01-${metadata.common.year || 2026}`,
|
||||
genres: metadata.common.genre || [],
|
||||
})
|
||||
}
|
||||
} catch {}
|
||||
}
|
||||
}
|
||||
await ctx.runMutation(internal.library.createSongs, { songs: newSongs })
|
||||
await ctx.runMutation(internal.library.changeFilesForSongs, {
|
||||
songs: updateSongs,
|
||||
})
|
||||
}
|
||||
|
||||
return "success"
|
||||
},
|
||||
})
|
||||
|
||||
@@ -556,13 +574,7 @@ export const updateLibrary = action({
|
||||
args: {},
|
||||
handler: async (ctx): Promise<string> => {
|
||||
await requireAdmin(ctx)
|
||||
const result: string | null = await ctx.runAction(
|
||||
internal.actions.scheduledUpdateLibrary
|
||||
)
|
||||
if (result === null) {
|
||||
throw new ConvexError("A library scan is already running")
|
||||
}
|
||||
return result
|
||||
return ctx.runAction(internal.actions.scheduledUpdateLibrary)
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ async function songEntities(ctx: QueryCtx, songs: Doc<"songs">[]) {
|
||||
albumId: album._id,
|
||||
duration: String(Math.max(0, Math.round(song.length))),
|
||||
genres: song.genres.join(", "),
|
||||
year: song.year ? String(song.year) : "",
|
||||
year: String(song.year),
|
||||
track: String(song.track),
|
||||
disk: String(song.diskNumber ?? ""),
|
||||
},
|
||||
@@ -112,7 +112,7 @@ async function albumEntities(ctx: QueryCtx, albums: Doc<"albums">[]) {
|
||||
metadata: {
|
||||
artistName: artist.name,
|
||||
artistId: artist._id,
|
||||
year: album.year ? String(album.year) : "",
|
||||
year: String(album.year),
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
@@ -1,138 +0,0 @@
|
||||
const { test } = require("node:test")
|
||||
const assert = require("node:assert/strict")
|
||||
const fs = require("node:fs/promises")
|
||||
const path = require("node:path")
|
||||
const os = require("node:os")
|
||||
const vm = require("node:vm")
|
||||
const ts = require("typescript")
|
||||
|
||||
// Exercise the action against real directory listings without a backend or
|
||||
// audio decoder. Metadata is fixed so renames and same-title copies match.
|
||||
async function scanner(root) {
|
||||
const module = { exports: {} }
|
||||
const source = ts.transpileModule(
|
||||
await fs.readFile(`${__dirname}/actions.ts`, "utf8"),
|
||||
{
|
||||
compilerOptions: {
|
||||
module: ts.ModuleKind.CommonJS,
|
||||
target: ts.ScriptTarget.ES2022,
|
||||
},
|
||||
}
|
||||
).outputText
|
||||
const library = new Proxy({}, { get: (_, name) => name })
|
||||
vm.runInNewContext(source, {
|
||||
module,
|
||||
exports: module.exports,
|
||||
process: { env: { DATA: root } },
|
||||
crypto: require("node:crypto"),
|
||||
console: { log() {} },
|
||||
require(name) {
|
||||
if (name.startsWith("node:")) return require(name)
|
||||
if (name === "convex/values") return require(name)
|
||||
if (name === "./_generated/api") return { api: {}, internal: { library } }
|
||||
if (name === "./_generated/server")
|
||||
return { action: (x) => x, internalAction: (x) => x }
|
||||
if (name === "music-metadata")
|
||||
return {
|
||||
parseFile: async () => ({
|
||||
common: { title: "Song", disk: {}, track: {} },
|
||||
format: { duration: 60 },
|
||||
}),
|
||||
}
|
||||
throw new Error(`Unexpected import ${name}`)
|
||||
},
|
||||
})
|
||||
return module.exports.scheduledUpdateLibrary.handler
|
||||
}
|
||||
|
||||
test("rescans keep tracked songs and covers stable, and a rename keeps the song ID", async (t) => {
|
||||
const root = await fs.mkdtemp(path.join(os.tmpdir(), "otunes-scan-"))
|
||||
t.after(() => fs.rm(root, { recursive: true, force: true }))
|
||||
const folder = (codec) => path.join(root, codec, "The Abnormals", "Album")
|
||||
for (const codec of ["normal", "lossless"]) {
|
||||
await fs.mkdir(folder(codec), { recursive: true })
|
||||
await fs.writeFile(path.join(folder(codec), "song.mp3"), "audio")
|
||||
await fs.writeFile(path.join(folder(codec), "cover.jpg"), "cover")
|
||||
await fs.writeFile(path.join(folder(codec), "..", "folder.jpg"), "cover")
|
||||
}
|
||||
const artists = [
|
||||
{
|
||||
_id: "artist",
|
||||
name: "The Abnormals",
|
||||
folder: "The Abnormals",
|
||||
cover: path.join(root, "lossless", "The Abnormals", "folder.jpg"),
|
||||
},
|
||||
]
|
||||
const albums = [
|
||||
{
|
||||
_id: "album",
|
||||
artist: "artist",
|
||||
folder: "Album",
|
||||
cover: path.join(folder("lossless"), "cover.jpg"),
|
||||
},
|
||||
]
|
||||
const songs = [
|
||||
{
|
||||
_id: "song",
|
||||
name: "Song",
|
||||
album: "album",
|
||||
files: Object.fromEntries(
|
||||
["normal", "lossless"].map((c) => [c, path.join(folder(c), "song.mp3")])
|
||||
),
|
||||
},
|
||||
]
|
||||
const writes = []
|
||||
let locked = false
|
||||
const ctx = {
|
||||
async runQuery(name) {
|
||||
const page = {
|
||||
scanArtistsPage: artists,
|
||||
scanAlbumsPage: albums,
|
||||
scanSongsPage: songs,
|
||||
}[name]
|
||||
assert.ok(page, name)
|
||||
return { page, isDone: true, continueCursor: "" }
|
||||
},
|
||||
async runMutation(name, args) {
|
||||
if (name === "acquireLibraryScanLock") return !locked
|
||||
if (name === "releaseLibraryScanLock") return
|
||||
writes.push({ name, args })
|
||||
if (name === "changeFilesForSongs") {
|
||||
for (const update of args.songs)
|
||||
songs.find((s) => s._id === update.id).files = update.files
|
||||
return
|
||||
}
|
||||
throw new Error(`Unexpected write ${name}`)
|
||||
},
|
||||
}
|
||||
const scan = await scanner(root)
|
||||
await scan(ctx)
|
||||
assert.equal(writes.length, 0)
|
||||
await fs.writeFile(path.join(folder("normal"), "copy.mp3"), "audio")
|
||||
await scan(ctx)
|
||||
await scan(ctx)
|
||||
assert.equal(writes.length, 0)
|
||||
await fs.rm(path.join(folder("normal"), "copy.mp3"))
|
||||
await fs.rename(
|
||||
path.join(folder("normal"), "song.mp3"),
|
||||
path.join(folder("normal"), "renamed.mp3")
|
||||
)
|
||||
await scan(ctx)
|
||||
assert.equal(writes.length, 1)
|
||||
assert.equal(writes[0].args.songs[0].id, "song")
|
||||
assert.equal(
|
||||
songs[0].files.normal,
|
||||
path.join(folder("normal"), "renamed.mp3")
|
||||
)
|
||||
await scan(ctx)
|
||||
assert.equal(writes.length, 1)
|
||||
locked = true
|
||||
assert.equal(await scan(ctx), null)
|
||||
assert.equal(writes.length, 1)
|
||||
locked = false
|
||||
for (const codec of ["normal", "lossless"]) {
|
||||
await fs.rm(folder(codec), { recursive: true })
|
||||
}
|
||||
await assert.rejects(scan(ctx), /refusing to empty the library/)
|
||||
assert.equal(writes.length, 1)
|
||||
})
|
||||
+218
-319
@@ -3,7 +3,7 @@ import { getAuthUserId } from "@convex-dev/auth/server"
|
||||
import { internalMutation, internalQuery, query } from "./_generated/server"
|
||||
import { ConvexError, v } from "convex/values"
|
||||
import type { Doc, Id } from "./_generated/dataModel"
|
||||
import type { MutationCtx, QueryCtx } from "./_generated/server"
|
||||
import type { QueryCtx } from "./_generated/server"
|
||||
import type { PaginationOptions, PaginationResult } from "convex/server"
|
||||
import type {
|
||||
BrowseAlbum,
|
||||
@@ -545,7 +545,7 @@ export const browseAlbumDetail = query({
|
||||
|
||||
return {
|
||||
...toBrowseAlbum(album, artist),
|
||||
year: primarySong?.year || null,
|
||||
year: primarySong?.year ?? null,
|
||||
genre: primarySong?.genres[0] ?? null,
|
||||
releaseDate: album.date,
|
||||
hasLossless: songs.some((song) => "lossless" in song.files),
|
||||
@@ -845,55 +845,27 @@ export const browseRecentlyPlayedPaginated = query({
|
||||
},
|
||||
})
|
||||
|
||||
export const scanArtistsPage = internalQuery({
|
||||
args: { paginationOpts: paginationOptsValidator },
|
||||
handler: async (ctx, args) => {
|
||||
const result = await ctx.db.query("artists").paginate(args.paginationOpts)
|
||||
return {
|
||||
...result,
|
||||
page: result.page.map(({ _id, name, folder, cover }) => ({
|
||||
_id,
|
||||
name,
|
||||
folder,
|
||||
cover,
|
||||
})),
|
||||
}
|
||||
export const getArtists = internalQuery({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
return await ctx.db.query("artists").collect()
|
||||
},
|
||||
})
|
||||
|
||||
export const scanAlbumsPage = internalQuery({
|
||||
args: { paginationOpts: paginationOptsValidator },
|
||||
handler: async (ctx, args) => {
|
||||
const result = await ctx.db.query("albums").paginate(args.paginationOpts)
|
||||
return {
|
||||
...result,
|
||||
page: result.page.map(({ _id, folder, cover, artist }) => ({
|
||||
_id,
|
||||
folder,
|
||||
cover,
|
||||
artist,
|
||||
})),
|
||||
}
|
||||
export const getAlbums = internalQuery({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
return await ctx.db.query("albums").collect()
|
||||
},
|
||||
})
|
||||
|
||||
export const scanSongsPage = internalQuery({
|
||||
args: { paginationOpts: paginationOptsValidator },
|
||||
handler: async (ctx, args) => {
|
||||
const result = await ctx.db.query("songs").paginate(args.paginationOpts)
|
||||
return {
|
||||
...result,
|
||||
page: result.page.map(({ _id, name, files, album }) => ({
|
||||
_id,
|
||||
name,
|
||||
files,
|
||||
album,
|
||||
})),
|
||||
}
|
||||
export const getSongs = internalQuery({
|
||||
args: {},
|
||||
handler: async (ctx) => {
|
||||
return await ctx.db.query("songs").collect()
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
/** Public: share-link previews load covers without a session. */
|
||||
export const getArtistCover = query({
|
||||
args: { id: v.id("artists") },
|
||||
@@ -990,260 +962,225 @@ export const getSongsForPlayback = query({
|
||||
},
|
||||
})
|
||||
|
||||
/**
|
||||
* Creates (or reuses, matched by folder) the artist and album for each entry
|
||||
* together with its songs, so an album never exists without songs.
|
||||
*/
|
||||
export const importAlbums = internalMutation({
|
||||
export const createArtists = internalMutation({
|
||||
args: {
|
||||
albums: v.array(
|
||||
artists: v.array(
|
||||
v.object({
|
||||
artist: v.object({
|
||||
name: v.string(),
|
||||
folder: v.string(),
|
||||
cover: v.nullable(v.string()),
|
||||
}),
|
||||
album: v.object({
|
||||
name: v.string(),
|
||||
folder: v.string(),
|
||||
cover: v.nullable(v.string()),
|
||||
year: v.number(),
|
||||
date: v.string(),
|
||||
}),
|
||||
songs: v.array(
|
||||
v.object({
|
||||
name: v.string(),
|
||||
files: v.record(v.string(), v.string()),
|
||||
artist: v.union(v.string(), v.array(v.string())),
|
||||
length: v.number(),
|
||||
diskNumber: v.nullable(v.number()),
|
||||
track: v.number(),
|
||||
year: v.number(),
|
||||
date: v.string(),
|
||||
genres: v.array(v.string()),
|
||||
})
|
||||
),
|
||||
name: v.string(),
|
||||
folder: v.string(),
|
||||
cover: v.nullable(v.string()),
|
||||
})
|
||||
),
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
for (const entry of args.albums) {
|
||||
if (entry.songs.length === 0) {
|
||||
for (const artist of args.artists) {
|
||||
const existing = await ctx.db
|
||||
.query("artists")
|
||||
.withIndex("by_folder", (q) => q.eq("folder", artist.folder))
|
||||
.first()
|
||||
if (existing) {
|
||||
continue
|
||||
}
|
||||
await ctx.db.insert("artists", artist)
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
const artistId =
|
||||
(
|
||||
await ctx.db
|
||||
.query("artists")
|
||||
.withIndex("by_folder", (q) => q.eq("folder", entry.artist.folder))
|
||||
.first()
|
||||
)?._id ?? (await ctx.db.insert("artists", entry.artist))
|
||||
export const createAlbums = internalMutation({
|
||||
args: {
|
||||
albums: v.array(
|
||||
v.object({
|
||||
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) => {
|
||||
for (const album of args.albums) {
|
||||
const existing = await ctx.db
|
||||
.query("albums")
|
||||
.withIndex("by_all", (q) =>
|
||||
q.eq("artist", album.artist).eq("folder", album.folder)
|
||||
)
|
||||
.first()
|
||||
if (existing) {
|
||||
continue
|
||||
}
|
||||
await ctx.db.insert("albums", album)
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
const albumId =
|
||||
(
|
||||
await ctx.db
|
||||
.query("albums")
|
||||
.withIndex("by_all", (q) =>
|
||||
q.eq("artist", artistId).eq("folder", entry.album.folder)
|
||||
)
|
||||
.first()
|
||||
)?._id ??
|
||||
(await ctx.db.insert("albums", { ...entry.album, artist: artistId }))
|
||||
export const createSongs = internalMutation({
|
||||
args: {
|
||||
songs: v.array(
|
||||
v.object({
|
||||
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) => {
|
||||
for (const song of args.songs) {
|
||||
const existing = await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_all", (q) =>
|
||||
q
|
||||
.eq("name", song.name)
|
||||
.eq("albumArtist", song.albumArtist)
|
||||
.eq("album", song.album)
|
||||
)
|
||||
.first()
|
||||
if (existing) {
|
||||
await ctx.db.patch(existing._id, {
|
||||
files: { ...existing.files, ...song.files },
|
||||
})
|
||||
continue
|
||||
}
|
||||
await ctx.db.insert("songs", song)
|
||||
}
|
||||
|
||||
for (const song of entry.songs) {
|
||||
const existing = await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_all", (q) =>
|
||||
q
|
||||
.eq("name", song.name)
|
||||
.eq("albumArtist", artistId)
|
||||
.eq("album", albumId)
|
||||
)
|
||||
.first()
|
||||
if (existing) {
|
||||
await ctx.db.patch(existing._id, {
|
||||
files: { ...existing.files, ...song.files },
|
||||
})
|
||||
continue
|
||||
return
|
||||
},
|
||||
})
|
||||
|
||||
export const purgeSongsFromUsersAndPlaylists = internalMutation({
|
||||
args: { ids: v.array(v.id("songs")) },
|
||||
handler: async (ctx, args) => {
|
||||
const remove = new Set(args.ids)
|
||||
if (remove.size === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
for (const playlist of await ctx.db.query("playlists").collect()) {
|
||||
if (playlist.songs.some((songId) => remove.has(songId))) {
|
||||
await ctx.db.patch(playlist._id, {
|
||||
songs: playlist.songs.filter((songId) => !remove.has(songId)),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
for (const user of await ctx.db.query("users").collect()) {
|
||||
const favoriteSongs = user.favoriteSongs
|
||||
const songQueue = user.songQueue
|
||||
const queueHistory = user.queueHistory
|
||||
const patch: Partial<
|
||||
Pick<
|
||||
Doc<"users">,
|
||||
"favoriteSongs" | "songQueue" | "queueHistory" | "currentSongProgress"
|
||||
>
|
||||
> = {}
|
||||
|
||||
if (favoriteSongs?.some((songId) => remove.has(songId))) {
|
||||
patch.favoriteSongs = favoriteSongs.filter(
|
||||
(songId) => !remove.has(songId)
|
||||
)
|
||||
}
|
||||
if (songQueue?.some((songId) => remove.has(songId))) {
|
||||
const currentRemoved = remove.has(songQueue[0])
|
||||
patch.songQueue = songQueue.filter((songId) => !remove.has(songId))
|
||||
if (currentRemoved) {
|
||||
patch.currentSongProgress = 0
|
||||
}
|
||||
await ctx.db.insert("songs", {
|
||||
...song,
|
||||
album: albumId,
|
||||
albumArtist: artistId,
|
||||
}
|
||||
if (queueHistory?.some((songId) => remove.has(songId))) {
|
||||
patch.queueHistory = queueHistory.filter(
|
||||
(songId) => !remove.has(songId)
|
||||
)
|
||||
}
|
||||
if (Object.keys(patch).length > 0) {
|
||||
await ctx.db.patch(user._id, patch)
|
||||
}
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
export const purgeAlbumsFromUsers = internalMutation({
|
||||
args: { ids: v.array(v.id("albums")) },
|
||||
handler: async (ctx, args) => {
|
||||
const remove = new Set(args.ids)
|
||||
if (remove.size === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
for (const user of await ctx.db.query("users").collect()) {
|
||||
const favoriteAlbums = user.favoriteAlbums
|
||||
const recentlyPlayed = user.recentlyPlayed
|
||||
const patch: Partial<
|
||||
Pick<Doc<"users">, "favoriteAlbums" | "recentlyPlayed">
|
||||
> = {}
|
||||
if (favoriteAlbums?.some((albumId) => remove.has(albumId))) {
|
||||
patch.favoriteAlbums = favoriteAlbums.filter(
|
||||
(albumId) => !remove.has(albumId)
|
||||
)
|
||||
}
|
||||
if (
|
||||
recentlyPlayed?.some((itemId) => remove.has(itemId as Id<"albums">))
|
||||
) {
|
||||
patch.recentlyPlayed = recentlyPlayed.filter(
|
||||
(itemId) => !remove.has(itemId as Id<"albums">)
|
||||
)
|
||||
}
|
||||
if (Object.keys(patch).length > 0) {
|
||||
await ctx.db.patch(user._id, patch)
|
||||
}
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
export const purgeArtistsFromUsers = internalMutation({
|
||||
args: { ids: v.array(v.id("artists")) },
|
||||
handler: async (ctx, args) => {
|
||||
const remove = new Set(args.ids)
|
||||
if (remove.size === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
for (const user of await ctx.db.query("users").collect()) {
|
||||
const favoriteArtists = user.favoriteArtists
|
||||
if (favoriteArtists?.some((artistId) => remove.has(artistId))) {
|
||||
await ctx.db.patch(user._id, {
|
||||
favoriteArtists: favoriteArtists.filter(
|
||||
(artistId) => !remove.has(artistId)
|
||||
),
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
/** Deletes songs and removes them from every playlist, favorite and queue. */
|
||||
export const deleteSongs = internalMutation({
|
||||
args: { ids: v.array(v.id("songs")) },
|
||||
handler: async (ctx, args) => {
|
||||
for (const id of args.ids) {
|
||||
await ctx.db.delete("songs", id)
|
||||
}
|
||||
await purgeSongsFromUsersAndPlaylists(ctx, new Set(args.ids))
|
||||
await recordIntentCatalogChanges(ctx, "song", args.ids, true)
|
||||
},
|
||||
})
|
||||
|
||||
/** Deletes the albums that still have no songs when this mutation runs. */
|
||||
export const deleteEmptyAlbums = internalMutation({
|
||||
args: { ids: v.array(v.id("albums")) },
|
||||
handler: async (ctx, args) => {
|
||||
const deleted = new Set<Id<"albums">>()
|
||||
for (const id of args.ids) {
|
||||
const song = await ctx.db
|
||||
.query("songs")
|
||||
.withIndex("by_album", (q) => q.eq("album", id))
|
||||
.first()
|
||||
if (song === null && (await ctx.db.get("albums", id)) !== null) {
|
||||
await ctx.db.delete("albums", id)
|
||||
deleted.add(id)
|
||||
}
|
||||
}
|
||||
await purgeAlbumsFromUsers(ctx, deleted)
|
||||
await recordIntentCatalogChanges(ctx, "album", [...deleted], true)
|
||||
return deleted.size
|
||||
},
|
||||
})
|
||||
|
||||
/** Deletes the artists that still have no albums when this mutation runs. */
|
||||
export const deleteEmptyArtists = internalMutation({
|
||||
export const removeArtists = internalMutation({
|
||||
args: { ids: v.array(v.id("artists")) },
|
||||
handler: async (ctx, args) => {
|
||||
const deleted = new Set<Id<"artists">>()
|
||||
for (const id of args.ids) {
|
||||
const album = await ctx.db
|
||||
.query("albums")
|
||||
.withIndex("by_artist", (q) => q.eq("artist", id))
|
||||
.first()
|
||||
if (album === null && (await ctx.db.get("artists", id)) !== null) {
|
||||
await ctx.db.delete("artists", id)
|
||||
deleted.add(id)
|
||||
}
|
||||
await ctx.db.delete("artists", id)
|
||||
}
|
||||
await purgeArtistsFromUsers(ctx, deleted)
|
||||
await recordIntentCatalogChanges(ctx, "artist", [...deleted], true)
|
||||
return deleted.size
|
||||
await recordIntentCatalogChanges(ctx, "artist", args.ids, true)
|
||||
},
|
||||
})
|
||||
|
||||
async function purgeSongsFromUsersAndPlaylists(
|
||||
ctx: MutationCtx,
|
||||
remove: Set<Id<"songs">>
|
||||
) {
|
||||
if (remove.size === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
for (const playlist of await ctx.db.query("playlists").collect()) {
|
||||
if (playlist.songs.some((songId) => remove.has(songId))) {
|
||||
await ctx.db.patch(playlist._id, {
|
||||
songs: playlist.songs.filter((songId) => !remove.has(songId)),
|
||||
})
|
||||
export const removeAlbums = internalMutation({
|
||||
args: { ids: v.array(v.id("albums")) },
|
||||
handler: async (ctx, args) => {
|
||||
for (const id of args.ids) {
|
||||
await ctx.db.delete("albums", id)
|
||||
}
|
||||
}
|
||||
|
||||
for (const state of await ctx.db.query("playbackStates").collect()) {
|
||||
if (
|
||||
state.songQueue.some((songId) => remove.has(songId)) ||
|
||||
state.queueHistory.some((songId) => remove.has(songId))
|
||||
) {
|
||||
await ctx.db.patch(state._id, {
|
||||
songQueue: state.songQueue.filter((songId) => !remove.has(songId)),
|
||||
queueHistory: state.queueHistory.filter(
|
||||
(songId) => !remove.has(songId)
|
||||
),
|
||||
revision: state.revision + 1,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Legacy queue fields stay until `migrations.migrateUsers` clears them.
|
||||
for (const user of await ctx.db.query("users").collect()) {
|
||||
const favoriteSongs = user.favoriteSongs
|
||||
const songQueue = user.songQueue
|
||||
const queueHistory = user.queueHistory
|
||||
const patch: Partial<
|
||||
Pick<
|
||||
Doc<"users">,
|
||||
"favoriteSongs" | "songQueue" | "queueHistory" | "currentSongProgress"
|
||||
>
|
||||
> = {}
|
||||
|
||||
if (favoriteSongs?.some((songId) => remove.has(songId))) {
|
||||
patch.favoriteSongs = favoriteSongs.filter(
|
||||
(songId) => !remove.has(songId)
|
||||
)
|
||||
}
|
||||
if (songQueue?.some((songId) => remove.has(songId))) {
|
||||
const currentRemoved = remove.has(songQueue[0])
|
||||
patch.songQueue = songQueue.filter((songId) => !remove.has(songId))
|
||||
if (currentRemoved) {
|
||||
patch.currentSongProgress = 0
|
||||
}
|
||||
}
|
||||
if (queueHistory?.some((songId) => remove.has(songId))) {
|
||||
patch.queueHistory = queueHistory.filter((songId) => !remove.has(songId))
|
||||
}
|
||||
if (Object.keys(patch).length > 0) {
|
||||
await ctx.db.patch(user._id, patch)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function purgeAlbumsFromUsers(
|
||||
ctx: MutationCtx,
|
||||
remove: Set<Id<"albums">>
|
||||
) {
|
||||
if (remove.size === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
for (const user of await ctx.db.query("users").collect()) {
|
||||
const favoriteAlbums = user.favoriteAlbums
|
||||
const recentlyPlayed = user.recentlyPlayed
|
||||
const patch: Partial<
|
||||
Pick<Doc<"users">, "favoriteAlbums" | "recentlyPlayed">
|
||||
> = {}
|
||||
if (favoriteAlbums?.some((albumId) => remove.has(albumId))) {
|
||||
patch.favoriteAlbums = favoriteAlbums.filter(
|
||||
(albumId) => !remove.has(albumId)
|
||||
)
|
||||
}
|
||||
if (recentlyPlayed?.some((itemId) => remove.has(itemId as Id<"albums">))) {
|
||||
patch.recentlyPlayed = recentlyPlayed.filter(
|
||||
(itemId) => !remove.has(itemId as Id<"albums">)
|
||||
)
|
||||
}
|
||||
if (Object.keys(patch).length > 0) {
|
||||
await ctx.db.patch(user._id, patch)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function purgeArtistsFromUsers(
|
||||
ctx: MutationCtx,
|
||||
remove: Set<Id<"artists">>
|
||||
) {
|
||||
if (remove.size === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
for (const user of await ctx.db.query("users").collect()) {
|
||||
const favoriteArtists = user.favoriteArtists
|
||||
if (favoriteArtists?.some((artistId) => remove.has(artistId))) {
|
||||
await ctx.db.patch(user._id, {
|
||||
favoriteArtists: favoriteArtists.filter(
|
||||
(artistId) => !remove.has(artistId)
|
||||
),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
await recordIntentCatalogChanges(ctx, "album", args.ids, true)
|
||||
},
|
||||
})
|
||||
|
||||
export const changeFilesForSongs = internalMutation({
|
||||
args: {
|
||||
@@ -1259,64 +1196,26 @@ export const changeFilesForSongs = internalMutation({
|
||||
},
|
||||
})
|
||||
|
||||
export const updateArtistCovers = internalMutation({
|
||||
args: {
|
||||
artists: v.array(
|
||||
v.object({ id: v.id("artists"), cover: v.nullable(v.string()) })
|
||||
),
|
||||
},
|
||||
export const updateArtistCover = internalMutation({
|
||||
args: { id: v.id("artists"), cover: v.nullable(v.string()) },
|
||||
handler: async (ctx, args) => {
|
||||
for (const { id, cover } of args.artists) {
|
||||
if ((await ctx.db.get("artists", id)) !== null) {
|
||||
await ctx.db.patch("artists", id, { cover })
|
||||
}
|
||||
}
|
||||
return await ctx.db.patch("artists", args.id, { cover: args.cover })
|
||||
},
|
||||
})
|
||||
|
||||
export const updateAlbumCovers = internalMutation({
|
||||
args: {
|
||||
albums: v.array(
|
||||
v.object({ id: v.id("albums"), cover: v.nullable(v.string()) })
|
||||
),
|
||||
},
|
||||
export const updateAlbumCover = internalMutation({
|
||||
args: { id: v.id("albums"), cover: v.nullable(v.string()) },
|
||||
handler: async (ctx, args) => {
|
||||
for (const { id, cover } of args.albums) {
|
||||
if ((await ctx.db.get("albums", id)) !== null) {
|
||||
await ctx.db.patch("albums", id, { cover })
|
||||
}
|
||||
}
|
||||
return await ctx.db.patch("albums", args.id, { cover: args.cover })
|
||||
},
|
||||
})
|
||||
|
||||
/**
|
||||
* Takes the single library scan lease if it is free or expired. The lease
|
||||
* outlives the action timeout so a crashed scan cannot hold it forever.
|
||||
*/
|
||||
export const acquireLibraryScanLock = internalMutation({
|
||||
args: { token: v.string(), leaseMs: v.number() },
|
||||
export const removeSongs = internalMutation({
|
||||
args: { ids: v.array(v.id("songs")) },
|
||||
handler: async (ctx, args) => {
|
||||
const now = Date.now()
|
||||
const lock = await ctx.db.query("libraryScanLock").first()
|
||||
if (lock && lock.token !== args.token && lock.expiresAt > now) {
|
||||
return false
|
||||
}
|
||||
const expiresAt = now + args.leaseMs
|
||||
if (lock) {
|
||||
await ctx.db.patch(lock._id, { token: args.token, expiresAt })
|
||||
} else {
|
||||
await ctx.db.insert("libraryScanLock", { token: args.token, expiresAt })
|
||||
}
|
||||
return true
|
||||
},
|
||||
})
|
||||
|
||||
export const releaseLibraryScanLock = internalMutation({
|
||||
args: { token: v.string() },
|
||||
handler: async (ctx, args) => {
|
||||
const lock = await ctx.db.query("libraryScanLock").first()
|
||||
if (lock?.token === args.token) {
|
||||
await ctx.db.delete(lock._id)
|
||||
for (const id of args.ids) {
|
||||
await ctx.db.delete("songs", id)
|
||||
}
|
||||
await recordIntentCatalogChanges(ctx, "song", args.ids, true)
|
||||
},
|
||||
})
|
||||
@@ -78,10 +78,6 @@ export default defineSchema({
|
||||
appSettings: defineTable({
|
||||
disableAccountCreation: v.boolean(),
|
||||
}),
|
||||
libraryScanLock: defineTable({
|
||||
token: v.string(),
|
||||
expiresAt: v.number(),
|
||||
}),
|
||||
artists: defineTable({
|
||||
name: v.string(),
|
||||
folder: v.string(),
|
||||
|
||||
@@ -33,10 +33,8 @@ export type BrowseAlbumTrack = {
|
||||
}
|
||||
|
||||
export type BrowseAlbumDetail = BrowseAlbum & {
|
||||
/** `null` when the files have no year tag; clients hide it. */
|
||||
year: number | null
|
||||
genre: string | null
|
||||
/** Empty when unknown; clients hide it. */
|
||||
releaseDate: string
|
||||
hasLossless: boolean
|
||||
hasAtmos: boolean
|
||||
|
||||
Reference in new issue
Block a user