@picsa/capacitor-video-player 7.1.0 → 7.2.2

package/ios/Plugin/Extensions/CapacitorVideoPlayerPlugin.AVPlayerViewController.swift

@@ -1,59 +1,59 @@
-//
-//  CapacitorVideoPlayerPlugin.AVPlayerViewController.swift
-//  CapacitorVideoPlayer
-//
-//  Created by  Quéau Jean Pierre on 10/12/2021.
-//
-
-import AVFoundation
-import AVKit
-
-var isInPIPMode: Bool = false
-var isInBackgroundMode: Bool = false
-var isPIPModeAvailable: Bool = false
-var isVideoEnded: Bool = false
-var isRateZero: Bool = false
-var isPlayerViewRestored: Bool = false
-
-extension CapacitorVideoPlayerPlugin: AVPlayerViewControllerDelegate {
-
-    public func playerViewControllerShouldAutomaticallyDismissAtPictureInPictureStart(_ playerViewController: AVPlayerViewController) -> Bool {
-        if isPIPModeAvailable {
-
-            isInPIPMode = true
-            self.bridge?.viewController?.dismiss(animated: true, completion: nil)
-
-            return true
-        } else {
-            return false
-        }
-    }
-    public func playerViewControllerWillStopPictureInPicture(_ playerViewController: AVPlayerViewController) {
-        isRateZero = false
-    }
-    public func playerViewControllerDidStopPictureInPicture(_ playerViewController: AVPlayerViewController) {
-        // if !isPlayerViewRestored then the user closed the PIP
-        if isPIPModeAvailable && ((isRateZero || isVideoEnded) || !isPlayerViewRestored) {
-            isInPIPMode = false
-            NotificationCenter.default.post(name: .playerFullscreenDismiss, object: nil)
-        }
-        isPlayerViewRestored = false
-    }
-    public func playerViewController(_ playerViewController: AVPlayerViewController, restoreUserInterfaceForPictureInPictureStopWithCompletionHandler completionHandler: @escaping (Bool) -> Void) {
-        if isPIPModeAvailable {
-            if isInPIPMode && !isVideoEnded {
-                isPlayerViewRestored = true
-                self.bridge?.viewController?.present(playerViewController, animated: true, completion: nil)
-            }
-            isInPIPMode = false
-        }
-
-    }
-    /*    public func playerViewController(_ playerViewController: AVPlayerViewController, willEndFullScreenPresentationWithAnimationCoordinator coordinator: UIViewControllerTransitionCoordinator) {
-     if playerViewController.isBeingDismissed {
-     playerViewController.dismiss(animated: false) {
-     print(">>>>> playerViewController has been dismiss ")
-     }
-     }
-     }
-     */}
+//
+//  CapacitorVideoPlayerPlugin.AVPlayerViewController.swift
+//  CapacitorVideoPlayer
+//
+//  Created by  Quéau Jean Pierre on 10/12/2021.
+//
+
+import AVFoundation
+import AVKit
+
+var isInPIPMode: Bool = false
+var isInBackgroundMode: Bool = false
+var isPIPModeAvailable: Bool = false
+var isVideoEnded: Bool = false
+var isRateZero: Bool = false
+var isPlayerViewRestored: Bool = false
+
+extension CapacitorVideoPlayerPlugin: AVPlayerViewControllerDelegate {
+
+    public func playerViewControllerShouldAutomaticallyDismissAtPictureInPictureStart(_ playerViewController: AVPlayerViewController) -> Bool {
+        if isPIPModeAvailable {
+
+            isInPIPMode = true
+            self.bridge?.viewController?.dismiss(animated: true, completion: nil)
+
+            return true
+        } else {
+            return false
+        }
+    }
+    public func playerViewControllerWillStopPictureInPicture(_ playerViewController: AVPlayerViewController) {
+        isRateZero = false
+    }
+    public func playerViewControllerDidStopPictureInPicture(_ playerViewController: AVPlayerViewController) {
+        // if !isPlayerViewRestored then the user closed the PIP
+        if isPIPModeAvailable && ((isRateZero || isVideoEnded) || !isPlayerViewRestored) {
+            isInPIPMode = false
+            NotificationCenter.default.post(name: .playerFullscreenDismiss, object: nil)
+        }
+        isPlayerViewRestored = false
+    }
+    public func playerViewController(_ playerViewController: AVPlayerViewController, restoreUserInterfaceForPictureInPictureStopWithCompletionHandler completionHandler: @escaping (Bool) -> Void) {
+        if isPIPModeAvailable {
+            if isInPIPMode && !isVideoEnded {
+                isPlayerViewRestored = true
+                self.bridge?.viewController?.present(playerViewController, animated: true, completion: nil)
+            }
+            isInPIPMode = false
+        }
+
+    }
+    /*    public func playerViewController(_ playerViewController: AVPlayerViewController, willEndFullScreenPresentationWithAnimationCoordinator coordinator: UIViewControllerTransitionCoordinator) {
+     if playerViewController.isBeingDismissed {
+     playerViewController.dismiss(animated: false) {
+     print(">>>>> playerViewController has been dismiss ")
+     }
+     }
+     }
+     */}

