WIP: local changes befor cherry-pick

Author: juangarciaSD

boringNotch/managers/MusicManager.swift

@@ -184,88 +184,55 @@ class MusicManager: ObservableObject {
                 self.updateSneakPeek()
             }
         }
-
-        // Check for changes in track metadata using last artwork change values
+        
+        // Determine if anything changed
         let titleChanged = state.title != self.lastArtworkTitle
         let artistChanged = state.artist != self.lastArtworkArtist
         let albumChanged = state.album != self.lastArtworkAlbum
         let bundleChanged = state.bundleIdentifier != self.lastArtworkBundleIdentifier
-
-        // Check for artwork changes
         let artworkChanged = state.artwork != nil && state.artwork != self.artworkData
         let hasContentChange = titleChanged || artistChanged || albumChanged || artworkChanged || bundleChanged
 
-        // Handle artwork and visual transitions for changed content
         if hasContentChange {
-            self.triggerFlipAnimation()
-
-            if artworkChanged, let artwork = state.artwork {
-                self.updateArtwork(artwork)
-            } else if state.artwork == nil {
-                // Try to use app icon if no artwork but track changed
-                if let appIconImage = AppIconAsNSImage(for: state.bundleIdentifier) {
-                    self.usingAppIconForArtwork = true
-                    self.updateAlbumArt(newAlbumArt: appIconImage)
-                }
-            }
+            // Update last values
+            self.lastArtworkTitle = state.title
+            self.lastArtworkArtist = state.artist
+            self.lastArtworkAlbum = state.album
+            self.lastArtworkBundleIdentifier = state.bundleIdentifier
             self.artworkData = state.artwork
 
-            if artworkChanged || state.artwork == nil {
-                // Update last artwork change values
-                self.lastArtworkTitle = state.title
-                self.lastArtworkArtist = state.artist
-                self.lastArtworkAlbum = state.album
-                self.lastArtworkBundleIdentifier = state.bundleIdentifier
+            // Update all content together
+            self.updatePlaybackContent(
+                title: state.title,
+                artist: state.artist,
+                album: state.album,
+                artworkData: state.artwork,
+                bundleIdentifier: state.bundleIdentifier
+            )
+        }
+
+        // Playback state changes (play/pause)
+        if state.isPlaying != self.isPlaying {
+            withAnimation(.smooth) {
+                self.isPlaying = state.isPlaying
+                self.updateIdleState(state: state.isPlaying)
             }
 
-            // Only update sneak peek if there's actual content and something changed
-            if !state.title.isEmpty && !state.artist.isEmpty && state.isPlaying {
+            if state.isPlaying && !state.title.isEmpty && !state.artist.isEmpty {
                 self.updateSneakPeek()
             }
         }
 
-        let timeChanged = state.currentTime != self.elapsedTime
-        let durationChanged = state.duration != self.songDuration
-        let playbackRateChanged = state.playbackRate != self.playbackRate
-        let shuffleChanged = state.isShuffled != self.isShuffled
-        let repeatModeChanged = state.repeatMode != self.repeatMode
-
-        if state.title != self.songTitle {
-            self.songTitle = state.title
-        }
-
-        if state.artist != self.artistName {
-            self.artistName = state.artist
-        }
-
-        if state.album != self.album {
-            self.album = state.album
-        }
-
-        if timeChanged {
-            self.elapsedTime = state.currentTime
-        }
-
-        if durationChanged {
-            self.songDuration = state.duration
-        }
-
-        if playbackRateChanged {
-            self.playbackRate = state.playbackRate
-        }
-        
-        if shuffleChanged {
-            self.isShuffled = state.isShuffled
-        }
-
-        if state.bundleIdentifier != self.bundleIdentifier {
-            self.bundleIdentifier = state.bundleIdentifier
-        }
-
-        if repeatModeChanged {
-            self.repeatMode = state.repeatMode
-        }
-        
+        // Other playback properties
+        if state.currentTime != self.elapsedTime { self.elapsedTime = state.currentTime }
+        if state.duration != self.songDuration { self.songDuration = state.duration }
+        if state.playbackRate != self.playbackRate { self.playbackRate = state.playbackRate }
+        if state.isShuffled != self.isShuffled { self.isShuffled = state.isShuffled }
+        if state.repeatMode != self.repeatMode { self.repeatMode = state.repeatMode }
+        if state.title != self.songTitle { self.songTitle = state.title }
+        if state.artist != self.artistName { self.artistName = state.artist }
+        if state.album != self.album { self.album = state.album }
+        if state.bundleIdentifier != self.bundleIdentifier { self.bundleIdentifier = state.bundleIdentifier }
         self.timestampDate = state.lastUpdated
     }
 
@@ -284,18 +251,30 @@ class MusicManager: ObservableObject {
         flipWorkItem = workItem
         DispatchQueue.main.async(execute: workItem)
     }
-
-    private func updateArtwork(_ artworkData: Data) {
-        DispatchQueue.global(qos: .userInitiated).async { [weak self] in
-            guard let self = self else { return }
-
-            if let artworkImage = NSImage(data: artworkData) {
-                DispatchQueue.main.async { [weak self] in
-                    self?.usingAppIconForArtwork = false
-                    self?.updateAlbumArt(newAlbumArt: artworkImage)
-                }
-            }
-        }
+    
+    @MainActor
+    private func updatePlaybackContent(title: String,
+                                       artist: String,
+                                       album: String,
+                                       artworkData: Data?,
+                                       bundleIdentifier: String?) {
+        var finalArtwork: NSImage = defaultImage
+
+        if let data = artworkData, let image = NSImage(data: data) {
+            finalArtwork = image
+            self.usingAppIconForArtwork = false
+        } else if let bundleID = bundleIdentifier,
+                  let appIcon = AppIconAsNSImage(for: bundleID) {
+            finalArtwork = appIcon
+            self.usingAppIconForArtwork = true
+        }
+
+        // Update properties on main actor
+        self.songTitle = title
+        self.artistName = artist
+        self.album = album
+        self.albumArt = finalArtwork
+        self.triggerFlipAnimation()
     }
 
     private func updateIdleState(state: Bool) {