Merge 42e954428b into 973ca20c8e

lib/components/track_tile/track_options.dart

@@ -5,6 +5,7 @@ import 'package:shadcn_flutter/shadcn_flutter.dart';
 
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 import 'package:spotube/collections/assets.gen.dart';
+import 'package:spotube/collections/routes.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/ui/button_tile.dart';
 import 'package:spotube/extensions/constrains.dart';
@@ -59,7 +60,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.delete,
                 playlistId,
               );
@@ -73,7 +74,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.album,
                 playlistId,
               );
@@ -97,7 +98,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.addToQueue,
                 playlistId,
               );
@@ -110,7 +111,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.playNext,
                 playlistId,
               );
@@ -124,7 +125,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.removeFromQueue,
                 playlistId,
               );
@@ -139,7 +140,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.favorite,
                 playlistId,
               );
@@ -162,7 +163,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.startRadio,
                 playlistId,
               );
@@ -175,7 +176,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.addToPlaylist,
                 playlistId,
               );
@@ -190,7 +191,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.removeFromPlaylist,
                 playlistId,
               );
@@ -204,7 +205,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.download,
                 playlistId,
               );
@@ -226,7 +227,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.blacklist,
                 playlistId,
               );
@@ -250,7 +251,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.share,
                 playlistId,
               );
@@ -264,7 +265,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.songlink,
                 playlistId,
               );
