From 52df6bf76eb232b082025d914d2598b731a0e383 Mon Sep 17 00:00:00 2001
From: Arkadiusz Fal <arek@arekf.net>
Date: Sun, 17 Apr 2022 11:33:49 +0200
Subject: [PATCH] Fix using Watch history in player queue

---
 Model/Player/PlayerModel.swift          |  2 +-
 Model/Player/PlayerQueue.swift          | 12 +++++-----
 Shared/Player/PlayerQueueRow.swift      | 32 ++++++++++++++++++++++---
 Shared/VideoURLParser.swift             |  7 +++---
 Shared/Views/VideoContextMenuView.swift |  2 +-
 5 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/Model/Player/PlayerModel.swift b/Model/Player/PlayerModel.swift
index 44446ab8..ba349bf6 100644
--- a/Model/Player/PlayerModel.swift
+++ b/Model/Player/PlayerModel.swift
@@ -201,7 +201,7 @@ final class PlayerModel: ObservableObject {
         backend.pause()
     }
 
-    func play(_ video: Video, at time: TimeInterval? = nil, inNavigationView: Bool = false) {
+    func play(_ video: Video, at time: CMTime? = nil, inNavigationView: Bool = false) {
         playNow(video, at: time)
 
         guard !playingInPictureInPicture else {
diff --git a/Model/Player/PlayerQueue.swift b/Model/Player/PlayerQueue.swift
index f3e89b14..f8c20990 100644
--- a/Model/Player/PlayerQueue.swift
+++ b/Model/Player/PlayerQueue.swift
@@ -42,7 +42,7 @@ extension PlayerModel {
         }
     }
 
-    func playNow(_ video: Video, at time: TimeInterval? = nil) {
+    func playNow(_ video: Video, at time: CMTime? = nil) {
         if playingInPictureInPicture, closePiPOnNavigation {
             closePiP()
         }
@@ -54,7 +54,7 @@ extension PlayerModel {
         }
     }
 
-    func playItem(_ item: PlayerQueueItem, video: Video? = nil, at time: TimeInterval? = nil) {
+    func playItem(_ item: PlayerQueueItem, video: Video? = nil, at time: CMTime? = nil) {
         if !playingInPictureInPicture {
             backend.closeItem()
         }
@@ -64,7 +64,7 @@ extension PlayerModel {
         currentItem = item
 
         if !time.isNil {
-            currentItem.playbackTime = .secondsInDefaultTimescale(time!)
+            currentItem.playbackTime = time
         } else if currentItem.playbackTime.isNil {
             currentItem.playbackTime = .zero
         }
@@ -105,7 +105,7 @@ extension PlayerModel {
         }
     }
 
-    func advanceToItem(_ newItem: PlayerQueueItem, at time: TimeInterval? = nil) {
+    func advanceToItem(_ newItem: PlayerQueueItem, at time: CMTime? = nil) {
         prepareCurrentItemForHistory()
 
         remove(newItem)
@@ -177,8 +177,8 @@ extension PlayerModel {
         }
     }
 
-    func playHistory(_ item: PlayerQueueItem) {
-        var time = item.playbackTime
+    func playHistory(_ item: PlayerQueueItem, at time: CMTime? = nil) {
+        var time = time ?? item.playbackTime
 
         if item.shouldRestartPlaying {
             time = .zero
diff --git a/Shared/Player/PlayerQueueRow.swift b/Shared/Player/PlayerQueueRow.swift
index 18233123..ab411bd7 100644
--- a/Shared/Player/PlayerQueueRow.swift
+++ b/Shared/Player/PlayerQueueRow.swift
@@ -1,3 +1,4 @@
+import CoreMedia
 import Defaults
 import Foundation
 import SwiftUI
@@ -11,15 +12,28 @@ struct PlayerQueueRow: View {
 
     @Default(.closePiPOnNavigation) var closePiPOnNavigation
 
+    @FetchRequest private var watchRequest: FetchedResults<Watch>
+
+    init(item: PlayerQueueItem, history: Bool = false, fullScreen: Binding<Bool> = .constant(false)) {
+        self.item = item
+        self.history = history
+        _fullScreen = fullScreen
+        _watchRequest = FetchRequest<Watch>(
+            entity: Watch.entity(),
+            sortDescriptors: [],
+            predicate: NSPredicate(format: "videoID = %@", item.videoID)
+        )
+    }
+
     var body: some View {
         Group {
             Button {
                 player.prepareCurrentItemForHistory()
 
                 if history {
-                    player.playHistory(item)
+                    player.playHistory(item, at: watchStoppedAt)
                 } else {
-                    player.advanceToItem(item)
+                    player.advanceToItem(item, at: watchStoppedAt)
                 }
 
                 if fullScreen {
@@ -32,9 +46,21 @@ struct PlayerQueueRow: View {
                     player.closePiP()
                 }
             } label: {
-                VideoBanner(video: item.video, playbackTime: item.playbackTime, videoDuration: item.videoDuration)
+                VideoBanner(video: item.video, playbackTime: watchStoppedAt, videoDuration: watch?.videoDuration)
             }
             .buttonStyle(.plain)
         }
     }
+
+    private var watch: Watch? {
+        watchRequest.first
+    }
+
+    private var watchStoppedAt: CMTime? {
+        guard let seconds = watch?.stoppedAt else {
+            return nil
+        }
+
+        return .secondsInDefaultTimescale(seconds)
+    }
 }
diff --git a/Shared/VideoURLParser.swift b/Shared/VideoURLParser.swift
index 69500932..2036317d 100644
--- a/Shared/VideoURLParser.swift
+++ b/Shared/VideoURLParser.swift
@@ -1,3 +1,4 @@
+import CoreMedia
 import Foundation
 
 struct VideoURLParser {
@@ -11,7 +12,7 @@ struct VideoURLParser {
         return queryItemValue("v")
     }
 
-    var time: TimeInterval? {
+    var time: CMTime? {
         guard let time = queryItemValue("t") else {
             return nil
         }
@@ -24,13 +25,13 @@ struct VideoURLParser {
               let seconds = TimeInterval(timeComponents["seconds"] ?? "0")
         else {
             if let time = TimeInterval(time) {
-                return time
+                return .secondsInDefaultTimescale(time)
             }
 
             return nil
         }
 
-        return seconds + (minutes * 60) + (hours * 60 * 60)
+        return .secondsInDefaultTimescale(seconds + (minutes * 60) + (hours * 60 * 60))
     }
 
     func queryItemValue(_ name: String) -> String? {
diff --git a/Shared/Views/VideoContextMenuView.swift b/Shared/Views/VideoContextMenuView.swift
index 611032dd..054e2b83 100644
--- a/Shared/Views/VideoContextMenuView.swift
+++ b/Shared/Views/VideoContextMenuView.swift
@@ -111,7 +111,7 @@ struct VideoContextMenuView: View {
 
     private var continueButton: some View {
         Button {
-            player.play(video, at: watch!.stoppedAt, inNavigationView: inNavigationView)
+            player.play(video, at: .secondsInDefaultTimescale(watch!.stoppedAt), inNavigationView: inNavigationView)
         } label: {
             Label("Continue from \(watch!.stoppedAt.formattedAsPlaybackTime() ?? "where I left off")", systemImage: "playpause")
         }