refactoring

Author: swiftuiux

Sources/swiftui-loop-videoplayer/enum/Setting.swift

@@ -19,6 +19,8 @@ public enum Setting: Equatable, SettingsConvertible{
         [self]
     }
 
+    case loop
+    
     /// File name
     case name(String)
 
@@ -53,6 +55,8 @@ public enum Setting: Equatable, SettingsConvertible{
             return nil
         }
 
+        print(firstChild)
+        
         return firstChild.value
     }
 }

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

@@ -37,13 +37,14 @@ public protocol LoopingPlayerProtocol: AbstractPlayer, LayerMakerProtocol{
     /// Declare a variable to hold the time observer token outside the if statement
     var timeObserverToken: Any? { get set }
 
-    /// Initializes a new instance of the view
+    /// Initializes a new player view with specified video asset and configurations.
     ///
     /// - Parameters:
-    ///   - asset: The AVURLAsset to be used in the player.
-    ///   - gravity: Specifies how the video content should be displayed within the layer bounds.
-    ///   - timePublishing: Optional CMTime that determines the interval at which the video current time should be published. Pass nil to disable time publishing.
-    init(asset: AVURLAsset, gravity: AVLayerVideoGravity, timePublishing: CMTime?)
+    ///   - asset: The `AVURLAsset` used for video playback.
+    ///   - gravity: The `AVLayerVideoGravity` defining how the video content is displayed within the layer bounds.
+    ///   - timePublishing: Optional `CMTime` that specifies a particular time for publishing or triggering an event.
+    ///   - loop: A Boolean value that indicates whether the video should loop when playback reaches the end of the content.
+    init(asset: AVURLAsset, gravity: AVLayerVideoGravity, timePublishing: CMTime?, loop : Bool)
 
     /// Sets up the necessary observers on the AVPlayerItem and AVQueuePlayer to monitor changes and errors.
     ///
@@ -82,7 +83,6 @@ internal extension LoopingPlayerProtocol {
         // Replace the current item
         let newItem = AVPlayerItem(asset: asset)
         player.insert(newItem, after: nil)
-        loop()
         play()
     }
 
@@ -95,14 +95,15 @@ internal extension LoopingPlayerProtocol {
     func setupPlayerComponents(
         asset: AVURLAsset,
         gravity: AVLayerVideoGravity,
-        timePublishing:  CMTime?
+        timePublishing:  CMTime?,
+        loop: Bool
     ) {
         let item = AVPlayerItem(asset: asset)
 
         let player = AVQueuePlayer(items: [item])
         self.player = player
 
-        configurePlayer(player, gravity: gravity, timePublishing: timePublishing)
+        configurePlayer(player, gravity: gravity, timePublishing: timePublishing, loop: loop)
 
         setupObservers(for: item, player: player)
     }
@@ -116,7 +117,8 @@ internal extension LoopingPlayerProtocol {
     func configurePlayer(
         _ player: AVQueuePlayer,
         gravity: AVLayerVideoGravity,
-        timePublishing:  CMTime?
+        timePublishing:  CMTime?,
+        loop : Bool
     ) {
         player.isMuted = true
         playerLayer.player = player
@@ -134,7 +136,10 @@ internal extension LoopingPlayerProtocol {
         self.wantsLayer = true
         #endif
         compositeLayer.frame = CGRect(x: 0, y: 0, width: bounds.width, height: bounds.height)
-        loop()
+        
+        if loop{
+            self.loop()
+        }
 
         if !filters.isEmpty{ // have an idea for the feature
             applyVideoComposition()

Sources/swiftui-loop-videoplayer/protocol/view/LoopPlayerViewProtocol.swift

@@ -87,7 +87,7 @@ public extension LoopPlayerViewProtocol{
         asset: AVURLAsset?) -> PlayerView? {
 
         if let asset{
-            let player = PlayerView(asset: asset, gravity: settings.gravity, timePublishing: settings.timePublishing)
+            let player = PlayerView(asset: asset, gravity: settings.gravity, timePublishing: settings.timePublishing, loop:  settings.loop)
             container.addSubview(player)
             activateFullScreenConstraints(for: player, in: container)
             return player

Sources/swiftui-loop-videoplayer/settings/Loop.swift

@@ -0,0 +1,22 @@
+//
+//  Loop.swift
+//
+//
+//  Created by Igor  on 16.08.24.
+//
+
+import Foundation
+
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, *)
+public struct Loop: SettingsConvertible{
+    
+    // MARK: - Life circle
+    
+    public init() {}
+    
+    /// Fetch settings
+    @_spi(Private)
+    public func asSettings() -> [Setting] {
+        [.loop]
+    }
+}

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

@@ -19,6 +19,8 @@ public struct VideoSettings: Equatable{
     /// Video extension
     public let ext: String
 
+    public let loop: Bool
+    
     /// A CMTime value representing the interval at which the player's current time should be published.
     /// If set, the player will publish periodic time updates based on this interval.
     public let timePublishing: CMTime?
@@ -61,6 +63,8 @@ public struct VideoSettings: Equatable{
         errorFontSize = settings.fetch(by : "errorFontSize", defaulted: 17)
 
         timePublishing = settings.fetch(by : "timePublishing", defaulted: nil)
+        
+        loop = settings.contains(.loop)
     }
 }
 

Sources/swiftui-loop-videoplayer/view/loop/helpers/PlayerCoordinator.swift renamed to Sources/swiftui-loop-videoplayer/view/helpers/PlayerCoordinator.swift

@@ -48,16 +48,17 @@ class LoopingPlayerUIView: UIView, LoopingPlayerProtocol {
     /// The delegate to be notified about errors encountered by the player.
     weak var delegate: PlayerDelegateProtocol?
 
-    /// Initializes a new instance of the view
+    /// Initializes a new player view with specified video asset and configurations.
     ///
     /// - Parameters:
-    ///   - asset: The AVURLAsset to be used in the player.
-    ///   - gravity: Specifies how the video content should be displayed within the layer bounds.
-    ///   - timePublishing: Optional CMTime that determines the interval at which the video current time should be published. Pass nil to disable time publishing.
-    required init(asset: AVURLAsset, gravity: AVLayerVideoGravity, timePublishing: CMTime?){
+    ///   - asset: The `AVURLAsset` used for video playback.
+    ///   - gravity: The `AVLayerVideoGravity` defining how the video content is displayed within the layer bounds.
+    ///   - timePublishing: Optional `CMTime` that specifies a particular time for publishing or triggering an event.
+    ///   - loop: A Boolean value that indicates whether the video should loop when playback reaches the end of the content.
+    required init(asset: AVURLAsset, gravity: AVLayerVideoGravity, timePublishing: CMTime?, loop: Bool){
         super.init(frame: .zero)
         setupPlayerComponents(
-            asset: asset, gravity: gravity, timePublishing : timePublishing
+            asset: asset, gravity: gravity, timePublishing : timePublishing, loop: loop
         )
     }
 

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

@@ -50,16 +50,17 @@ class LoopingPlayerNSView: NSView, LoopingPlayerProtocol {
     /// The delegate to be notified about errors encountered by the player.
     weak var delegate: PlayerDelegateProtocol?
 
-    /// Initializes a new instance of the view
+    /// Initializes a new player view with specified video asset and configurations.
     ///
     /// - Parameters:
-    ///   - asset: The AVURLAsset to be used in the player.
-    ///   - gravity: Specifies how the video content should be displayed within the layer bounds.
-    ///   - timePublishing: Optional CMTime that determines the interval at which the video current time should be published. Pass nil to disable time publishing.
-    required init(asset: AVURLAsset, gravity: AVLayerVideoGravity, timePublishing: CMTime?) {
+    ///   - asset: The `AVURLAsset` used for video playback.
+    ///   - gravity: The `AVLayerVideoGravity` defining how the video content is displayed within the layer bounds.
+    ///   - timePublishing: Optional `CMTime` that specifies a particular time for publishing or triggering an event.
+    ///   - loop: A Boolean value that indicates whether the video should loop when playback reaches the end of the content.
+    required init(asset: AVURLAsset, gravity: AVLayerVideoGravity, timePublishing: CMTime?, loop : Bool) {
         super.init(frame: .zero)
         setupPlayerComponents(
-            asset: asset, gravity: gravity, timePublishing: timePublishing
+            asset: asset, gravity: gravity, timePublishing: timePublishing, loop: loop
         )
     }