Merge ff252d6b14 into 2c4cc94985

.vscode/settings.json

@@ -9,7 +9,6 @@
     "fuzzywuzzy",
     "gapless",
     "instrumentalness",
-    "isrc",
     "Mpris",
     "RGBO",
     "riverpod",

lib/provider/server/routes/playback.dart

@@ -128,10 +128,7 @@ class ServerPlaybackRoutes {
           .read(sourcedTrackProvider(SpotubeMedia(track)).notifier)
           .refreshStreamingUrl();
 
-      if (playlist.activeTrack?.id == sourcedTrack?.id &&
+      ref.read(activeSourcedTrackProvider.notifier).update(sourcedTrack);
-          sourcedTrack != null) {
-        ref.read(activeSourcedTrackProvider.notifier).update(sourcedTrack);
-      }
 
       return await dio.get<Uint8List>(
         sourcedTrack!.url,
@@ -202,10 +199,7 @@ class ServerPlaybackRoutes {
           ? activeSourcedTrack
           : await ref.read(sourcedTrackProvider(SpotubeMedia(track)).future);
 
-      if (playlist.activeTrack?.id == sourcedTrack?.id &&
+      ref.read(activeSourcedTrackProvider.notifier).update(sourcedTrack);
-          sourcedTrack != null) {
-        ref.read(activeSourcedTrackProvider.notifier).update(sourcedTrack);
-      }
 
       final (bytes: audioBytes, response: res) =
           await streamTrack(sourcedTrack!, request.headers);

lib/services/sourced_track/sources/youtube.dart

@@ -238,28 +238,32 @@ class YoutubeSourcedTrack extends SourcedTrack {
 
   static Future<List<YoutubeVideoInfo>> fetchFromIsrc({
     required Track track,
+    required Provider provider,
     required Ref ref,
   }) async {
     final isrcResults = <YoutubeVideoInfo>[];
     final isrc = track.externalIds?.isrc;
     if (isrc != null && isrc.isNotEmpty) {
-      final searchedVideos =
+      final searchedVideos = await ref
-          await ref.read(youtubeEngineProvider).searchVideos(isrc.toString());
+          .read(provider)
+          .searchVideos(isrc.toString());
       if (searchedVideos.isNotEmpty) {
         isrcResults.addAll(searchedVideos
             .map<YoutubeVideoInfo>(YoutubeVideoInfo.fromVideo)
             .map((YoutubeVideoInfo videoInfo) {
-              final ytWords = videoInfo.title
+              final ytWords =
-                  .toLowerCase()
+                  videoInfo.title
-                  .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                      .toLowerCase()
-                  .split(RegExp(r'\s+'))
+                      .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
-                  .where((item) => item.isNotEmpty);
+                      .split(RegExp(r'\s+'))
-              final spWords = track.name!
+                      .where((item) => item.isNotEmpty);
-                  .toLowerCase()
+              final spWords =
-                  .replaceAll(RegExp(r'\((.*)\)'), '')
+                  track.name!
-                  .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                      .toLowerCase()
-                  .split(RegExp(r'\s+'))
+                      .replaceAll(RegExp(r'\((.*)\)'), '')
-                  .where((item) => item.isNotEmpty);
+                      .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                      .split(RegExp(r'\s+'))
+                      .where((item) => item.isNotEmpty);
               // Word match to filter out unrelated results
               final matchCount =
                   ytWords.where((word) => spWords.contains(word)).length;
@@ -267,9 +271,8 @@ class YoutubeSourcedTrack extends SourcedTrack {
                 return videoInfo;
               }
               return null;
-            })
+            }
-            .whereType<YoutubeVideoInfo>()
+        ).whereType<YoutubeVideoInfo>().toList());
-            .toList());
       }
     }
     return isrcResults;
@@ -281,31 +284,22 @@ class YoutubeSourcedTrack extends SourcedTrack {
   }) async {
     final videoResults = <YoutubeVideoInfo>[];
 
-    if (track is! SourcedTrack) {
+    final isrcResults = await fetchFromIsrc(track: track, provider: youtubeEngineProvider, ref: ref);
-      final isrcResults = await fetchFromIsrc(
+    videoResults.addAll(isrcResults);
-        track: track,
-        ref: ref,
-      );
 
-      videoResults.addAll(isrcResults);
+    final links = await SongLinkService.links(track.id!);
+    final ytLink = links.firstWhereOrNull((link) => link.platform == "youtube");
 
-      if (isrcResults.isEmpty) {
+    if (isrcResults.isEmpty && ytLink?.url != null) {
-        final links = await SongLinkService.links(track.id!);
+      try {
-        final ytLink = links.firstWhereOrNull(
+        videoResults.add(
-          (link) => link.platform == "youtube",
+            YoutubeVideoInfo.fromVideo(
-        );
+                await ref.read(youtubeEngineProvider)
-        if (ytLink?.url != null) {
+                    .getVideo(Uri.parse(ytLink!.url!).queryParameters["v"]!)
-          try {
+        ));
-            videoResults.add(
+      } on VideoUnplayableException catch (e, stack) {
-              YoutubeVideoInfo.fromVideo(await ref
+        // Ignore this error and continue with the search
-                  .read(youtubeEngineProvider)
+        AppLogger.reportError(e, stack);
-                  .getVideo(Uri.parse(ytLink!.url!).queryParameters["v"]!)),
-            );
-          } on VideoUnplayableException catch (e, stack) {
-            // Ignore this error and continue with the search
-            AppLogger.reportError(e, stack);
-          }
-        }
       }
     }
 
@@ -315,12 +309,13 @@ class YoutubeSourcedTrack extends SourcedTrack {
         await ref.read(youtubeEngineProvider).searchVideos(query);
 
     if (ServiceUtils.onlyContainsEnglish(query)) {
-      videoResults
+      videoResults.addAll(
-          .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,
       ));
     }
 

linux/CMakeLists.txt

@@ -32,7 +32,6 @@ function(APPLY_STANDARD_SETTINGS TARGET)
   target_compile_options(${TARGET} PRIVATE -Wall -Werror)
   target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
   target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
-  target_compile_options(${TARGET} PRIVATE -Wno-error=deprecated-declarations)
 endfunction()
 
 set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")

pubspec.lock

@@ -2449,10 +2449,10 @@ packages:
     dependency: "direct main"
     description:
       name: tray_manager
-      sha256: c2da0f0f1ddb455e721cf68d05d1281fec75cf5df0a1d3cb67b6ca0bdfd5709d
+      sha256: f231031c5c0eb4ad514e18ddaab27a912ddbe50335c594bc28fb0f9972ab6a84
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.0"
+    version: "0.3.1"
   type_plus:
     dependency: transitive
     description:

pubspec.yaml

@@ -120,7 +120,7 @@ dependencies:
   test: ^1.25.7
   timezone: ^0.10.0
   titlebar_buttons: ^1.0.0
-  tray_manager: ^0.4.0
+  tray_manager: ^0.3.0
   url_launcher: ^6.2.6
   uuid: ^4.4.0
   version: ^3.0.2