Merge 42e954428b into dddaa5a964

lib/models/metadata/image.dart

@@ -42,17 +42,6 @@ extension SpotubeImageExtensions on List<SpotubeImageObject>? {
         : placeholderUrlMap[placeholder]!;
   }
 
-  Uri asUri({
-    int index = 1,
-    required ImagePlaceholder placeholder,
-  }) {
-    final url = asUrlString(placeholder: placeholder, index: index);
-    if (url.startsWith("http")) {
-      return Uri.parse(url);
-    }
-    return Uri.file(url);
-  }
-
   String smallest(ImagePlaceholder placeholder) {
     final sortedImage = this?.sorted((a, b) {
       final widthComparison = (a.width ?? 0).compareTo(b.width ?? 0);

lib/models/playback/track_sources.dart

@@ -2,7 +2,6 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:spotube/models/database/database.dart';
 import 'package:spotube/models/metadata/metadata.dart';
 import 'package:spotube/services/audio_player/audio_player.dart';
-import 'package:spotube/services/logger/logger.dart';
 import 'package:spotube/services/sourced_track/enums.dart';
 
 part 'track_sources.freezed.dart';
@@ -39,30 +38,10 @@ class TrackSourceQuery with _$TrackSourceQuery {
 
   /// Parses [SpotubeMedia]'s [uri] property to create a [TrackSourceQuery].
   factory TrackSourceQuery.parseUri(String url) {
-    final isLocal = !url.startsWith("http");
-
-    if (isLocal) {
-      try {
-        return TrackSourceQuery(
-          id: url,
-          title: '',
-          artists: [],
-          album: '',
-          durationMs: 0,
-          isrc: '',
-          explicit: false,
-        );
-      } catch (e, stackTrace) {
-        AppLogger.log.e(
-          "Failed to parse local track URI: $url\n$e",
-          stackTrace: stackTrace,
-        );
-      }
-    }
-
     final uri = Uri.parse(url);
+    final isLocal = uri.queryParameters.isEmpty;
     return TrackSourceQuery(
-      id: uri.pathSegments.last,
+      id: isLocal ? uri.path : uri.pathSegments.last,
       title: uri.queryParameters['title'] ?? '',
       artists: uri.queryParameters['artists']?.split(',') ?? [],
       album: uri.queryParameters['album'] ?? '',

lib/modules/library/local_folder/local_folder_item.dart

@@ -32,6 +32,23 @@ class LocalFolderItem extends HookConsumerWidget {
     final isDownloadFolder = folder == downloadFolder;
     final isCacheFolder = folder == cacheFolder.data;
 
+    final Uri(:pathSegments) = Uri.parse(
+      folder
+          .replaceFirst(RegExp(r'^/Volumes/[^/]+/Users/'), "")
+          .replaceFirst(r'C:\Users\', "")
+          .replaceFirst(r'/home/', ""),
+    );
+
+    // if length > 5, we ... all the middle segments after 2 and the last 2
+    final segments = pathSegments.length > 5
+        ? [
+            ...pathSegments.take(2),
+            "...",
+            ...pathSegments.skip(pathSegments.length - 3).toList()
+              ..removeLast(),
+          ]
+        : pathSegments.take(max(pathSegments.length - 1, 0)).toList();
+
     final trackSnapshot = ref.watch(
       localTracksProvider.select(
         (s) => s.whenData((tracks) => tracks[folder]?.take(4).toList()),
@@ -94,18 +111,40 @@ class LocalFolderItem extends HookConsumerWidget {
           const Gap(8),
           Stack(
             children: [
-              Center(
+              Column(
-                child: Text(
+                mainAxisSize: MainAxisSize.min,
-                  isDownloadFolder
+                children: [
-                      ? context.l10n.downloads
+                  Center(
-                      : isCacheFolder
+                    child: Text(
-                          ? context.l10n.cache_folder.capitalize()
+                      isDownloadFolder
-                          : basename(folder),
+                          ? context.l10n.downloads
-                  style: const TextStyle(fontWeight: FontWeight.bold),
+                          : isCacheFolder
-                  textAlign: TextAlign.center,
+                              ? context.l10n.cache_folder.capitalize()
-                  maxLines: 1,
+                              : basename(folder),
-                  overflow: TextOverflow.ellipsis,
+                      style: const TextStyle(fontWeight: FontWeight.bold),
-                ),
+                      textAlign: TextAlign.center,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
+                  Wrap(
+                    spacing: 2,
+                    runSpacing: 2,
+                    children: [
+                      for (final MapEntry(key: index, value: segment)
+                          in segments.asMap().entries)
+                        Text.rich(
+                          TextSpan(
+                            children: [
+                              if (index != 0) const TextSpan(text: "/ "),
+                              TextSpan(text: segment),
+                            ],
+                          ),
+                          maxLines: 2,
+                        ).xSmall().muted(),
+                    ],
+                  ),
+                ],
               ),
               if (!isDownloadFolder && !isCacheFolder)
                 Align(

lib/modules/player/player.dart

@@ -25,6 +25,7 @@ import 'package:spotube/provider/metadata_plugin/core/auth.dart';
 import 'package:spotube/provider/server/active_track_sources.dart';
 import 'package:spotube/provider/volume_provider.dart';
 import 'package:spotube/services/sourced_track/sources/youtube.dart';
+import 'package:spotube/utils/platform.dart';
 
 import 'package:url_launcher/url_launcher_string.dart';
 
@@ -99,6 +100,8 @@ class PlayerView extends HookConsumerWidget {
           backgroundColor: Colors.transparent,
           headers: [
             SafeArea(
+              minimum:
+                  kIsMobile ? const EdgeInsets.only(top: 80) : EdgeInsets.zero,
               bottom: false,
               child: TitleBar(
                 surfaceOpacity: 0,

lib/modules/player/player_overlay_collapsed.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:sliding_up_panel/sliding_up_panel.dart';
 import 'package:spotube/collections/intents.dart';
 import 'package:spotube/collections/spotube_icons.dart';

lib/pages/library/user_local_tracks/user_local_tracks.dart

@@ -4,7 +4,6 @@ import 'package:file_selector/file_selector.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
-import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/modules/library/local_folder/local_folder_item.dart';
@@ -86,10 +85,10 @@ class UserLocalLibraryPage extends HookConsumerWidget {
                       gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
                         maxCrossAxisExtent: 200,
                         mainAxisExtent: constrains.isXs
-                            ? 230 * context.theme.scaling
+                            ? 210
                             : constrains.mdAndDown
-                                ? 280 * context.theme.scaling
+                                ? 280
-                                : 250 * context.theme.scaling,
+                                : 250,
                         crossAxisSpacing: 10,
                         mainAxisSpacing: 10,
                       ),

lib/provider/audio_player/audio_player.dart

@@ -163,15 +163,6 @@ class AudioPlayerNotifier extends Notifier<AudioPlayerState> {
               .nonNulls
               .toList();
 
-          if (tracks.length != state.tracks.length) {
-            AppLogger.log.w("Mismatch in tracks after reordering/shuffling.");
-            final missingTracks =
-                state.tracks.where((track) => !tracks.contains(track)).toList();
-            AppLogger.log.w(
-              "Missing tracks: ${missingTracks.map((e) => e.id).join(", ")}",
-            );
-          }
-
           state = state.copyWith(
             tracks: tracks,
             currentIndex: playlist.index,

lib/provider/glance/glance.dart

@@ -83,9 +83,7 @@ Future<void> _sendActiveTrack(SpotubeTrackObject? track) async {
   final image = track.album.images.firstOrNull;
   final cachedImage = image == null
       ? null
-      : image.url.startsWith("http")
+      : await DefaultCacheManager().getSingleFile(image.url);
-          ? (await DefaultCacheManager().getSingleFile(image.url)).path
-          : image.url;
   final data = {
     ...jsonTrack,
     "album": {
@@ -94,7 +92,7 @@ Future<void> _sendActiveTrack(SpotubeTrackObject? track) async {
         if (cachedImage != null && image != null)
           {
             ...image.toJson(),
-            "path": cachedImage,
+            "path": cachedImage.path,
           }
       ]
     }

lib/services/audio_services/audio_services.dart

@@ -53,8 +53,10 @@ class AudioServices with WidgetsBindingObserver {
       title: track.name,
       artist: track.artists.asString(),
       duration: Duration(milliseconds: track.durationMs),
-      artUri: (track.album.images).asUri(
+      artUri: Uri.parse(
-        placeholder: ImagePlaceholder.albumArt,
+        (track.album.images).asUrlString(
+          placeholder: ImagePlaceholder.albumArt,
+        ),
       ),
       playable: true,
     ));