react-native-video-trim 6.0.11 → 6.0.13

package/ios/VideoTrim.swift

@@ -3,14 +3,12 @@ import Photos
 import ffmpegkit
 
 let FILE_PREFIX = "trimmedVideo"
-let BEFORE_TRIM_PREFIX = "beforeTrim"
 
 @objc(VideoTrimSwift)
 public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDelegate {
   // MARK: instance private props
   private var isShowing = false
   private var vc: VideoTrimmerViewController?
-  private var isVideoType = true
   private var outputFile: URL?
   private var editorConfig: NSDictionary?
   
@@ -261,7 +259,7 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
     }
   }
   
-  private func trim(viewController: VideoTrimmerViewController, inputFile: URL, videoDuration: Double, startTime: Double, endTime: Double) {
+  private func trim(viewController: VideoTrimmerViewController, inputFile: URL, videoDuration: Double, startTime: Double, endTime: Double, isVideoType: Bool) {
     vc?.pausePlayer()
     
     let timestamp = Int(Date().timeIntervalSince1970)
@@ -343,12 +341,12 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
     
     cmds.append(contentsOf: [
       "-i",
-      "\(inputFile)",
+      inputFile.path,
       "-c",
       "copy",
       "-metadata",
       "creation_time=\(dateTime)",
-      outputFile!.absoluteString
+      outputFile!.path
     ])
     
     print("Command: ", cmds.joined(separator: " "))
@@ -372,7 +370,7 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
         let eventPayload: [String: Any] = ["outputPath": self.outputFile!.absoluteString, "startTime": (startTime * 1000).rounded(), "endTime": (endTime * 1000).rounded(), "duration": (videoDuration * 1000).rounded()]
         self.emitEventToJS("onFinishTrimming", eventData: eventPayload)
         
-        if (self.saveToPhoto && self.isVideoType) {
+        if (self.saveToPhoto && isVideoType) {
           PHPhotoLibrary.requestAuthorization { status in
             guard status == .authorized else {
               self.onError(message: "Permission to access Photo Library is not granted", code: .noPhotoPermission)
@@ -465,13 +463,7 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
   // New Arch
   @objc(trim:url:config:)
   public func _trim(inputFile: String, config: NSDictionary, completion: @escaping ([String: Any]) -> Void) {
-    var destPath: URL?
-    
-    if inputFile.hasPrefix("http://") || inputFile.hasPrefix("https://") {
-      destPath = URL(string: inputFile)
-    } else {
-      destPath = renameFile(at: URL(string: inputFile)!, newName: BEFORE_TRIM_PREFIX)
-    }
+    let destPath = URL(string: inputFile)
     
     guard let destPath = destPath else {
       let result = [
@@ -511,12 +503,12 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
     
     cmds.append(contentsOf: [
       "-i",
-      "\(destPath.absoluteString)",
+      destPath.path,
       "-c",
       "copy",
       "-metadata",
       "creation_time=\(dateTime)",
-      outputFile.absoluteString
+      outputFile.path
     ])
     
     print("Command: ", cmds.joined(separator: " "))
@@ -706,40 +698,6 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
     ]
     self.emitEventToJS("onError", eventData: eventPayload)
   }
-  
-  private func renameFile(at url: URL, newName: String) -> URL? {
-    let fileManager = FileManager.default
-    
-    // Get the directory of the existing file
-    let directory = url.deletingLastPathComponent()
-    
-    // Get the file extension
-    let fileExtension = url.pathExtension
-    
-    // Create the new file URL with the new name and the same extension
-    let newFileURL = directory.appendingPathComponent(newName).appendingPathExtension(fileExtension)
-    
-    // Check if a file with the new name already exists
-    if fileManager.fileExists(atPath: newFileURL.path) {
-      do {
-        // If the file exists, remove it first to avoid conflicts
-        try fileManager.removeItem(at: newFileURL)
-      } catch {
-        print("Error removing existing file: \(error)")
-        return nil
-      }
-    }
-    
-    do {
-      // Rename (move) the file
-      try fileManager.moveItem(at: url, to: newFileURL)
-      print("File renamed successfully to \(newFileURL.absoluteString)")
-      return newFileURL
-    } catch {
-      print("Error renaming file: \(error)")
-      return nil
-    }
-  }
 }
 
 // MARK: @objc instance methods
@@ -751,63 +709,10 @@ extension VideoTrim {
       return
     }
     editorConfig = config
+    print("Show editor called with URI: \(uri)")
     
-    //
-    //    saveToPhoto = config["saveToPhoto"] as? Bool ?? false
-    //
-    //    removeAfterSavedToPhoto = config["removeAfterSavedToPhoto"] as? Bool ?? false
-    //    removeAfterFailedToSavePhoto = config["removeAfterFailedToSavePhoto"] as? Bool ?? false
-    //    removeAfterSavedToDocuments = config["removeAfterSavedToDocuments"] as? Bool ?? false
-    //    removeAfterFailedToSaveDocuments = config["removeAfterFailedToSaveDocuments"] as? Bool ?? false
-    //    removeAfterShared = config["removeAfterShared"] as? Bool ?? false
-    //    removeAfterFailedToShare = config["removeAfterFailedToShare"] as? Bool ?? false
-    //
-    //    enableCancelDialog = config["enableCancelDialog"] as? Bool ?? true
-    //    cancelDialogTitle = config["cancelDialogTitle"] as? String ?? "Warning!"
-    //    cancelDialogMessage = config["cancelDialogMessage"] as? String ?? "Are you sure want to cancel?"
-    //    cancelDialogCancelText = config["cancelDialogCancelText"] as? String ?? "Close"
-    //    cancelDialogConfirmText = config["cancelDialogConfirmText"] as? String ?? "Proceed"
-    //
-    //    enableSaveDialog = config["enableSaveDialog"] as? Bool ?? true
-    //    saveDialogTitle = config["saveDialogTitle"] as? String ?? "Confirmation!"
-    //    saveDialogMessage = config["saveDialogMessage"] as? String ?? "Are you sure want to save?"
-    //    saveDialogCancelText = config["saveDialogCancelText"] as? String ?? "Close"
-    //    saveDialogConfirmText = config["saveDialogConfirmText"] as? String ?? "Proceed"
-    //    trimmingText = config["trimmingText"] as? String ?? "Trimming video..."
-    //    fullScreenModalIOS = config["fullScreenModalIOS"] as? Bool ?? false
-    //    isVideoType = (config["type"] as? String ?? "video") == "video"
-    //    outputExt = config["outputExt"] as? String ?? "mp4"
-    //    openDocumentsOnFinish = config["openDocumentsOnFinish"] as? Bool ?? false
-    //    openShareSheetOnFinish = config["openShareSheetOnFinish"] as? Bool ?? false
-    //
-    //    closeWhenFinish = config["closeWhenFinish"] as? Bool ?? true
-    //    enableCancelTrimming = config["enableCancelTrimming"] as? Bool ?? true
-    //    cancelTrimmingButtonText = config["cancelTrimmingButtonText"] as? String ?? "Cancel"
-    //    enableCancelTrimmingDialog = config["enableCancelTrimmingDialog"] as? Bool ?? true
-    //    cancelTrimmingDialogTitle = config["cancelTrimmingDialogTitle"] as? String ?? "Warning!"
-    //    cancelTrimmingDialogMessage = config["cancelTrimmingDialogMessage"] as? String ?? "Are you sure want to cancel trimming?"
-    //    cancelTrimmingDialogCancelText = config["cancelTrimmingDialogCancelText"] as? String ?? "Close"
-    //    cancelTrimmingDialogConfirmText = config["cancelTrimmingDialogConfirmText"] as? String ?? "Proceed"
-    //    alertOnFailToLoad = config["alertOnFailToLoad"] as? Bool ?? true
-    //    alertOnFailTitle = config["alertOnFailTitle"] as? String ?? "Error"
-    //    alertOnFailMessage = config["alertOnFailMessage"] as? String ?? "Fail to load media. Possibly invalid file or no network connection"
-    //    alertOnFailCloseText = config["alertOnFailCloseText"] as? String ?? "Close"
-    //
-    //    if let cancelBtnText = config["cancelButtonText"] as? String, !cancelBtnText.isEmpty {
-    //      self.cancelButtonText = cancelBtnText
-    //    }
-    //
-    //    if let saveButtonText = config["saveButtonText"] as? String, !saveButtonText.isEmpty {
-    //      self.saveButtonText = saveButtonText
-    //    }
-    
-    var destPath: URL?
-    
-    if uri.hasPrefix("http://") || uri.hasPrefix("https://") {
-      destPath = URL(string: uri)
-    } else {
-      destPath = renameFile(at: URL(string: uri)!, newName: BEFORE_TRIM_PREFIX)
-    }
+    let destPath = URL(string: uri)
+    print("Destination Path: \(destPath!.absoluteString), path: \(destPath!.path)")
     
     guard let destPath = destPath else { return }
     
@@ -849,9 +754,11 @@ extension VideoTrim {
         }
       }
       
+      let isVideoType = (config["type"] as? String ?? "video") == "video"
+      
       vc.saveBtnClicked = {(selectedRange: CMTimeRange) in
         if !self.enableSaveDialog {
-          self.trim(viewController: vc,inputFile: destPath, videoDuration: self.vc!.asset!.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds)
+          self.trim(viewController: vc,inputFile: destPath, videoDuration: self.vc!.asset!.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds, isVideoType: isVideoType)
           return
         }
         
@@ -861,7 +768,7 @@ extension VideoTrim {
         
         // Create OK button with action handler
         let ok = UIAlertAction(title: self.saveDialogConfirmText, style: .default, handler: { (action) -> Void in
-          self.trim(viewController: vc,inputFile: destPath, videoDuration: vc.asset!.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds)
+          self.trim(viewController: vc,inputFile: destPath, videoDuration: vc.asset!.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds, isVideoType: isVideoType)
         })
         
         // Create Cancel button with action handlder
@@ -892,7 +799,7 @@ extension VideoTrim {
           // otherwise it may run too fast for local file and autoplay looks weird
           let assetLoader = AssetLoader()
           assetLoader.delegate = self
-          assetLoader.loadAsset(url: destPath, isVideoType: self.isVideoType)
+          assetLoader.loadAsset(url: destPath, isVideoType: isVideoType)
         })
       }
     }
@@ -978,7 +885,7 @@ extension VideoTrim {
       let directoryContents = try FileManager.default.contentsOfDirectory(at: documentsDirectory, includingPropertiesForKeys: nil)
       
       for fileURL in directoryContents {
-        if fileURL.lastPathComponent.starts(with: FILE_PREFIX) || fileURL.lastPathComponent.starts(with: BEFORE_TRIM_PREFIX) {
+        if fileURL.lastPathComponent.starts(with: FILE_PREFIX) {
           files.append(fileURL)
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "6.0.11",
+  "version": "6.0.13",
   "description": "Video trimmer for your React Native app",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",