package/ios/Plugin/Extensions/CapacitorVideoPlayerPlugin.File.swift

@@ -1,126 +1,126 @@
-//
-//  CapacitorVideoPlayerPlugin.swift
-//  Plugin
-//
-//  Created by  Quéau Jean Pierre on 30/05/2021.
-//  Copyright © 2021 Max Lynch. All rights reserved.
-//
-
-import Foundation
-
-extension CapacitorVideoPlayerPlugin {
-
-    // MARK: - getURLFromFilePath
-
-    // swiftlint:disable cyclomatic_complexity
-    // swiftlint:disable function_body_length
-    func getURLFromFilePath(filePath: String) -> [String: Any] {
-        var dict: [String: Any] = [:]
-        dict["message"] = ""
-        let docPath: String =
-            NSSearchPathForDirectoriesInDomains(.documentDirectory,
-                                                .userDomainMask,
-                                                true)[0]
-        let appPath: String =
-            NSSearchPathForDirectoriesInDomains(.applicationDirectory,
-                                                .userDomainMask,
-                                                true)[0]
-
-        if String(filePath.prefix(4)) == "http" {
-            if let url = URL(string: filePath) {
-                dict["url"] = url
-                return dict
-            } else {
-                dict["message"] = "cannot convert filePath in URL"
-                return dict
-            }
-        }
-        if String(filePath.prefix(13)) == "public/assets" {
-            if let appFolder = Bundle.main.resourceURL {
-                dict["url"] = appFolder.appendingPathComponent(filePath)
-                return dict
-            } else {
-                dict["message"] = "did not find appFolder"
-                return dict
-            }
-        }
-        if String(filePath.prefix(11)) == "application" {
-            let path: String = String(filePath.dropFirst(12))
-            let vPath: String = docPath.appendingFormat("/\(path)")
-            if !isFileExists(filePath: vPath) {
-                print("*** file does not exist at path \n \(vPath) \n***")
-                let info: [String: Any] = ["dismiss": true]
-                self.notifyListeners("jeepCapVideoPlayerExit", data: info, retainUntilConsumed: true)
-                dict["message"] = "file does not exist"
-                return dict
-            }
-            dict["url"] = URL(fileURLWithPath: vPath)
-            return dict
-        }
-        if String(filePath.prefix(29)) == "file:///var/mobile/Containers" {
-
-            // get the appId from the appPath
-            let pathArray = appPath.components(separatedBy: "Application")
-            let appId: String = pathArray[1].replacingOccurrences(of: "/", with: "")
-            // remove the appId from the given filePath and replace it with the current appId
-            let fPathArray = filePath.components(separatedBy: "Application")
-            if let uPath = URL(string: pathArray[0]) {
-                let fPath = (uPath.appendingPathComponent("Application")
-                                .appendingPathComponent(appId)
-                                .appendingPathComponent(
-                                    String(fPathArray[1].dropFirst(38)))
-                ).absoluteString
-                if !isFileExists(filePath: fPath) {
-                    print("*** file does not exist at path \n \(fPath) \n***")
-                    let info: [String: Any] = ["dismiss": true]
-                    self.notifyListeners("jeepCapVideoPlayerExit", data: info,
-                                         retainUntilConsumed: true)
-                    dict["message"] = "file does not exist"
-                    return dict
-                }
-                dict["url"] = URL(fileURLWithPath: fPath)
-            } else {
-                dict["message"] = "file path not correct"
-            }
-            return dict
-        }
-         if String(filePath.prefix(19)) == "file:///var/mobile/" {
-             let pathArray = appPath.components(separatedBy: "Containers")
-             let fPathArray = filePath.components(separatedBy: "mobile/")
-
-             if let uPath = URL(string: pathArray[0]) {
-                 let fPath = (uPath.appendingPathComponent(
-                                 String(fPathArray[1]))
-                 ).absoluteString
-                 if !isFileExists(filePath: fPath) {
-                     print("*** file does not exist at path \n \(fPath) \n***")
-                     let info: [String: Any] = ["dismiss": true]
-                     self.notifyListeners("jeepCapVideoPlayerExit", data: info,
-                                          retainUntilConsumed: true)
-                     dict["message"] = "file does not exist"
-                     return dict
-                 }
-                 dict["url"] = URL(fileURLWithPath: fPath)
-             } else {
-                 dict["message"] = "file path not correct"
-             }
-             return dict
-        }
-        dict["message"] = "filePath not implemented"
-        return dict
-    }
-    // swiftlint:enable function_body_length
-    // swiftlint:enable cyclomatic_complexity
-
-    // MARK: - isFileExists
-
-    func isFileExists(filePath: String) -> Bool {
-        var ret: Bool = false
-        let fileManager = FileManager.default
-        if fileManager.fileExists(atPath: filePath) {
-            ret = true
-        }
-        return ret
-    }
-
-}
+//
+//  CapacitorVideoPlayerPlugin.swift
+//  Plugin
+//
+//  Created by  Quéau Jean Pierre on 30/05/2021.
+//  Copyright © 2021 Max Lynch. All rights reserved.
+//
+
+import Foundation
+
+extension CapacitorVideoPlayerPlugin {
+
+    // MARK: - getURLFromFilePath
+
+    // swiftlint:disable cyclomatic_complexity
+    // swiftlint:disable function_body_length
+    func getURLFromFilePath(filePath: String) -> [String: Any] {
+        var dict: [String: Any] = [:]
+        dict["message"] = ""
+        let docPath: String =
+            NSSearchPathForDirectoriesInDomains(.documentDirectory,
+                                                .userDomainMask,
+                                                true)[0]
+        let appPath: String =
+            NSSearchPathForDirectoriesInDomains(.applicationDirectory,
+                                                .userDomainMask,
+                                                true)[0]
+
+        if String(filePath.prefix(4)) == "http" {
+            if let url = URL(string: filePath) {
+                dict["url"] = url
+                return dict
+            } else {
+                dict["message"] = "cannot convert filePath in URL"
+                return dict
+            }
+        }
+        if String(filePath.prefix(13)) == "public/assets" {
+            if let appFolder = Bundle.main.resourceURL {
+                dict["url"] = appFolder.appendingPathComponent(filePath)
+                return dict
+            } else {
+                dict["message"] = "did not find appFolder"
+                return dict
+            }
+        }
+        if String(filePath.prefix(11)) == "application" {
+            let path: String = String(filePath.dropFirst(12))
+            let vPath: String = docPath.appendingFormat("/\(path)")
+            if !isFileExists(filePath: vPath) {
+                print("*** file does not exist at path \n \(vPath) \n***")
+                let info: [String: Any] = ["dismiss": true]
+                self.notifyListeners("jeepCapVideoPlayerExit", data: info, retainUntilConsumed: true)
+                dict["message"] = "file does not exist"
+                return dict
+            }
+            dict["url"] = URL(fileURLWithPath: vPath)
+            return dict
+        }
+        if String(filePath.prefix(29)) == "file:///var/mobile/Containers" {
+
+            // get the appId from the appPath
+            let pathArray = appPath.components(separatedBy: "Application")
+            let appId: String = pathArray[1].replacingOccurrences(of: "/", with: "")
+            // remove the appId from the given filePath and replace it with the current appId
+            let fPathArray = filePath.components(separatedBy: "Application")
+            if let uPath = URL(string: pathArray[0]) {
+                let fPath = (uPath.appendingPathComponent("Application")
+                                .appendingPathComponent(appId)
+                                .appendingPathComponent(
+                                    String(fPathArray[1].dropFirst(38)))
+                ).absoluteString
+                if !isFileExists(filePath: fPath) {
+                    print("*** file does not exist at path \n \(fPath) \n***")
+                    let info: [String: Any] = ["dismiss": true]
+                    self.notifyListeners("jeepCapVideoPlayerExit", data: info,
+                                         retainUntilConsumed: true)
+                    dict["message"] = "file does not exist"
+                    return dict
+                }
+                dict["url"] = URL(fileURLWithPath: fPath)
+            } else {
+                dict["message"] = "file path not correct"
+            }
+            return dict
+        }
+         if String(filePath.prefix(19)) == "file:///var/mobile/" {
+             let pathArray = appPath.components(separatedBy: "Containers")
+             let fPathArray = filePath.components(separatedBy: "mobile/")
+
+             if let uPath = URL(string: pathArray[0]) {
+                 let fPath = (uPath.appendingPathComponent(
+                                 String(fPathArray[1]))
+                 ).absoluteString
+                 if !isFileExists(filePath: fPath) {
+                     print("*** file does not exist at path \n \(fPath) \n***")
+                     let info: [String: Any] = ["dismiss": true]
+                     self.notifyListeners("jeepCapVideoPlayerExit", data: info,
+                                          retainUntilConsumed: true)
+                     dict["message"] = "file does not exist"
+                     return dict
+                 }
+                 dict["url"] = URL(fileURLWithPath: fPath)
+             } else {
+                 dict["message"] = "file path not correct"
+             }
+             return dict
+        }
+        dict["message"] = "filePath not implemented"
+        return dict
+    }
+    // swiftlint:enable function_body_length
+    // swiftlint:enable cyclomatic_complexity
+
+    // MARK: - isFileExists
+
+    func isFileExists(filePath: String) -> Bool {
+        var ret: Bool = false
+        let fileManager = FileManager.default
+        if fileManager.fileExists(atPath: filePath) {
+            ret = true
+        }
+        return ret
+    }
+
+}

