Compare commits
3
Commits
No files matched your search
@@ -489,8 +489,21 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
) => Promise<void>
|
||||
}) {
|
||||
const Row = Platform.OS === "ios" ? SongSwipeRow : Pressable
|
||||
const { config } = useServerConfig()
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={
|
||||
config
|
||||
? {
|
||||
kind: "song",
|
||||
title: track.title,
|
||||
artist: album.artist.name,
|
||||
album: album.title,
|
||||
artworkUrl: albumCoverUrl(config.serverUrl, album.id),
|
||||
hasArtwork: album.cover != null,
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
stationArtistId={album.artist.id}
|
||||
favorited={favorited}
|
||||
navigation={{
|
||||
|
||||
@@ -141,6 +141,12 @@ const ArtistRow = memo(function ArtistRow({
|
||||
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={{
|
||||
kind: "artist",
|
||||
title: artist.name,
|
||||
artworkUrl: artistCoverUrl(serverUrl, artist.id),
|
||||
hasArtwork: artist.photo != null,
|
||||
}}
|
||||
favorited={favorited}
|
||||
share={{ type: "artist", artistId: artist.id, title: artist.name }}
|
||||
onAction={(action) => void onAction(artist, action)}
|
||||
@@ -160,7 +166,11 @@ const ArtistRow = memo(function ArtistRow({
|
||||
>
|
||||
{artist.name}
|
||||
</Text>
|
||||
<Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
|
||||
<Ionicons
|
||||
name="chevron-forward"
|
||||
size={16}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaContextMenu>
|
||||
)
|
||||
|
||||
@@ -94,6 +94,13 @@ export const AlbumCard = memo(function AlbumCard({
|
||||
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={{
|
||||
kind: "album",
|
||||
title: album.title,
|
||||
artist: album.artist.name,
|
||||
artworkUrl: albumCoverUrl(config.serverUrl, album.id),
|
||||
hasArtwork: album.cover != null,
|
||||
}}
|
||||
favorited={isAlbumFavorite(album.id)}
|
||||
stationArtistId={album.artist.id}
|
||||
navigation={{ artist: { id: album.artist.id } }}
|
||||
@@ -149,6 +156,12 @@ export const ArtistCard = memo(function ArtistCard({
|
||||
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={{
|
||||
kind: "artist",
|
||||
title: artist.name,
|
||||
artworkUrl: artistCoverUrl(config.serverUrl, artist.id),
|
||||
hasArtwork: artist.photo != null,
|
||||
}}
|
||||
favorited={isArtistFavorite(artist.id)}
|
||||
share={{ type: "artist", artistId: artist.id, title: artist.name }}
|
||||
onAction={(action) => void handleArtistAction(artist, action)}
|
||||
|
||||
@@ -4,12 +4,19 @@ import { requireNativeView } from "expo"
|
||||
import type { ComponentType, ReactNode } from "react"
|
||||
import {
|
||||
Platform,
|
||||
Text,
|
||||
useWindowDimensions,
|
||||
View,
|
||||
type StyleProp,
|
||||
type ViewProps,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import type { MediaShareContext } from "@/lib/media-links"
|
||||
import { shouldShowShare } from "@/lib/media-links"
|
||||
@@ -32,7 +39,17 @@ export type MediaNavigation = {
|
||||
album?: { id: string }
|
||||
}
|
||||
|
||||
export type MediaMenuPreview = {
|
||||
title: string
|
||||
artist?: string
|
||||
album?: string
|
||||
artworkUrl: string
|
||||
hasArtwork: boolean
|
||||
kind: "album" | "artist" | "song"
|
||||
}
|
||||
|
||||
export type MediaMenuConfig = {
|
||||
preview?: MediaMenuPreview
|
||||
selectedCount?: number
|
||||
playlistLabel?: string
|
||||
favorited?: boolean
|
||||
@@ -214,10 +231,95 @@ function MediaMenuBase({
|
||||
const NativeContextMenuView =
|
||||
Platform.OS === "ios"
|
||||
? requireNativeView<
|
||||
ViewProps & { disableForceFlatten?: boolean; children: ReactNode }
|
||||
ViewProps & {
|
||||
disableForceFlatten?: boolean
|
||||
children: ReactNode
|
||||
onPreviewTappedAnimationCompleted?: () => void
|
||||
}
|
||||
>("ExpoRouterNativeLinkPreview", "NativeLinkPreviewView")
|
||||
: null
|
||||
|
||||
const NativeContextMenuPreview =
|
||||
Platform.OS === "ios"
|
||||
? requireNativeView<
|
||||
ViewProps & {
|
||||
preferredContentSize: { width: number; height: number }
|
||||
children: ReactNode
|
||||
}
|
||||
>("ExpoRouterNativeLinkPreview", "NativeLinkPreviewContentView")
|
||||
: null
|
||||
|
||||
function MediaPreview({ preview }: { preview: MediaMenuPreview }) {
|
||||
const colors = useThemeColors()
|
||||
const { width: windowWidth, fontScale } = useWindowDimensions()
|
||||
if (!NativeContextMenuPreview) return null
|
||||
|
||||
const width = Math.min(360, windowWidth - 32)
|
||||
const height = Math.max(124, 32 + 76 * fontScale)
|
||||
const isArtist = preview.kind === "artist"
|
||||
return (
|
||||
// Match Expo Router's preview wrapper: UIKit mounts this separately, but
|
||||
// Yoga must also keep it out of the trigger's normal layout.
|
||||
<NativeContextMenuPreview
|
||||
preferredContentSize={{ width, height }}
|
||||
style={{ position: "absolute", top: 0, left: 0 }}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
width,
|
||||
height,
|
||||
padding: 16,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 16,
|
||||
backgroundColor: colors.card,
|
||||
}}
|
||||
>
|
||||
<CoverImage
|
||||
uri={preview.artworkUrl}
|
||||
hasCover={preview.hasArtwork}
|
||||
style={{ width: 88, height: 88, borderRadius: isArtist ? 44 : 12 }}
|
||||
/>
|
||||
<View style={{ flex: 1, gap: 2 }}>
|
||||
<Text
|
||||
numberOfLines={2}
|
||||
style={{
|
||||
color: colors.foreground,
|
||||
fontSize: 17,
|
||||
fontWeight: "600",
|
||||
}}
|
||||
>
|
||||
{preview.title}
|
||||
</Text>
|
||||
{preview.artist ? (
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
style={{ color: colors.mutedForeground, fontSize: 15 }}
|
||||
>
|
||||
{preview.artist}
|
||||
</Text>
|
||||
) : null}
|
||||
{preview.album ? (
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
style={{ color: colors.mutedForeground, fontSize: 14 }}
|
||||
>
|
||||
{preview.album}
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
{preview.kind !== "song" ? (
|
||||
<Ionicons
|
||||
name="chevron-forward"
|
||||
size={20}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
) : null}
|
||||
</View>
|
||||
</NativeContextMenuPreview>
|
||||
)
|
||||
}
|
||||
|
||||
const NativeContextMenuAction: ComponentType<{
|
||||
identifier: string
|
||||
title: string
|
||||
@@ -233,11 +335,13 @@ const NativeContextMenuAction: ComponentType<{
|
||||
|
||||
function NativeMediaContextMenu({
|
||||
children,
|
||||
preview,
|
||||
onAction,
|
||||
share,
|
||||
...actionConfig
|
||||
}: MediaMenuWrapperProps) {
|
||||
const { config } = useServerConfig()
|
||||
const { push } = useAppNavigation()
|
||||
|
||||
if (!NativeContextMenuView || !NativeContextMenuAction) {
|
||||
return children
|
||||
@@ -252,10 +356,21 @@ function NativeMediaContextMenu({
|
||||
}
|
||||
|
||||
return (
|
||||
<NativeContextMenuView style={{ display: "contents" }} disableForceFlatten>
|
||||
<NativeContextMenuView
|
||||
style={{ display: "contents" }}
|
||||
disableForceFlatten
|
||||
onPreviewTappedAnimationCompleted={() => {
|
||||
if (share?.type === "artist") push(`/artist/${share.artistId}`)
|
||||
else if (share?.type === "album" || share?.type === "song")
|
||||
push(`/album/${share.albumId}`)
|
||||
}}
|
||||
>
|
||||
{/* The native menu retains its first trigger. Keep that view mounted when
|
||||
focus changes replace the Siri entity wrapper inside it. */}
|
||||
<View collapsable={false}>{children}</View>
|
||||
{preview && (actionConfig.selectedCount ?? 1) === 1 ? (
|
||||
<MediaPreview preview={preview} />
|
||||
) : null}
|
||||
{buildMediaMenuActions({ ...actionConfig, share }).map((action) => (
|
||||
<NativeContextMenuAction
|
||||
key={action.id}
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
import type { MenuComponentProps } from "@expo/ui/community/menu"
|
||||
import { Button, Host, Menu, RNHostView } from "@expo/ui/swift-ui"
|
||||
import { disabled, menuOrder } from "@expo/ui/swift-ui/modifiers"
|
||||
|
||||
// SwiftUI's automatic order reverses menus that open upward in the player.
|
||||
// Keep the same top-to-bottom order as the UIKit long-press menus.
|
||||
export function MenuView({
|
||||
actions,
|
||||
children,
|
||||
style,
|
||||
testID,
|
||||
onPressAction,
|
||||
}: MenuComponentProps) {
|
||||
return (
|
||||
<Host matchContents style={style} testID={testID} ignoreSafeArea="all">
|
||||
<Menu
|
||||
modifiers={[menuOrder("fixed")]}
|
||||
label={
|
||||
<RNHostView matchContents>
|
||||
<>{children}</>
|
||||
</RNHostView>
|
||||
}
|
||||
>
|
||||
{actions
|
||||
.filter((action) => !action.attributes?.hidden)
|
||||
.map((action) => (
|
||||
<Button
|
||||
key={action.id ?? action.title}
|
||||
label={action.title}
|
||||
systemImage={
|
||||
typeof action.image === "string" ? action.image : undefined
|
||||
}
|
||||
role={action.attributes?.destructive ? "destructive" : undefined}
|
||||
modifiers={[disabled(action.attributes?.disabled ?? false)]}
|
||||
onPress={() =>
|
||||
onPressAction?.({
|
||||
nativeEvent: { event: action.id ?? action.title },
|
||||
})
|
||||
}
|
||||
/>
|
||||
))}
|
||||
</Menu>
|
||||
</Host>
|
||||
)
|
||||
}
|
||||
@@ -172,6 +172,7 @@ export const SongListRow = memo(function SongListRow({
|
||||
onPlay: (song: BrowseSong) => void
|
||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||
}) {
|
||||
const { config } = useServerConfig()
|
||||
const handlePress = useCallback(() => onPlay(song), [onPlay, song])
|
||||
|
||||
return (
|
||||
@@ -182,6 +183,16 @@ export const SongListRow = memo(function SongListRow({
|
||||
swipe={swipe}
|
||||
onPress={handlePress}
|
||||
contextMenu={{
|
||||
preview: config
|
||||
? {
|
||||
kind: "song",
|
||||
title: song.title,
|
||||
artist: song.artist.name,
|
||||
album: song.album.title,
|
||||
artworkUrl: albumCoverUrl(config.serverUrl, song.album.id),
|
||||
hasArtwork: song.album.cover != null,
|
||||
}
|
||||
: undefined,
|
||||
stationArtistId: song.artist.id,
|
||||
favorited,
|
||||
playlistLabel,
|
||||
|
||||
@@ -68,6 +68,21 @@ async function coverPathIfExists(path: string): Promise<string | null> {
|
||||
.catch(() => null)
|
||||
}
|
||||
|
||||
async function shouldReplaceCover(dbCover: string | null) {
|
||||
return dbCover === null || (await coverPathIfExists(dbCover)) === null
|
||||
}
|
||||
|
||||
function isCodecPath(filePath: string, codec: string) {
|
||||
return filePath.startsWith(`${DATA_DIR}/${codec}/`)
|
||||
}
|
||||
|
||||
function releaseDate(common: music.ICommonTagsResult) {
|
||||
if (common.date) {
|
||||
return common.date
|
||||
}
|
||||
return common.year ? `01-01-${common.year}` : ""
|
||||
}
|
||||
|
||||
async function syncArtistCover(
|
||||
ctx: ActionCtx,
|
||||
codec: string,
|
||||
@@ -77,13 +92,13 @@ async function syncArtistCover(
|
||||
) {
|
||||
const onDisk = await coverPathIfExists(diskPath)
|
||||
if (onDisk !== null) {
|
||||
if (dbCover !== onDisk) {
|
||||
if (await shouldReplaceCover(dbCover)) {
|
||||
await ctx.runMutation(internal.library.updateArtistCover, {
|
||||
id,
|
||||
cover: onDisk,
|
||||
})
|
||||
}
|
||||
} else if (dbCover !== null && dbCover.includes(codec)) {
|
||||
} else if (dbCover !== null && isCodecPath(dbCover, codec)) {
|
||||
await ctx.runMutation(internal.library.updateArtistCover, {
|
||||
id,
|
||||
cover: null,
|
||||
@@ -100,13 +115,13 @@ async function syncAlbumCover(
|
||||
) {
|
||||
const onDisk = await coverPathIfExists(diskPath)
|
||||
if (onDisk !== null) {
|
||||
if (dbCover !== onDisk) {
|
||||
if (await shouldReplaceCover(dbCover)) {
|
||||
await ctx.runMutation(internal.library.updateAlbumCover, {
|
||||
id,
|
||||
cover: onDisk,
|
||||
})
|
||||
}
|
||||
} else if (dbCover !== null && dbCover.includes(codec)) {
|
||||
} else if (dbCover !== null && isCodecPath(dbCover, codec)) {
|
||||
await ctx.runMutation(internal.library.updateAlbumCover, {
|
||||
id,
|
||||
cover: null,
|
||||
@@ -402,9 +417,8 @@ export const scheduledUpdateLibrary = internalAction({
|
||||
name: metadata.common.album || potentialAlbum,
|
||||
folder: potentialAlbum,
|
||||
cover,
|
||||
year: metadata.common.year || 2026,
|
||||
date:
|
||||
metadata.common.date || `01-01-${metadata.common.year || 2026}`,
|
||||
year: metadata.common.year || 0,
|
||||
date: releaseDate(metadata.common),
|
||||
artist: dbArtist._id,
|
||||
})
|
||||
} catch {}
|
||||
@@ -494,11 +508,14 @@ export const scheduledUpdateLibrary = internalAction({
|
||||
)
|
||||
|
||||
if (existingSong) {
|
||||
// A tracked path that still exists is a different file with the
|
||||
// same title; replacing it would flip-flop between scans.
|
||||
const trackedPath = existingSong.files[codec]
|
||||
if (
|
||||
!(codec in existingSong.files) ||
|
||||
existingSong.files[codec] !== path
|
||||
trackedPath === undefined ||
|
||||
!fsSync.existsSync(trackedPath)
|
||||
) {
|
||||
const update = { [codec]: path, ...existingSong.files }
|
||||
const update = { ...existingSong.files, [codec]: path }
|
||||
updateSongs.push({
|
||||
id: existingSong._id,
|
||||
files: update,
|
||||
@@ -550,10 +567,8 @@ export const scheduledUpdateLibrary = internalAction({
|
||||
? 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}`,
|
||||
year: metadata.common.year || 0,
|
||||
date: releaseDate(metadata.common),
|
||||
genres: metadata.common.genre || [],
|
||||
})
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user