Circular Progress fixes + Continue watching fixes

Sora/MediaUtils/ContinueWatching/ContinueWatchingManager.swift

@@ -11,49 +11,51 @@ class ContinueWatchingManager {
     static let shared = ContinueWatchingManager()
     private let storageKey = "continueWatchingItems"
     private let lastCleanupKey = "lastContinueWatchingCleanup"
-
+    
     private init() {
         NotificationCenter.default.addObserver(self, selector: #selector(handleiCloudSync), name: .iCloudSyncDidComplete, object: nil)
         performCleanupIfNeeded()
     }
-
+    
     @objc private func handleiCloudSync() {
         NotificationCenter.default.post(name: .ContinueWatchingDidUpdate, object: nil)
     }
-
+    
     private func performCleanupIfNeeded() {
         let lastCleanup = UserDefaults.standard.double(forKey: lastCleanupKey)
         let currentTime = Date().timeIntervalSince1970
-
+        
         if currentTime - lastCleanup > 86400 {
             cleanupOldEpisodes()
             UserDefaults.standard.set(currentTime, forKey: lastCleanupKey)
         }
     }
-
+    
     private func cleanupOldEpisodes() {
         var items = fetchItems()
         var itemsToRemove: Set<UUID> = []
-
+        
         let groupedItems = Dictionary(grouping: items) { item in
             let title = item.mediaTitle.replacingOccurrences(of: "Episode \\d+.*$", with: "", options: .regularExpression)
                 .trimmingCharacters(in: .whitespacesAndNewlines)
             return title
         }
-
+        
         for (_, showEpisodes) in groupedItems {
             let sortedEpisodes = showEpisodes.sorted { $0.episodeNumber < $1.episodeNumber }
-
+            
             for i in 0..<sortedEpisodes.count - 1 {
                 let currentEpisode = sortedEpisodes[i]
                 let nextEpisode = sortedEpisodes[i + 1]
-
+                
-                if currentEpisode.progress >= 0.8 && nextEpisode.episodeNumber > currentEpisode.episodeNumber {
+                let remainingTimePercentage = UserDefaults.standard.object(forKey: "remainingTimePercentage") != nil ? UserDefaults.standard.double(forKey: "remainingTimePercentage") : 90.0
+                let threshold = (100.0 - remainingTimePercentage) / 100.0
+                if currentEpisode.progress >= threshold && nextEpisode.episodeNumber > currentEpisode.episodeNumber {
                     itemsToRemove.insert(currentEpisode.id)
                 }
             }
         }
-
+        
         if !itemsToRemove.isEmpty {
             items.removeAll { itemsToRemove.contains($0.id) }
             if let data = try? JSONEncoder().encode(items) {
@@ -61,59 +63,59 @@ class ContinueWatchingManager {
             }
         }
     }
-
+    
     func save(item: ContinueWatchingItem) {
-        // Use real playback times
         let lastKey = "lastPlayedTime_\(item.fullUrl)"
         let totalKey = "totalTime_\(item.fullUrl)"
         let lastPlayed = UserDefaults.standard.double(forKey: lastKey)
         let totalTime = UserDefaults.standard.double(forKey: totalKey)
-
+        
-        // Compute up-to-date progress
         let actualProgress: Double
         if totalTime > 0 {
             actualProgress = min(max(lastPlayed / totalTime, 0), 1)
         } else {
             actualProgress = item.progress
-        }
+            
-
+            let remainingTimePercentage = UserDefaults.standard.object(forKey: "remainingTimePercentage") != nil ? UserDefaults.standard.double(forKey: "remainingTimePercentage") : 90.0
-        // If watched ≥ 90%, remove it
+            let threshold = (100.0 - remainingTimePercentage) / 100.0
-        if actualProgress >= 0.9 {
+            if actualProgress >= threshold {
-            remove(item: item)
+                remove(item: item)
-            return
+                return
-        }
+            }
-
+            
-        // Otherwise update progress and remove old episodes from the same show
+            var updatedItem = item
-        var updatedItem = item
+            updatedItem.progress = actualProgress
-        updatedItem.progress = actualProgress
+            
-
+            var items = fetchItems()
-        var items = fetchItems()
+            
-
+            let showTitle = item.mediaTitle.replacingOccurrences(of: "Episode \\d+.*$", with: "", options: .regularExpression)
-        let showTitle = item.mediaTitle.replacingOccurrences(of: "Episode \\d+.*$", with: "", options: .regularExpression)
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-
-        items.removeAll { existingItem in
-            let existingShowTitle = existingItem.mediaTitle.replacingOccurrences(of: "Episode \\d+.*$", with: "", options: .regularExpression)
                 .trimmingCharacters(in: .whitespacesAndNewlines)
-
+            
-            return showTitle == existingShowTitle &&
+            items.removeAll { existingItem in
-                   existingItem.episodeNumber < item.episodeNumber &&
+                let existingShowTitle = existingItem.mediaTitle.replacingOccurrences(of: "Episode \\d+.*$", with: "", options: .regularExpression)
-                   existingItem.progress >= 0.8
+                    .trimmingCharacters(in: .whitespacesAndNewlines)
-        }
+                
-
+                let remainingTimePercentage = UserDefaults.standard.object(forKey: "remainingTimePercentage") != nil ? UserDefaults.standard.double(forKey: "remainingTimePercentage") : 90.0
-        items.removeAll { existing in
+                let threshold = (100.0 - remainingTimePercentage) / 100.0
-            existing.fullUrl == item.fullUrl &&
+                return showTitle == existingShowTitle &&
-            existing.episodeNumber == item.episodeNumber &&
+                existingItem.episodeNumber < item.episodeNumber &&
-            existing.module.metadata.sourceName == item.module.metadata.sourceName
+                existingItem.progress >= threshold
-        }
+            }
-
+            
-        items.append(updatedItem)
+            items.removeAll { existing in
-
+                existing.fullUrl == item.fullUrl &&
-        if let data = try? JSONEncoder().encode(items) {
+                existing.episodeNumber == item.episodeNumber &&
-            UserDefaults.standard.set(data, forKey: storageKey)
+                existing.module.metadata.sourceName == item.module.metadata.sourceName
+            }
+            
+            items.append(updatedItem)
+            
+            if let data = try? JSONEncoder().encode(items) {
+                UserDefaults.standard.set(data, forKey: storageKey)
+            }
         }
     }
-
+    
     func fetchItems() -> [ContinueWatchingItem] {
         guard
             let data = UserDefaults.standard.data(forKey: storageKey),
@@ -121,7 +123,7 @@ class ContinueWatchingManager {
         else {
             return []
         }
-
+        
         var seen = Set<String>()
         let unique = raw.reversed().filter { item in
             let key = "\(item.fullUrl)|\(item.module.metadata.sourceName)|\(item.episodeNumber)"
@@ -132,10 +134,10 @@ class ContinueWatchingManager {
                 return true
             }
         }.reversed()
-
+        
         return Array(unique)
     }
-
+    
     func remove(item: ContinueWatchingItem) {
         var items = fetchItems()
         items.removeAll { $0.id == item.id }

Sora/Views/MediaInfoView/EpisodeCell/CircularProgressBar.swift

@@ -24,7 +24,10 @@ struct CircularProgressBar: View {
                 .rotationEffect(Angle(degrees: 270.0))
                 .animation(.linear, value: progress)
             
-            if progress >= 0.9 {
+            let remainingTimePercentage = UserDefaults.standard.object(forKey: "remainingTimePercentage") != nil ? UserDefaults.standard.double(forKey: "remainingTimePercentage") : 90.0
+            let threshold = (100.0 - remainingTimePercentage) / 100.0
+            
+            if progress >= threshold {
                 Image(systemName: "checkmark")
                     .font(.system(size: 12))
             } else {