package/ios/Plugin/Extensions/CapacitorVideoPlayerPlugin.Fullscreen.swift

@@ -1,94 +1,94 @@
-//
-//  CapacitorVideoPlayerPlugin.Fullscreen.swift
-//  Plugin
-//
-//  Created by  Quéau Jean Pierre on 30/05/2021.
-//  Copyright © 2021 Max Lynch. All rights reserved.
-//
-
-import Foundation
-import Capacitor
-import AVKit
-
-extension CapacitorVideoPlayerPlugin {
-
-    // MARK: - createVideoPlayerFullScreenView
-
-    // swiftlint:disable function_body_length
-    // swiftlint:disable function_parameter_count
-    func createVideoPlayerFullscreenView(
-        call: CAPPluginCall, videoUrl: URL, rate: Float,
-        exitOnEnd: Bool, loopOnEnd: Bool, pipEnabled: Bool,
-        backModeEnabled: Bool, showControls: Bool,
-        displayMode: String,
-        subTitleUrl: URL?, subTitleLanguage: String?,
-        subTitleOptions: [String: Any]?,
-        headers: [String: String]?, title: String?,
-        smallTitle: String?, artwork: String?) {
-        DispatchQueue.main.async { [weak self] in
-            let playerId: String = self?.fsPlayerId ?? "fullscreen"
-            if let fullscreenView = self?.implementation
-                .createFullscreenPlayer(
-                    playerId: playerId, videoUrl: videoUrl,
-                    rate: rate, exitOnEnd: exitOnEnd, loopOnEnd: loopOnEnd,
-                    pipEnabled: pipEnabled,
-                    showControls: showControls,
-                    displayMode: displayMode,
-                    subTitleUrl: subTitleUrl,
-                    language: subTitleLanguage, headers: headers, options: subTitleOptions,
-                    title: title, smallTitle: smallTitle, artwork: artwork) {
-                self?.videoPlayerFullScreenView = fullscreenView
-                if backModeEnabled {
-                    self?.bgPlayer = self?.videoPlayerFullScreenView?
-                        .videoPlayer.player
-                }
-                guard let videoPlayer: AVPlayerViewController =
-                        self?.videoPlayerFullScreenView?.videoPlayer else {
-                    let error: String = "No videoPlayer available"
-                    print(error)
-                    call.resolve([ "result": false, "method": "createVideoPlayerFullScreenView",
-                                   "message": error])
-                    return
-                }
-                videoPlayer.delegate = self
-                self?.bridge?.viewController?.present(
-                    videoPlayer, animated: true, completion: {
-                        if backModeEnabled {
-                            // add audio session
-                            self?.audioSession = AVAudioSession.sharedInstance()
-                            // Set the audio session category, mode, and options.
-                            do {
-                                try self?.audioSession?
-                                    .setCategory(.playback,
-                                                 mode: .moviePlayback,
-                                                 options: [])
-                                try self?.audioSession?.setActive(true)
-                                call.resolve([
-                                                "result": true,
-                                                "method": "createVideoPlayerFullScreenView",
-                                                "value": true])
-                                return
-                            } catch let error as NSError {
-                                print("Unable to activate audio session:  \(error.localizedDescription)")
-                                call.resolve([
-                                                "result": false,
-                                                "method": "createVideoPlayerFullScreenView",
-                                                "message": error.localizedDescription])
-                                return
-                            }
-                        } else {
-                            call.resolve([
-                                            "result": true,
-                                            "method": "createVideoPlayerFullScreenView",
-                                            "value": true])
-                            return
-                        }
-                    })
-
-            }
-        }
-    }
-    // swiftlint:enable function_parameter_count
-    // swiftlint:enable function_body_length
-
-}
+//
+//  CapacitorVideoPlayerPlugin.Fullscreen.swift
+//  Plugin
+//
+//  Created by  Quéau Jean Pierre on 30/05/2021.
+//  Copyright © 2021 Max Lynch. All rights reserved.
+//
+
+import Foundation
+import Capacitor
+import AVKit
+
+extension CapacitorVideoPlayerPlugin {
+
+    // MARK: - createVideoPlayerFullScreenView
+
+    // swiftlint:disable function_body_length
+    // swiftlint:disable function_parameter_count
+    func createVideoPlayerFullscreenView(
+        call: CAPPluginCall, videoUrl: URL, rate: Float,
+        exitOnEnd: Bool, loopOnEnd: Bool, pipEnabled: Bool,
+        backModeEnabled: Bool, showControls: Bool,
+        displayMode: String,
+        subTitleUrl: URL?, subTitleLanguage: String?,
+        subTitleOptions: [String: Any]?,
+        headers: [String: String]?, title: String?,
+        smallTitle: String?, artwork: String?) {
+        DispatchQueue.main.async { [weak self] in
+            let playerId: String = self?.fsPlayerId ?? "fullscreen"
+            if let fullscreenView = self?.implementation
+                .createFullscreenPlayer(
+                    playerId: playerId, videoUrl: videoUrl,
+                    rate: rate, exitOnEnd: exitOnEnd, loopOnEnd: loopOnEnd,
+                    pipEnabled: pipEnabled,
+                    showControls: showControls,
+                    displayMode: displayMode,
+                    subTitleUrl: subTitleUrl,
+                    language: subTitleLanguage, headers: headers, options: subTitleOptions,
+                    title: title, smallTitle: smallTitle, artwork: artwork) {
+                self?.videoPlayerFullScreenView = fullscreenView
+                if backModeEnabled {
+                    self?.bgPlayer = self?.videoPlayerFullScreenView?
+                        .videoPlayer.player
+                }
+                guard let videoPlayer: AVPlayerViewController =
+                        self?.videoPlayerFullScreenView?.videoPlayer else {
+                    let error: String = "No videoPlayer available"
+                    print(error)
+                    call.resolve([ "result": false, "method": "createVideoPlayerFullScreenView",
+                                   "message": error])
+                    return
+                }
+                videoPlayer.delegate = self
+                self?.bridge?.viewController?.present(
+                    videoPlayer, animated: true, completion: {
+                        if backModeEnabled {
+                            // add audio session
+                            self?.audioSession = AVAudioSession.sharedInstance()
+                            // Set the audio session category, mode, and options.
+                            do {
+                                try self?.audioSession?
+                                    .setCategory(.playback,
+                                                 mode: .moviePlayback,
+                                                 options: [])
+                                try self?.audioSession?.setActive(true)
+                                call.resolve([
+                                                "result": true,
+                                                "method": "createVideoPlayerFullScreenView",
+                                                "value": true])
+                                return
+                            } catch let error as NSError {
+                                print("Unable to activate audio session:  \(error.localizedDescription)")
+                                call.resolve([
+                                                "result": false,
+                                                "method": "createVideoPlayerFullScreenView",
+                                                "message": error.localizedDescription])
+                                return
+                            }
+                        } else {
+                            call.resolve([
+                                            "result": true,
+                                            "method": "createVideoPlayerFullScreenView",
+                                            "value": true])
+                            return
+                        }
+                    })
+
+            }
+        }
+    }
+    // swiftlint:enable function_parameter_count
+    // swiftlint:enable function_body_length
+
+}