Merge b493642f21 into 0ec9f3535b

lib/services/sourced_track/sources/youtube.dart

@@ -241,16 +241,37 @@ class YoutubeSourcedTrack extends SourcedTrack {
     required Provider provider,
     required Ref ref,
   }) async {
-    final isrcResults = <YoutubeVideoInfo>[];
+    final matchingResults = <YoutubeVideoInfo>[];
     final isrc = track.externalIds?.isrc;
     if (isrc != null && isrc.isNotEmpty) {
-      final searchedVideos = await ref.read(provider)
+      final isrcResults = await ref
+          .read(provider)
           .searchVideos(isrc.toString());
-      isrcResults.addAll(await searchedVideos
+      if (isrcResults.isNotEmpty) {
-          .map<YoutubeVideoInfo>(YoutubeVideoInfo.fromVideo)
+        for (final videoInfo in isrcResults.map(YoutubeVideoInfo.fromVideo).toList()) {
-          .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 isrcResults;
+    return matchingResults;
   }
 
   static Future<List<SiblingType>> fetchSiblings({
@@ -259,19 +280,20 @@ class YoutubeSourcedTrack extends SourcedTrack {
   }) async {
     final videoResults = <YoutubeVideoInfo>[];
 
-    videoResults.addAll(await fetchFromIsrc(
+    videoResults.addAll(await fetchFromIsrc(track: track, provider: youtubeEngineProvider, ref: ref));
-        track: track, provider: youtubeEngineProvider, ref: ref));
 
     final links = await SongLinkService.links(track.id!);
     final ytLink = links.firstWhereOrNull((link) => link.platform == "youtube");
 
     if (ytLink?.url != null) {
       try {
-        videoResults.add(YoutubeVideoInfo.fromVideo(
+        videoResults.add(
-          await ref
+            YoutubeVideoInfo.fromVideo(
-              .read(youtubeEngineProvider)
+            await ref
-              .getVideo(Uri.parse(ytLink!.url!).queryParameters["v"]!),
+                .read(youtubeEngineProvider)
-        ));
+                .getVideo(Uri.parse(ytLink!.url!).queryParameters["v"]!),
+          )
+        );
       } on VideoUnplayableException catch (e, stack) {
         // Ignore this error and continue with the search
         AppLogger.reportError(e, stack);
@@ -280,17 +302,18 @@ 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)) {
       videoResults.addAll(
-        searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
+          searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
       );
     } else {
       videoResults.addAll(rankResults(
-        searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
+          searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
-        track,
+          track,
       ));
     }