@@ -282,7 +283,7 @@ class TrackOptions extends HookConsumerWidget {
             style: ButtonVariance.menu,
             onPressed: () async {
               await trackOptionActions.action(
-                context,
+                rootNavigatorKey.currentContext!,
                 TrackOptionValue.details,
                 playlistId,
               );

lib/pages/getting_started/sections/playback.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart' show Badge;
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
@@ -83,14 +84,20 @@ class GettingStartedPagePlaybackSection extends HookConsumerWidget {
                 runSpacing: 6,
                 children: [
                   for (final source in AudioSource.values)
-                    RadioCard(
-                      value: source,
-                      child: Column(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          audioSourceToIconMap[source]!,
-                          Text(source.label),
-                        ],
+                    Badge(
+                      isLabelVisible: source == AudioSource.dabMusic,
+                      label: const Text("NEW"),
+                      backgroundColor: Colors.lime[300],
+                      textColor: Colors.black,
+                      child: RadioCard(
+                        value: source,
+                        child: Column(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            audioSourceToIconMap[source]!,
+                            Text(source.label),
+                          ],
+                        ),
                       ),
                     ),
                 ],

lib/provider/audio_player/audio_player.dart

@@ -259,11 +259,14 @@ class AudioPlayerNotifier extends Notifier<AudioPlayerState> {
       return addTracks(tracks);
     }
 
-    final addableTracks = _blacklist.filter(tracks).where(
+    final addableTracks = _blacklist
+        .filter(tracks)
+        .where(
           (track) =>
               allowDuplicates ||
               !state.tracks.any((element) => _compareTracks(element, track)),
-        );
+        )
+        .toList();
 
     state = state.copyWith(
       tracks: [...addableTracks, ...state.tracks],
@@ -371,13 +374,12 @@ class AudioPlayerNotifier extends Notifier<AudioPlayerState> {
   }
 
   bool _compareTracks(SpotubeTrackObject a, SpotubeTrackObject b) {
-    if ((a is SpotubeLocalTrackObject && b is! SpotubeLocalTrackObject) ||
-        (a is! SpotubeLocalTrackObject && b is SpotubeLocalTrackObject)) {
+    if (a.runtimeType != b.runtimeType) {
       return false;
     }
 
     return a is SpotubeLocalTrackObject && b is SpotubeLocalTrackObject
-        ? (a).path == (b).path
+        ? a.path == b.path
         : a.id == b.id;
   }
 

lib/provider/metadata_plugin/metadata_plugin_provider.dart

@@ -214,7 +214,7 @@ class MetadataPluginNotifier extends AsyncNotifier<MetadataPluginState> {
   /// Root directory where all metadata plugins are stored.
   Future<Directory> _getPluginRootDir() async => Directory(
         join(
-          (await getApplicationCacheDirectory()).path,
+          (await getApplicationSupportDirectory()).path,
           "metadata-plugins",
         ),
       );

lib/provider/track_options/track_options_provider.dart

@@ -166,7 +166,7 @@ class TrackOptionsActions {
         }
         break;
       case TrackOptionValue.playNext:
-        playback.addTracksAtFirst([track]);
+        await playback.addTracksAtFirst([track]);
 
         if (context.mounted) {
           showToast(

lib/services/audio_player/audio_player.dart

@@ -57,6 +57,7 @@ abstract class AudioPlayerInterface {
             title: "Spotube",
             logLevel: kDebugMode ? mk.MPVLogLevel.info : mk.MPVLogLevel.error,
             bufferSize: 4 * 1024 * 1024, // 4MB buffer
+            async: true,
           ),
         ) {
     _mkPlayer.stream.error.listen((event) {

lib/services/audio_player/custom_player.dart

@@ -121,9 +121,23 @@ class CustomPlayer extends Player {
   NativePlayer get nativePlayer => platform as NativePlayer;
 
   Future<void> insert(int index, Media media) async {
-    await add(media);
-    await Future.delayed(const Duration(milliseconds: 100));
-    await move(state.playlist.medias.length - 1, index);
+    final addedMediaCompleter = Completer<int>();
+    final playlistStream = stream.playlist.listen(
+      (event) {
+        final mediaAddedIndex =
+            event.medias.indexWhere((m) => m.uri == media.uri);
+        if (mediaAddedIndex != -1 && !addedMediaCompleter.isCompleted) {
+          addedMediaCompleter.complete(mediaAddedIndex);
+        }
+      },
+    );
+    try {
+      await add(media);
+      final mediaAddedIndex = await addedMediaCompleter.future;
+      await move(mediaAddedIndex, index);
+    } finally {
+      playlistStream.cancel();
+    }
   }
 
   Future<void> setAudioNormalization(bool normalize) async {

lib/services/sourced_track/sources/dab_music.dart

@@ -1,8 +1,12 @@
+import 'dart:convert';
+
 import 'package:collection/collection.dart';
 import 'package:dio/dio.dart';
+import 'package:drift/drift.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spotube/models/database/database.dart';
 import 'package:spotube/models/playback/track_sources.dart';
+import 'package:spotube/provider/database/database.dart';
 import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
 import 'package:spotube/services/logger/logger.dart';
 import 'package:spotube/services/sourced_track/enums.dart';
@@ -32,11 +36,68 @@ class DABMusicSourcedTrack extends SourcedTrack {
     required Ref ref,
   }) async {
     try {
+      final database = ref.read(databaseProvider);
+      final cachedSource = await (database.select(database.sourceMatchTable)
+            ..where((s) => s.trackId.equals(query.id))
+            ..limit(1)
+            ..orderBy([
+              (s) => OrderingTerm(
+                    expression: s.createdAt,
+                    mode: OrderingMode.desc,
+                  ),
+            ]))
+          .get()
+          .then((s) => s.firstOrNull);
+
+      if (cachedSource != null &&
+          cachedSource.sourceType == SourceType.dabMusic) {
+        final json = jsonDecode(cachedSource.sourceId);
+        final info = TrackSourceInfo.fromJson(json["info"]);
+        final source = (json["sources"] as List?)
+            ?.map((s) => TrackSource.fromJson(s))
+            .toList();
+
+        final [updatedSource] = await fetchSources(
+          info.id,
+          ref.read(userPreferencesProvider).audioQuality,
+          const AudioQuality(
+            isHiRes: true,
+            maximumBitDepth: 16,
+            maximumSamplingRate: 44.1,
+          ),
+        );
+
+        return DABMusicSourcedTrack(
+          ref: ref,
+          source: AudioSource.dabMusic,
+          siblings: [],
+          info: info,
+          query: query,
+          sources: [
+            source!.first.copyWith(url: updatedSource.url),
+          ],
+        );
+      }
+
       final siblings = await fetchSiblings(ref: ref, query: query);
 
       if (siblings.isEmpty) {
         throw TrackNotFoundError(query);
       }
+
+      await database.into(database.sourceMatchTable).insert(
+            SourceMatchTableCompanion.insert(
+              trackId: query.id,
+              sourceId: jsonEncode({
+                "info": siblings.first.info.toJson(),
+                "sources": (siblings.first.source ?? [])
+                    .map((s) => s.toJson())
+                    .toList(),
+              }),
+              sourceType: const Value(SourceType.dabMusic),
+            ),
+          );
+
       return DABMusicSourcedTrack(
         ref: ref,
         siblings: siblings.map((s) => s.info).skip(1).toList(),
@@ -207,6 +268,23 @@ class DABMusicSourcedTrack extends SourcedTrack {
       ),
     );
 
+    final database = ref.read(databaseProvider);
+
+    await database.into(database.sourceMatchTable).insert(
+          SourceMatchTableCompanion.insert(
+            trackId: query.id,
+            sourceId: jsonEncode({
+              "info": newSourceInfo.toJson(),
+              "sources": source.map((s) => s.toJson()).toList(),
+            }),
+            sourceType: const Value(SourceType.dabMusic),
+            // Because we're sorting by createdAt in the query
+            // we have to update it to indicate priority
+            createdAt: Value(DateTime.now()),
+          ),
+          mode: InsertMode.replace,
+        );
+
     return DABMusicSourcedTrack(
       ref: ref,
       siblings: newSiblings,

pubspec.lock

@@ -1412,10 +1412,10 @@ packages:
     dependency: "direct main"
     description:
       name: invidious
-      sha256: "27ef3a001df875665de15535dbc9099f44d12a59480018fb1e17377d4af0308d"
+      sha256: "0da8ebc4c4110057f03302bbd54514b10642154d7be569e7994172f2202dcfe8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.1"
+    version: "0.1.2"
   io:
     dependency: "direct dev"
     description:

pubspec.yaml

@@ -81,7 +81,7 @@ dependencies:
   http: ^1.2.1
   image_picker: ^1.1.0
   intl: any
-  invidious: ^0.1.1
+  invidious: ^0.1.2
   jiosaavn: ^0.1.0
   json_annotation: ^4.8.1
   local_notifier: ^0.1.6