feat: remember shuffle and repeat (#49)

Author: sozercan

Core/Services/Player/PlayerService.swift

@@ -130,6 +130,10 @@ final class PlayerService: NSObject, PlayerServiceProtocol {
     static let volumeKey = "playerVolume"
     /// UserDefaults key for persisting volume before mute.
     static let volumeBeforeMuteKey = "playerVolumeBeforeMute"
+    /// UserDefaults key for persisting shuffle state.
+    static let shuffleEnabledKey = "playerShuffleEnabled"
+    /// UserDefaults key for persisting repeat mode.
+    static let repeatModeKey = "playerRepeatMode"
 
     // MARK: - Initialization
 
@@ -150,6 +154,29 @@ final class PlayerService: NSObject, PlayerServiceProtocol {
             self.volumeBeforeMute = self.volume > 0 ? self.volume : 1.0
         }
 
+        // Restore shuffle and repeat settings if enabled in settings
+        if SettingsManager.shared.rememberPlaybackSettings {
+            if UserDefaults.standard.object(forKey: Self.shuffleEnabledKey) != nil {
+                self.shuffleEnabled = UserDefaults.standard.bool(forKey: Self.shuffleEnabledKey)
+                self.logger.info("Restored shuffle state: \(self.shuffleEnabled)")
+            }
+
+            if let savedRepeatMode = UserDefaults.standard.string(forKey: Self.repeatModeKey) {
+                switch savedRepeatMode {
+                case "all":
+                    self.repeatMode = .all
+                case "one":
+                    self.repeatMode = .one
+                case "off":
+                    self.repeatMode = .off
+                default:
+                    self.logger.warning("Unexpected repeat mode value in UserDefaults: \(savedRepeatMode), defaulting to off")
+                    self.repeatMode = .off
+                }
+                self.logger.info("Restored repeat mode: \(String(describing: self.repeatMode))")
+            }
+        }
+
         // Load mock state for UI tests
         self.loadMockStateIfNeeded()
     }
@@ -618,6 +645,10 @@ final class PlayerService: NSObject, PlayerServiceProtocol {
     /// Toggles shuffle mode.
     func toggleShuffle() {
         self.shuffleEnabled.toggle()
+        // Persist shuffle state to UserDefaults if setting is enabled
+        if SettingsManager.shared.rememberPlaybackSettings {
+            UserDefaults.standard.set(self.shuffleEnabled, forKey: Self.shuffleEnabledKey)
+        }
         let status = self.shuffleEnabled ? "enabled" : "disabled"
         self.logger.info("Shuffle mode: \(status)")
     }
@@ -632,6 +663,18 @@ final class PlayerService: NSObject, PlayerServiceProtocol {
         case .one:
             self.repeatMode = .off
         }
+        // Persist repeat mode to UserDefaults if setting is enabled
+        if SettingsManager.shared.rememberPlaybackSettings {
+            let modeString = switch self.repeatMode {
+            case .off:
+                "off"
+            case .all:
+                "all"
+            case .one:
+                "one"
+            }
+            UserDefaults.standard.set(modeString, forKey: Self.repeatModeKey)
+        }
         let mode = self.repeatMode
         self.logger.info("Repeat mode: \(String(describing: mode))")
     }

Core/Services/SettingsManager.swift

@@ -13,6 +13,7 @@ final class SettingsManager {
         static let showNowPlayingNotifications = "settings.showNowPlayingNotifications"
         static let defaultLaunchPage = "settings.defaultLaunchPage"
         static let hapticFeedbackEnabled = "settings.hapticFeedbackEnabled"
+        static let rememberPlaybackSettings = "settings.rememberPlaybackSettings"
     }
 
     // MARK: - Launch Page Options
@@ -81,6 +82,18 @@ final class SettingsManager {
         }
     }
 
+    /// Whether to remember shuffle/repeat settings across app restarts.
+    var rememberPlaybackSettings: Bool {
+        didSet {
+            UserDefaults.standard.set(self.rememberPlaybackSettings, forKey: Keys.rememberPlaybackSettings)
+            // Clear stale values when setting is disabled to prevent unexpected restoration
+            if !self.rememberPlaybackSettings {
+                UserDefaults.standard.removeObject(forKey: "playerShuffleEnabled")
+                UserDefaults.standard.removeObject(forKey: "playerRepeatMode")
+            }
+        }
+    }
+
     /// The last page the user was on (for "Last Used" option).
     var lastUsedPage: LaunchPage = .home
 
@@ -90,6 +103,7 @@ final class SettingsManager {
         // Load persisted settings or use defaults
         self.showNowPlayingNotifications = UserDefaults.standard.object(forKey: Keys.showNowPlayingNotifications) as? Bool ?? true
         self.hapticFeedbackEnabled = UserDefaults.standard.object(forKey: Keys.hapticFeedbackEnabled) as? Bool ?? true
+        self.rememberPlaybackSettings = UserDefaults.standard.object(forKey: Keys.rememberPlaybackSettings) as? Bool ?? false
 
         if let rawValue = UserDefaults.standard.string(forKey: Keys.defaultLaunchPage),
            let page = LaunchPage(rawValue: rawValue)

Tests/KasetTests/SettingsManagerTests.swift

@@ -66,6 +66,31 @@ struct SettingsManagerTests {
         #expect(manager.hapticFeedbackEnabled == true)
     }
 
+    @Test("Default rememberPlaybackSettings is false")
+    func defaultRememberPlaybackSettings() {
+        let manager = SettingsManager.shared
+        #expect(manager.rememberPlaybackSettings == false)
+    }
+
+    @Test("Disabling rememberPlaybackSettings clears persisted values")
+    func disablingRememberPlaybackSettingsClearsValues() {
+        let manager = SettingsManager.shared
+        let shuffleKey = "playerShuffleEnabled"
+        let repeatKey = "playerRepeatMode"
+
+        // Set up some persisted values
+        UserDefaults.standard.set(true, forKey: shuffleKey)
+        UserDefaults.standard.set("all", forKey: repeatKey)
+
+        // Enable then disable the setting
+        manager.rememberPlaybackSettings = true
+        manager.rememberPlaybackSettings = false
+
+        // Verify values are cleared
+        #expect(UserDefaults.standard.object(forKey: shuffleKey) == nil)
+        #expect(UserDefaults.standard.object(forKey: repeatKey) == nil)
+    }
+
     // MARK: - launchPage Computed Property Tests
 
     @Test("launchPage returns defaultLaunchPage for non-lastUsed")

Views/macOS/GeneralSettingsView.swift

@@ -45,6 +45,10 @@ struct GeneralSettingsView: View {
                 Toggle("Haptic Feedback", isOn: self.$settings.hapticFeedbackEnabled)
                     .help("Provide tactile feedback for actions on Force Touch trackpads")
 
+                // Remember Playback Settings
+                Toggle("Remember Shuffle & Repeat", isOn: self.$settings.rememberPlaybackSettings)
+                    .help("Save shuffle and repeat settings across app restarts")
+
                 // Default Launch Page
                 Picker("Default Page on Launch", selection: self.$settings.defaultLaunchPage) {
                     ForEach(SettingsManager.LaunchPage.allCases) { page in