refactor using proxy, refactor logging, more

LePips · Oct 6, 2022 · 5e1a021 · 5e1a021
1 parent 8a2ebe2
commit 5e1a021
Show file tree

Hide file tree

Showing 17 changed files with 275 additions and 278 deletions.
diff --git a/Example/VLCUIExample/.DS_Store b/Example/VLCUIExample/.DS_Store
diff --git a/Example/VLCUIExample/Shared/ContentView.swift b/Example/VLCUIExample/Shared/ContentView.swift
@@ -9,7 +9,7 @@ struct ContentView: View {
     var body: some View {
         ZStack(alignment: .bottom) {
             VLCVideoPlayer(configuration: viewModel.configuration)
-                .eventSubject(viewModel.eventSubject)
+                .proxy(viewModel.proxy)
                 .onTicksUpdated { ticks, playbackInformation in
                     viewModel.ticks = ticks
                     viewModel.totalTicks = playbackInformation.length

diff --git a/Example/VLCUIExample/Shared/ContentViewModel.swift b/Example/VLCUIExample/Shared/ContentViewModel.swift
@@ -13,7 +13,7 @@ class ContentViewModel: ObservableObject {
     @Published
     var totalTicks: Int32 = 0
 
-    var eventSubject: CurrentValueSubject<VLCVideoPlayer.Event?, Never> = .init(nil)
+    let proxy: VLCVideoPlayer.Proxy = .init()
 
     var configuration: VLCVideoPlayer.Configuration {
         let configuration = VLCVideoPlayer
@@ -30,7 +30,7 @@ class ContentViewModel: ObservableObject {
         ((totalTicks.roundDownNearestThousand - ticks.roundDownNearestThousand) / 1000).timeLabel
     }
 
-    func setCustomPosition(_ position: Float) {
-        self.position = position
+    func setCustomPosition(_ newPosition: Float) {
+        position = newPosition
     }
 }
diff --git a/Example/VLCUIExample/Shared/IntExtensions.swift b/Example/VLCUIExample/Shared/IntExtensions.swift
@@ -1,6 +1,7 @@
 import Foundation
 
 extension Int32 {
+
     var timeLabel: String {
         let formatter = DateComponentsFormatter()
         formatter.unitsStyle = .abbreviated

diff --git a/Example/VLCUIExample/iOS/OverlayView.swift b/Example/VLCUIExample/iOS/OverlayView.swift
@@ -14,17 +14,17 @@ struct OverlayView: View {
         HStack(spacing: 20) {
 
             Button {
-                viewModel.eventSubject.send(.jumpBackward(15))
+                viewModel.proxy.jumpBackward(15)
             } label: {
                 Image(systemName: "gobackward.15")
                     .font(.system(size: 28, weight: .regular, design: .default))
             }
 
             Button {
                 if viewModel.playerState == .playing {
-                    viewModel.eventSubject.send(.pause)
+                    viewModel.proxy.pause()
                 } else {
-                    viewModel.eventSubject.send(.play)
+                    viewModel.proxy.play()
                 }
             } label: {
                 Group {
@@ -41,14 +41,14 @@ struct OverlayView: View {
             }
 
             Button {
-                viewModel.eventSubject.send(.jumpForward(15))
+                viewModel.proxy.jumpForward(15)
             } label: {
                 Image(systemName: "goforward.15")
                     .font(.system(size: 28, weight: .regular, design: .default))
             }
 
             HStack(spacing: 5) {
-                Text((viewModel.ticks.roundDownNearestThousand / 1000).timeLabel)
+                Text(viewModel.positiveTimeLabel)
                     .frame(width: 50)
 
                 Slider(
@@ -58,17 +58,17 @@ struct OverlayView: View {
                     isScrubbing = isEditing
                 }
 
-                Text(((viewModel.totalTicks.roundDownNearestThousand - viewModel.ticks.roundDownNearestThousand) / 1000).timeLabel)
+                Text(viewModel.negativeTimeLabel)
                     .frame(width: 50)
             }
         }
         .onChange(of: isScrubbing) { isScrubbing in
             guard !isScrubbing else { return }
-            self.viewModel.eventSubject.send(.setTime(.ticks(viewModel.totalTicks * Int32(currentPosition * 100) / 100)))
+            viewModel.proxy.setTime(.ticks(viewModel.totalTicks * Int32(currentPosition * 100) / 100))
         }
         .onChange(of: viewModel.position) { newValue in
             guard !isScrubbing else { return }
-            self.currentPosition = newValue
+            currentPosition = newValue
         }
     }
 }
diff --git a/Example/VLCUIExample/macOS/OverlayView.swift b/Example/VLCUIExample/macOS/OverlayView.swift
@@ -14,7 +14,7 @@ struct OverlayView: View {
         HStack(spacing: 20) {
 
             Button {
-                viewModel.eventSubject.send(.jumpBackward(15))
+                viewModel.proxy.jumpBackward(15)
             } label: {
                 Image(systemName: "gobackward.15")
                     .font(.system(size: 28, weight: .regular, design: .default))
@@ -23,9 +23,9 @@ struct OverlayView: View {
 
             Button {
                 if viewModel.playerState == .playing {
-                    viewModel.eventSubject.send(.pause)
+                    viewModel.proxy.pause()
                 } else {
-                    viewModel.eventSubject.send(.play)
+                    viewModel.proxy.play()
                 }
             } label: {
                 Group {
@@ -43,7 +43,7 @@ struct OverlayView: View {
             .buttonStyle(.plain)
 
             Button {
-                viewModel.eventSubject.send(.jumpForward(15))
+                viewModel.proxy.jumpForward(15)
             } label: {
                 Image(systemName: "goforward.15")
                     .font(.system(size: 28, weight: .regular, design: .default))
@@ -67,11 +67,11 @@ struct OverlayView: View {
         }
         .onChange(of: isScrubbing) { isScrubbing in
             guard !isScrubbing else { return }
-            self.viewModel.eventSubject.send(.setTime(.ticks(viewModel.totalTicks * Int32(currentPosition * 100) / 100)))
+            viewModel.proxy.setTime(.ticks(viewModel.totalTicks * Int32(currentPosition * 100) / 100))
         }
         .onChange(of: viewModel.position) { newValue in
             guard !isScrubbing else { return }
-            self.currentPosition = newValue
+            currentPosition = newValue
         }
     }
 }
diff --git a/Example/VLCUIExample/tvOS/OverlayView.swift b/Example/VLCUIExample/tvOS/OverlayView.swift
@@ -19,7 +19,7 @@ struct OverlayView: View {
 
             HStack {
                 Button {
-                    viewModel.eventSubject.send(.jumpBackward(15))
+                    viewModel.proxy.jumpBackward(15)
                 } label: {
                     Image(systemName: "gobackward.15")
                         .font(.system(size: 28, weight: .regular, design: .default))
@@ -28,9 +28,9 @@ struct OverlayView: View {
 
                 Button {
                     if viewModel.playerState == .playing {
-                        viewModel.eventSubject.send(.pause)
+                        viewModel.proxy.pause()
                     } else {
-                        viewModel.eventSubject.send(.play)
+                        viewModel.proxy.play()
                     }
                 } label: {
                     Group {
@@ -45,7 +45,7 @@ struct OverlayView: View {
                 .buttonStyle(.plain)
 
                 Button {
-                    viewModel.eventSubject.send(.jumpForward(15))
+                    viewModel.proxy.jumpForward(15)
                 } label: {
                     Image(systemName: "goforward.15")
                         .font(.system(size: 28, weight: .regular, design: .default))

diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+# VLCUI
+
 A [VLCKit](https://code.videolan.org/videolan/VLCKit) wrapper for SwiftUI.
 
 ## Requirements

diff --git a/Sources/VLCUI/Extensions/VLCMediaPlayerExtensions.swift b/Sources/VLCUI/Extensions/VLCMediaPlayerExtensions.swift
@@ -73,57 +73,31 @@ extension VLCMediaPlayer {
     func subtitleTrackIndex(from track: VLCVideoPlayer.ValueSelector<Int32>) -> Int32 {
         guard let indexes = videoSubTitlesIndexes as? [Int32] else { return -1 }
 
-        let trackIndex: Int32
-
         switch track {
         case .auto:
-            if let firstValidTrackIndex = indexes.first(where: { $0 != -1 }) {
-                trackIndex = firstValidTrackIndex
-            } else {
-                trackIndex = -1
-            }
+            return indexes.first(where: { $0 != -1 }) ?? -1
         case let .absolute(index):
-            if indexes.contains(index) {
-                trackIndex = index
-            } else {
-                trackIndex = -1
-            }
+            return indexes.contains(index) ? index : -1
         }
-
-        return trackIndex
     }
 
     func audioTrackIndex(from track: VLCVideoPlayer.ValueSelector<Int32>) -> Int32 {
         guard let indexes = audioTrackIndexes as? [Int32] else { return -1 }
 
-        let trackIndex: Int32
-
         switch track {
         case .auto:
-            if let firstValidTrackIndex = indexes.first(where: { $0 != -1 }) {
-                trackIndex = firstValidTrackIndex
-            } else {
-                trackIndex = -1
-            }
+            return indexes.first(where: { $0 != -1 }) ?? -1
         case let .absolute(index):
-            if indexes.contains(index) {
-                trackIndex = index
-            } else {
-                trackIndex = -1
-            }
+            return indexes.contains(index) ? index : -1
         }
-
-        return trackIndex
     }
 
-    func fastForwardSpeed(from speed: VLCVideoPlayer.ValueSelector<Float>) -> Float {
-        let newSpeed: Float
-        switch speed {
+    func rate(from rate: VLCVideoPlayer.ValueSelector<Float>) -> Float {
+        switch rate {
         case .auto:
-            newSpeed = 1
+            return 1
         case let .absolute(speed):
-            newSpeed = speed
+            return speed
         }
-        return newSpeed
     }
 }
diff --git a/Sources/VLCUI/Extensions/ViewExtensions.swift b/Sources/VLCUI/Extensions/ViewExtensions.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SwiftUI
 
 #if os(macOS)
 import AppKit
@@ -22,3 +23,12 @@ extension _PlatformView {
         #endif
     }
 }
+
+extension View {
+
+    func copy<Value>(modifying keyPath: WritableKeyPath<Self, Value>, with newValue: Value) -> Self {
+        var copy = self
+        copy[keyPath: keyPath] = newValue
+        return copy
+    }
+}