Merge 50d729f8a0 into 0ec9f3535b

lib/services/sourced_track/sources/youtube.dart

@@ -242,28 +242,30 @@ class YoutubeSourcedTrack extends SourcedTrack {
   }) async {
     List<SiblingType> siblings = [];
 
-    final isrc = track.externalIds?.isrc.toString();
+    final isrc = track.externalIds?.isrc;
     if (isrc != null && isrc.isNotEmpty) {
       final isrcResults =
-          await ref.read(youtubeEngineProvider).searchVideos(isrc);
+          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
-              .replaceAll(RegExp(r'\((.*)\)'), '')
               .toLowerCase()
+              .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
               .split(RegExp(r'\s+'))
+              .where((item) => item.isNotEmpty)
               .toList();
           final nameLower = track.name!
-              .replaceAll(RegExp(r'\((.*)\)'), '')
               .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) {
+          if (matchCount > nameLower.length / 2) {
             matchingResults.add(video);
           }
         }
@@ -322,18 +324,16 @@ class YoutubeSourcedTrack extends SourcedTrack {
             .mapIndexed((index, info) => toSiblingType(index, info, ref)),
       ));
     }
-    return await (() async {
+
-      // Deduplicate siblings by info.id, keeping the first occurrence
+    final seenIds = <String>{};
-      final seenIds = <String>{};
+    // Deduplicate siblings by info.id, keeping the first occurrence
-      final uniqueSiblings = <SiblingType>[];
+    return await Future.wait(siblings.map((sibling) async {
-      for (final sibling in siblings) {
+      if (!seenIds.contains(sibling.info.id)) {
-        if (!seenIds.contains(sibling.info.id)) {
+        seenIds.add(sibling.info.id);
-          seenIds.add(sibling.info.id);
+        return sibling;
-          uniqueSiblings.add(sibling);
-        }
       }
-      return uniqueSiblings;
+      return null;
-    })();
+    })).then((s) => s.whereType<SiblingType>().toList());
   }
 
   @override