Model improvements

Model/AudioVideoStream.swift

@@ -9,8 +9,4 @@ final class AudioVideoStream: Stream {
 
         super.init(audioAsset: avAsset, videoAsset: avAsset, resolution: resolution, type: type, encoding: encoding)
     }
-
-    override var assets: [AVURLAsset] {
-        [videoAsset]
-    }
 }

Model/PlayerState.swift

@@ -5,13 +5,31 @@ import Logging
 final class PlayerState: ObservableObject {
     let logger = Logger(label: "net.arekf.Pearvidious.ps")
 
+    var video: Video
+
     @Published private(set) var currentStream: Stream!
     @Published var streamToLoad: Stream!
 
-    @Published var seekTo: CMTime?
+    @Published var savedTime: CMTime?
 
     @Published var streamLoading = false
 
+    @Published var player = AVPlayer()
+    var composition = AVMutableComposition()
+
+    var playerItem: AVPlayerItem {
+        let playerItem = AVPlayerItem(asset: composition)
+
+        playerItem.externalMetadata = [makeMetadataItem(.commonIdentifierTitle, value: video.title)]
+        playerItem.preferredForwardBufferDuration = 10
+
+        return playerItem
+    }
+
+    init(_ video: Video) {
+        self.video = video
+    }
+
     func cancelLoadingStream(_ stream: Stream) {
         guard streamToLoad == stream else {
             return
@@ -30,9 +48,10 @@ final class PlayerState: ObservableObject {
 
         streamToLoad?.cancelLoadingAssets()
 
-        streamLoading = true
-        streamToLoad = stream
-
+        DispatchQueue.main.async {
+            self.streamLoading = true
+            self.streamToLoad = stream
+        }
         logger.info("replace streamToLoad: \(streamToLoad?.description ?? "nil"), streamLoading \(streamLoading)")
     }
 
@@ -49,4 +68,43 @@ final class PlayerState: ObservableObject {
 
         logger.info("after: toLoad: \(streamToLoad?.description ?? "nil"), current \(currentStream?.description ?? "nil"), loading \(streamLoading)")
     }
+
+    func loadStreamIntoPlayer(_ stream: Stream) {
+        logger.warning("loading \(stream.description) to player")
+
+        beforeLoadStreamIntoPlayer()
+
+        player.replaceCurrentItem(with: playerItem)
+        streamDidLoad(stream)
+
+        afterLoadStreamIntoPlayer()
+    }
+
+    func beforeLoadStreamIntoPlayer() {
+        let currentTime = player.currentTime()
+
+        guard currentTime.seconds > 0 else {
+            return
+        }
+
+        savedTime = currentTime
+    }
+
+    func afterLoadStreamIntoPlayer() {
+        if let time = savedTime {
+            player.seek(to: time)
+        }
+
+        player.play()
+    }
+
+    private func makeMetadataItem(_ identifier: AVMetadataIdentifier, value: Any) -> AVMetadataItem {
+        let item = AVMutableMetadataItem()
+
+        item.identifier = identifier
+        item.value = value as? NSCopying & NSObjectProtocol
+        item.extendedLanguageTag = "und"
+
+        return item.copy() as! AVMetadataItem
+    }
 }

Model/Stream.swift

@@ -31,6 +31,10 @@ class Stream: Equatable {
         assets.allSatisfy { $0.statusOfValue(forKey: "playable", error: nil) == .loaded }
     }
 
+    var loadedAssets: [AVURLAsset] {
+        assets.filter { $0.statusOfValue(forKey: "playable", error: nil) == .loaded }
+    }
+
     func cancelLoadingAssets() {
         assets.forEach { $0.cancelLoading() }
         audioAsset = AVURLAsset(url: audioAsset.url)