kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2025-09-13 16:05:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not probe Song.Link when ISRC results are valid, fix rate limit

Browse Source
This commit is contained in:
Seungmin Kim 2025-03-27 03:10:01 -07:00
parent 2c5cd8d505
commit 88f208a7d0
4 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/extensions/track.dart
View File

@ -69,34 +69,39 @@ extension TrackExtensions on Track {
} }
} }
extension TrackSimpleExtensions on TrackSimple { extension IterableTrackSimpleExtensions on Iterable<TrackSimple> {
Future<Track> asTrack(AlbumSimple album, ref) async { Future<List<Track>> asTracks(AlbumSimple album, ref) async {
try { try {
final spotify = ref.read(spotifyProvider); final spotify = ref.read(spotifyProvider);
return await spotify.invoke((api) => api.tracks.get(id!)); final tracks = await spotify.invoke(
(api) => api.tracks.list(map((trackSimple) => trackSimple.id!).toList()));
return tracks.toList();
} catch (e, stack) { } catch (e, stack) {
// Ignore errors and create the track locally // Ignore errors and create the track locally
AppLogger.reportError(e, stack); AppLogger.reportError(e, stack);
List<Track> tracks = [];
for (final trackSimple in this) {
Track track = Track(); Track track = Track();
track.name = name;
track.album = album; track.album = album;
track.artists = artists; track.name = trackSimple.name;
track.availableMarkets = availableMarkets; track.artists = trackSimple.artists;
track.discNumber = discNumber; track.availableMarkets = trackSimple.availableMarkets;
track.durationMs = durationMs; track.discNumber = trackSimple.discNumber;
track.explicit = explicit; track.durationMs = trackSimple.durationMs;
track.externalUrls = externalUrls; track.explicit = trackSimple.explicit;
track.href = href; track.externalUrls = trackSimple.externalUrls;
track.id = id; track.href = trackSimple.href;
track.isPlayable = isPlayable; track.id = trackSimple.id;
track.linkedFrom = linkedFrom; track.isPlayable = trackSimple.isPlayable;
track.name = name; track.linkedFrom = trackSimple.linkedFrom;
track.previewUrl = previewUrl; track.previewUrl = trackSimple.previewUrl;
track.trackNumber = trackNumber; track.trackNumber = trackSimple.trackNumber;
track.type = type; track.type = trackSimple.type;
track.uri = uri; track.uri = trackSimple.uri;
return track; tracks.add(track);
}
return tracks;
} }
} }
} }

3
lib/modules/album/album_card.dart
View File

@ -54,8 +54,7 @@ class AlbumCard extends HookConsumerWidget {
Future<List<Track>> fetchAllTrack() async { Future<List<Track>> fetchAllTrack() async {
if (album.tracks != null && album.tracks!.isNotEmpty) { if (album.tracks != null && album.tracks!.isNotEmpty) {
return await Future.wait( return album.tracks!.asTracks(album, ref);
album.tracks!.map((track) => track.asTrack(album, ref)));
} }
await ref.read(albumTracksProvider(album).future); await ref.read(albumTracksProvider(album).future);
return ref.read(albumTracksProvider(album).notifier).fetchAll(); return ref.read(albumTracksProvider(album).notifier).fetchAll();

2
lib/provider/spotify/album/tracks.dart
View File

@ -33,7 +33,7 @@ class AlbumTracksNotifier extends AutoDisposeFamilyPaginatedAsyncNotifier<Track,
final tracks = await spotify.invoke( final tracks = await spotify.invoke(
(api) => api.albums.tracks(arg.id!).getPage(limit, offset), (api) => api.albums.tracks(arg.id!).getPage(limit, offset),
); );
final List<Track> items = await Future.wait(tracks.items?.map((e) => e.asTrack(arg, ref)) ?? []); final items = await tracks.items!.asTracks(arg, ref);
return ( return (
items: items, items: items,

5
lib/services/sourced_track/sources/youtube.dart
View File

@ -284,12 +284,13 @@ class YoutubeSourcedTrack extends SourcedTrack {
}) async { }) async {
final videoResults = <YoutubeVideoInfo>[]; final videoResults = <YoutubeVideoInfo>[];
videoResults.addAll(await fetchFromIsrc(track: track, provider: youtubeEngineProvider, ref: ref)); final isrcResults = await fetchFromIsrc(track: track, provider: youtubeEngineProvider, ref: ref);
videoResults.addAll(isrcResults);
final links = await SongLinkService.links(track.id!); final links = await SongLinkService.links(track.id!);
final ytLink = links.firstWhereOrNull((link) => link.platform == "youtube"); final ytLink = links.firstWhereOrNull((link) => link.platform == "youtube");
if (ytLink?.url != null) { if (isrcResults.isEmpty && ytLink?.url != null) {
try { try {
videoResults.add( videoResults.add(
YoutubeVideoInfo.fromVideo( YoutubeVideoInfo.fromVideo(