Merge branch 'master' into dev

Author: avmoroz

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## Changes for v2.17
+
+- #938 Manually flush & invalidate session upon completion
+- #954 Switch to using channels for byte copying.
+- #962 Size limit with copyAssetsVideoIOS
+- #963 Add basic support for Android content URIs in stat
+- #972 Manually flush & invalidate completed session
+- #974 Add content for copyAssetsFileIOS method
+- #975 Fix copyAssetsFileIOS's image resizing option to resize to exact width and height
+- #985 README.md: clarify usage of readFileRes
+- #986 macOS support
+
 ## Changes for v2.16
 - #797 Added path to the Android download folder
 - #842 Fixes #811 Concurrent downloads send progress updates to all progress callbacks

Downloader.m

@@ -128,12 +128,22 @@ - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTas
     NSLog(@"RNFS download: unable to move tempfile to destination. %@, %@", error, error.userInfo);
   }
 
+  // When numerous downloads are called the sessions are not always invalidated and cleared by iOS14. 
+  // This leads to error 28 – no space left on device so we manually flush and invalidate to free up space
+  if(session != nil){
+    [session flushWithCompletionHandler:^{
+      [session finishTasksAndInvalidate];
+    }];
+  }
+
   return _params.completeCallback(_statusCode, _bytesWritten);
 }
 
 - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error
 {
-  if (error && error.code != NSURLErrorCancelled) {
+  if (error) {
+    NSLog(@"RNFS download: didCompleteWithError %@, %@", error, error.userInfo);
+    if (error.code != NSURLErrorCancelled) {
       _resumeData = error.userInfo[NSURLSessionDownloadTaskResumeData];
       if (_resumeData != nil) {
         if (_params.resumableCallback) {
@@ -142,6 +152,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp
       } else {
           _params.errorCallback(error);
       }
+    }
   }
 }
 

README.md

@@ -25,7 +25,7 @@ For RN >= 0.61 please install react-native-fs at version >= @2.16.0!
 
 View the changelog [here](https://github.com/itinance/react-native-fs/blob/master/CHANGELOG.md).
 
-## Usage (iOS)
+## Usage (iOS/macOS)
 
 First you need to install react-native-fs:
 
@@ -408,7 +408,7 @@ Note: Android only.
 
 ### `readFileRes(filename:string, encoding?: string): Promise<string>`
 
-Reads the file named `filename` in the Android app's res folder and return contents. `res/drawable` is used as the parent folder for image files, `res/raw` for everything else. `encoding` can be one of `utf8` (default), `ascii`, `base64`. Use `base64` for reading binary files.
+Reads the file named `filename` in the Android app's `res` folder and return contents. Only the file name (not folder) needs to be specified. The file type will be detected from the extension and automatically located within `res/drawable` (for image files) or `res/raw` (for everything else). `encoding` can be one of `utf8` (default), `ascii`, `base64`. Use `base64` for reading binary files.
 
 Note: Android only.
 
@@ -454,16 +454,52 @@ Copies the file named `filename` in the Android app's res folder and copies it t
 
 Note: Android only. Will overwrite destPath if it already exists.
 
-### `copyAssetsFileIOS(imageUri: string, destPath: string, width: number, height: number, scale : number = 1.0, compression : number = 1.0, resizeMode : string = 'contain'  ): Promise<string>`
+### (iOS only) `copyAssetsFileIOS(imageUri: string, destPath: string, width: number, height: number, scale?: number, compression?: number, resizeMode?: string): Promise<string>`
 
-iOS-only (not available on Mac Catalyst): copies a file from camera-roll, that is prefixed with "assets-library://asset/asset.JPG?..."
-to a specific destination. It will download the original from iCloud if necessary.
+*Not available on Mac Catalyst.*
 
-If width and height is > 0, the image will be resized to a specific size and a specific compression rate.
-If scale is below 1, the image will be scaled according to the scale-factor (between 0.0 and 1.0)
-The resizeMode is also considered.
+Reads an image file from Camera Roll and writes to `destPath`. This method [assumes the image file to be JPEG file](https://github.com/itinance/react-native-fs/blob/f2f8f4a058cd9acfbcac3b8cf1e08fa1e9b09786/RNFSManager.m#L752-L753). This method will download the original from iCloud if necessary.
 
-*Video-Support:*
+#### Parameters
+
+##### `imageUri` string (required)
+
+URI of a file in Camera Roll. Can be [either of the following formats](https://github.com/itinance/react-native-fs/blob/f2f8f4a058cd9acfbcac3b8cf1e08fa1e9b09786/RNFSManager.m#L781-L785):
+
+- `ph://CC95F08C-88C3-4012-9D6D-64A413D254B3/L0/001`
+- `assets-library://asset/asset.JPG?id=CC95F08C-88C3-4012-9D6D-64A413D254B3&ext=JPG`
+
+##### `destPath` string (required)
+
+Destination to which the copied file will be saved, e.g. `RNFS.TemporaryDirectoryPath + 'example.jpg'`.
+
+##### `width` number (required)
+
+Copied file's image width will be resized to `width`. [If 0 is provided, width won't be resized.](https://github.com/itinance/react-native-fs/blob/f2f8f4a058cd9acfbcac3b8cf1e08fa1e9b09786/RNFSManager.m#L808)
+
+##### `height` number (required)
+
+Copied file's image height will be resized to `height`. [If 0 is provided, height won't be resized.](https://github.com/itinance/react-native-fs/blob/f2f8f4a058cd9acfbcac3b8cf1e08fa1e9b09786/RNFSManager.m#L808)
+
+##### `scale` number (optional)
+
+Copied file's image will be scaled proportional to `scale` factor from `width` x `height`. If both `width` and `height` are 0, the image won't scale. Range is [0.0, 1.0] and default is 1.0.
+
+##### `compression` number (optional)
+
+Quality of copied file's image. The value 0.0 represents the maximum compression (or lowest quality) while the value 1.0 represents the least compression (or best quality). Range is [0.0, 1.0] and default is 1.0.
+
+##### `resizeMode` string (optional)
+
+If `resizeMode` is 'contain', copied file's image will be scaled so that its larger dimension fits `width` x `height`. If `resizeMode` is other value than 'contain', the image will be scaled so that it completely fills `width` x `height`. Default is 'contain'. Refer to [PHImageContentMode](https://developer.apple.com/documentation/photokit/phimagecontentmode).
+
+#### Return value
+
+##### `Promise<string>`
+
+Copied file's URI.
+
+#### Video-Support
 
 One can use this method also to create a thumbNail from a video in a specific size.
 Currently it is impossible to specify a concrete position, the OS will decide wich
@@ -473,10 +509,11 @@ To copy a video from assets-library and save it as a mp4-file, refer to copyAsse
 Further information: https://developer.apple.com/reference/photos/phimagemanager/1616964-requestimageforasset
 The promise will on success return the final destination of the file, as it was defined in the destPath-parameter.
 
-### copyAssetsVideoIOS(videoUri: string, destPath: string): Promise<string>
+### (iOS only) `copyAssetsVideoIOS(videoUri: string, destPath: string): Promise<string>`
+
+*Not available on Mac Catalyst.*
 
-iOS-only (not available on Mac Catalyst): copies a video from assets-library, that is prefixed with 'assets-library://asset/asset.MOV?...'
-to a specific destination.
+Copies a video from assets-library, that is prefixed with 'assets-library://asset/asset.MOV?...' to a specific destination.
 
 ### `unlink(filepath: string): Promise<void>`
 

RNFS.podspec

@@ -12,6 +12,7 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = '8.0'
   s.tvos.deployment_target = '9.2'
+  s.osx.deployment_target = '10.10'
 
   s.source          = { :git => "https://github.com/itinance/react-native-fs", :tag => "v#{s.version}" }
   s.source_files    = '*.{h,m}'

RNFSManager.m

@@ -747,7 +747,7 @@ + (BOOL)requiresMainQueueSetup
 
 
 // [PHAsset fetchAssetsWithALAssetURLs] is deprecated and not supported in Mac Catalyst
-#if !TARGET_OS_UIKITFORMAC
+#if !TARGET_OS_UIKITFORMAC && !TARGET_OS_OSX
 /**
  * iOS Only: copy images from the assets-library (camera-roll) to a specific path, asuming
  * JPEG-Images.
@@ -812,7 +812,7 @@ + (BOOL)requiresMainQueueSetup
         imageOptions.resizeMode = PHImageRequestOptionsResizeModeNone;
     } else {
         targetSize = CGSizeApplyAffineTransform(size, CGAffineTransformMakeScale(scale, scale));
-        imageOptions.resizeMode = PHImageRequestOptionsResizeModeFast;
+        imageOptions.resizeMode = PHImageRequestOptionsResizeModeExact;
     }
 
     PHImageContentMode contentMode = PHImageContentModeAspectFill;
@@ -844,7 +844,7 @@ + (BOOL)requiresMainQueueSetup
 #endif
 
 // [PHAsset fetchAssetsWithALAssetURLs] is deprecated and not supported in Mac Catalyst
-#if !TARGET_OS_UIKITFORMAC
+#if !TARGET_OS_UIKITFORMAC && !TARGET_OS_OSX
 /**
  * iOS Only: copy videos from the assets-library (camera-roll) to a specific path as mp4-file.
  *
@@ -882,10 +882,16 @@ + (BOOL)requiresMainQueueSetup
     if ([asset isKindOfClass:[AVURLAsset class]]) {
       NSURL *url = [(AVURLAsset *)asset URL];
       NSLog(@"Final URL %@",url);
-      NSData *videoData = [NSData dataWithContentsOfURL:url];
-
-      BOOL writeResult = [videoData writeToFile:destination options:NSDataWritingAtomic error:&error];
-
+      BOOL writeResult = false;
+        
+      if (@available(iOS 9.0, *)) {
+          NSURL *destinationUrl = [NSURL fileURLWithPath:destination relativeToURL:nil];
+          writeResult = [[NSFileManager defaultManager] copyItemAtURL:url toURL:destinationUrl error:&error];
+      } else {
+          NSData *videoData = [NSData dataWithContentsOfURL:url];
+          writeResult = [videoData writeToFile:destination options:NSDataWritingAtomic error:&error];
+      }
+        
       if(writeResult) {
         NSLog(@"video success");
       }

Uploader.h

@@ -1,5 +1,8 @@
 #import <Foundation/Foundation.h>
+
+#if !TARGET_OS_OSX
 #import <MobileCoreServices/MobileCoreServices.h>
+#endif
 
 typedef void (^UploadCompleteCallback)(NSString*, NSURLResponse *);
 typedef void (^UploadErrorCallback)(NSError*);

android/build.gradle

@@ -4,7 +4,7 @@ def safeExtGet(prop, fallback) {
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

android/src/main/java/com/rnfs/Uploader.java

@@ -16,6 +16,9 @@
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
+import java.nio.channels.Channels;
+import java.nio.channels.FileChannel;
+import java.nio.channels.WritableByteChannel;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -126,39 +129,46 @@ private void upload(UploadParams params, UploadResult result) throws Exception {
             connection.connect();
 
             request = new DataOutputStream(connection.getOutputStream());
+            WritableByteChannel requestChannel = Channels.newChannel(request);
+
             if (!binaryStreamOnly) {
                 request.writeBytes(metaData);
             }
 
             byteSentTotal = 0;
-            Runtime run = Runtime.getRuntime();
 
             for (ReadableMap map : params.files) {
                 if (!binaryStreamOnly) {
                     request.writeBytes(fileHeader[fileCount]);
                 }
+
                 File file = new File(map.getString("filepath"));
-                int fileLength = (int) file.length();
-                int bytes_read = 0;
-                BufferedInputStream bufInput = new BufferedInputStream(new FileInputStream(file));
-                int buffer_size =(int) Math.ceil(fileLength / 100.f);
-                if(buffer_size > run.freeMemory() / 10.f) {
-                    buffer_size = (int) Math.ceil(run.freeMemory() / 10.f);
-                }
-                byte[] buffer = new byte[buffer_size];
-                while ((bytes_read = bufInput.read(buffer)) != -1) {
-                    request.write(buffer, 0, bytes_read);
+
+                long fileLength = file.length();
+                long bufferSize = (long) Math.ceil(fileLength / 100.f);
+                long bytesRead = 0;
+
+                FileInputStream fileStream = new FileInputStream(file);
+                FileChannel fileChannel = fileStream.getChannel();
+
+                while (bytesRead < fileLength) {
+                    long transferredBytes = fileChannel.transferTo(bytesRead, bufferSize, requestChannel);
+                    bytesRead += transferredBytes;
+
                     if (mParams.onUploadProgress != null) {
-                        byteSentTotal += bytes_read;
+                        byteSentTotal += transferredBytes;
                         mParams.onUploadProgress.onUploadProgress((int) totalFileLength, byteSentTotal);
                     }
                 }
+
                 if (!binaryStreamOnly) {
                     request.writeBytes(crlf);
                 }
+
                 fileCount++;
-                bufInput.close();
+                fileStream.close();
             }
+
             if (!binaryStreamOnly) {
                 request.writeBytes(tail);
             }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-fs",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Native filesystem access for react-native",
   "main": "FS.common.js",
   "typings": "index.d.ts",
@@ -35,7 +35,7 @@
     "prop-types": "^15.7.2"
   },
   "peerDependencies": {
-    "react-native": "^0.59.5",
-    "react-native-windows": "^0.57.2"
+    "react-native": "*",
+    "react-native-windows": "*"
   }
 }