Merge pull request #1112 from TortugaPower/fix-autotimer

Fix auto sleep timer & initial migration for synced tasks
TortugaPower · Mar 2, 2024 · dcffd98 · dcffd98
2 parents 9beaad3 + 5e1289e
commit dcffd98
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/BookPlayer/Player/PlayerManager.swift b/BookPlayer/Player/PlayerManager.swift
@@ -704,6 +704,10 @@ extension PlayerManager {
   }
 
   func play() {
+    play(autoPlayed: false)
+  }
+
+  func play(autoPlayed: Bool) {
     playTask?.cancel()
     playTask = Task { @MainActor in
       /// Ignore play commands if there's no item loaded,
@@ -739,7 +743,9 @@ extension PlayerManager {
 
       handleSmartRewind(currentItem)
 
-      handleAutoTimer()
+      if !autoPlayed {
+        handleAutoTimer()
+      }
 
       fadeTimer?.invalidate()
       shakeMotionService.stopMotionUpdates()
@@ -815,7 +821,7 @@ extension PlayerManager {
       self.observeStatus = false
 
       if self.playbackQueued == true {
-        self.play()
+        self.play(autoPlayed: true)
       }
       // Clean up flag
       self.playbackQueued = nil
@@ -1119,7 +1125,7 @@ extension PlayerManager {
       }
       let options = AVAudioSession.InterruptionOptions(rawValue: optionsValue)
       if options.contains(.shouldResume) {
-        play()
+        play(autoPlayed: true)
       }
     @unknown default:
       break

diff --git a/Shared/Realm/Migrations/MigrationStoredSyncTasks.swift b/Shared/Realm/Migrations/MigrationStoredSyncTasks.swift
@@ -47,6 +47,10 @@ class MigrationStoredSyncTasks: MigrationHandler {
           let taskId = UUID().uuidString
           taskParams["id"] = taskId
 
+          if taskParams["lastPlayDateTimestamp"] is String {
+            taskParams["lastPlayDateTimestamp"] = 0
+          }
+
           let task = migrateTask(
             taskParams,
             id: taskId,
@@ -77,11 +81,16 @@ class MigrationStoredSyncTasks: MigrationHandler {
 
     for taskData in storedTasks {
       autoreleasepool {
-        if let taskParams = try? JSONSerialization.jsonObject(with: taskData) as? [String: Any],
+        if var taskParams = try? JSONSerialization.jsonObject(with: taskData) as? [String: Any],
            let taskId = taskParams["id"] as? String,
            let relativePath = taskParams["relativePath"] as? String,
            let jobTypeRaw = taskParams["jobType"] as? String,
            let jobType = SyncJobType(rawValue: jobTypeRaw) {
+
+          if taskParams["lastPlayDateTimestamp"] is String {
+            taskParams["lastPlayDateTimestamp"] = 0
+          }
+
           let task = migrateTask(
             taskParams,
             id: taskId,