Merge b493642f21 into 0ec9f3535b

lib/collections/fake.dart

@@ -94,6 +94,7 @@ abstract class FakeData {
     ..trackNumber = 1
     ..type = "type"
     ..uri = "uri"
+    ..externalIds = externalIds
     ..isPlayable = true
     ..explicit = false
     ..linkedFrom = trackLink;

lib/extensions/track.dart

@@ -4,7 +4,9 @@ import 'dart:typed_data';
 import 'package:metadata_god/metadata_god.dart';
 import 'package:path/path.dart';
 import 'package:spotify/spotify.dart';
+import 'package:spotube/provider/spotify/spotify.dart';
 import 'package:spotube/services/audio_player/audio_player.dart';
+import 'package:spotube/services/logger/logger.dart';
 
 extension TrackExtensions on Track {
   Track fromFile(
@@ -68,26 +70,38 @@ extension TrackExtensions on Track {
 }
 
 extension TrackSimpleExtensions on TrackSimple {
-  Track asTrack(AlbumSimple album) {
+  Future<Track> asTrack(AlbumSimple album, ref) async {
-    Track track = Track();
+    try {
-    track.name = name;
+      final spotify = ref.read(spotifyProvider);
-    track.album = album;
+      return await spotify.invoke((api) => api.tracks.get(id!));
-    track.artists = artists;
+    } catch (e, stack) {
-    track.availableMarkets = availableMarkets;
+      if ((e is AuthorizationException && e.error != 'invalid_token') ||
-    track.discNumber = discNumber;
+          e is SpotifyException) {
-    track.durationMs = durationMs;
+        // Ignore this error and create the Track locally
-    track.explicit = explicit;
+        AppLogger.reportError(e, stack);
-    track.externalUrls = externalUrls;
+
-    track.href = href;
+        Track track = Track();
-    track.id = id;
+        track.name = name;
-    track.isPlayable = isPlayable;
+        track.album = album;	
-    track.linkedFrom = linkedFrom;
+        track.artists = artists;	
-    track.name = name;
+        track.availableMarkets = availableMarkets;	
-    track.previewUrl = previewUrl;
+        track.discNumber = discNumber;	
-    track.trackNumber = trackNumber;
+        track.durationMs = durationMs;	
-    track.type = type;
+        track.explicit = explicit;	
-    track.uri = uri;
+        track.externalUrls = externalUrls;	
-    return track;
+        track.href = href;	
+        track.id = id;	
+        track.isPlayable = isPlayable;	
+        track.linkedFrom = linkedFrom;	
+        track.name = name;	
+        track.previewUrl = previewUrl;	
+        track.trackNumber = trackNumber;	
+        track.type = type;	
+        track.uri = uri;	
+        return track;
+      }
+      rethrow;
+    }
   }
 }
 

lib/modules/album/album_card.dart

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

lib/provider/spotify/album/tracks.dart

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

lib/services/sourced_track/sources/youtube.dart

@@ -236,69 +236,64 @@ class YoutubeSourcedTrack extends SourcedTrack {
         .toList();
   }
 
+  static Future<List<YoutubeVideoInfo>> fetchFromIsrc({
+    required Track track,
+    required Provider provider,
+    required Ref ref,
+  }) async {
+    final matchingResults = <YoutubeVideoInfo>[];
+    final isrc = track.externalIds?.isrc;
+    if (isrc != null && isrc.isNotEmpty) {
+      final isrcResults = await ref
+          .read(provider)
+          .searchVideos(isrc.toString());
+      if (isrcResults.isNotEmpty) {
+        for (final videoInfo in isrcResults.map(YoutubeVideoInfo.fromVideo).toList()) {
+          final titleWords =
+              videoInfo.title
+                  .toLowerCase()
+                  .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                  .split(RegExp(r'\s+'))
+                  .where((item) => item.isNotEmpty)
+                  .toList();
+          final nameLower =
+              track.name!
+                  .toLowerCase()
+                  .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                  .split(RegExp(r'\s+'))
+                  .where((item) => item.isNotEmpty)
+                  .toList();
+          final matchCount =
+              titleWords.where((word) => nameLower.contains(word)).length;
+          if (matchCount > nameLower.length / 2) {
+            matchingResults.add(videoInfo);
+          }
+        }
+      }
+    }
+    return matchingResults;
+  }
+
   static Future<List<SiblingType>> fetchSiblings({
     required Track track,
     required Ref ref,
   }) async {
-    List<SiblingType> siblings = [];
+    final videoResults = <YoutubeVideoInfo>[];
 
-    final isrc = track.externalIds?.isrc;
+    videoResults.addAll(await fetchFromIsrc(track: track, provider: youtubeEngineProvider, ref: ref));
-    if (isrc != null && isrc.isNotEmpty) {
-      final isrcResults =
-          await ref.read(youtubeEngineProvider).searchVideos(isrc.toString());
-      if (isrcResults.isNotEmpty) {
-        final rankedResults = rankResults(
-            isrcResults.map(YoutubeVideoInfo.fromVideo).toList(), track);
-        final matchingResults = <YoutubeVideoInfo>[];
-        for (final video in rankedResults) {
-          final titleWords = video.title
-              .toLowerCase()
-              .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
-              .split(RegExp(r'\s+'))
-              .where((item) => item.isNotEmpty)
-              .toList();
-          final nameLower = track.name!
-              .toLowerCase()
-              .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
-              .split(RegExp(r'\s+'))
-              .where((item) => item.isNotEmpty)
-              .toList();
-          final matchCount =
-              titleWords.where((word) => nameLower.contains(word)).length;
-          if (matchCount > nameLower.length / 2) {
-            matchingResults.add(video);
-          }
-        }
-        if (matchingResults.isNotEmpty) {
-          final matchingSiblings =
-              await Future.wait(matchingResults.map((matchingResult) async {
-            try {
-              return await toSiblingType(0, matchingResult, ref);
-            } on VideoUnplayableException catch (e, stack) {
-              // Ignore this error and continue with the search
-              AppLogger.reportError(e, stack);
-              return null;
-            }
-          }));
-          siblings.addAll(matchingSiblings.whereType<SiblingType>());
-        }
-      }
-    }
 
     final links = await SongLinkService.links(track.id!);
     final ytLink = links.firstWhereOrNull((link) => link.platform == "youtube");
 
     if (ytLink?.url != null) {
       try {
-        siblings.add(await toSiblingType(
+        videoResults.add(
-          0,
+            YoutubeVideoInfo.fromVideo(
-          YoutubeVideoInfo.fromVideo(
+            await ref
-            await ref.read(youtubeEngineProvider).getVideo(
+                .read(youtubeEngineProvider)
-                  Uri.parse(ytLink!.url!).queryParameters["v"]!,
+                .getVideo(Uri.parse(ytLink!.url!).queryParameters["v"]!),
-                ),
+          )
-          ),
+        );
-          ref,
-        ));
       } on VideoUnplayableException catch (e, stack) {
         // Ignore this error and continue with the search
         AppLogger.reportError(e, stack);
@@ -307,33 +302,33 @@ class YoutubeSourcedTrack extends SourcedTrack {
 
     final query = SourcedTrack.getSearchTerm(track);
 
-    final searchResults =
+    final searchResults = await ref
-        await ref.read(youtubeEngineProvider).searchVideos(query);
+        .read(youtubeEngineProvider)
+        .searchVideos(query);
 
     if (ServiceUtils.onlyContainsEnglish(query)) {
-      siblings.addAll(await Future.wait(searchResults
+      videoResults.addAll(
-          .map(YoutubeVideoInfo.fromVideo)
+          searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
-          .mapIndexed((index, info) => toSiblingType(index, info, ref))));
-    } else {
-      final rankedSiblings = rankResults(
-        searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
-        track,
       );
-      siblings.addAll(await Future.wait(
+    } else {
-        rankedSiblings
+      videoResults.addAll(rankResults(
-            .mapIndexed((index, info) => toSiblingType(index, info, ref)),
+          searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
+          track,
       ));
     }
 
     final seenIds = <String>{};
-    // Deduplicate siblings by info.id, keeping the first occurrence
+    int index = 0;
-    return await Future.wait(siblings.map((sibling) async {
+    return await Future.wait(
-      if (!seenIds.contains(sibling.info.id)) {
+      videoResults.map((videoResult) async {
-        seenIds.add(sibling.info.id);
+        // Deduplicate results
-        return sibling;
+        if (!seenIds.contains(videoResult.id)) {
-      }
+          seenIds.add(videoResult.id);
-      return null;
+          return await toSiblingType(index++, videoResult, ref);
-    })).then((s) => s.whereType<SiblingType>().toList());
+        }
+        return null;
+      }),
+    ).then((s) => s.whereType<SiblingType>().toList());
   }
 
   @override