Merge 24f186e9fd into 4fae9013a7

android/app/build.gradle

@@ -36,7 +36,7 @@ android {
     
     compileSdkVersion 36
 
-    ndkVersion = "29.0.14206865"
+    ndkVersion = "27.0.12077973"
 
     compileOptions {
         coreLibraryDesugaringEnabled true

lib/models/database/database.dart

@@ -19,7 +19,6 @@ import 'package:spotube/services/kv_store/kv_store.dart';
 import 'package:flutter/widgets.dart' hide Table, Key, View;
 import 'package:spotube/modules/settings/color_scheme_picker_dialog.dart';
 import 'package:drift/native.dart';
-import 'package:spotube/services/logger/logger.dart';
 import 'package:spotube/services/youtube_engine/newpipe_engine.dart';
 import 'package:spotube/services/youtube_engine/youtube_explode_engine.dart';
 import 'package:spotube/services/youtube_engine/yt_dlp_engine.dart';
@@ -201,41 +200,26 @@ class AppDatabase extends _$AppDatabase {
           });
         },
         from8To9: (m, schema) async {
-          await m
+          await m.renameTable(schema.pluginsTable, "metadata_plugins_table");
-              .renameTable(schema.pluginsTable, "metadata_plugins_table")
+          await m.renameColumn(
-              .catchError((e, stack) => AppLogger.reportError(e, stack));
-          await m
-              .renameColumn(
             schema.pluginsTable,
             "selected",
             pluginsTable.selectedForMetadata,
-              )
+          );
-              .catchError((e, stack) => AppLogger.reportError(e, stack));
+          await m.addColumn(
-          await m
-              .addColumn(
             schema.pluginsTable,
             pluginsTable.selectedForAudioSource,
-              )
+          );
-              .catchError((e, stack) => AppLogger.reportError(e, stack));
         },
         from9To10: (m, schema) async {
-          await m
+          await m.dropColumn(schema.preferencesTable, "piped_instance");
-              .dropColumn(schema.preferencesTable, "piped_instance")
+          await m.dropColumn(schema.preferencesTable, "invidious_instance");
-              .catchError((e, stack) => AppLogger.reportError(e, stack));
+          await m.addColumn(
-          await m
-              .dropColumn(schema.preferencesTable, "invidious_instance")
-              .catchError((e, stack) => AppLogger.reportError(e, stack));
-          await m
-              .addColumn(
             schema.sourceMatchTable,
             sourceMatchTable.sourceInfo,
-              )
+          );
-              .catchError((e, stack) => AppLogger.reportError(e, stack));
+          await customStatement("DROP INDEX IF EXISTS uniq_track_match;");
-          await customStatement("DROP INDEX IF EXISTS uniq_track_match;")
+          await m.dropColumn(schema.sourceMatchTable, "source_id");
-              .catchError((e, stack) => AppLogger.reportError(e, stack));
-          await m
-              .dropColumn(schema.sourceMatchTable, "source_id")
-              .catchError((e, stack) => AppLogger.reportError(e, stack));
         },
       ),
     );

lib/pages/library/user_local_tracks/local_folder.dart

@@ -198,7 +198,7 @@ class LocalLibraryPage extends HookConsumerWidget {
                       ),
                     );
 
