refactoring

Author: swiftuiux

Sources/swiftui-loop-videoplayer/protocol/player/AbstractPlayer.swift

@@ -14,7 +14,11 @@ import CoreImage
 @MainActor @preconcurrency
 public protocol AbstractPlayer: AnyObject {
 
-    var currentSettings : VideoSettings? { get set }
+    /// An optional property that stores the current video settings.
+    ///
+    /// This property holds an instance of `VideoSettings` or nil if no settings have been configured yet.
+    /// It is a computed property with both getter and setter to retrieve and update the video settings respectively.
+    var currentSettings: VideoSettings? { get set }
 
     /// The delegate to be notified about errors encountered by the player.
     var delegate: PlayerDelegateProtocol? { get set }
@@ -153,8 +157,10 @@ extension AbstractPlayer{
         }
 
         guard currentItem?.status == .readyToPlay else{
+            /// The case when the video if finished and we are trying to seek back
             if let currentAsset, let currentSettings{
-                update(asset: currentAsset, settings: currentSettings.GetWithNotLoopNotAutoplay){ [weak self] status in
+                let settings = currentSettings.GetSettingsWithNotAutoPlay
+                update(asset: currentAsset, settings: settings){ [weak self] status in
                     if status == .readyToPlay{
                         self?.seek(to: time)
                     }else {

Sources/swiftui-loop-videoplayer/utils/VideoSettings.swift

@@ -103,8 +103,26 @@ public struct VideoSettings: Equatable{
 public extension VideoSettings {
 
     /// Returns a new instance of VideoSettings with loop set to false and notAutoPlay set to true, keeping other settings unchanged.
-    var GetWithNotLoopNotAutoplay: VideoSettings {
-        VideoSettings(name: self.name, ext: self.ext, loop: false, mute: self.mute, notAutoPlay: true, timePublishing: self.timePublishing, gravity: self.gravity, errorColor: self.errorColor, errorFontSize: self.errorFontSize, errorWidgetOff: self.errorWidgetOff, unique: self.unique)
+    var GetSettingsWithNotAutoPlay : VideoSettings {
+        VideoSettings(name: self.name, ext: self.ext, loop: self.loop, mute: self.mute, notAutoPlay: true, timePublishing: self.timePublishing, gravity: self.gravity, errorColor: self.errorColor, errorFontSize: self.errorFontSize, errorWidgetOff: self.errorWidgetOff, unique: self.unique)
+    }
+    
+    /// Checks if the asset has changed based on the provided settings and current asset.
+    /// - Parameters:
+    ///   - asset: The current asset being played.
+    /// - Returns: A new `AVURLAsset` if the asset has changed, or `nil` if the asset remains the same.
+    func getAssetIfDifferent(than asset: AVURLAsset?) -> AVURLAsset?{
+        let newAsset =  assetFor(self)
+        
+        if asset == nil {
+            return newAsset
+        }
+        
+        if let newUrl = newAsset?.url, let oldUrl = asset?.url, newUrl != oldUrl{
+            return newAsset
+        }
+
+        return nil
     }
 }
 

Sources/swiftui-loop-videoplayer/view/main/LoopPlayerMultiPlatform.swift

@@ -115,7 +115,7 @@ extension LoopPlayerMultiPlatform: UIViewRepresentable{
     @MainActor func updateUIView(_ uiView: UIView, context: Context) {
         let player = uiView.findFirstSubview(ofType: PlayerView.self)
         if let player {
-            if let asset = getAssetIfChanged(for: settings, and: player.currentAsset) {
+            if let asset = settings.getAssetIfDifferent(than: player.currentAsset) {
                 player.update(asset: asset, settings: settings)
             }
 
@@ -163,7 +163,7 @@ extension LoopPlayerMultiPlatform: NSViewRepresentable{
     @MainActor func updateNSView(_ nsView: NSView, context: Context) {
         let player = nsView.findFirstSubview(ofType: PlayerView.self)
         if let player {
-            if let asset = getAssetIfChanged(for: settings, and: player.currentAsset){
+            if let asset = settings.getAssetIfDifferent(than: player.currentAsset){
                 player.update(asset: asset, settings: settings)
             }
             // Check if command changed before applying it
@@ -183,22 +183,3 @@ extension LoopPlayerMultiPlatform: NSViewRepresentable{
     }
 }
 #endif
-
-/// Checks if the asset has changed based on the provided settings and current asset.
-/// - Parameters:
-///   - settings: The current video settings, containing the asset's name and extension.
-///   - asset: The current asset being played.
-/// - Returns: A new `AVURLAsset` if the asset has changed, or `nil` if the asset remains the same.
-fileprivate func getAssetIfChanged(for settings: VideoSettings, and asset: AVURLAsset?) -> AVURLAsset?{
-    let newAsset =  assetFor(settings)
-    
-    if asset == nil {
-        return newAsset
-    }
-    
-    if let newUrl = newAsset?.url, let oldUrl = asset?.url, newUrl != oldUrl{
-        return newAsset
-    }
-
-    return nil
-}

Sources/swiftui-loop-videoplayer/view/player/ios/LoopingPlayerUIView.swift

@@ -18,6 +18,7 @@ import UIKit
 @MainActor @preconcurrency
 class LoopingPlayerUIView: UIView, LoopingPlayerProtocol {   
 
+    /// This property holds an instance of `VideoSettings`
     internal var currentSettings : VideoSettings?
 
     /// `filters` is an array that stores CIFilter objects used to apply different image processing effects

Sources/swiftui-loop-videoplayer/view/player/mac/LoopingPlayerNSView.swift

@@ -20,6 +20,7 @@ import AppKit
 @MainActor @preconcurrency
 class LoopingPlayerNSView: NSView, LoopingPlayerProtocol {   
 
+    /// This property holds an instance of `VideoSettings`
     internal var currentSettings : VideoSettings?
 
     /// `filters` is an array that stores CIFilter objects used to apply different image processing effects