chore: add resetRemoteSource option in updateState and improve remote art handling (#112)

Author: Feichtmeier

lib/player/player_manager.dart

@@ -8,7 +8,6 @@ import 'package:safe_change_notifier/safe_change_notifier.dart';
 import 'package:yaru/yaru.dart';
 
 import '../common/logging.dart';
-import '../extensions/string_x.dart';
 import 'data/local_media.dart';
 import 'data/unique_media.dart';
 import 'view/player_view_state.dart';
@@ -56,6 +55,7 @@ class PlayerManager extends BaseAudioHandler with SeekHandler {
     Color? color,
     String? remoteSourceArtUrl,
     String? remoteSourceTitle,
+    bool resetRemoteSource = false,
   }) {
     final previousArtUri = mediaItem.value?.artUri;
     final artUri =
@@ -64,22 +64,32 @@ class PlayerManager extends BaseAudioHandler with SeekHandler {
             : Uri.tryParse(remoteSourceArtUrl)) ??
         previousArtUri;
 
-    playerViewState.value = playerViewState.value.copyWith(
-      fullMode: fullMode,
-      showPlayerExplorer: showPlayerExplorer,
-      explorerIndex: explorerIndex,
-      color: color,
-      remoteSourceArtUrl: artUri.toString(),
-      remoteSourceTitle: remoteSourceTitle,
-    );
+    if (resetRemoteSource) {
+      playerViewState.value = PlayerViewState(
+        fullMode: fullMode ?? playerViewState.value.fullMode,
+        showPlayerExplorer:
+            showPlayerExplorer ?? playerViewState.value.showPlayerExplorer,
+        explorerIndex: explorerIndex ?? playerViewState.value.explorerIndex,
+        color: color,
+        remoteSourceArtUrl: null,
+        remoteSourceTitle: null,
+      );
+    } else {
+      playerViewState.value = playerViewState.value.copyWith(
+        fullMode: fullMode,
+        showPlayerExplorer: showPlayerExplorer,
+        explorerIndex: explorerIndex,
+        color: color,
+        remoteSourceArtUrl: remoteSourceArtUrl,
+        remoteSourceTitle: remoteSourceTitle,
+      );
+    }
 
-    if (remoteSourceTitle != null) {
-      final split = remoteSourceTitle.splitByDash;
+    if (remoteSourceTitle != null && mediaItem.value != null) {
       mediaItem.add(
-        MediaItem(
-          id: remoteSourceTitle,
+        mediaItem.value?.copyWith(
           title: remoteSourceTitle,
-          artist: currentMedia?.artist ?? split.artist,
+          artist: currentMedia?.artist,
           artUri: artUri,
         ),
       );
@@ -200,13 +210,7 @@ class PlayerManager extends BaseAudioHandler with SeekHandler {
 
   Future<void> setPlaylist(List<UniqueMedia> mediaList, {int index = 0}) async {
     if (mediaList.isEmpty) return;
-    updateState(
-      remoteSourceArtUrl:
-          mediaList.elementAtOrNull(index)?.artUrl?.endsWith('.ico') == true
-          ? null
-          : mediaList.elementAtOrNull(index)?.artUrl,
-      remoteSourceTitle: mediaList.elementAtOrNull(index)?.title,
-    );
+    updateState(resetRemoteSource: true);
     await _player.open(Playlist(mediaList, index: index));
   }
 

lib/player/view/player_album_art.dart

@@ -76,6 +76,11 @@ class PlayerRemoteSourceImage extends StatelessWidget with WatchItMixin {
           p.playerViewState.select((e) => e.remoteSourceArtUrl),
     );
 
+    final artUrl = watchStream(
+      (PlayerManager p) => p.currentMediaStream.map((e) => e.artUrl),
+      initialValue: di<PlayerManager>().currentMedia?.artUrl,
+    ).data;
+
     final color = watchValue(
       (PlayerManager p) => p.playerViewState.select((e) => e.color),
     );
@@ -96,7 +101,7 @@ class PlayerRemoteSourceImage extends StatelessWidget with WatchItMixin {
         );
       },
       onImageLoaded: di<PlayerManager>().setRemoteColorFromImageProvider,
-      url: remoteSourceArtUrl,
+      url: remoteSourceArtUrl ?? artUrl,
       filterQuality: FilterQuality.medium,
       fit: fit ?? BoxFit.scaleDown,
       fallBackIcon: Icon(

lib/player/view/player_full_view.dart

@@ -4,6 +4,7 @@ import 'package:media_kit_video/media_kit_video.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../common/platforms.dart';
 import '../../common/view/build_context_x.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
@@ -95,7 +96,7 @@ class PlayerFullView extends StatelessWidget
               title: Text('Media Player', style: TextStyle(color: iconColor)),
               backgroundColor: Colors.transparent,
               border: BorderSide.none,
-              isClosable: false,
+              isClosable: !Platforms.isMacOS,
               actions: [
                 IconButton(
                   isSelected: showPlayerExplorer,