Merge 045c865904 into 0ec9f3535b

lib/services/sourced_track/sources/youtube.dart

@@ -240,16 +240,55 @@ class YoutubeSourcedTrack extends SourcedTrack {
     required Track track,
     required Ref ref,
   }) async {
+    List<SiblingType> siblings = [];
+
+    final isrc = track.externalIds?.isrc.toString();
+    if (isrc != null && isrc.isNotEmpty) {
+      final isrcResults =
+          await ref.read(youtubeEngineProvider).searchVideos(isrc);
+      if (isrcResults.isNotEmpty) {
+        final rankedResults = rankResults(
+            isrcResults.map(YoutubeVideoInfo.fromVideo).toList(), track);
+        final matchingResults = <YoutubeVideoInfo>[];
+        for (final video in rankedResults) {
+          final titleWords = video.title
+              .replaceAll(RegExp(r'\((.*)\)'), '')
+              .toLowerCase()
+              .split(RegExp(r'\s+'))
+              .toList();
+          final nameLower = track.name!
+              .replaceAll(RegExp(r'\((.*)\)'), '')
+              .toLowerCase()
+              .split(RegExp(r'\s+'))
+              .toList();
+          final matchCount =
+              titleWords.where((word) => nameLower.contains(word)).length;
+          if (matchCount >= nameLower.length) {
+            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
-        // allows to fetch siblings more results for already sourced track
-        &&
-        track is! SourcedTrack) {
+    if (ytLink?.url != null) {
       try {
-        return [
-          await toSiblingType(
+        siblings.add(await toSiblingType(
           0,
           YoutubeVideoInfo.fromVideo(
             await ref.read(youtubeEngineProvider).getVideo(
@@ -257,8 +296,7 @@ class YoutubeSourcedTrack extends SourcedTrack {
                 ),
           ),
           ref,
-          )
-        ];
+        ));
       } on VideoUnplayableException catch (e, stack) {
         // Ignore this error and continue with the search
         AppLogger.reportError(e, stack);
@@ -271,20 +309,31 @@ class YoutubeSourcedTrack extends SourcedTrack {
         await ref.read(youtubeEngineProvider).searchVideos(query);
 
     if (ServiceUtils.onlyContainsEnglish(query)) {
-      return await Future.wait(searchResults
+      siblings.addAll(await Future.wait(searchResults
           .map(YoutubeVideoInfo.fromVideo)
-          .mapIndexed((index, info) => toSiblingType(index, info, ref)));
-    }
-
+          .mapIndexed((index, info) => toSiblingType(index, info, ref))));
+    } else {
       final rankedSiblings = rankResults(
         searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
         track,
       );
-
-    return await Future.wait(
+      siblings.addAll(await Future.wait(
         rankedSiblings
             .mapIndexed((index, info) => toSiblingType(index, info, ref)),
-    );
+      ));
+    }
+    return await (() async {
+      // Deduplicate siblings by info.id, keeping the first occurrence
+      final seenIds = <String>{};
+      final uniqueSiblings = <SiblingType>[];
+      for (final sibling in siblings) {
+        if (!seenIds.contains(sibling.info.id)) {
+          seenIds.add(sibling.info.id);
+          uniqueSiblings.add(sibling);
+        }
+      }
+      return uniqueSiblings;
+    })();
   }
 
   @override