react-native-video-trim 6.0.7 → 6.0.9

package/android/src/main/java/com/videotrim/BaseVideoTrimModule.kt

@@ -609,19 +609,32 @@ open class BaseVideoTrimModule internal constructor(
       when {
         ReturnCode.isSuccess(returnCode) -> {
           // SUCCESS
+          val startTime = options?.getDouble("startTime") ?: 0.0
+          val endTime = options?.getDouble("endTime") ?: 1000.0
+          val duration = endTime - startTime
+          
+          val result = Arguments.createMap()
+          result.putString("outputPath", outputFile)
+          result.putDouble("startTime", startTime)
+          result.putDouble("endTime", endTime)
+          result.putDouble("duration", duration)
+          
           if (options?.getBoolean("saveToPhoto") == true && options.getString("type") == "video") {
+            Log.d(TAG, "Android trim: saveToPhoto is true, attempting to save to gallery")
             try {
               StorageUtil.saveVideoToGallery(reactApplicationContext, outputFile)
               Log.d(TAG, "Edited video saved to Photo Library successfully.")
               if (options.getBoolean("removeAfterSavedToPhoto")) {
+                Log.d(TAG, "Removing file after successful save to photo")
                 StorageUtil.deleteFile(outputFile)
               }
 
-              promise.resolve(outputFile)
+              promise.resolve(result)
             } catch (e: IOException) {
               e.printStackTrace()
 
               if (options.getBoolean("removeAfterFailedToSavePhoto")) {
+                Log.d(TAG, "Removing file after failed save to photo")
                 StorageUtil.deleteFile(outputFile)
               }
 
@@ -629,6 +642,10 @@ open class BaseVideoTrimModule internal constructor(
                 Exception("Failed to save edited video to Photo Library: " + e.localizedMessage)
               )
             }
+          } else {
+            Log.d(TAG, "Android trim: saveToPhoto is false or not video type, resolving with structured result")
+            
+            promise.resolve(result)
           }
         }
         ReturnCode.isCancel(returnCode) -> {

package/ios/VideoTrim.swift

@@ -211,8 +211,6 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
   
   @objc public weak var delegate: VideoTrimProtocol?
   @objc public var isNewArch = false
-
-  
   
   // MARK: for old arch
   private var hasListeners = false
@@ -527,14 +525,90 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
       let returnCode = session?.getReturnCode()
       
       if ReturnCode.isSuccess(returnCode) {
-        let result = [
-          "success": true,
-          "outputPath": outputFile.absoluteString,
-          "startTime": startTime,
-          "endTime": endTime
-        ] as [String : Any]
-        
-        completion(result)
+        // Handle saveToPhoto functionality
+        if let saveToPhoto = config["saveToPhoto"] as? Bool, saveToPhoto {
+          print("iOS trim: saveToPhoto is true, attempting to save to photo library")
+          // Check if it's a video type
+          let isVideoType = (config["type"] as? String ?? "video") == "video"
+          
+          if isVideoType {
+            PHPhotoLibrary.requestAuthorization { status in
+              DispatchQueue.main.async {
+                if status == .authorized {
+                  PHPhotoLibrary.shared().performChanges({
+                    PHAssetChangeRequest.creationRequestForAssetFromVideo(atFileURL: outputFile)
+                  }) { success, error in
+                    if success {
+                      print("Edited video saved to Photo Library successfully.")
+                      
+                      // Handle removeAfterSavedToPhoto
+                      if let removeAfterSaved = config["removeAfterSavedToPhoto"] as? Bool, removeAfterSaved {
+                        let _ = VideoTrim.deleteFile(url: outputFile)
+                      }
+                      
+                      let result = [
+                        "outputPath": outputFile.absoluteString,
+                        "startTime": startTime,
+                        "endTime": endTime,
+                        "duration": endTime - startTime
+                      ] as [String : Any]
+                      
+                      completion(result)
+                    } else {
+                      print("Failed to save edited video to Photo Library: \(error?.localizedDescription ?? "Unknown error")")
+                      
+                      // Handle removeAfterFailedToSavePhoto
+                      if let removeAfterFailed = config["removeAfterFailedToSavePhoto"] as? Bool, removeAfterFailed {
+                        let _ = VideoTrim.deleteFile(url: outputFile)
+                      }
+                      
+                      let result = [
+                        "success": false,
+                        "message": "Failed to save edited video to Photo Library: \(error?.localizedDescription ?? "Unknown error")",
+                      ] as [String : Any]
+                      
+                      completion(result)
+                    }
+                  }
+                } else {
+                  // Permission denied
+                  print("Photo Library access denied")
+                  
+                  // Handle removeAfterFailedToSavePhoto
+                  if let removeAfterFailed = config["removeAfterFailedToSavePhoto"] as? Bool, removeAfterFailed {
+                    let _ = VideoTrim.deleteFile(url: outputFile)
+                  }
+                  
+                  let result = [
+                    "success": false,
+                    "message": "Photo Library access denied",
+                  ] as [String : Any]
+                  
+                  completion(result)
+                }
+              }
+            }
+          } else {
+            // For audio files, we can't save to photo library, just return success
+            let result = [
+              "outputPath": outputFile.absoluteString,
+              "startTime": startTime,
+              "endTime": endTime,
+              "duration": endTime - startTime
+            ] as [String : Any]
+            
+            completion(result)
+          }
+        } else {
+          let result = [
+            "outputPath": outputFile.absoluteString,
+            "startTime": startTime,
+            "endTime": endTime,
+            "duration": endTime - startTime
+          ] as [String : Any]
+          
+          completion(result)
+        }
       } else if ReturnCode.isCancel(returnCode) {
         // CANCEL
         let result = [
@@ -937,9 +1011,8 @@ extension VideoTrim {
   @objc(isValidFile:withResolver:withRejecter:)
   func isValidFile(uri: String, resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
     VideoTrim.isValidFile(url: uri, completion: { payload in
-        resolve(payload)
-      }
-    )
+      resolve(payload)
+    })
   }
   
   private static func checkFileValidity(url: URL, completion: @escaping (Bool, String, Double) -> Void) {

package/package.json

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