chore: sort network lyrics only if track duration was not modified (n…

…ightcore/spedup)
namidaco · Jan 26, 2025 · 1039ece · 1039ece
1 parent 26acfe7
commit 1039ece
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/lib/controller/lyrics_controller.dart b/lib/controller/lyrics_controller.dart
@@ -335,7 +335,8 @@ class _LRCSearchManager with PortsProvider<SendPort> {
           final jsonLists = (jsonDecode(responseBody) as List<dynamic>?) ?? [];
 
           final mainDuration = details?.durationMS ?? 0;
-          if (mainDuration > 0) {
+          final isDurationModified = details?.isDurationModified ?? false;
+          if (mainDuration > 0 && !isDurationModified) {
             // -- prefer lyrics with closer duration (if info the same)
             jsonLists.sort(
               (a, b) {

diff --git a/lib/controller/lyrics_search_utils/lrc_search_details.dart b/lib/controller/lyrics_search_utils/lrc_search_details.dart
@@ -1,11 +1,13 @@
 class LRCSearchDetails {
   final String title, artist, album;
   final int durationMS;
+  final bool isDurationModified;
 
   const LRCSearchDetails({
     required this.title,
     required this.artist,
     required this.album,
     required this.durationMS,
+    required this.isDurationModified,
   });
 }
diff --git a/lib/controller/lyrics_search_utils/lrc_search_utils_selectable.dart b/lib/controller/lyrics_search_utils/lrc_search_utils_selectable.dart
@@ -45,14 +45,46 @@ class LrcSearchUtilsSelectable extends LrcSearchUtils {
     return track.lyrics != '' || super.hasLyrics();
   }
 
+  static final _durationModifiedRegex = RegExp('nightcore|sped up', caseSensitive: false);
+  static bool _checkIsDurationModified(String property) {
+    return _durationModifiedRegex.firstMatch(property) != null;
+  }
+
   @override
   List<LRCSearchDetails> searchDetailsQueries() {
     final durMS = trackExt.durationMS;
+    final isDurationModified = _checkIsDurationModified(trackExt.originalGenre) || _checkIsDurationModified(trackExt.title) || _checkIsDurationModified(trackExt.originalArtist);
     return [
-      LRCSearchDetails(title: trackExt.title, artist: trackExt.originalArtist, album: '', durationMS: durMS),
-      LRCSearchDetails(title: trackExt.title, artist: trackExt.originalArtist, album: trackExt.album, durationMS: durMS),
-      if (trackExt.artistsList.isNotEmpty) LRCSearchDetails(title: trackExt.title, artist: trackExt.artistsList.first, album: '', durationMS: durMS),
-      if (trackExt.artistsList.isNotEmpty) LRCSearchDetails(title: trackExt.title, artist: trackExt.artistsList.first, album: trackExt.album, durationMS: durMS),
+      LRCSearchDetails(
+        title: trackExt.title,
+        artist: trackExt.originalArtist,
+        album: '',
+        durationMS: durMS,
+        isDurationModified: isDurationModified,
+      ),
+      LRCSearchDetails(
+        title: trackExt.title,
+        artist: trackExt.originalArtist,
+        album: trackExt.album,
+        durationMS: durMS,
+        isDurationModified: isDurationModified,
+      ),
+      if (trackExt.artistsList.isNotEmpty)
+        LRCSearchDetails(
+          title: trackExt.title,
+          artist: trackExt.artistsList.first,
+          album: '',
+          durationMS: durMS,
+          isDurationModified: isDurationModified,
+        ),
+      if (trackExt.artistsList.isNotEmpty)
+        LRCSearchDetails(
+          title: trackExt.title,
+          artist: trackExt.artistsList.first,
+          album: trackExt.album,
+          durationMS: durMS,
+          isDurationModified: isDurationModified,
+        ),
     ];
   }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: namida
 description: A Beautiful and Feature-rich Music Player, With YouTube & Video Support Built in Flutter
 publish_to: "none"
-version: 4.9.4-beta+250125000
+version: 4.9.42-beta+250126167
 
 environment:
   sdk: ">=3.6.0 <4.0.0"