Merge 2c5cd8d505 into 0ec9f3535b

lib/extensions/track.dart

@@ -75,7 +75,7 @@ extension TrackSimpleExtensions on TrackSimple {
       final spotify = ref.read(spotifyProvider);
       return await spotify.invoke((api) => api.tracks.get(id!));
     } catch (e, stack) {
-      // Ignore this error and create the Track locally
+      // Ignore errors and create the track locally
       AppLogger.reportError(e, stack);
 
       Track track = Track();

lib/modules/album/album_card.dart

@@ -54,8 +54,8 @@ class AlbumCard extends HookConsumerWidget {
 
     Future<List<Track>> fetchAllTrack() async {
       if (album.tracks != null && album.tracks!.isNotEmpty) {
-        return Future.wait(
+        return await Future.wait(
-            album.tracks!.map((track) => track.asTrack(album, ref)).toList());
+            album.tracks!.map((track) => track.asTrack(album, ref)));
       }
       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 List<Track> items = await Future.wait(tracks.items?.map((e) => e.asTrack(arg, ref)).toList() ?? []);
+    final List<Track> items = await Future.wait(tracks.items?.map((e) => e.asTrack(arg, ref)) ?? []);
 
     return (
       items: items,

lib/services/sourced_track/sources/youtube.dart

@@ -248,30 +248,31 @@ class YoutubeSourcedTrack extends SourcedTrack {
           .read(provider)
           .searchVideos(isrc.toString());
       if (searchedVideos.isNotEmpty) {
-        isrcResults.addAll(await Future.wait(
+        isrcResults.addAll(searchedVideos
-          searchedVideos
+            .map<YoutubeVideoInfo>(YoutubeVideoInfo.fromVideo)
-          .map<YoutubeVideoInfo>(YoutubeVideoInfo.fromVideo)
+            .map((YoutubeVideoInfo videoInfo) {
-          .map((YoutubeVideoInfo videoInfo) async {
+              final ytWords =
-            final titleWords =
+                  videoInfo.title
-                videoInfo.title
+                      .toLowerCase()
-                    .toLowerCase()
+                      .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
-                    .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                      .split(RegExp(r'\s+'))
-                    .split(RegExp(r'\s+'))
+                      .where((item) => item.isNotEmpty);
-                    .where((item) => item.isNotEmpty)
+              final spWords =
-                    .toList();
+                  track.name!
-            final nameLower =
+                      .toLowerCase()
-                track.name!
+                      .replaceAll(RegExp(r'\((.*)\)'), '')
-                    .toLowerCase()
+                      .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
-                    .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                      .split(RegExp(r'\s+'))
-                    .split(RegExp(r'\s+'))
+                      .where((item) => item.isNotEmpty);
-                    .where((item) => item.isNotEmpty)
+              // Word match to filter out unrelated results
-                    .toList();
+              final matchCount =
-            if (titleWords.any((word) => nameLower.contains(word))) {
+                  ytWords.where((word) => spWords.contains(word)).length;
-              return videoInfo;
+              if (matchCount > spWords.length ~/ 2) {
+                return videoInfo;
+              }
+              return null;
             }
-            return null;
+        ).whereType<YoutubeVideoInfo>().toList());
-          }
-        )).then((s) => s.whereType<YoutubeVideoInfo>().toList()));
       }
     }
     return isrcResults;
@@ -292,11 +293,9 @@ class YoutubeSourcedTrack extends SourcedTrack {
       try {
         videoResults.add(
             YoutubeVideoInfo.fromVideo(
-            await ref
+                await ref.read(youtubeEngineProvider)
-                .read(youtubeEngineProvider)
+                    .getVideo(Uri.parse(ytLink!.url!).queryParameters["v"]!)
-                .getVideo(Uri.parse(ytLink!.url!).queryParameters["v"]!),
+        ));
-          )
-        );
       } on VideoUnplayableException catch (e, stack) {
         // Ignore this error and continue with the search
         AppLogger.reportError(e, stack);
@@ -305,13 +304,12 @@ class YoutubeSourcedTrack extends SourcedTrack {
 
     final query = SourcedTrack.getSearchTerm(track);
 
-    final searchResults = await ref
+    final searchResults =
-        .read(youtubeEngineProvider)
+        await ref.read(youtubeEngineProvider).searchVideos(query);
-        .searchVideos(query);
 
     if (ServiceUtils.onlyContainsEnglish(query)) {
       videoResults.addAll(
-          searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
+          searchResults.map(YoutubeVideoInfo.fromVideo).toList()
       );
     } else {
       videoResults.addAll(rankResults(