Merge ff252d6b14 into 2a0853026a

Made the translations more friendly

lib/l10n/app_it.arb

@@ -137,16 +137,16 @@
   "pre_download_play_description": "Anzi che effettuare lo stream dell'audio, scarica invece i byte e li riproduce (raccomandato per gli utenti con banda più alta)",
   "skip_non_music": "Salta i segmenti non di musica (SponsorBlock)",
   "blacklist_description": "Tracce e artisti in blacklist",
-  "wait_for_download_to_finish": "Prego attendere che lo scaricamento corrente finisca",
+  "wait_for_download_to_finish": "Prego attendere che il download corrente finisca",
   "desktop": "Desktop",
   "close_behavior": "Comportamento Chiusura",
   "close": "Chiudi",
   "minimize_to_tray": "Minimizza in tray",
   "show_tray_icon": "Mostra icona in tray di sistema",
-  "about": "A proposito di",
+  "about": "Informazioni su",
   "u_love_spotube": "Sappiamo che ami Spotube",
   "check_for_updates": "Controlla aggiornamenti",
-  "about_spotube": "A proposito di Spotube",
+  "about_spotube": "Informazioni su Spotube",
   "blacklist": "Blacklist",
   "please_sponsor": "Per favore sponsorizza/dona",
   "spotube_description": "Spotube, un client spotify gratis per tutti, multipiattaforma e leggero",
@@ -187,7 +187,7 @@
   "generate_playlist": "Genera Playlist",
   "track_exists": "La traccia {track} esiste già",
   "replace_downloaded_tracks": "Sostituisci tutte le tracce scaricate",
-  "skip_download_tracks": "Salta lo scaricamento di tutte le tracce scaricate",
+  "skip_download_tracks": "Salta il download di tutte le tracce scaricate",
   "do_you_want_to_replace": "Vuoi sovrascrivere la traccia esistente??",
   "replace": "Sovrascrivi",
   "skip": "Salta",
@@ -256,7 +256,7 @@
   "querying_info": "Richiesta informazioni...",
   "piped_api_down": "Le Piped API non funzionano",
   "piped_down_error_instructions": "L'istanza di Piped {pipedInstance} è correntemente offline\n\nCambia istanza o cambia 'Tipo API' alle API ufficiali YouTube\n\nAssicurati di riavviare l'app dopo il cambio",
-  "you_are_offline": "Sei correntemente offline",
+  "you_are_offline": "Al momento sei offline",
   "connection_restored": "Connessione ad internet ripristinata",
   "use_system_title_bar": "Usa la barra del titolo di sistema",
   "crunching_results": "Elaborazione risultati...",
@@ -267,15 +267,15 @@
   "change_cover": "Cambia copertina",
   "add_cover": "Aggiungi copertina",
   "restore_defaults": "Ripristina default",
-  "download_music_codec": "Codec musicale scaricamento",
+  "download_music_codec": "Codec download musica",
-  "streaming_music_codec": "Codec musicale streaming",
+  "streaming_music_codec": "Codec streaming musica",
-  "login_with_lastfm": "Accesso a Last.fm",
+  "login_with_lastfm": "Accedi con Last.fm",
-  "connect": "Connetti",
+  "connect": "Connettiti",
-  "disconnect_lastfm": "Disconnetti Last.fm",
+  "disconnect_lastfm": "Disconnettiti da Last.fm",
   "disconnect": "Disconnetti",
   "username": "Nome utente",
   "password": "Password",
-  "login": "Accesso",
+  "login": "Accedi",
   "login_with_your_lastfm": "Accedi con il tuo account Last.fm",
   "scrobble_to_lastfm": "Invia a Last.fm",
   "audio_source": "Fonte audio",
@@ -299,7 +299,7 @@
   "song_link": "Link della Canzone",
   "skip_this_nonsense": "Salta questa sciocchezza",
   "freedom_of_music": "“Libertà della Musica”",
-  "freedom_of_music_palm": "“Libertà della Musica nel palmo della tua mano”",
+  "freedom_of_music_palm": "“Libertà della Musica nelle tue mani”",
   "get_started": "Cominciamo",
   "youtube_source_description": "Consigliato e funziona meglio.",
   "piped_source_description": "Ti senti libero? Come YouTube ma molto più gratuito.",

lib/models/metadata/image.dart

@@ -42,6 +42,17 @@ 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,6 +2,7 @@ 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';
@@ -38,10 +39,30 @@ 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: isLocal ? uri.path : uri.pathSegments.last,
+      id: 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,23 +32,6 @@ 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()),
@@ -111,40 +94,18 @@ class LocalFolderItem extends HookConsumerWidget {
           const Gap(8),
           Stack(
             children: [
-              Column(
+              Center(
-                mainAxisSize: MainAxisSize.min,
+                child: Text(
-                children: [
+                  isDownloadFolder
-                  Center(
+                      ? context.l10n.downloads
-                    child: Text(
+                      : isCacheFolder
-                      isDownloadFolder
+                          ? context.l10n.cache_folder.capitalize()
-                          ? context.l10n.downloads
+                          : basename(folder),
-                          : isCacheFolder
+                  style: const TextStyle(fontWeight: FontWeight.bold),
-                              ? context.l10n.cache_folder.capitalize()
+                  textAlign: TextAlign.center,
-                              : basename(folder),
+                  maxLines: 1,
-                      style: const TextStyle(fontWeight: FontWeight.bold),
+                  overflow: TextOverflow.ellipsis,
-                      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,7 +25,6 @@ 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';
 
@@ -100,8 +99,6 @@ 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' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 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,6 +4,7 @@ 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';
@@ -85,10 +86,10 @@ class UserLocalLibraryPage extends HookConsumerWidget {
                       gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
                         maxCrossAxisExtent: 200,
                         mainAxisExtent: constrains.isXs
-                            ? 210
+                            ? 230 * context.theme.scaling
                             : constrains.mdAndDown
-                                ? 280
+                                ? 280 * context.theme.scaling
-                                : 250,
+                                : 250 * context.theme.scaling,
                         crossAxisSpacing: 10,
                         mainAxisSpacing: 10,
                       ),

lib/provider/audio_player/audio_player.dart

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

lib/services/audio_services/audio_services.dart

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