react-native-video-trim 2.2.5 → 2.2.7

package/android/src/main/java/com/videotrim/widgets/VideoTrimmerView.java

@@ -327,8 +327,10 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
   }
 
   private void mediaCompleted() {
-    setPlayPauseViewIcon(false);
-    mTimingHandler.removeCallbacks(mTimingRunnable);
+    onMediaPause();
+
+    // when mediaCompleted is called,  the endTime may not be exactly at the end of the video (can be slightly before), therefore we should seek to exact position on ended
+    seekTo(endTime, true);
   }
 
   private void playOrPause() {
@@ -345,11 +347,9 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
   }
 
   public void onMediaPause() {
-    if (mediaPlayer.isPlaying()) {
-      mTimingHandler.removeCallbacks(mTimingRunnable);
-      mediaPlayer.pause();
-      setPlayPauseViewIcon(false);
-    }
+    mTimingHandler.removeCallbacks(mTimingRunnable);
+    mediaPlayer.pause();
+    setPlayPauseViewIcon(false);
   }
 
   public void setOnTrimVideoListener(VideoTrimListener onTrimVideoListener) {
@@ -521,27 +521,13 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
     mTimingRunnable = new Runnable() {
       @Override
       public void run() {
-        // prevent crashing when video is playing and we close editor
         try {
-          if (mediaPlayer == null || !mediaPlayer.isPlaying()) {
-            mTimingHandler.removeCallbacks(mTimingRunnable);
-            return;
-          }
+          updateCurrentTime(true);
+          mTimingHandler.postDelayed(this, TIMING_UPDATE_INTERVAL);
         } catch (IllegalStateException e) {
           e.printStackTrace();
           mTimingHandler.removeCallbacks(mTimingRunnable);
-          Log.d(TAG, "startTimingRunnable mediaPlayer is already released");
-          return;
-        }
-
-        int currentPosition = mediaPlayer.getCurrentPosition();
-
-        if (currentPosition >= endTime) {
-          onMediaPause();
-          seekTo(endTime, true); // Ensure exact end time display
-        } else {
-          updateCurrentTime(true);
-          mTimingHandler.postDelayed(this, TIMING_UPDATE_INTERVAL);
+          // this is to catch the error thrown if we close editor while playing (mediaPlayer is released)
         }
       }
     };
@@ -549,10 +535,7 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
   }
 
   private void updateCurrentTime(boolean needUpdateProgress) {
-    // TODO: check the case after drag the progress indicator and hit play, it'll play a little bit earlier than the progress indicator
-
     int currentPosition = mediaPlayer.getCurrentPosition();
-
     int duration = mDuration;
 
     if (currentPosition >= duration - 100) {

package/ios/VideoTrim.swift

@@ -121,7 +121,9 @@ class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDelegate
         }
         
         let destPath = URL(string: uri)
-        guard let destPath = destPath else { return }
+        let newPath = renameFile(at: destPath!, newName: "beforeTrim")
+      
+        guard let destPath = newPath else { return }
         
         DispatchQueue.main.async {
             self.vc = VideoTrimmerViewController()
@@ -509,7 +511,7 @@ class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDelegate
     
     func assetLoader(_ loader: AssetLoader, didFailWithError error: any Error, forKey key: String) {
         let message = "Failed to load \(key): \(error.localizedDescription)"
-        print(message)
+        print("Failed to load \(key)", message)
         
         self.onError(message: message, code: .failToLoadMedia)
         vc?.onAssetFailToLoad()
@@ -698,4 +700,38 @@ class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDelegate
             }
         }
     }
+  
+  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
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "description": "Video trimmer for your React Native app",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",