Merge 42e954428b into 2a0853026a

lib/provider/server/routes/playback.dart

@@ -215,12 +215,16 @@ class ServerPlaybackRoutes {
           ? activeSourcedTrack?.source
           : await ref.read(
               trackSourcesProvider(
-                //! Use [Request.requestedUri] as it contains full https url.
-                //! [Request.url] will exclude and starts relatively. (streams/<trackId>... basically)
-                TrackSourceQuery.parseUri(request.requestedUri.toString()),
+                TrackSourceQuery.parseUri(request.url.toString()),
               ).future,
             );
 
+      // This will be automatically updated by the notifier.
+      // if (playlist.activeTrack?.id == sourcedTrack?.query.id &&
+      //     sourcedTrack != null) {
+      //   ref.read(activeTrackSourcesProvider.notifier).update(sourcedTrack);
+      // }
+
       final (bytes: audioBytes, response: res) =
           await streamTrack(sourcedTrack!, request.headers);
 

lib/services/sourced_track/sourced_track.dart

@@ -84,8 +84,6 @@ abstract class SourcedTrack extends BasicSourcedTrack {
       onlyCleanArtist: true,
     ).trim();
 
-    assert(title.trim().isNotEmpty, "Title should not be empty");
-
     return "$title - ${track.artists.join(", ")}";
   }
 

lib/services/sourced_track/sources/youtube.dart

@@ -201,10 +201,7 @@ class YoutubeSourcedTrack extends SourcedTrack {
       final searchedVideos =
           await ref.read(youtubeEngineProvider).searchVideos(isrc.toString());
       if (searchedVideos.isNotEmpty) {
-        AppLogger.log
-            .d("${track.title} ISRC $isrc Total ${searchedVideos.length}");
-
-        final filteredMatches = searchedVideos
+        isrcResults.addAll(searchedVideos
             .map<YoutubeVideoInfo>(YoutubeVideoInfo.fromVideo)
             .map((YoutubeVideoInfo videoInfo) {
               final ytWords = videoInfo.title
@@ -228,16 +225,8 @@ class YoutubeSourcedTrack extends SourcedTrack {
               }
               return null;
             })
-            .nonNulls
-            .toList();
-
-        for (final match in filteredMatches) {
-          AppLogger.log.d(
-            "ISRC MATCH: ${match.id} ${match.title} by ${match.channelName} ${match.duration}",
-          );
-        }
-
-        isrcResults.addAll(filteredMatches);
+            .whereType<YoutubeVideoInfo>()
+            .toList());
       }
     }
     return isrcResults;
@@ -258,14 +247,7 @@ class YoutubeSourcedTrack extends SourcedTrack {
       videoResults.addAll(isrcResults);
 
       if (isrcResults.isEmpty) {
-        AppLogger.log.w("No ISRC results found, falling back to SongLink");
-
         final links = await SongLinkService.links(query.id);
-
-        for (final link in links) {
-          AppLogger.log.d("SongLink ${query.id} ${link.platform} ${link.url}");
-        }
-
         final ytLink = links.firstWhereOrNull(
           (link) => link.platform == "youtube",
         );
@@ -280,8 +262,6 @@ class YoutubeSourcedTrack extends SourcedTrack {
             // Ignore this error and continue with the search
             AppLogger.reportError(e, stack);
           }
-        } else {
-          AppLogger.log.w("No YouTube link found in SongLink results");
         }
       }
     }

lib/services/youtube_engine/youtube_explode_engine.dart

@@ -1,8 +1,5 @@
 import 'dart:isolate';
 
-import 'package:dio/dio.dart';
-import 'package:spotube/services/dio/dio.dart';
-import 'package:spotube/services/logger/logger.dart';
 import 'package:spotube/services/youtube_engine/youtube_engine.dart';
 import 'package:youtube_explode_dart/youtube_explode_dart.dart';
 
@@ -155,30 +152,9 @@ class YouTubeExplodeEngine implements YouTubeEngine {
       ],
     );
 
-    final accessibleStreams = <AudioOnlyStreamInfo>[];
-
-    for (final stream in streamManifest.audioOnly) {
-      // Call dio head request to check if the stream is accessible
-      final response = await globalDio.headUri(
-        stream.url,
-        options: Options(
-          followRedirects: true,
-          validateStatus: (status) {
-            return status != null && status < 500;
-          },
-        ),
-      );
-
-      AppLogger.log.d(
-        "Stream $videoId Status ${response.statusCode} Codec ${stream.audioCodec} "
-        "Bitrate ${stream.bitrate} Container ${stream.container}",
-      );
-
-      if (response.statusCode != null &&
-          response.statusCode! >= 200 &&
-          response.statusCode! < 400) {
-        accessibleStreams.add(
-          AudioOnlyStreamInfo(
+    return StreamManifest(
+      streamManifest.audioOnly.map((stream) {
+        return AudioOnlyStreamInfo(
           stream.videoId,
           stream.tag,
           stream.url,
@@ -194,12 +170,9 @@ class YouTubeExplodeEngine implements YouTubeEngine {
           stream.fragments,
           stream.codec,
           stream.audioTrack,
-          ),
         );
-      }
-    }
-
-    return StreamManifest(accessibleStreams);
+      }),
+    );
   }
 
   @override