This commit is contained in:
krishang0224 2026-09-23 11:17:48 +00:00 committed by GitHub
commit b8251fcd9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,4 +1,5 @@
import 'package:spotube/provider/metadata_plugin/metadata_plugin_provider.dart';
import 'package:spotube/models/metadata/metadata.dart';
import 'package:spotube/services/logger/logger.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
@ -9,8 +10,9 @@ import 'package:spotube/services/audio_player/audio_player.dart';
void useEndlessPlayback(WidgetRef ref) {
final playback = ref.watch(audioPlayerProvider.notifier);
final audioPlayerState = ref.watch(audioPlayerProvider);
final endlessPlayback =
ref.watch(userPreferencesProvider.select((s) => s.endlessPlayback));
final endlessPlayback = ref.watch(
userPreferencesProvider.select((s) => s.endlessPlayback),
);
final metadataPlugin = ref.watch(metadataPluginProvider.future);
useEffect(
@ -23,19 +25,54 @@ void useEndlessPlayback(WidgetRef ref) {
if (index != playlist.tracks.length - 1) return;
final track = playlist.tracks.last;
final plugin = await metadataPlugin;
if (plugin == null) return;
final tracks = await (await metadataPlugin)?.track.radio(track.id);
final tracks = <SpotubeFullTrackObject>[];
final existingIds = playlist.tracks.map((track) => track.id).toSet();
if (tracks == null || tracks.isEmpty) return;
Future<void> addFirstAvailable(
Future<Iterable<SpotubeFullTrackObject>> Function() load,
) async {
if (tracks.isNotEmpty) return;
await playback.addTracks(
tracks.toList()
..removeWhere((e) {
final playlist = ref.read(audioPlayerProvider);
final isDuplicate = playlist.tracks.any((t) => t.id == e.id);
return e.id == track.id || isDuplicate;
}),
try {
final candidates = await load();
for (final candidate in candidates) {
if (existingIds.add(candidate.id)) {
tracks.add(candidate);
}
}
} catch (error, stack) {
// A provider may not implement every discovery endpoint. Keep
// trying the progressively broader fallbacks below.
AppLogger.reportError(error, stack);
}
}
// Prefer the provider's recommendations. Some providers currently
// return an empty list or throw here, leaving a searched song as a
// one-item queue even when Endless Playback is enabled.
await addFirstAvailable(() => plugin.track.radio(track.id));
// Keep playback moving with the rest of the album when radio is not
// available. Singles naturally fall through to the artist fallback.
await addFirstAvailable(
() async =>
(await plugin.album.tracks(track.album.id, limit: 50)).items,
);
if (track.artists.isNotEmpty) {
await addFirstAvailable(
() async => (await plugin.artist.topTracks(
track.artists.first.id,
limit: 50,
)).items,
);
}
if (tracks.isEmpty) return;
await playback.addTracks(tracks);
} catch (e, stack) {
AppLogger.reportError(e, stack);
}
@ -49,8 +86,9 @@ void useEndlessPlayback(WidgetRef ref) {
listener(audioPlayerState.currentIndex);
}
final subscription =
audioPlayer.currentIndexChangedStream.listen(listener);
final subscription = audioPlayer.currentIndexChangedStream.listen(
listener,
);
return subscription.cancel;
},