diff --git a/lib/providers/music_player_provider.dart b/lib/providers/music_player_provider.dart index 06a251ce3..dcea43576 100644 --- a/lib/providers/music_player_provider.dart +++ b/lib/providers/music_player_provider.dart @@ -309,6 +309,21 @@ final playQueueProvider = StreamProvider>((ref) { return ref.watch(musicPlayerRuntimeProvider).queueEvents(); }); +/// Prefers the reported queue index while it still names the current item. +final currentQueueIndexProvider = Provider((ref) { + final queue = ref.watch(playQueueProvider).value ?? const []; + final id = ref.watch(currentMediaItemProvider.select((s) => s.value?.id)); + final index = ref.watch( + playbackStateProvider.select((state) => state.value?.queueIndex), + ); + return index != null && + index >= 0 && + index < queue.length && + queue[index].id == id + ? index + : queue.indexWhere((item) => item.id == id); +}); + class MusicPlayerController { MusicPlayerController({MusicPlayerRuntime? runtime}) : _runtime = runtime ?? musicPlayerRuntime; diff --git a/lib/widgets/mornye_player_layout.dart b/lib/widgets/mornye_player_layout.dart index 0f8b24c26..314de5dcb 100644 --- a/lib/widgets/mornye_player_layout.dart +++ b/lib/widgets/mornye_player_layout.dart @@ -99,16 +99,7 @@ class MornyePlayerLayout extends ConsumerWidget { ? Duration.zero : const Duration(milliseconds: 380); final queue = ref.watch(playQueueProvider).value ?? const []; - final reportedIndex = ref.watch( - playbackStateProvider.select((state) => state.value?.queueIndex), - ); - final currentIndex = - reportedIndex != null && - reportedIndex >= 0 && - reportedIndex < queue.length && - queue[reportedIndex].id == mediaItem.id - ? reportedIndex - : queue.indexWhere((item) => item.id == mediaItem.id); + final currentIndex = ref.watch(currentQueueIndexProvider); final landscape = MediaQuery.sizeOf(context).width > MediaQuery.sizeOf(context).height; Widget hideControls(Widget child) => PlayerLyricsControlsVisibility( diff --git a/lib/widgets/mornye_player_queue.dart b/lib/widgets/mornye_player_queue.dart index a4518b591..63feb6908 100644 --- a/lib/widgets/mornye_player_queue.dart +++ b/lib/widgets/mornye_player_queue.dart @@ -17,27 +17,15 @@ class MornyePlayerQueue extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final queue = ref.watch(playQueueProvider).value ?? const []; - final currentId = ref.watch( - currentMediaItemProvider.select((item) => item.value?.id), - ); final playback = ref.watch( playbackStateProvider.select( (state) => ( - index: state.value?.queueIndex, shuffle: state.value?.shuffleMode == AudioServiceShuffleMode.all, repeat: state.value?.repeatMode ?? AudioServiceRepeatMode.none, ), ), ); - final reportedIndex = playback.index; - final currentIndex = - reportedIndex != null && - reportedIndex >= 0 && - reportedIndex < queue.length && - queue[reportedIndex].id == currentId - ? reportedIndex - : queue.indexWhere((item) => item.id == currentId); - final start = currentIndex + 1; + final start = ref.watch(currentQueueIndexProvider) + 1; final count = queue.length - start; final controller = ref.read(musicPlayerControllerProvider); final autoMix = ref.watch(settingsProvider.select((s) => s.autoMix)); diff --git a/test/current_queue_index_provider_test.dart b/test/current_queue_index_provider_test.dart new file mode 100644 index 000000000..41d168561 --- /dev/null +++ b/test/current_queue_index_provider_test.dart @@ -0,0 +1,42 @@ +import 'package:audio_service/audio_service.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mornye/providers/music_player_provider.dart'; + +Future _index(List ids, String? current, int? reported) async { + final queue = [for (final id in ids) MediaItem(id: id, title: id)]; + final container = ProviderContainer( + overrides: [ + playQueueProvider.overrideWith((ref) => Stream.value(queue)), + currentMediaItemProvider.overrideWithBuild( + (ref, notifier) => Stream.value( + current == null ? null : MediaItem(id: current, title: current), + ), + ), + playbackStateProvider.overrideWith( + (ref) => Stream.value(PlaybackState(queueIndex: reported)), + ), + ], + ); + addTearDown(container.dispose); + final subscription = container.listen(currentQueueIndexProvider, (_, _) {}); + await container.read(playQueueProvider.future); + await container.read(currentMediaItemProvider.future); + await container.read(playbackStateProvider.future); + return subscription.read(); +} + +void main() { + test('reported index wins only while it names the current item', () async { + // A repeated track keeps the reported copy. + expect(await _index(['a', 'b', 'a'], 'a', 2), 2); + // Shuffle or a stale report falls back to the first match. + expect(await _index(['a', 'b', 'c'], 'c', 0), 2); + expect(await _index(['a', 'b', 'c'], 'b', 7), 1); + expect(await _index(['a', 'b', 'c'], 'b', -1), 1); + expect(await _index(['a', 'b', 'c'], 'b', null), 1); + expect(await _index(['a', 'b'], 'x', 1), -1); + expect(await _index([], 'a', 0), -1); + expect(await _index(['a'], null, 0), -1); + }); +}