-                    if (accepted != true) return;
+                    if (accepted ?? false) return;
 
                     final cacheDir = Directory(
                       await UserPreferencesNotifier.getMusicCacheDir(),
@@ -207,8 +207,6 @@ class LocalLibraryPage extends HookConsumerWidget {
                     if (cacheDir.existsSync()) {
                       await cacheDir.delete(recursive: true);
                     }
-
-                    ref.invalidate(localTracksProvider);
                   },
                 ),
                 IconButton.outline(

lib/provider/audio_player/state.dart

@@ -51,17 +51,15 @@ class AudioPlayerState with _$AudioPlayerState {
   }
 
   bool containsTrack(SpotubeTrackObject track) {
-    return tracks.isNotEmpty &&
+    return tracks.any(
-        tracks.any(
+      (t) => t is SpotubeLocalTrackObject && track is SpotubeLocalTrackObject
-          (t) =>
-              t is SpotubeLocalTrackObject && track is SpotubeLocalTrackObject
           ? t.path == track.path
           : t.id == track.id,
     );
   }
 
   bool containsTracks(List<SpotubeTrackObject> tracks) {
-    return this.tracks.isNotEmpty && tracks.every(containsTrack);
+    return tracks.every(containsTrack);
   }
 
   bool containsCollection(String collectionId) {

lib/provider/server/routes/playback.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 
@@ -125,7 +124,8 @@ class ServerPlaybackRoutes {
     return res;
   }
 
-  Future<dio_lib.Response> streamTrack(
+  Future<({dio_lib.Response<Uint8List> response, Uint8List? bytes})>
+      streamTrack(
     Request request,
     SourcedTrack track,
     Map<String, dynamic> headers,
@@ -141,29 +141,30 @@ class ServerPlaybackRoutes {
       final bytes = await trackCacheFile.readAsBytes();
       final cachedFileLength = bytes.length;
 
-      return dio_lib.Response<Uint8List>(
+      return (
+        response: dio_lib.Response<Uint8List>(
           statusCode: 200,
           headers: Headers.fromMap({
             "content-type": ["audio/${track.qualityPreset!.name}"],
-          "content-length": ["${cachedFileLength - 1}"],
+            "content-length": ["$cachedFileLength"],
             "accept-ranges": ["bytes"],
-          "content-range": [
+            "content-range": ["bytes 0-$cachedFileLength/$cachedFileLength"],
-            "bytes 0-${cachedFileLength - 1}/$cachedFileLength"
-          ],
-          "connection": ["close"],
           }),
           requestOptions: RequestOptions(path: request.requestedUri.toString()),
-        data: bytes,
+        ),
+        bytes: bytes,
       );
     }
 
+    final trackPartialCacheFile = File("${trackCacheFile.path}.part");
+
     String url = track.url ??
         await ref
             .read(sourcedTrackProvider(track.query).notifier)
             .swapWithNextSibling()
             .then((track) => track.url!);
 
-    final options = Options(
+    var options = Options(
       headers: {
         ...headers,
         "user-agent": _randomUserAgent,
@@ -171,15 +172,12 @@ class ServerPlaybackRoutes {
         "Connection": "keep-alive",
         "host": Uri.parse(url).host,
       },
-      responseType: ResponseType.stream,
+      responseType: ResponseType.bytes,
       validateStatus: (status) => status! < 400,
     );
 
     final contentLengthRes = await Future<dio_lib.Response?>.value(
-      dio.head(
+      dio.head(url, options: options),
-        url,
-        options: options.copyWith(responseType: ResponseType.bytes),
-      ),
     ).catchError((e, stack) async {
       AppLogger.reportError(e, stack);
 
@@ -195,7 +193,8 @@ class ServerPlaybackRoutes {
     // Redirect to m3u8 link directly as it handles range requests internally
     if (contentLengthRes?.headers.value("content-type") ==
         "application/vnd.apple.mpegurl") {
-      return dio_lib.Response<Uint8List>(
+      return (
+        response: dio_lib.Response<Uint8List>(
           statusCode: 301,
           statusMessage: "M3U8 Redirect",
           headers: Headers.fromMap({
@@ -204,10 +203,29 @@ class ServerPlaybackRoutes {
           }),
           requestOptions: RequestOptions(path: request.requestedUri.toString()),
           isRedirect: true,
+        ),
+        bytes: null,
       );
     }
 
-    final res = await dio.get<ResponseBody>(url, options: options);
+    if (headers["range"] == "bytes=0-" &&
+        track.qualityPreset is SpotubeAudioSourceContainerPresetLossless) {
+      const bufferSize = 6 * 1024 * 1024; // 6MB for lossless
+
+      final endRange = min(
+        bufferSize,
+        int.parse(contentLengthRes?.headers.value("content-length") ?? "0"),
+      );
+
+      options = options.copyWith(
+        headers: {
+          ...?options.headers,
+          "range": "bytes=0-$endRange",
+        },
+      );
+    }
+
+    final res = await dio.get<Uint8List>(url, options: options);
 
     AppLogger.log.i(
       "Response for track: ${track.query.name}\n"
@@ -215,43 +233,49 @@ class ServerPlaybackRoutes {
       "Headers: ${res.headers.map}",
     );
 
-    if (!userPreferences.cacheMusic) {
+    final bytes = res.data;
-      return res;
+
+    if (bytes == null || !userPreferences.cacheMusic) {
+      return (response: res, bytes: bytes);
     }
 
-    final resStream = res.data!.stream.asBroadcastStream();
+    final contentRange =
+        ContentRangeHeader.parse(res.headers.value("content-range") ?? "");
 
-    final trackPartialCacheFile = File("${trackCacheFile.path}.part");
     if (!await trackPartialCacheFile.exists()) {
       await trackPartialCacheFile.create(recursive: true);
     }
 
     // Write the stream to the file based on the range
-    final partialCacheFileSink =
+    final partialCacheFile =
-        trackPartialCacheFile.openWrite(mode: FileMode.writeOnlyAppend);
+        await trackPartialCacheFile.open(mode: FileMode.writeOnlyAppend);
-    final contentRange = res.headers.value("content-range") != null
+    int fileLength = 0;
-        ? ContentRangeHeader.parse(res.headers.value("content-range") ?? "")
+    try {
-        : ContentRangeHeader(0, 0, 0);
+      await partialCacheFile.setPosition(contentRange.start);
-
+      await partialCacheFile.writeFrom(bytes);
-    resStream.listen(
+      fileLength = await partialCacheFile.length();
-      (data) {
+    } finally {
-        partialCacheFileSink.add(data);
+      await partialCacheFile.close();
-      },
+    }
-      onError: (e, stack) {
-        partialCacheFileSink.close();
-      },
-      onDone: () async {
-        await partialCacheFileSink.close();
-
-        final fileLength = await trackPartialCacheFile.length();
-        if (fileLength != contentRange.total) return;
 
+    if (fileLength == contentRange.total) {
       await trackPartialCacheFile.rename(trackCacheFile.path);
+    }
 
-        if (track.qualityPreset!.getFileExtension() == "weba") return;
+    if (contentRange.total == fileLength &&
+        track.qualityPreset!.getFileExtension() != "weba") {
+      final playlistTrack = playlist.tracks.firstWhereOrNull(
+        (element) => element.id == track.query.id,
+      );
+      if (playlistTrack == null) {
+        AppLogger.log.e(
+          "Track ${track.query.id} not found in playlist, cannot write metadata.",
+        );
+        return (response: res, bytes: bytes);
+      }
 
       final imageBytes = await ServiceUtils.downloadImage(
-          track.query.album.images.asUrlString(
+        (playlistTrack.album.images).asUrlString(
           placeholder: ImagePlaceholder.albumArt,
           index: 1,
         ),
@@ -259,20 +283,16 @@ class ServerPlaybackRoutes {
 
       await MetadataGod.writeMetadata(
         file: trackCacheFile.path,
-          metadata: track.query.toMetadata(
+        metadata: (playlistTrack as SpotubeFullTrackObject).toMetadata(
           imageBytes: imageBytes,
           fileLength: fileLength,
         ),
       ).catchError((e, stackTrace) {
         AppLogger.reportError(e, stackTrace);
       });
-      },
+    }
-      cancelOnError: true,
-    );
 
-    res.data?.stream =
+    return (bytes: bytes, response: res);
-        resStream; // To avoid Stream has been already listened to exception
-    return res;
   }
 
   /// @head('/stream/<trackId>')
@@ -308,23 +328,15 @@ class ServerPlaybackRoutes {
         return Response.notFound("Track not found in the current queue");
       }
 
-      final res = await streamTrack(
+      final (bytes: audioBytes, response: res) = await streamTrack(
         request,
         sourcedTrack,
         request.headers,
       );
 
-      if (res.data is ResponseBody) {
       return Response(
         res.statusCode!,
-          body: (res.data as ResponseBody).stream,
+        body: audioBytes,
-          headers: res.headers.map,
-        );
-      }
-
-      return Response(
-        res.statusCode!,
-        body: res.data,
         headers: res.headers.map,
       );
     } catch (e, stack) {

pubspec.lock

@@ -1530,58 +1530,65 @@ packages:
   media_kit:
     dependency: "direct main"
     description:
-      name: media_kit
+      path: media_kit
-      sha256: "52a8e989babc431db0aa242f32a4a08e55f60662477ea09759a105d7cd6410da"
+      ref: HEAD
-      url: "https://pub.dev"
+      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
-    source: hosted
+      url: "https://github.com/media-kit/media-kit"
-    version: "1.2.1"
+    source: git
+    version: "1.2.0"
   media_kit_libs_android_audio:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: media_kit_libs_android_audio
+      path: "libs/android/media_kit_libs_android_audio"
-      sha256: "8f8f9759e537e12d66f08bc4d5279eb1bb21a0ccc519ff3442c68a9f3b6dd68b"
+      ref: HEAD
-      url: "https://pub.dev"
+      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
-    source: hosted
+      url: "https://github.com/media-kit/media-kit"
-    version: "1.3.8"
+    source: git
+    version: "1.3.7"
   media_kit_libs_audio:
     dependency: "direct main"
     description:
-      name: media_kit_libs_audio
+      path: "libs/universal/media_kit_libs_audio"
-      sha256: "81bf506c234e81e3ec536ba72f8f700a928543c14c345220210cae0411636316"
+      ref: HEAD
-      url: "https://pub.dev"
+      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
-    source: hosted
+      url: "https://github.com/media-kit/media-kit"
-    version: "1.0.7"
+    source: git
+    version: "1.0.6"
   media_kit_libs_ios_audio:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: media_kit_libs_ios_audio
+      path: "libs/ios/media_kit_libs_ios_audio"
-      sha256: "78ccf04e27d6b4ba00a355578ccb39b772f00d48269a6ac3db076edf2d51934f"
+      ref: HEAD
-      url: "https://pub.dev"
+      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
-    source: hosted
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.1.4"
   media_kit_libs_linux:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: media_kit_libs_linux
+      path: "libs/linux/media_kit_libs_linux"
-      sha256: "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf"
+      ref: HEAD
-      url: "https://pub.dev"
+      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
-    source: hosted
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.2.1"
   media_kit_libs_macos_audio:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: media_kit_libs_macos_audio
+      path: "libs/macos/media_kit_libs_macos_audio"
-      sha256: "3be21844df98f286de32808592835073cdef2c1a10078bac135da790badca950"
+      ref: HEAD
-      url: "https://pub.dev"
+      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
-    source: hosted
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.1.4"
   media_kit_libs_windows_audio:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: media_kit_libs_windows_audio
+      path: "libs/windows/media_kit_libs_windows_audio"
-      sha256: c2fd558cc87b9d89a801141fcdffe02e338a3b21a41a18fbd63d5b221a1b8e53
+      ref: HEAD
-      url: "https://pub.dev"
+      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
-    source: hosted
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.0.9"
   menu_base:
     dependency: transitive

pubspec.yaml

@@ -61,6 +61,7 @@ dependencies:
     sdk: flutter
   flutter_native_splash: ^2.4.6
   flutter_riverpod: ^2.5.1
+  flutter_secure_storage: ^9.2.4
   flutter_sharing_intent: ^1.1.0
   flutter_undraw: ^0.2.1
   form_builder_validators: ^11.1.1
@@ -81,8 +82,14 @@ dependencies:
   logger: ^2.0.2
   logging: ^1.3.0
   lrc: ^1.0.2
-  media_kit: ^1.2.1
+  media_kit:
-  media_kit_libs_audio: ^1.0.7
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: media_kit
+  media_kit_libs_audio:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/universal/media_kit_libs_audio
   metadata_god: ^1.1.0
   mime: ^2.0.0
   open_file: ^3.5.10
@@ -154,7 +161,6 @@ dependencies:
   flutter_markdown_plus: ^1.0.3
   pub_semver: ^2.2.0
   change_case: ^1.1.0
-  flutter_secure_storage: ^9.2.4
 
 dev_dependencies:
   build_runner: ^2.4.13
@@ -185,12 +191,32 @@ dependency_overrides:
   flutter_svg: ^2.0.17
   intl: any
   collection: any
-  flutter_secure_storage_platform_interface: 2.0.0
   flutter_secure_storage_linux:
     git:
       url: https://github.com/m-berto/flutter_secure_storage.git
       ref: patch-2
       path: flutter_secure_storage_linux
+  flutter_secure_storage_platform_interface: 2.0.0
+  media_kit_libs_android_audio:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/android/media_kit_libs_android_audio
+  media_kit_libs_ios_audio:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/ios/media_kit_libs_ios_audio
+  media_kit_libs_macos_audio:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/macos/media_kit_libs_macos_audio
+  media_kit_libs_windows_audio:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/windows/media_kit_libs_windows_audio
+  media_kit_libs_linux:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/linux/media_kit_libs_linux
 
 flutter:
   generate: true