mirror/App
1
0
Fork 0
mirror of https://github.com/Jellify-Music/App.git synced 2026-05-04 18:00:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Queue Provider Hotfix (#292)

Browse Source 
Updates to queuing mechanism - namely around playing an item next in the queue
This commit is contained in:
Violet Caulfield
2025-04-26 18:24:43 -05:00
committed by GitHub
parent c83272a04b
commit 926caeae1c
8 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/Global/components/track.tsx
+1 -3
View File
@@ -88,9 +88,7 @@ export default function Track({
queuingType: QueuingType.FromSelection,
},
{
onSuccess: () => {
useStartPlayback.mutate()
},
onSuccess: () => useStartPlayback.mutate(),
},
)
}
components/Home/helpers/frequent-tracks.tsx
+1 -3
View File
@@ -59,9 +59,7 @@ export default function FrequentlyPlayedTracks({
queuingType: QueuingType.FromSelection,
},
{
onSuccess: () => {
useStartPlayback.mutate()
},
onSuccess: () => useStartPlayback.mutate(),
},
)
}}
components/Home/helpers/recently-played.tsx
+1 -3
View File
@@ -59,9 +59,7 @@ export default function RecentlyPlayed({
queuingType: QueuingType.FromSelection,
},
{
onSuccess: () => {
useStartPlayback.mutate()
},
onSuccess: () => useStartPlayback.mutate(),
},
)
}}
components/Library/categories.ts
+6 -2
View File
@@ -1,11 +1,15 @@
import { BaseItemDto } from '@jellyfin/sdk/lib/generated-client/models'
import { QueryKeys } from '../../enums/query-keys'
import { Queue } from '../../player/types/queue-item'
interface CategoryRoute {
/* eslint-disable @typescript-eslint/no-explicit-any */
name: any // ¯\_(ツ)_/¯
iconName: string
params?: {
query: QueryKeys
query?: QueryKeys
queue?: Queue
tracks?: BaseItemDto[]
}
}
@@ -16,7 +20,7 @@ const Categories: CategoryRoute[] = [
params: { query: QueryKeys.FavoriteArtists },
},
{ name: 'Albums', iconName: 'music-box-multiple', params: { query: QueryKeys.FavoriteAlbums } },
{ name: 'Tracks', iconName: 'music-note', params: { query: QueryKeys.FavoriteTracks } },
{ name: 'Tracks', iconName: 'music-note', params: { queue: 'Favorite Tracks' } },
{ name: 'Playlists', iconName: 'playlist-music' },
]
components/Playlist/component.tsx
+1 -1
View File
@@ -176,7 +176,7 @@ export default function Playlist({ playlist, navigation }: PlaylistProps): React
navigation={navigation}
track={track}
tracklist={tracks!}
index={getIndex()}
index={getIndex() ?? 0}
queue={playlist}
showArtwork
onLongPress={editing ? drag : undefined}
components/Tracks/screen.tsx
+17 -2
View File
@@ -3,20 +3,35 @@ import React from 'react'
import Track from '../Global/components/track'
import { FlatList } from 'react-native'
import { Separator } from 'tamagui'
import { useQuery } from '@tanstack/react-query'
import { QueryKeys } from '../../enums/query-keys'
import { fetchFavoriteTracks } from '../../api/queries/functions/favorites'
export default function TracksScreen({ route, navigation }: TracksProps): React.JSX.Element {
const { data: favoriteTracks } = useQuery({
queryKey: [QueryKeys.FavoriteTracks],
queryFn: fetchFavoriteTracks,
})
return (
<FlatList
contentInsetAdjustmentBehavior='automatic'
ItemSeparatorComponent={() => <Separator />}
numColumns={1}
data={route.params.tracks}
data={route.params.tracks ? route.params.tracks : favoriteTracks ? favoriteTracks : []}
renderItem={({ index, item: track }) => (
<Track
navigation={navigation}
showArtwork
index={index}
track={track}
tracklist={route.params.tracks?.slice(index, index + 50) ?? []}
tracklist={
route.params.tracks
? route.params.tracks.slice(index, index + 50)
: favoriteTracks
? favoriteTracks
: []
}
queue={route.params.queue}
/>
)}
ios/Jellify.xcodeproj/project.pbxproj
+10 -8
View File
@@ -519,10 +519,14 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Jellify/Pods-Jellify-resources-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Jellify/Pods-Jellify-resources-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Jellify/Pods-Jellify-resources.sh\"\n";
@@ -536,10 +540,14 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Jellify/Pods-Jellify-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Jellify/Pods-Jellify-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Jellify/Pods-Jellify-frameworks.sh\"\n";
@@ -839,10 +847,7 @@
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
);
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
OTHER_LDFLAGS = "$(inherited) ";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -928,10 +933,7 @@
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
);
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
OTHER_LDFLAGS = "$(inherited) ";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
player/queue-provider.tsx
+2 -9
View File
@@ -127,11 +127,7 @@ const QueueContextInitailizer = () => {
setUpdateRntp(false)
TrackPlayer.add([playNextTrack], currentIndex + 1)
setPlayQueue([
...playQueue.slice(0, currentIndex + 1),
playNextTrack,
...playQueue.slice(currentIndex + 1),
])
setPlayQueue((await getQueue()) as JellifyTrack[])
}
const playInQueue = async (items: BaseItemDto[]) => {
@@ -189,10 +185,7 @@ const QueueContextInitailizer = () => {
setUpdateRntp(false)
TrackPlayer.remove([index])
setPlayQueue([
...playQueue.slice(0, index),
...playQueue.slice(index + 1, playQueue.length - 1),
])
setPlayQueue((await getQueue()) as JellifyTrack[])
},
})