Compare commits

..
50 changed files with 567 additions and 1072 deletions

No files matched your search

-97
View File
@@ -1,97 +0,0 @@
name: Mobile Build
# Tags build preview Android and iOS and attach them to the tag's release.
# Manual runs pick the profile and platforms and keep the builds as run artifacts.
on:
push:
tags:
- 'v*'
workflow_dispatch:
inputs:
profile:
description: EAS build profile
type: choice
options:
- preview
- development
default: preview
platforms:
description: Platforms to build
type: choice
options:
- all
- android
- ios
default: all
env:
# Tag pushes have no inputs, so they fall back to preview on all platforms.
PROFILE: ${{ inputs.profile || 'preview' }}
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
jobs:
android:
if: inputs.platforms != 'ios'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 24
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
- uses: android-actions/setup-android@v3
- name: Build
id: build
working-directory: apps/mobile
run: |
version=$([[ "$GITHUB_REF" == refs/tags/* ]] && echo "$GITHUB_REF_NAME" || echo "${GITHUB_SHA::7}")
out="$PWD/otunes-$PROFILE-$version.apk"
npx --yes eas-cli@latest build --local --non-interactive --platform android --profile "$PROFILE" --output "$out"
echo "file=$out" >> "$GITHUB_OUTPUT"
- uses: actions/upload-artifact@v3
with:
name: android-${{ env.PROFILE }}
path: ${{ steps.build.outputs.file }}
- name: Attach to release
if: startsWith(gitea.ref, 'refs/tags/')
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: scripts/upload-release-asset.sh "${{ steps.build.outputs.file }}"
ios:
if: inputs.platforms != 'android'
# Queues until a self-hosted macOS runner (Xcode, CocoaPods, fastlane) picks it up.
runs-on: macos
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 24
- name: Build
id: build
working-directory: apps/mobile
run: |
version=$([[ "$GITHUB_REF" == refs/tags/* ]] && echo "$GITHUB_REF_NAME" || echo "${GITHUB_SHA::7}")
out="$PWD/otunes-$PROFILE-$version.ipa"
npx --yes eas-cli@latest build --local --non-interactive --platform ios --profile "$PROFILE" --output "$out"
echo "file=$out" >> "$GITHUB_OUTPUT"
- uses: actions/upload-artifact@v3
with:
name: ios-${{ env.PROFILE }}
path: ${{ steps.build.outputs.file }}
- name: Attach to release
if: startsWith(gitea.ref, 'refs/tags/')
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: scripts/upload-release-asset.sh "${{ steps.build.outputs.file }}"
+2 -2
View File
@@ -121,7 +121,7 @@ RUN curl -fsSL -o ffmpeg.tar.xz "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VER
# Decoders cover the library formats (FLAC, ALAC/AAC in m4a, MP3, Opus,
# Vorbis, WavPack, WMA, E-AC-3/TrueHD for Atmos). Encoders are only the two
# the app writes: AAC (HLS, ADTS and .m4a downloads) and FLAC.
# the app writes: AAC (HLS and ADTS) and FLAC.
RUN ./configure \
--prefix=/opt/ffmpeg \
--disable-shared \
@@ -138,7 +138,7 @@ RUN ./configure \
--enable-demuxer=aac,ac3,aiff,ape,asf,au,caf,dsf,flac,matroska,mov,mp3,ogg,wav,wv \
--enable-decoder=aac,aac_latm,ac3,alac,ape,dsd_lsbf,dsd_msbf,eac3,flac,mlp,mp3,opus,pcm_f32le,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32be,pcm_s32le,pcm_u8,truehd,vorbis,wavpack,wmav1,wmav2 \
--enable-encoder=aac,flac \
--enable-muxer=adts,flac,hls,ipod,mpegts \
--enable-muxer=adts,flac,hls,mpegts \
--enable-parser=aac,aac_latm,ac3,flac,mpegaudio,opus,vorbis \
--enable-bsf=aac_adtstoasc \
--enable-filter=aresample,aformat \
-7
View File
@@ -32,13 +32,6 @@ export default ({ config }: ConfigContext): ExpoConfig => {
...config,
plugins: [
...(config.plugins ?? []),
[
"react-native-continued-task",
{
// Matches TASK_PREFIX in hooks/use-background-downloads.ts.
identifierPrefixes: [`${bundleIdentifier}.downloads`],
},
],
...(process.env.MAC_CATALYST === "1"
? ["./plugins/with-mac-catalyst"]
: []),
@@ -1,8 +1,11 @@
import { Stack } from "expo-router"
import { TabStackContext } from "@/lib/app-navigation"
import { renderTabScreenContent } from "@/components/tab-screen-content"
import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
import {
inlineTitleOptions,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
export default function TabletSectionLayout({ segment }: { segment: string }) {
@@ -11,18 +14,17 @@ export default function TabletSectionLayout({ segment }: { segment: string }) {
return (
<TabletSectionContext value={section}>
<TabStackContext value={section?.group}>
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...options,
title:
route.name === "index"
? section?.title
: tabStackScreenTitles[route.name],
})}
/>
</TabStackContext>
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...options,
...inlineTitleOptions,
title:
route.name === "index"
? section?.title
: tabStackScreenTitles[route.name],
})}
/>
</TabletSectionContext>
)
}
+18 -23
View File
@@ -1,9 +1,13 @@
import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { TabStackContext } from "@/lib/app-navigation"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
import {
inlineTitleOptions,
showHeaderProfile,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
export const unstable_settings = {
anchor: "index",
@@ -13,26 +17,17 @@ export default function HomeLayout() {
const baseOptions = useStackScreenOptions({ title: "Home" })
return (
<TabStackContext value="home">
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Home",
headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
unstable_headerRightItems:
route.name === "index"
? () => [
{
type: "custom",
element: <ProfileHeaderButton />,
hidesSharedBackground: true,
},
]
: undefined,
})}
/>
</TabStackContext>
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
...inlineTitleOptions,
title: tabStackScreenTitles[route.name] ?? "Home",
// iOS shows the profile button inline with the screen title instead.
headerRight: showHeaderProfile(route.name)
? () => <ProfileHeaderButton />
: undefined,
})}
/>
)
}
@@ -53,7 +53,7 @@ export default function AlbumsScreen() {
return (
<>
{searchBar}
<MediaGridSkeleton />
<MediaGridSkeleton title="Albums" />
</>
)
}
@@ -63,6 +63,7 @@ export default function AlbumsScreen() {
{searchBar}
<MediaGridList
title="Albums"
content={albums}
paddingBottom={contentBottomInset}
onEndReached={() => {
@@ -2,12 +2,13 @@ import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
import { memo, useCallback } from "react"
import {
FlatList,
type FlatList,
Pressable,
StyleSheet,
Text,
type ListRenderItemInfo,
} from "react-native"
import Animated from "react-native-reanimated"
import {
MediaContextMenu,
@@ -15,6 +16,7 @@ import {
} from "@/components/media-context-menu"
import { CoverImage } from "@/components/cover-image"
import { ArtistListSkeleton } from "@/components/skeletons"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { contentBottomInset } from "@/components/player"
import { useServerConfig } from "@/contexts/server-config"
import {
@@ -33,6 +35,7 @@ import { spacing, useThemeColors } from "@/lib/theme"
const PAGE_SIZE = 50
export default function ArtistsScreen() {
const { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseArtist>>()
const { push } = useAppNavigation()
const colors = useThemeColors()
const { config } = useServerConfig()
@@ -94,7 +97,7 @@ export default function ArtistsScreen() {
return (
<>
{searchBar}
<ArtistListSkeleton />
<ArtistListSkeleton title="Artists" />
</>
)
}
@@ -103,8 +106,11 @@ export default function ArtistsScreen() {
<>
{searchBar}
<FlatList
<Animated.FlatList
{...longListProps}
ref={ref}
scrollEventThrottle={16}
ListHeaderComponent={<ScreenTitle title="Artists" scrollY={scrollY} />}
data={artists}
keyExtractor={artistKey}
renderItem={renderItem}
@@ -1,3 +1,4 @@
import { useContext } from "react"
import { Pressable } from "react-native"
import { MediaGridList } from "@/components/media-cards"
@@ -10,19 +11,20 @@ import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
import { SymbolView } from "expo-symbols"
import { useAddToPlaylist } from "@/contexts/add-to-playlist"
import { TabletSectionContext } from "@/lib/tablet-navigation"
export default function PlaylistsTabScreen() {
const colors = useThemeColors()
const playlists = useCachedQuery(api.playlists.listAllPlaylists)
const { openCreatePlaylist } = useAddToPlaylist()
const title = useContext(TabletSectionContext)?.title ?? "Playlists"
if (playlists === undefined) {
return (
<>
<Stack.Screen
options={{
title: "Playlists",
headerLargeTitle: true,
title,
headerRight: () => (
<Pressable
onPress={openCreatePlaylist}
@@ -38,7 +40,7 @@ export default function PlaylistsTabScreen() {
),
}}
/>
<MediaGridSkeleton />
<MediaGridSkeleton title={title} />
</>
)
}
@@ -47,8 +49,7 @@ export default function PlaylistsTabScreen() {
<>
<Stack.Screen
options={{
title: "Playlists",
headerLargeTitle: true,
title,
headerRight: () => (
<Pressable
onPress={openCreatePlaylist}
@@ -61,6 +62,7 @@ export default function PlaylistsTabScreen() {
}}
/>
<MediaGridList
title={title}
content={playlists}
paddingBottom={tabContentBottomInset}
/>
@@ -1,10 +1,16 @@
import { Stack } from "expo-router"
import { useCallback, useState } from "react"
import { FlatList, StyleSheet, type ListRenderItemInfo } from "react-native"
import {
type FlatList,
StyleSheet,
type ListRenderItemInfo,
} from "react-native"
import Animated from "react-native-reanimated"
import type { MediaAction } from "@/components/media-context-menu"
import { contentBottomInset, SongListRow } from "@/components/player"
import { SongListSkeleton } from "@/components/skeletons"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
import {
@@ -20,6 +26,7 @@ import { longListProps } from "@/lib/list"
const PAGE_SIZE = 50
export default function SongsScreen() {
const { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseSong>>()
const { playFromLibrarySong } = usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
@@ -87,7 +94,7 @@ export default function SongsScreen() {
return (
<>
{searchBar}
<SongListSkeleton />
<SongListSkeleton title="Songs" />
</>
)
}
@@ -96,8 +103,11 @@ export default function SongsScreen() {
<>
{searchBar}
<FlatList
<Animated.FlatList
{...longListProps}
ref={ref}
scrollEventThrottle={16}
ListHeaderComponent={<ScreenTitle title="Songs" scrollY={scrollY} />}
data={songs}
keyExtractor={songKey}
renderItem={renderItem}
@@ -1,6 +1,6 @@
import { useMemo } from "react"
import {
FlatList,
type FlatList,
Pressable,
StyleSheet,
Text,
@@ -8,8 +8,10 @@ import {
type ListRenderItemInfo,
} from "react-native"
import { Stack } from "expo-router"
import Animated from "react-native-reanimated"
import { CoverImage } from "@/components/cover-image"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { tabContentBottomInset } from "@/components/player"
import {
FAVORITES_DOWNLOAD_ID,
@@ -53,6 +55,7 @@ export default function DownloadsScreen() {
const { push } = useAppNavigation()
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
useMediaGridLayout()
const { ref, scrollY } = useScreenTitleScroll<FlatList<Card>>()
const cards = useMemo<Card[]>(() => {
if (!queue) return []
@@ -135,8 +138,10 @@ export default function DownloadsScreen() {
return (
<>
<Stack.Screen options={{ title: "Downloads", headerLargeTitle: true }} />
<FlatList
<Stack.Screen options={{ title: "Downloads" }} />
<Animated.FlatList
ref={ref}
scrollEventThrottle={16}
key={columns}
onLayout={onLayout}
data={cards}
@@ -149,13 +154,20 @@ export default function DownloadsScreen() {
numColumns={columns}
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{
paddingTop: spacing.lg,
paddingHorizontal: horizontalPadding,
paddingBottom: tabContentBottomInset,
gap,
}}
columnWrapperStyle={columns > 1 ? { gap } : undefined}
contentInsetAdjustmentBehavior="automatic"
ListHeaderComponent={
<ScreenTitle
title="Downloads"
scrollY={scrollY}
// The list padding already insets the title.
style={{ paddingHorizontal: 0 }}
/>
}
ListEmptyComponent={
<View style={styles.empty}>
<Text style={{ color: colors.mutedForeground }}>
@@ -1,15 +1,17 @@
import { useCallback, useMemo } from "react"
import {
FlatList,
type FlatList,
Pressable,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
import Animated from "react-native-reanimated"
import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { useSwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
import type { MediaAction } from "@/components/media-context-menu"
import { contentBottomInset, SongListRow } from "@/components/player"
@@ -52,6 +54,7 @@ export default function OtherDownloadsScreen() {
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
const swipeGroup = useSwipeRowGroup()
const { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseSong>>()
const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, playableIds, PLAY_ORIGIN),
@@ -90,11 +93,11 @@ export default function OtherDownloadsScreen() {
return (
<>
<Stack.Screen
options={{ title: OTHER_DOWNLOADS_TITLE, headerLargeTitle: false }}
/>
<FlatList
<Stack.Screen options={{ title: OTHER_DOWNLOADS_TITLE }} />
<Animated.FlatList
{...longListProps}
ref={ref}
scrollEventThrottle={16}
data={songs}
keyExtractor={(song) => song.id}
renderItem={renderItem}
@@ -103,25 +106,32 @@ export default function OtherDownloadsScreen() {
contentInsetAdjustmentBehavior="automatic"
onScrollBeginDrag={swipeGroup.closeOpenRow}
ListHeaderComponent={
songs.length > 0 ? (
<View style={styles.actions}>
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={() => void playShuffled(playableIds, PLAY_ORIGIN)}
style={[styles.iconAction, { backgroundColor: colors.muted }]}
>
<Ionicons name="shuffle" size={24} color={colors.foreground} />
</Pressable>
<Button
title="Play"
icon="play"
onPress={() => void playInOrder(playableIds, PLAY_ORIGIN)}
style={styles.playButton}
/>
</View>
) : undefined
<>
<ScreenTitle title={OTHER_DOWNLOADS_TITLE} scrollY={scrollY} />
{songs.length > 0 ? (
<View style={styles.actions}>
<Button
title="Play"
icon="play"
onPress={() => void playInOrder(playableIds, PLAY_ORIGIN)}
style={styles.play}
/>
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={() => void playShuffled(playableIds, PLAY_ORIGIN)}
style={[styles.shuffle, { backgroundColor: colors.card }]}
>
<Ionicons
name="shuffle"
size={24}
color={colors.foreground}
/>
</Pressable>
</View>
) : null}
</>
}
ListEmptyComponent={
<Text style={[styles.empty, { color: colors.mutedForeground }]}>
@@ -137,15 +147,14 @@ const styles = StyleSheet.create({
actions: {
flexDirection: "row",
alignItems: "center",
justifyContent: "center",
gap: spacing.sm,
padding: spacing.lg,
},
playButton: { borderRadius: 999, minWidth: 160 },
iconAction: {
width: 44,
height: 44,
borderRadius: 22,
play: { flex: 1 },
shuffle: {
width: 48,
height: 48,
borderRadius: 24,
alignItems: "center",
justifyContent: "center",
},
+24 -4
View File
@@ -1,8 +1,11 @@
import { memo } from "react"
import { ScrollView, StyleSheet } from "react-native"
import { type ScrollViewInstance, StyleSheet } from "react-native"
import Animated from "react-native-reanimated"
import { ContentCarousel } from "@/components/media-cards"
import { HomeSkeleton } from "@/components/skeletons"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabContentBottomInset } from "@/components/player"
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api"
@@ -38,6 +41,7 @@ const HomeCarousels = memo(function HomeCarousels({
export default function HomeScreen() {
const colors = useThemeColors()
const { ref, scrollY } = useScreenTitleScroll<ScrollViewInstance>()
const recentlyAdded = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated,
{},
@@ -53,14 +57,18 @@ export default function HomeScreen() {
(result) => result.status === "LoadingFirstPage" && !result.isCached
)
if (isLoading) {
return <HomeSkeleton />
return (
<HomeSkeleton title="Home" titleAccessory={<ProfileHeaderButton />} />
)
}
const added = recentlyAdded.results.slice(0, CAROUSEL_ITEM_LIMIT)
const played = recentlyPlayed.results.slice(0, CAROUSEL_ITEM_LIMIT)
return (
<ScrollView
<Animated.ScrollView
ref={ref}
scrollEventThrottle={16}
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[
styles.content,
@@ -68,8 +76,14 @@ export default function HomeScreen() {
]}
contentInsetAdjustmentBehavior="automatic"
>
<ScreenTitle
title="Home"
scrollY={scrollY}
accessory={<ProfileHeaderButton />}
style={styles.title}
/>
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
</ScrollView>
</Animated.ScrollView>
)
}
@@ -78,4 +92,10 @@ const styles = StyleSheet.create({
padding: spacing.lg,
gap: spacing.xl,
},
// The content padding already insets the title.
title: {
paddingHorizontal: 0,
marginTop: -spacing.lg,
marginBottom: -spacing.md,
},
})
@@ -14,11 +14,12 @@ export default function RecentlyAddedScreen() {
)
if (status === "LoadingFirstPage" && !isCached) {
return <MediaGridSkeleton />
return <MediaGridSkeleton title="Recently Added" />
}
return (
<MediaGridList
title="Recently Added"
content={results}
paddingBottom={contentBottomInset}
onEndReached={() => {
@@ -14,11 +14,12 @@ export default function RecentlyPlayedScreen() {
)
if (status === "LoadingFirstPage" && !isCached) {
return <MediaGridSkeleton />
return <MediaGridSkeleton title="Recently Played" />
}
return (
<MediaGridList
title="Recently Played"
content={results}
paddingBottom={contentBottomInset}
onEndReached={() => {
@@ -2,9 +2,13 @@ import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { TabStackContext } from "@/lib/app-navigation"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
import {
inlineTitleOptions,
showHeaderProfile,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
export const unstable_settings = {
anchor: "index",
@@ -15,28 +19,19 @@ export default function LibraryLayout() {
const baseOptions = useStackScreenOptions({ title: "Library" })
return (
<TabStackContext value="library">
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
title:
tabStackScreenTitles[route.name] ??
(tabletLayout ? "Recently Added" : "Library"),
headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
unstable_headerRightItems:
route.name === "index"
? () => [
{
type: "custom",
element: <ProfileHeaderButton />,
hidesSharedBackground: true,
},
]
: undefined,
})}
/>
</TabStackContext>
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
...inlineTitleOptions,
title:
tabStackScreenTitles[route.name] ??
(tabletLayout ? "Recently Added" : "Library"),
// iOS shows the profile button inline with the screen title instead.
headerRight: showHeaderProfile(route.name)
? () => <ProfileHeaderButton />
: undefined,
})}
/>
)
}
+12 -1
View File
@@ -8,6 +8,7 @@ import { Ionicons } from "@expo/vector-icons"
import { MediaGridList } from "@/components/media-cards"
import { tabContentBottomInset } from "@/components/player"
import { MediaGridSkeleton } from "@/components/skeletons"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
import { useAppNavigation } from "@/lib/app-navigation"
import { api } from "@otunes/convex/_generated/api"
@@ -72,6 +73,7 @@ export default function LibraryScreen() {
const { push } = useAppNavigation()
const isTablet = tabletLayout
const colors = useThemeColors()
const title = isTablet ? "Recently Added" : "Library"
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated,
{},
@@ -124,11 +126,20 @@ export default function LibraryScreen() {
)
if (status === "LoadingFirstPage" && !isCached) {
return <MediaGridSkeleton contentInset={false} header={listHeader} />
return (
<MediaGridSkeleton
title={title}
titleAccessory={<ProfileHeaderButton />}
contentInset={false}
header={listHeader}
/>
)
}
return (
<MediaGridList
title={title}
titleAccessory={<ProfileHeaderButton />}
content={results}
paddingBottom={tabContentBottomInset}
contentInset={false}
+18 -23
View File
@@ -1,9 +1,13 @@
import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { TabStackContext } from "@/lib/app-navigation"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
import {
inlineTitleOptions,
showHeaderProfile,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
export const unstable_settings = {
anchor: "index",
@@ -13,26 +17,17 @@ export default function SearchLayout() {
const baseOptions = useStackScreenOptions({ title: "Search" })
return (
<TabStackContext value="search">
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Search",
headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
unstable_headerRightItems:
route.name === "index"
? () => [
{
type: "custom",
element: <ProfileHeaderButton />,
hidesSharedBackground: true,
},
]
: undefined,
})}
/>
</TabStackContext>
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
...inlineTitleOptions,
title: tabStackScreenTitles[route.name] ?? "Search",
// iOS shows the profile button inline with the screen title instead.
headerRight: showHeaderProfile(route.name)
? () => <ProfileHeaderButton />
: undefined,
})}
/>
)
}
@@ -35,7 +35,7 @@ export default function SearchScreen() {
: {})}
/>
<SearchResults searchQuery={searchQuery} />
<SearchResults searchQuery={searchQuery} title="Search" />
</>
)
}
+7 -12
View File
@@ -12,7 +12,6 @@ import Animated, {
Easing,
useAnimatedStyle,
useSharedValue,
withSequence,
withTiming,
type SharedValue,
} from "react-native-reanimated"
@@ -285,17 +284,13 @@ function FilledWords({
useEffect(() => {
cancelAnimation(sung)
// Jump to the reported time first, so the wipe never runs from a stale one.
sung.value =
isPlaying && end > time
? withSequence(
withTiming(time, { duration: 0 }),
withTiming(end, {
duration: (end - time) * 1000,
easing: Easing.linear,
})
)
: time
sung.value = time
if (isPlaying && end > time) {
sung.value = withTiming(end, {
duration: (end - time) * 1000,
easing: Easing.linear,
})
}
}, [sung, time, isPlaying, end])
return (
+30 -3
View File
@@ -4,9 +4,10 @@ import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { TabletMediaGrid } from "@/components/tablet-media-grid"
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { MusicEntityView } from "@/components/music-entity-view"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { Link } from "expo-router"
import { Ionicons } from "@expo/vector-icons"
import { memo, useCallback, type ReactElement } from "react"
import { memo, useCallback, type ReactElement, type ReactNode } from "react"
import {
FlatList,
Platform,
@@ -300,17 +301,23 @@ export function MediaGridList({
onEndReached,
ListHeaderComponent,
contentInset = true,
title,
titleAccessory,
}: {
content: MediaItem[]
paddingBottom: number
onEndReached?: () => void
ListHeaderComponent?: ReactElement
contentInset?: boolean
/** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
title?: string
titleAccessory?: ReactNode
}) {
const tabletLayout = useTabletLayout()
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
useMediaGridLayout()
const colors = useThemeColors()
const { ref, scrollY } = useScreenTitleScroll<FlatList<MediaItem>>()
const renderItem = useCallback(
({ item }: ListRenderItemInfo<MediaItem>) => (
<View style={{ width: cardWidth }}>
@@ -328,13 +335,32 @@ export function MediaGridList({
onEndReached={onEndReached}
ListHeaderComponent={ListHeaderComponent}
contentInset={contentInset}
title={title}
titleAccessory={titleAccessory}
renderCard={renderTabletCard}
/>
)
}
const header = title ? (
<View>
<ScreenTitle
title={title}
scrollY={scrollY}
accessory={titleAccessory}
// Inset grids already pad the whole list horizontally.
style={{ paddingHorizontal: contentInset ? 0 : horizontalPadding }}
/>
{ListHeaderComponent}
</View>
) : (
ListHeaderComponent
)
return (
<FlatList
<Animated.FlatList
ref={ref}
scrollEventThrottle={16}
key={columns}
onLayout={onLayout}
data={content}
@@ -351,6 +377,7 @@ export function MediaGridList({
paddingBottom,
gap,
...(contentInset ? { paddingHorizontal: horizontalPadding } : {}),
...(title ? { paddingTop: 0 } : {}),
},
]}
columnWrapperStyle={[
@@ -359,7 +386,7 @@ export function MediaGridList({
{ gap },
]}
contentInsetAdjustmentBehavior="automatic"
ListHeaderComponent={ListHeaderComponent}
ListHeaderComponent={header}
onEndReached={onEndReached}
onEndReachedThreshold={0.5}
/>
+97
View File
@@ -0,0 +1,97 @@
import { useHeaderHeight } from "expo-router/react-navigation"
import type { Component, ReactNode } from "react"
import {
Platform,
StyleSheet,
Text,
type ScrollViewInstance,
type StyleProp,
type ViewStyle,
} from "react-native"
import Animated, {
useAnimatedRef,
useAnimatedStyle,
useScrollOffset,
type SharedValue,
} from "react-native-reanimated"
import { spacing, useThemeColors } from "@/lib/theme"
/**
* Tracks the scroll view that renders a `ScreenTitle`. Attach `ref` to that
* Reanimated `Animated.ScrollView` / `Animated.FlatList` and pass `scrollY`
* to the title.
*/
export function useScreenTitleScroll<
TScrollView extends Component | ScrollViewInstance,
>() {
const ref = useAnimatedRef<TScrollView>()
const scrollY = useScrollOffset(ref)
return { ref, scrollY }
}
/**
* iOS screen title rendered as the first item of a screen's scroll content,
* in place of the native large title (Apple Music style): it scrolls away
* with the content, never collapses into the bar, and stays put on
* pull-down. `accessory` (e.g. the profile button) sits on the same row and
* scrolls with it. Android keeps its native header, so this renders nothing.
*/
export function ScreenTitle({
title,
scrollY,
accessory,
style,
}: {
title: string
/** From `useScreenTitleScroll`; omit for screens that never scroll. */
scrollY?: SharedValue<number>
accessory?: ReactNode
style?: StyleProp<ViewStyle>
}) {
const colors = useThemeColors()
// At rest the scroll offset is minus the automatic header inset, so any
// offset below that is overscroll the title should cancel out.
const headerHeight = useHeaderHeight()
const pinStyle = useAnimatedStyle(() => ({
transform: [
{
translateY: scrollY ? Math.min(0, scrollY.value + headerHeight) : 0,
},
],
}))
if (Platform.OS !== "ios") return null
return (
<Animated.View style={[styles.row, style, pinStyle]}>
<Text
accessibilityRole="header"
numberOfLines={2}
style={[styles.title, { color: colors.foreground }]}
>
{title}
</Text>
{accessory}
</Animated.View>
)
}
// Matches UIKit's large title metrics: 34pt bold in a 52pt tall area.
const styles = StyleSheet.create({
row: {
flexDirection: "row",
alignItems: "center",
gap: spacing.md,
paddingHorizontal: spacing.lg,
paddingTop: 3,
paddingBottom: 8,
},
title: {
flex: 1,
fontSize: 34,
lineHeight: 41,
fontWeight: "700",
letterSpacing: 0.37,
},
})
+32 -13
View File
@@ -1,13 +1,16 @@
import { memo, useCallback, useMemo } from "react"
import {
FlatList,
type FlatList,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
import Animated from "react-native-reanimated"
import { ContentCarousel } from "@/components/media-cards"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import type { MediaAction } from "@/components/media-context-menu"
import { tabContentBottomInset, SongListRow } from "@/components/player"
import { SongListSkeleton } from "@/components/skeletons"
@@ -19,8 +22,16 @@ import { api } from "@otunes/convex/_generated/api"
import type { BrowseSong, SearchSong } from "@otunes/convex/types"
import { spacing, useThemeColors } from "@/lib/theme"
function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
function SearchResultsBody({
searchQuery,
title,
}: {
searchQuery: string
/** iOS `ScreenTitle`, shown above the results and while idle. */
title: string
}) {
const colors = useThemeColors()
const { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseSong>>()
const { playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
@@ -76,16 +87,19 @@ function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
)
if (isSearching) {
return <SongListSkeleton />
}
if (!hasQuery) {
return <></>
return (
<SongListSkeleton
title={title}
titleAccessory={<ProfileHeaderButton />}
/>
)
}
return (
<FlatList
data={results?.songs ?? []}
<Animated.FlatList
ref={ref}
scrollEventThrottle={16}
data={hasQuery ? (results?.songs ?? []) : []}
keyExtractor={(song) => song.id}
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{ paddingBottom: tabContentBottomInset }}
@@ -93,7 +107,12 @@ function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
keyboardShouldPersistTaps="handled"
ListHeaderComponent={
<>
{!hasResults ? (
<ScreenTitle
title={title}
scrollY={scrollY}
accessory={<ProfileHeaderButton />}
/>
{hasQuery && !hasResults ? (
<View style={styles.empty}>
<Text
style={[styles.emptyText, { color: colors.mutedForeground }]}
@@ -103,13 +122,13 @@ function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
</View>
) : null}
{results?.artists.length ? (
{hasQuery && results?.artists.length ? (
<View style={styles.section}>
<ContentCarousel title="Artists" content={results.artists} />
</View>
) : null}
{results?.albums.length ? (
{hasQuery && results?.albums.length ? (
<View style={styles.section}>
<ContentCarousel title="Albums" content={results.albums} />
</View>
@@ -118,7 +137,7 @@ function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
}
renderItem={renderItem}
ListFooterComponent={
playlistResults && playlistResults.length > 0 ? (
hasQuery && playlistResults && playlistResults.length > 0 ? (
<View style={styles.section}>
<ContentCarousel title="Playlists" content={playlistResults} />
</View>
+70 -5
View File
@@ -9,6 +9,7 @@ import {
collectionInset,
} from "@/components/collection-list"
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
import { ScreenTitle } from "@/components/screen-title"
import { Link } from "expo-router"
import { useHeaderHeight } from "expo-router/react-navigation"
import Reanimated from "react-native-reanimated"
@@ -151,9 +152,18 @@ function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
))
}
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
export function SongListSkeleton({
rows = 10,
title,
titleAccessory,
}: {
rows?: number
title?: string
titleAccessory?: ReactNode
}) {
return (
<SkeletonScreen>
{title ? <ScreenTitle title={title} accessory={titleAccessory} /> : null}
<SongRows rows={rows} />
</SkeletonScreen>
)
@@ -234,23 +244,54 @@ export function MediaGridSkeleton({
items = 6,
contentInset = true,
header,
title,
titleAccessory,
}: {
items?: number
contentInset?: boolean
/** The loaded list's `ListHeaderComponent`, so it keeps its position. */
header?: ReactNode
/** The loaded list's `ScreenTitle`, which replaces its top inset. */
title?: string
titleAccessory?: ReactNode
}) {
return (
<SkeletonScreen>
<MediaGridContent
items={items}
contentInset={contentInset}
header={header}
contentInset={contentInset && !title}
header={
title ? (
<>
<MediaGridTitle title={title} accessory={titleAccessory} />
{header}
</>
) : (
header
)
}
/>
</SkeletonScreen>
)
}
function MediaGridTitle({
title,
accessory,
}: {
title: string
accessory?: ReactNode
}) {
const { horizontalPadding } = useMediaGridLayout()
return (
<ScreenTitle
title={title}
accessory={accessory}
style={{ paddingHorizontal: horizontalPadding }}
/>
)
}
export function CarouselSkeleton() {
return (
<View style={styles.carousel}>
@@ -264,10 +305,21 @@ export function CarouselSkeleton() {
)
}
export function HomeSkeleton() {
export function HomeSkeleton({
title,
titleAccessory,
}: {
title: string
titleAccessory?: ReactNode
}) {
return (
<SkeletonScreen>
<View style={styles.home}>
<ScreenTitle
title={title}
accessory={titleAccessory}
style={styles.homeTitle}
/>
<CarouselSkeleton />
<CarouselSkeleton />
</View>
@@ -388,10 +440,17 @@ export function CollectionDetailSkeleton({
)
}
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
export function ArtistListSkeleton({
rows = 12,
title,
}: {
rows?: number
title?: string
}) {
const colors = useThemeColors()
return (
<SkeletonScreen>
{title ? <ScreenTitle title={title} /> : null}
{Array.from({ length: rows }, (_, index) => (
<View
key={index}
@@ -456,6 +515,12 @@ const styles = StyleSheet.create({
carousel: { gap: spacing.md, overflow: "hidden" },
carouselRow: { flexDirection: "row", gap: spacing.md },
home: { padding: spacing.lg, gap: spacing.xl },
// Mirrors the home screen's title spacing.
homeTitle: {
paddingHorizontal: 0,
marginTop: -spacing.lg,
marginBottom: -spacing.md,
},
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
actions: {
flexDirection: "row",
+24 -5
View File
@@ -4,9 +4,10 @@ import {
useRef,
useState,
type ReactElement,
type ReactNode,
} from "react"
import {
ScrollView,
type ScrollViewInstance,
View,
type NativeSyntheticEvent,
type NativeScrollEvent,
@@ -15,6 +16,7 @@ import Animated from "react-native-reanimated"
import { useSafeAreaInsets } from "react-native-safe-area-context"
import type { MediaItem } from "@/components/media-cards"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { useThemeColors } from "@/lib/theme"
@@ -28,6 +30,9 @@ type GridProps = {
onEndReached?: () => void
ListHeaderComponent?: ReactElement
contentInset?: boolean
/** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
title?: string
titleAccessory?: ReactNode
renderCard: (item: MediaItem, width: number) => ReactElement
}
@@ -41,9 +46,13 @@ export function TabletMediaGrid({
onEndReached,
ListHeaderComponent,
contentInset = true,
title,
titleAccessory,
renderCard,
}: GridProps) {
const colors = useThemeColors()
const { ref, scrollY: titleScrollY } =
useScreenTitleScroll<ScrollViewInstance>()
const insets = useSafeAreaInsets()
const { columns, cardWidth, onLayout, horizontalPadding, gap, ready } =
useMediaGridLayout()
@@ -102,18 +111,28 @@ export function TabletMediaGrid({
setViewportHeight(event.nativeEvent.layout.height)
}}
>
<ScrollView
<Animated.ScrollView
ref={ref}
onScroll={onScroll}
scrollEventThrottle={32}
// Every frame, so the title pins smoothly on pull-down.
scrollEventThrottle={16}
contentInsetAdjustmentBehavior="automatic"
contentContainerStyle={{
paddingTop: contentInset ? horizontalPadding : 0,
paddingTop: contentInset && !title ? horizontalPadding : 0,
paddingBottom: paddingBottom + insets.bottom,
}}
>
<View
onLayout={(event) => setHeaderHeight(event.nativeEvent.layout.height)}
>
{title ? (
<ScreenTitle
title={title}
scrollY={titleScrollY}
accessory={titleAccessory}
style={{ paddingHorizontal: horizontalPadding }}
/>
) : null}
{ListHeaderComponent}
</View>
<View style={{ height: gridHeight }}>
@@ -136,7 +155,7 @@ export function TabletMediaGrid({
)
})}
</View>
</ScrollView>
</Animated.ScrollView>
</Animated.View>
)
}
+3 -11
View File
@@ -25,7 +25,6 @@ import { AndroidSheet } from "@/components/android-sheet"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import { useCacheScope } from "@/contexts/persistent-cache"
import { useServerConfig } from "@/contexts/server-config"
import { useBackgroundDownloads } from "@/hooks/use-background-downloads"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { getAuthCookieHeader } from "@/lib/auth-cookies"
import {
@@ -345,7 +344,6 @@ export function DownloadsProvider({ children }: { children: ReactNode }) {
target: DownloadTarget
response: DownloadOptionsResponse
} | null>(null)
const keepDownloading = useBackgroundDownloads(queue)
useEffect(() => {
if (!queue) return
@@ -393,7 +391,6 @@ export function DownloadsProvider({ children }: { children: ReactNode }) {
const remembered = await readRememberedDownloadQuality()
if (remembered) {
await startDownload(queue, target, response.songs, remembered)
keepDownloading()
toast(`Downloading ${target.title}`)
} else {
setPending({ target, response })
@@ -402,7 +399,7 @@ export function DownloadsProvider({ children }: { children: ReactNode }) {
showError(error instanceof Error ? error.message : "Download failed")
}
},
[cacheScope, config, convex, keepDownloading, queue]
[cacheScope, config, convex, queue]
)
const removeDownload = useCallback(
@@ -420,14 +417,9 @@ export function DownloadsProvider({ children }: { children: ReactNode }) {
if (!pending || !queue) return
setPending(null)
if (remember) void writeRememberedDownloadQuality(quality)
void startDownload(
queue,
pending.target,
pending.response.songs,
quality
).then(keepDownloading)
void startDownload(queue, pending.target, pending.response.songs, quality)
},
[keepDownloading, pending, queue]
[pending, queue]
)
const value = useMemo(
@@ -1,164 +0,0 @@
import { requireOptionalNativeModule } from "expo"
import Constants from "expo-constants"
import { useCallback, useEffect, useRef } from "react"
import { AppState, Platform } from "react-native"
import {
ContinuedTasks,
type ContinuedTask,
} from "react-native-continued-task"
import { setKeptRunning } from "@/lib/downloads"
import type { DownloadQueue } from "@otunes/convex/client/download-queue"
const downloadService = requireOptionalNativeModule<{
update: (remaining: number) => void
}>("DownloadService")
/** Songs downloading at once while the app runs, as the queue defaults to. */
const RUNNING_CONCURRENCY = 2
// Stopping right after starting can beat the service to `startForeground`,
// which Android treats as a crash.
const STOP_DELAY_MS = 2000
// Must match `identifierPrefixes` in app.config.ts.
const TASK_PREFIX = `${Constants.expoConfig?.ios?.bundleIdentifier}.downloads`
function songsLeft(count: number) {
return count === 1 ? "1 song left" : `${count} songs left`
}
/**
* Keeps downloads going while the app is in the background. Call the returned
* function right after the person starts a download.
*
* iOS 26+: a continued processing task keeps the app running, with progress
* in a Live Activity, so songs keep downloading a few at a time with fresh
* sign-in tokens. It must start from the person's action, so it covers
* downloads they start, not playlist syncs.
*
* iOS otherwise (and once that task ends): songs download in a background URL
* session. Songs started while suspended may wait for Wi-Fi and power, so
* every waiting song is handed over as the app leaves the screen.
*
* Android: a foreground service keeps the app running while songs are queued.
*/
export function useBackgroundDownloads(queue: DownloadQueue | null) {
const startTask = useRef<() => void>(() => {})
useEffect(() => {
if (!queue) return
if (Platform.OS === "ios") {
let active = AppState.currentState === "active"
let task: ContinuedTask | null = null
let submitting = false
let total = 0
let lastPending = 0
const updateConcurrency = () =>
queue.setConcurrency(
active || task?.state === "running" ? RUNNING_CONCURRENCY : Infinity
)
const end = () => {
task = null
setKeptRunning(false)
updateConcurrency()
}
const report = () => {
const pending = queue.pendingCount()
if (pending > lastPending) total += pending - lastPending
lastPending = pending
if (task?.state !== "running") return
if (pending === 0) {
task.complete(true)
end()
return
}
task.setProgress(total - pending, total)
task.updateTitle("Downloading", songsLeft(pending))
}
startTask.current = () => {
if (!ContinuedTasks.isSupported || task || submitting) return
const pending = queue.pendingCount()
if (pending === 0) return
submitting = true
total = pending
lastPending = pending
ContinuedTasks.submit({
identifierPrefix: TASK_PREFIX,
title: "Downloading",
subtitle: songsLeft(pending),
totalUnitCount: total,
// A task that cannot start now is no use once the app is closed.
ios: { submissionStrategy: "fail" },
})
.then((submitted) => {
task = submitted
submitted.addOnStartListener(() => {
setKeptRunning(true)
updateConcurrency()
report()
})
// iOS reports a cancel from the Live Activity as expiry too, so
// either way the songs carry on in the background session.
submitted.addOnStopListener(() => {
if (task === submitted) end()
})
})
.catch(() => {
// Not permitted or unavailable: the background session covers it.
})
.finally(() => {
submitting = false
})
}
updateConcurrency()
const unsubscribe = queue.subscribe(report)
const subscription = AppState.addEventListener("change", (state) => {
active = state === "active"
updateConcurrency()
})
return () => {
startTask.current = () => {}
unsubscribe()
subscription.remove()
task?.cancel()
end()
}
}
if (!downloadService) return
const service = downloadService
let shown = 0
let stopTimer: ReturnType<typeof setTimeout> | null = null
const update = () => {
const remaining = queue.pendingCount()
if (remaining === shown) return
if (stopTimer) clearTimeout(stopTimer)
stopTimer = null
if (remaining > 0) {
shown = remaining
service.update(remaining)
} else {
stopTimer = setTimeout(() => {
shown = 0
service.update(0)
}, STOP_DELAY_MS)
}
}
update()
const unsubscribe = queue.subscribe(update)
return () => {
unsubscribe()
if (stopTimer) clearTimeout(stopTimer)
service.update(0)
}
}, [queue])
return useCallback(() => startTask.current(), [])
}
+8 -22
View File
@@ -1,5 +1,5 @@
import { useRouter, useSegments, type Href } from "expo-router"
import { createContext, use, useCallback } from "react"
import { useCallback } from "react"
import { tabletSections } from "@/lib/tablet-navigation"
@@ -30,13 +30,6 @@ export function tabPath(tab: AppTab, path: string): Href {
return `/(app)/(tabs)/${tab}${normalized}` as Href
}
/**
* The tab whose stack a screen lives in. Each tab stack layout provides it so
* links resolve against the screen's own tab, even when the global segments
* ref has not caught up with a tab switch yet.
*/
export const TabStackContext = createContext<AppTab | undefined>(undefined)
function getActiveTabFromRef(): AppTab {
return getActiveTab(activeSegmentsRef.current)
}
@@ -48,15 +41,8 @@ export function AppNavigationSync() {
return null
}
/** Tab-aware navigation: paths resolve inside the caller's tab stack, falling back to the active tab outside one. */
export function useAppNavigation() {
const router = useRouter()
const stackTab = use(TabStackContext)
const currentTab = useCallback(
() => stackTab ?? getActiveTabFromRef(),
[stackTab]
)
const push = useCallback(
(path: string) => {
@@ -67,26 +53,26 @@ export function useAppNavigation() {
return
}
router.push(tabPath(currentTab(), path))
router.push(tabPath(getActiveTabFromRef(), path))
},
[router, currentTab]
[router]
)
const replace = useCallback(
(path: string) => {
router.replace(tabPath(currentTab(), path))
router.replace(tabPath(getActiveTabFromRef(), path))
},
[router, currentTab]
[router]
)
const href = useCallback(
(path: string) => tabPath(currentTab(), path),
[currentTab]
(path: string) => tabPath(getActiveTabFromRef(), path),
[]
)
return {
get tab() {
return currentTab()
return getActiveTabFromRef()
},
href,
push,
+2 -9
View File
@@ -16,16 +16,9 @@ function authCookieNames(serverUrl: string) {
}
}
/**
* Cookies that sign a request to the server in. Pass `refresh: false` for
* requests that may run after the JWT expires (iOS background downloads): the
* server would spend the refresh token, and the app's next refresh of the same
* token would then end the session.
*/
export async function getAuthCookieHeader(
serverUrl: string,
convexUrl: string,
{ refresh = true }: { refresh?: boolean } = {}
convexUrl: string
): Promise<string | null> {
const [jwt, refreshToken] = await Promise.all([
secureGetItem(authStorageKey(JWT_STORAGE_KEY, convexUrl)),
@@ -38,7 +31,7 @@ export async function getAuthCookieHeader(
const names = authCookieNames(serverUrl)
const parts = [`${names.jwt}=${jwt}`]
if (refresh && refreshToken) {
if (refreshToken) {
parts.push(`${names.refresh}=${refreshToken}`)
}
+2 -11
View File
@@ -12,28 +12,19 @@ const secureStoreOptions: SecureStore.SecureStoreOptions = {
keychainAccessible: SecureStore.AFTER_FIRST_UNLOCK,
}
// The last value read or written per key, for when the keychain refuses a
// read (say, while the phone is locked and downloads continue).
const remembered = new Map<string, string>()
export async function secureGetItem(key: string): Promise<string | null> {
try {
const value = await SecureStore.getItemAsync(key, secureStoreOptions)
if (value === null) remembered.delete(key)
else remembered.set(key, value)
return value
return await SecureStore.getItemAsync(key, secureStoreOptions)
} catch {
return remembered.get(key) ?? null
return null
}
}
export async function secureSetItem(key: string, value: string): Promise<void> {
remembered.set(key, value)
await SecureStore.setItemAsync(key, value, secureStoreOptions)
}
export async function secureRemoveItem(key: string): Promise<void> {
remembered.delete(key)
try {
await SecureStore.deleteItemAsync(key, secureStoreOptions)
} catch {
+11 -97
View File
@@ -1,5 +1,5 @@
import AsyncStorage from "@react-native-async-storage/async-storage"
import { Directory, DownloadTask, File, Paths } from "expo-file-system"
import { Directory, File, Paths } from "expo-file-system"
import { Platform } from "react-native"
import {
@@ -73,82 +73,6 @@ function audioFile(folder: Directory) {
return folder.list().find((entry): entry is File => entry instanceof File)
}
type SongDownload = {
url: string
destination: Directory
headers: Record<string, string>
signal: AbortSignal
/** Checks and keeps the downloaded file, returning its size. */
finish: (file: File) => number
}
// Whether a continued processing task keeps the app running in the
// background (iOS 26+, see `useBackgroundDownloads`).
let keptRunning = false
const regularSessionDownloads = new Set<() => void>()
/**
* While a continued task keeps the app running, songs download through the
* regular session: iOS treats background session downloads started from the
* background as deferrable until Wi-Fi and power. When the task ends, running
* songs restart in the background session before iOS suspends the app.
*/
export function setKeptRunning(running: boolean) {
keptRunning = running
if (!running) for (const handOff of regularSessionDownloads) handOff()
}
/**
* Downloads through an iOS URL session. The background one keeps going while
* the app is suspended and wakes it when done; iOS keeps the app awake until
* `finish` returns (up to 25 seconds). Downloads still running when iOS
* terminates the app are lost.
*/
async function runDownloadTask(
{ url, destination, headers, signal, finish }: SongDownload,
sessionType: "foreground" | "background"
) {
const task = new DownloadTask(url, destination, {
headers,
signal,
sessionType,
deferBackgroundSessionCompletion: sessionType === "background",
})
const handOff = () => task.cancel()
if (sessionType === "foreground") regularSessionDownloads.add(handOff)
try {
const file = await task.downloadAsync()
if (!file) throw new Error("Download paused")
return finish(file)
} finally {
regularSessionDownloads.delete(handOff)
if (task.state === "completed") {
await task.acknowledgeBackgroundCompletionAsync().catch(() => {})
}
task.release()
}
}
async function downloadOnIOS(download: SongDownload) {
if (keptRunning) {
try {
return await runDownloadTask(download, "foreground")
} catch (error) {
// Still running means a real failure; otherwise it was handed off.
if (keptRunning || download.signal.aborted) throw error
}
}
return runDownloadTask(download, "background")
}
/** Android keeps the app running with a foreground service instead. */
async function downloadInForeground(download: SongDownload) {
const { url, destination, headers, signal, finish } = download
return finish(
await File.downloadFileAsync(url, destination, { headers, signal })
)
}
function createStorage(config: ServerConfig): DownloadStorage {
const root = serverDirectory(config)
const indexFile = new File(root, "index.json")
@@ -192,8 +116,7 @@ function createStorage(config: ServerConfig): DownloadStorage {
async save({ songId, requested, quality, albumId }, signal) {
const cookieHeader = await getAuthCookieHeader(
config.serverUrl,
config.convexUrl,
{ refresh: Platform.OS !== "ios" }
config.convexUrl
)
if (!cookieHeader) throw new Error("Sign in to download")
@@ -203,26 +126,17 @@ function createStorage(config: ServerConfig): DownloadStorage {
if (partial.exists) partial.delete()
partial.create()
try {
const url = `${config.serverUrl}${songDownloadPath(songId, requested, {
const path = songDownloadPath(songId, requested, {
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
})}`
const download =
Platform.OS === "ios" ? downloadOnIOS : downloadInForeground
return await download({
url,
destination: partial,
headers: { Cookie: cookieHeader },
signal,
finish(file) {
signal.throwIfAborted()
// A lapsed sign-in redirects to the sign-in page instead of failing.
if (file.extension === ".html") {
throw new Error("Sign in to download")
}
partial.rename(name)
return file.size ?? 0
},
})
const file = await File.downloadFileAsync(
`${config.serverUrl}${path}`,
partial,
{ headers: { Cookie: cookieHeader }, signal }
)
signal.throwIfAborted()
partial.rename(name)
return file.size ?? 0
} catch (error) {
if (partial.exists) partial.delete()
throw error
+13 -1
View File
@@ -17,13 +17,25 @@ export const tabStackScreenTitles: Record<string, string> = {
"downloads/other": "Other Downloaded Songs",
}
/**
* iOS tab stacks render their titles in the scroll content with
* `ScreenTitle`, so the bar keeps the title (for back menus) but hides it.
*/
export const inlineTitleOptions: StackScreenOptions =
Platform.OS === "ios" ? { headerTitleStyle: { color: "transparent" } } : {}
/** Tab roots show the profile button in the header, except on iOS where `ScreenTitle` holds it. */
export function showHeaderProfile(routeName: string) {
return routeName === "index" && Platform.OS !== "ios"
}
export function useStackScreenOptions(
overrides?: StackScreenOptions
): StackScreenOptions {
const theme = useThemeColors()
return {
headerLargeTitle: true,
headerLargeTitle: false,
headerTransparent: true,
headerTintColor: theme.foreground,
headerLargeTitleStyle: { color: theme.foreground },
@@ -1,11 +0,0 @@
plugins {
id 'com.android.library'
id 'expo-module-gradle-plugin'
}
group = 'expo.modules.downloadservice'
version = '1.0.0'
android {
namespace 'expo.modules.downloadservice'
}
@@ -1,11 +0,0 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<application>
<service
android:name="expo.modules.downloadservice.DownloadService"
android:exported="false"
android:foregroundServiceType="dataSync" />
</application>
</manifest>
@@ -1,88 +0,0 @@
package expo.modules.downloadservice
import android.app.Notification
import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.PendingIntent
import android.app.Service
import android.content.Context
import android.content.Intent
import android.content.pm.ServiceInfo
import android.os.Build
import android.os.IBinder
/**
* Keeps the app running while songs download, so Android does not freeze the
* JS downloads when the app leaves the screen. Started with the number of
* songs left, and stopped by the module once none are.
*/
class DownloadService : Service() {
override fun onBind(intent: Intent?): IBinder? = null
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
val remaining = intent?.getIntExtra(EXTRA_REMAINING, 0) ?: 0
val notification = notification(remaining)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
} else {
startForeground(NOTIFICATION_ID, notification)
}
// A restarted service would have no downloads to keep alive.
return START_NOT_STICKY
}
// Android 15 limits data sync services to six hours a day.
override fun onTimeout(startId: Int, fgsType: Int) {
stopSelf()
}
private fun notification(remaining: Int): Notification {
val manager = getSystemService(NotificationManager::class.java)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
manager.createNotificationChannel(
NotificationChannel(CHANNEL_ID, "Downloads", NotificationManager.IMPORTANCE_LOW)
)
}
val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
Notification.Builder(this, CHANNEL_ID)
} else {
@Suppress("DEPRECATION")
Notification.Builder(this)
}
val launch = packageManager.getLaunchIntentForPackage(packageName)?.let {
PendingIntent.getActivity(this, 0, it, PendingIntent.FLAG_IMMUTABLE)
}
return builder
.setSmallIcon(android.R.drawable.stat_sys_download)
.setContentTitle(if (remaining == 1) "Downloading 1 song" else "Downloading $remaining songs")
.setContentIntent(launch)
.setOngoing(true)
.setOnlyAlertOnce(true)
.build()
}
companion object {
private const val CHANNEL_ID = "downloads"
private const val NOTIFICATION_ID = 7301
private const val EXTRA_REMAINING = "remaining"
fun update(context: Context, remaining: Int) {
val intent = Intent(context, DownloadService::class.java)
if (remaining == 0) {
context.stopService(intent)
return
}
intent.putExtra(EXTRA_REMAINING, remaining)
try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
context.startForegroundService(intent)
} else {
context.startService(intent)
}
} catch (_: IllegalStateException) {
// Android 12+ refuses to start one from the background (say, a
// playlist syncing); downloads then run only while the app does.
}
}
}
}
@@ -1,15 +0,0 @@
package expo.modules.downloadservice
import expo.modules.kotlin.modules.Module
import expo.modules.kotlin.modules.ModuleDefinition
class DownloadServiceModule : Module() {
override fun definition() = ModuleDefinition {
Name("DownloadService")
/** Shows how many songs are left, or stops the service at zero. */
Function("update") { remaining: Int ->
DownloadService.update(requireNotNull(appContext.reactContext), remaining)
}
}
}
@@ -1,6 +0,0 @@
{
"platforms": ["android"],
"android": {
"modules": ["expo.modules.downloadservice.DownloadServiceModule"]
}
}
@@ -1,5 +0,0 @@
{
"name": "otunes-download-service",
"version": "1.0.0",
"private": true
}
@@ -1,3 +0,0 @@
{
"platforms": ["apple"]
}
@@ -1,37 +0,0 @@
// React Native draws `filter: [{ blur }]` on iOS only with its SwiftUI
// filters flag, which the stable release leaves off. This keeps the stable
// flags and turns that one on.
#import <UIKit/UIKit.h>
#import <react/featureflags/ReactNativeFeatureFlags.h>
#import <react/featureflags/ReactNativeFeatureFlagsOverridesOSSStable.h>
using namespace facebook::react;
class SwiftUIFilterFlags : public ReactNativeFeatureFlagsOverridesOSSStable {
public:
bool enableSwiftUIBasedFilters() override {
return true;
}
};
@interface SwiftUIFilters : NSObject
@end
@implementation SwiftUIFilters
+ (void)load
{
// React Native sets its flags once while launching and throws if they were
// set first, so this waits for launch to finish. No views exist yet then.
[NSNotificationCenter.defaultCenter
addObserverForName:UIApplicationDidFinishLaunchingNotification
object:nil
queue:nil
usingBlock:^(NSNotification *notification) {
ReactNativeFeatureFlags::dangerouslyForceOverride(
std::make_unique<SwiftUIFilterFlags>());
}];
}
@end
@@ -1,14 +0,0 @@
Pod::Spec.new do |s|
s.name = 'SwiftUIFilters'
s.version = '1.0.0'
s.summary = 'Turns on React Native view filters like blur on iOS'
s.description = s.summary
s.license = { :type => 'MIT' }
s.author = 'oTunes'
s.homepage = 'https://otunes.abunchofknowitalls.com'
s.platforms = { :ios => '16.4' }
s.source = { :git => '' }
s.static_framework = true
install_modules_dependencies(s)
s.source_files = '**/*.{h,mm}'
end
-2
View File
@@ -48,10 +48,8 @@
"react": "19.3.0",
"react-dom": "19.3.0",
"react-native": "0.88.0",
"react-native-continued-task": "0.1.0",
"react-native-gesture-handler": "~3.3.0",
"react-native-image-colors": "^2.6.0",
"react-native-nitro-modules": "0.37.2",
"react-native-reanimated": "4.7.1",
"react-native-safe-area-context": "~5.10.1",
"react-native-screens": "4.30.0",
+5 -6
View File
@@ -183,8 +183,7 @@ const SyncedLine = React.memo(function SyncedLine({
/**
* The playing line's words, each filled as far as it has been sung. The
* browser runs the fills on the song's timeline (a word's start is its
* delay); playback updates only correct their drift.
* browser runs the fills; playback updates only correct their drift.
*/
function FilledWords({
words,
@@ -201,7 +200,6 @@ function FilledWords({
React.useEffect(() => {
fills.current = words.map((word, index) =>
spans.current[index]?.animate(WORD_FILL_FRAMES, {
delay: word.start * 1000,
duration: Math.max(word.end - word.start, 0.05) * 1000,
easing: "linear",
fill: "both",
@@ -211,14 +209,15 @@ function FilledWords({
}, [words])
React.useEffect(() => {
const at = time * 1000
fills.current.forEach((fill, index) => {
if (!fill) return
const at = (time - words[index].start) * 1000
if (Math.abs(Number(fill.currentTime ?? 0) - at) > FILL_DRIFT_MS) {
fill.currentTime = at
}
// `play` on a finished fill would rewind it to the start.
if (isPlaying && time < words[index].end) fill.play()
// `play` on a finished fill would rewind it.
const duration = Number(fill.effect?.getTiming().duration ?? 0)
if (isPlaying && at < duration) fill.play()
else fill.pause()
})
}, [words, time, isPlaying])
+1 -13
View File
@@ -125,9 +125,8 @@ function collectionKey({ kind, id }: CollectionRef) {
*/
export function createDownloadQueue(
storage: DownloadStorage,
options: { concurrency?: number } = {}
{ concurrency = 2 }: { concurrency?: number } = {}
) {
let concurrency = options.concurrency ?? 2
const downloaded = new Map<string, DownloadedSong>()
const collections = new Map<string, DownloadedCollection>()
const otherSongIds = new Set<string>()
@@ -373,17 +372,6 @@ export function createDownloadQueue(
collections: () => [...collections.values()],
isQueued,
status,
/** Songs downloading or waiting to. */
pendingCount: () => running.size + waiting.length,
/**
* How many songs download at once. Raising it starts waiting songs now;
* lowering it lets running songs finish.
*/
setConcurrency(limit: number) {
concurrency = limit
pump()
},
/** Songs downloaded on their own, in the order they were added. */
otherSongIds: () => [...otherSongIds],
-93
View File
@@ -1,93 +0,0 @@
/**
* Typo-tolerant word matching, shared by library search, lyrics search and
* in-list song filters.
*/
/**
* Lowercase words without accents or apostrophes, so "Don't Stop Beyoncé"
* gives ["dont", "stop", "beyonce"].
*/
export function searchWords(text: string): string[] {
return (
text
.normalize("NFKD")
.replace(/\p{M}/gu, "")
.toLowerCase()
.replace(/['’]/g, "")
.match(/[\p{L}\p{N}]+/gu) ?? []
)
}
/** Typos a query word may hold. Short words get none, or they match too much. */
function allowedTypos(term: string) {
if (term.length < 4) return 0
return term.length < 8 ? 1 : 2
}
/**
* Edits (insert, delete, substitute or swap neighbors) turning `a` into `b`,
* or `max + 1` once it is sure to exceed `max`.
*/
function editDistance(a: string, b: string, max: number): number {
if (Math.abs(a.length - b.length) > max) return max + 1
let before: number[] = []
let previous = Array.from({ length: b.length + 1 }, (_, j) => j)
for (let i = 1; i <= a.length; i++) {
const current = [i]
let rowMin = i
for (let j = 1; j <= b.length; j++) {
const cost = a[i - 1] === b[j - 1] ? 0 : 1
let distance = Math.min(
previous[j]! + 1,
current[j - 1]! + 1,
previous[j - 1]! + cost
)
if (i > 1 && j > 1 && a[i - 1] === b[j - 2] && a[i - 2] === b[j - 1]) {
distance = Math.min(distance, before[j - 2]! + 1)
}
current.push(distance)
rowMin = Math.min(rowMin, distance)
}
if (rowMin > max) return max + 1
before = previous
previous = current
}
return previous[b.length]!
}
/**
* Whether `word` is query `term` give or take a few typos. With `prefix` the
* word may also just start with the term, as when it is still being typed.
*/
function wordMatchesTerm(term: string, word: string, prefix: boolean) {
const typos = allowedTypos(term)
if (typos === 0) return false
if (editDistance(term, word, typos) <= typos) return true
return (
prefix &&
word.length > term.length &&
editDistance(term, word.slice(0, term.length), typos) <= typos
)
}
/**
* How every query term (from `searchWords`) appears among `words`: "exact"
* when each is a word, "fuzzy" when some only match give or take typos, or
* null when one is missing. The last term may be a word's prefix.
*/
export function matchWords(
words: readonly string[],
terms: readonly string[]
): "exact" | "fuzzy" | null {
let quality: "exact" | "fuzzy" = "exact"
for (const [index, term] of terms.entries()) {
const prefix = index === terms.length - 1
const exact = words.some((word) =>
prefix ? word.startsWith(term) : word === term
)
if (exact) continue
if (!words.some((word) => wordMatchesTerm(term, word, prefix))) return null
quality = "fuzzy"
}
return terms.length > 0 ? quality : null
}
+27 -54
View File
@@ -5,8 +5,6 @@
* the same.
*/
import { matchWords, searchWords } from "./fuzzy-search"
export type LyricWord = {
/** Includes its trailing space, so a line's words join back into its text. */
text: string
@@ -18,15 +16,11 @@ export type LyricLine = {
text: string
/** Seconds; `null` for plain lyrics. */
start: number | null
/**
* The line's words as they are sung. Line-timed lyrics get estimated
* ones (see `estimateWords`); plain lyrics have none.
*/
/** Set only on word-timed lines. */
words: LyricWord[] | null
}
export type Lyrics = {
/** How the source was timed, whatever `words` were estimated. */
synced: "none" | "line" | "word"
lines: LyricLine[]
}
@@ -35,8 +29,6 @@ const LINE_STAMP = /^\[(\d+):(\d+(?:[.:]\d+)?)\]/
const WORD_STAMP = /<(\d+):(\d+(?:[.:]\d+)?)>/g
const HAS_WORD_STAMP = /<\d+:\d+(?:[.:]\d+)?>/
const ID_TAG = /^\[[a-z]+:.*\]$/i
/** A rough singing pace, so a line-timed line's fill tracks its words. */
const ESTIMATED_SECONDS_PER_CHAR = 0.07
function seconds(minutes: string, rest: string) {
return Number(minutes) * 60 + Number(rest.replace(":", "."))
@@ -115,31 +107,10 @@ export function parseLyrics(raw: string): Lyrics | null {
}
lines.sort((a, b) => a.start! - b.start!)
if (lines.length === 0) return null
const synced = lines.every((line) => line.words) ? "word" : "line"
if (synced === "line") estimateWords(lines)
return { synced, lines }
}
/**
* Gives timed lines without word timing words spread over them by length,
* at a singing pace but never past the next line, so they fill as they play.
*/
function estimateWords(lines: LyricLine[]) {
lines.forEach((line, index) => {
if (line.words || line.start === null) return
const next = lines[index + 1]?.start ?? Infinity
const duration = Math.min(
next - line.start,
line.text.length * ESTIMATED_SECONDS_PER_CHAR
)
const perChar = duration / line.text.length
let at = line.start
line.words = (line.text.match(/\S+\s*/g) ?? []).map((text) => {
const start = at
at += text.length * perChar
return { text, start, end: at }
})
})
return {
synced: lines.every((line) => line.words) ? "word" : "line",
lines,
}
}
/** The text without timestamps, one line per row, for search and snippets. */
@@ -214,32 +185,32 @@ export function followLyrics(
return () => clearTimeout(timer)
}
/** Lowercase words of a search, for matching lyrics the way the search index does. */
function searchTerms(query: string): string[] {
return query.toLowerCase().match(/[\p{L}\p{N}']+/gu) ?? []
}
const SNIPPET_LEAD = 24
export type LyricsMatch = {
/** The matched line, trimmed to start near the match. */
snippet: string
/**
* 2 when the line holds the query as typed, 1 when it holds every word of
* it, 0 when it does give or take typos.
*/
score: 0 | 1 | 2
/** Whether the line holds the query as typed, not just its words. */
exact: boolean
}
/**
* Where a search matched the lyrics: the best line holding the query as
* typed, or else every word of it (see `matchWords`). Null when no single
* line does.
* Where a search matched the lyrics: a line holding the query as typed, or
* else a line holding every word of it (the last may be a prefix, as when
* typing). Null when no single line does.
*/
export function matchLyrics(plain: string, query: string): LyricsMatch | null {
const needle = query.trim().toLowerCase()
const terms = searchWords(needle)
// Most songs miss a word entirely, so skip them before checking lines.
if (!needle || !matchWords([...new Set(searchWords(plain))], terms)) {
return null
}
const terms = searchTerms(needle)
const last = terms.at(-1)
if (!needle || last === undefined) return null
let loose: LyricsMatch | null = null
let loose: string | null = null
for (const line of plain.split("\n")) {
const column = line.toLowerCase().indexOf(needle)
if (column !== -1) {
@@ -247,13 +218,15 @@ export function matchLyrics(plain: string, query: string): LyricsMatch | null {
column > SNIPPET_LEAD
? `…${line.slice(column - SNIPPET_LEAD).trimStart()}`
: line.trim()
return { snippet, score: 2 }
return { snippet, exact: true }
}
if (loose?.score === 1) continue
const quality = matchWords(searchWords(line), terms)
if (quality === "exact" || (quality && !loose)) {
loose = { snippet: line.trim(), score: quality === "exact" ? 1 : 0 }
if (loose === null) {
const words = searchTerms(line)
const hasAll =
terms.slice(0, -1).every((term) => words.includes(term)) &&
words.some((word) => word.startsWith(last))
if (hasAll) loose = line.trim()
}
}
return loose
return loose === null ? null : { snippet: loose, exact: false }
}
+10 -14
View File
@@ -1,5 +1,3 @@
import { matchWords, searchWords } from "./fuzzy-search"
type SearchableSong = {
id: string
title: string
@@ -8,9 +6,9 @@ type SearchableSong = {
}
/**
* Case-insensitive match on title, artist, or album, give or take typos (see
* `matchWords`), plus the songs in `lyricsMatches` (from
* `api.lyrics.matchingSongIds`). A blank query keeps every song.
* Case-insensitive match on title, artist, or album, plus the songs in
* `lyricsMatches` (from `api.lyrics.matchingSongIds`). A blank query keeps
* every song.
*/
export function filterSongs<T extends SearchableSong>(
songs: T[],
@@ -21,14 +19,12 @@ export function filterSongs<T extends SearchableSong>(
if (!normalized) {
return songs
}
const terms = searchWords(normalized)
const byLyrics = new Set(lyricsMatches)
return songs.filter((song) => {
if (byLyrics.has(song.id)) return true
const fields = [song.title, song.artist.name, song.album.title]
return (
fields.some((value) => value.toLowerCase().includes(normalized)) ||
matchWords(searchWords(fields.join(" ")), terms) !== null
)
})
return songs.filter(
(song) =>
byLyrics.has(song.id) ||
[song.title, song.artist.name, song.album.title].some((value) =>
value.toLowerCase().includes(normalized)
)
)
}
+11 -27
View File
@@ -27,7 +27,6 @@ import { chunk, type Chunked } from "./limits"
import { recordIntentCatalogChanges } from "./intentCatalogChanges"
import { playlistCoverVersion } from "./playlistCover"
import { deleteSongLyrics, searchSongLyrics, writeSongLyrics } from "./lyrics"
import { matchWords, searchWords } from "../client/fuzzy-search"
export type {
BrowseAlbum,
@@ -619,16 +618,7 @@ export const browseArtistDetail = query({
},
})
/**
* How well `text` matches a lowercase search, from 100 (the whole text) down
* to 20 (every word, give or take typos); 0 is no match. `terms` are the
* query's `searchWords`.
*/
function matchScore(
text: string,
query: string,
terms: readonly string[]
): number {
function matchScore(text: string, query: string): number {
const lower = text.toLowerCase()
if (lower === query) {
return 100
@@ -642,20 +632,15 @@ function matchScore(
if (lower.includes(query)) {
return 40
}
const words = matchWords(searchWords(text), terms)
if (words === "exact") {
return 30
}
return words === "fuzzy" ? 20 : 0
return 0
}
function matchScoreSongArtists(
artist: string | string[],
query: string,
terms: readonly string[]
query: string
): number {
return getSongArtistNames(artist).reduce(
(best, name) => Math.max(best, matchScore(name, query, terms)),
(best, name) => Math.max(best, matchScore(name, query)),
0
)
}
@@ -673,7 +658,6 @@ export const searchLibrary = query({
args: { query: v.string() },
handler: async (ctx, args) => {
const queryText = args.query.trim().toLowerCase()
const terms = searchWords(queryText)
if (!queryText || !(await isSignedIn(ctx))) {
return {
topResults: [],
@@ -694,7 +678,7 @@ export const searchLibrary = query({
.map((artist) => ({
kind: "artist" as const,
item: toBrowseArtist(artist),
score: matchScore(artist.name, queryText, terms),
score: matchScore(artist.name, queryText),
}))
.filter((result) => result.score > 0)
.sort(
@@ -708,8 +692,8 @@ export const searchLibrary = query({
return []
}
const score = Math.max(
matchScore(album.name, queryText, terms),
matchScore(artist.name, queryText, terms)
matchScore(album.name, queryText),
matchScore(artist.name, queryText)
)
if (score === 0) {
return []
@@ -734,10 +718,10 @@ export const searchLibrary = query({
return []
}
const score = Math.max(
matchScore(song.name, queryText, terms),
matchScoreSongArtists(song.artist, queryText, terms),
matchScore(album.name, queryText, terms),
matchScore(albumArtist.name, queryText, terms)
matchScore(song.name, queryText),
matchScoreSongArtists(song.artist, queryText),
matchScore(album.name, queryText),
matchScore(albumArtist.name, queryText)
)
if (score === 0) {
return []
+13 -13
View File
@@ -62,10 +62,10 @@ export async function deleteSongLyrics(ctx: MutationCtx, songId: Id<"songs">) {
}
/**
* Up to `limit` songs with a lyrics line matching `query` (see `matchLyrics`),
* with that line, best matches first. The search index matches any word
* anywhere in the lyrics and ranks common words poorly, so its whole page is
* checked line by line before trimming.
* Songs with a lyrics line matching `query` (see `matchLyrics`), with that
* line. Lines holding the query as typed come first, then the search index's
* relevance order. The index matches words anywhere in the lyrics, so its
* results are checked line by line.
*/
export async function searchSongLyrics(
ctx: QueryCtx,
@@ -77,15 +77,15 @@ export async function searchSongLyrics(
const rows = await ctx.db
.query("lyricsSearch")
.withSearchIndex("search_plain", (q) => q.search("plain", text))
.take(MAX_LYRICS_MATCHES)
return rows
.flatMap((row) => {
const match = matchLyrics(row.plain, text)
return match ? [{ song: row.song, ...match }] : []
})
.sort((a, b) => b.score - a.score)
.slice(0, limit)
.map(({ song, snippet }) => ({ song, snippet }))
.take(limit)
const matches = rows.flatMap((row) => {
const match = matchLyrics(row.plain, text)
return match ? [{ song: row.song, ...match }] : []
})
return [
...matches.filter((match) => match.exact),
...matches.filter((match) => !match.exact),
].map(({ song, snippet }) => ({ song, snippet }))
}
/** The song's lyrics tag (see `client/lyrics.ts`), or null without lyrics. */
-40
View File
@@ -363,18 +363,12 @@ importers:
react-native:
specifier: 0.88.0
version: 0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1)
react-native-continued-task:
specifier: 0.1.0
version: 0.1.0(react-native-nitro-modules@0.37.2(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
react-native-gesture-handler:
specifier: ~3.3.0
version: 3.3.0(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
react-native-image-colors:
specifier: ^2.6.0
version: 2.6.0(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)(supports-color@8.1.1)
react-native-nitro-modules:
specifier: 0.37.2
version: 0.37.2(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
react-native-reanimated:
specifier: 4.7.1
version: 4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
@@ -5444,9 +5438,6 @@ packages:
sass:
optional: true
nitro-core@0.37.2:
resolution: {integrity: sha512-dhagikz9VXXzfidRH/vPNJfYWPmTBArDOo9wE/wEqeERU9C8uRWz9YccOyNUOvADccPAZq319yzhDMoJ9excSQ==}
node-exports-info@1.6.2:
resolution: {integrity: sha512-kXs9Go0cah0qHVV2v389IXQLdLCeE1xfFtjOAF+iobu0OIoG1pje8At2vMHyaPMiPMnG/LWP50twML21eMcAag==}
engines: {node: '>= 0.4'}
@@ -5898,16 +5889,6 @@ packages:
react-is@19.2.7:
resolution: {integrity: sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==}
react-native-continued-task@0.1.0:
resolution: {integrity: sha512-6x9YesK++u6vraaReebWEKbcDjMeRInsQzd+uWXAbNiXasgZ2zulTextzK/zBZ2mBrCZqTZVK60eoPp07BF0MA==}
peerDependencies:
react: '*'
react-native: '*'
react-native-nitro-modules: '*'
peerDependenciesMeta:
react-native-nitro-modules:
optional: true
react-native-drawer-layout@4.2.12:
resolution: {integrity: sha512-qYmntEctkMSodN7pnC2llV21nswImLFPHJeT3PJXSJqZdU4jzDATR8iVi66sXkrtoOLJ2+EvXxgd7sMMpV4ViA==}
peerDependencies:
@@ -5935,12 +5916,6 @@ packages:
react: '*'
react-native: '*'
react-native-nitro-modules@0.37.2:
resolution: {integrity: sha512-Odnrq/p6/q0R01qZlkqeXu9VHHMuGEnZZmyxMvehEu6QiACNHhBCmAHgyBDqOSo9Lb3G0TscFAT+HG0uxsR/GA==}
peerDependencies:
react: '*'
react-native: '*'
react-native-reanimated@4.7.1:
resolution: {integrity: sha512-HviDFSZ6V4KTRsrLS6hRbBJ4j63l/L8a5az0EoWdJwaMLYnBNyYISTDxwXpEYkMbAbLzCMCviIdiOxXHYQWcNA==}
peerDependencies:
@@ -12498,8 +12473,6 @@ snapshots:
- '@types/node'
- babel-plugin-macros
nitro-core@0.37.2: {}
node-exports-info@1.6.2:
dependencies:
array.prototype.flatmap: 1.3.3
@@ -12963,13 +12936,6 @@ snapshots:
react-is@19.2.7: {}
react-native-continued-task@0.1.0(react-native-nitro-modules@0.37.2(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0):
dependencies:
react: 19.3.0
react-native: 0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1)
optionalDependencies:
react-native-nitro-modules: 0.37.2(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
react-native-drawer-layout@4.2.12(309f9235979e0472ca5a2d24f8d225b6):
dependencies:
color: 4.2.3
@@ -13001,12 +12967,6 @@ snapshots:
react: 19.3.0
react-native: 0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1)
react-native-nitro-modules@0.37.2(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0):
dependencies:
nitro-core: 0.37.2
react: 19.3.0
react-native: 0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1)
react-native-reanimated@4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0):
dependencies:
react: 19.3.0
-22
View File
@@ -1,22 +0,0 @@
#!/usr/bin/env bash
# Uploads a file to the Gitea release for the current tag, creating the release
# if it does not exist yet. Used by .gitea/workflows/mobile-build.yml.
# Usage: GITEA_TOKEN=... upload-release-asset.sh <file>
set -euo pipefail
file=$1
api="$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/releases"
auth=(-H "Authorization: token $GITEA_TOKEN")
json_id() { node -pe 'JSON.parse(require("fs").readFileSync(0, "utf8")).id'; }
existing_id() { curl -fsS "${auth[@]}" "$api/tags/$GITHUB_REF_NAME" | json_id; }
create_id() {
curl -fsS "${auth[@]}" -H "Content-Type: application/json" \
-d "{\"tag_name\":\"$GITHUB_REF_NAME\",\"name\":\"$GITHUB_REF_NAME\"}" "$api" | json_id
}
# Android and iOS race to create the release; whoever loses re-reads it.
id=$(existing_id 2>/dev/null || create_id || existing_id)
curl -fsS "${auth[@]}" -F "attachment=@$file" \
"$api/$id/assets?name=$(basename "$file")" > /dev/null