Merge branch 'master' of github.com:itinance/react-native-fs

* 'master' of github.com:itinance/react-native-fs:
  [Podspec]
  [tvOS] Add target
  fixed property-names for created/ctime and modified/mtime in ReadDirItem
  Fix flowtype of date object in ReadDirItem
  Added write function for performing random access writes (node-js fs style)

Author: itinance

FS.common.js

@@ -31,8 +31,8 @@ type MkdirOptions = {
 };
 
 type ReadDirItem = {
-  created: date;     // The creation date of the file (iOS only)
-  modified: date;     // The last modified date of the file
+  ctime: ?Date;    // The creation date of the file (iOS only)
+  mtime: Date;   // The last modified date of the file
   name: string;     // The name of the item
   path: string;     // The absolute path to the item
   size: string;     // Size in bytes
@@ -276,7 +276,7 @@ var RNFS = {
 
   // iOS only
   // Copies fotos from asset-library (camera-roll) to a specific location
-  // with a given width or height 
+  // with a given width or height
   // @see: https://developer.apple.com/reference/photos/phimagemanager/1616964-requestimageforasset
   copyAssetsFileIOS(imageUri: string, destPath: string, width: number, height: number,
     scale : number = 1.0, compression : number = 1.0, resizeMode : string = 'contain'  ): Promise<string> {
@@ -339,6 +339,38 @@ var RNFS = {
     return RNFSManager.appendFile(normalizeFilePath(filepath), b64);
   },
 
+  write(filepath: string, contents: string, position?: number, encodingOrOptions?: any): Promise<void> {
+    var b64;
+
+    var options = {
+      encoding: 'utf8'
+    };
+
+    if (encodingOrOptions) {
+      if (typeof encodingOrOptions === 'string') {
+        options.encoding = encodingOrOptions;
+      } else if (typeof encodingOrOptions === 'object') {
+        options = encodingOrOptions;
+      }
+    }
+
+    if (options.encoding === 'utf8') {
+      b64 = base64.encode(utf8.encode(contents));
+    } else if (options.encoding === 'ascii') {
+      b64 = base64.encode(contents);
+    } else if (options.encoding === 'base64') {
+      b64 = contents;
+    } else {
+      throw new Error('Invalid encoding type "' + options.encoding + '"');
+    }
+
+    if (position === undefined) {
+      position = -1;
+    }
+
+    return RNFSManager.write(normalizeFilePath(filepath), b64, position).then(() => void 0);
+  },
+
   downloadFile(options: DownloadFileOptions): { jobId: number, promise: Promise<DownloadResult> } {
     if (typeof options !== 'object') throw new Error('downloadFile: Invalid value for argument `options`');
     if (typeof options.fromUrl !== 'string') throw new Error('downloadFile: Invalid value for property `fromUrl`');

README.md

@@ -378,6 +378,10 @@ Write the `contents` to `filepath`. `encoding` can be one of `utf8` (default), `
 
 Append the `contents` to `filepath`. `encoding` can be one of `utf8` (default), `ascii`, `base64`.
 
+### `write(filepath: string, contents: string, position?: number, encoding?: string): Promise<void>`
+
+Write the `contents` to `filepath` at the given random access position. When `position` is `undefined` or `-1` the contents is appended to the end of the file. `encoding` can be one of `utf8` (default), `ascii`, `base64`.
+
 ### `moveFile(filepath: string, destPath: string): Promise<void>`
 
 Moves the file located at `filepath` to `destPath`. This is more performant than reading and then re-writing the file data because the move is done natively and the data doesn't have to be copied or cross the bridge.

RNFS.podspec

@@ -9,7 +9,8 @@ Pod::Spec.new do |s|
   s.summary         = pjson["description"]
   s.license         = pjson["license"]
   s.author          = { "Johannes Lumpe" => "[email protected]" }
-  s.platform        = :ios, "8.0"
+  s.ios.deployment_target = '8.0'
+  s.tvos.deployment_target = '9.0'
   s.source          = { :git => "https://github.com/itinance/react-native-fs", :tag => "v#{s.version}" }
   s.source_files    = '*.{h,m}'
   s.preserve_paths  = "**/*.js"

RNFS.xcodeproj/project.pbxproj

@@ -7,13 +7,26 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		645644281EB8DAA100672408 /* NSArray+Map.m in Sources */ = {isa = PBXBuildFile; fileRef = F1EB08BA1AFD0E6A008F8F2B /* NSArray+Map.m */; };
+		645644291EB8DAA100672408 /* RNFSManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F1E59BDE1ADD662800ACA28A /* RNFSManager.m */; };
+		6456442A1EB8DAA100672408 /* Downloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BF740761C033A2E0057A1E7 /* Downloader.m */; };
+		6456442B1EB8DAA100672408 /* Uploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BB364CB1CDA130000435A01 /* Uploader.m */; };
 		8BB364CC1CDA130000435A01 /* Uploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BB364CB1CDA130000435A01 /* Uploader.m */; };
 		8BF740771C033A2E0057A1E7 /* Downloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BF740761C033A2E0057A1E7 /* Downloader.m */; };
 		F1E59BDF1ADD662800ACA28A /* RNFSManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F1E59BDE1ADD662800ACA28A /* RNFSManager.m */; };
 		F1EB08BB1AFD0E6A008F8F2B /* NSArray+Map.m in Sources */ = {isa = PBXBuildFile; fileRef = F1EB08BA1AFD0E6A008F8F2B /* NSArray+Map.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+		6456441D1EB8DA9100672408 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		F12AFB991ADAF8F800E0535D /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -26,6 +39,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		6456441F1EB8DA9100672408 /* libRNFS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFS.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		8BB364CA1CDA130000435A01 /* Uploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uploader.h; sourceTree = "<group>"; };
 		8BB364CB1CDA130000435A01 /* Uploader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Uploader.m; sourceTree = "<group>"; };
 		8BF740751C033A2E0057A1E7 /* Downloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Downloader.h; sourceTree = "<group>"; };
@@ -38,6 +52,13 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		6456441C1EB8DA9100672408 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		F12AFB981ADAF8F800E0535D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -67,13 +88,31 @@
 			isa = PBXGroup;
 			children = (
 				F12AFB9B1ADAF8F800E0535D /* libRNFS.a */,
+				6456441F1EB8DA9100672408 /* libRNFS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		6456441E1EB8DA9100672408 /* RNFS-tvOS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 645644271EB8DA9100672408 /* Build configuration list for PBXNativeTarget "RNFS-tvOS" */;
+			buildPhases = (
+				6456441B1EB8DA9100672408 /* Sources */,
+				6456441C1EB8DA9100672408 /* Frameworks */,
+				6456441D1EB8DA9100672408 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "RNFS-tvOS";
+			productName = "RNFS-tvOS";
+			productReference = 6456441F1EB8DA9100672408 /* libRNFS.a */;
+			productType = "com.apple.product-type.library.static";
+		};
 		F12AFB9A1ADAF8F800E0535D /* RNFS */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = F12AFBAF1ADAF8F800E0535D /* Build configuration list for PBXNativeTarget "RNFS" */;
@@ -100,6 +139,10 @@
 				LastUpgradeCheck = 0630;
 				ORGANIZATIONNAME = "Johannes Lumpe";
 				TargetAttributes = {
+					6456441E1EB8DA9100672408 = {
+						CreatedOnToolsVersion = 8.3.2;
+						ProvisioningStyle = Automatic;
+					};
 					F12AFB9A1ADAF8F800E0535D = {
 						CreatedOnToolsVersion = 6.3;
 					};
@@ -118,11 +161,23 @@
 			projectRoot = "";
 			targets = (
 				F12AFB9A1ADAF8F800E0535D /* RNFS */,
+				6456441E1EB8DA9100672408 /* RNFS-tvOS */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXSourcesBuildPhase section */
+		6456441B1EB8DA9100672408 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				645644281EB8DAA100672408 /* NSArray+Map.m in Sources */,
+				645644291EB8DAA100672408 /* RNFSManager.m in Sources */,
+				6456442A1EB8DAA100672408 /* Downloader.m in Sources */,
+				6456442B1EB8DAA100672408 /* Uploader.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		F12AFB971ADAF8F800E0535D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -137,6 +192,40 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
+		645644251EB8DA9100672408 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_TESTABILITY = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = RNFS;
+				SDKROOT = appletvos;
+				SKIP_INSTALL = YES;
+				TVOS_DEPLOYMENT_TARGET = 10.2;
+			};
+			name = Debug;
+		};
+		645644261EB8DA9100672408 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = RNFS;
+				SDKROOT = appletvos;
+				SKIP_INSTALL = YES;
+				TVOS_DEPLOYMENT_TARGET = 10.2;
+			};
+			name = Release;
+		};
 		F12AFBAD1ADAF8F800E0535D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -250,6 +339,14 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		645644271EB8DA9100672408 /* Build configuration list for PBXNativeTarget "RNFS-tvOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				645644251EB8DA9100672408 /* Debug */,
+				645644261EB8DA9100672408 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
 		F12AFB961ADAF8F800E0535D /* Build configuration list for PBXProject "RNFS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

RNFSManager.m

@@ -147,6 +147,43 @@ - (dispatch_queue_t)methodQueue
   }
 }
 
+RCT_EXPORT_METHOD(write:(NSString *)filepath
+                  contents:(NSString *)base64Content
+                  position:(NSInteger)position
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  NSData *data = [[NSData alloc] initWithBase64EncodedString:base64Content options:NSDataBase64DecodingIgnoreUnknownCharacters];
+  
+  NSFileManager *fM = [NSFileManager defaultManager];
+  
+  if (![fM fileExistsAtPath:filepath])
+  {
+    BOOL success = [[NSFileManager defaultManager] createFileAtPath:filepath contents:data attributes:nil];
+    
+    if (!success) {
+      return reject(@"ENOENT", [NSString stringWithFormat:@"ENOENT: no such file or directory, open '%@'", filepath], nil);
+    } else {
+      return resolve(nil);
+    }
+  }
+  
+  @try {
+    NSFileHandle *fH = [NSFileHandle fileHandleForUpdatingAtPath:filepath];
+    
+    if (position >= 0) {
+      [fH seekToFileOffset:position];
+    } else {
+      [fH seekToEndOfFile];
+    }
+    [fH writeData:data];
+    
+    return resolve(nil);
+  } @catch (NSException *e) {
+    return reject(@"ENOENT", [NSString stringWithFormat:@"ENOENT: error writing file: '%@'", filepath], nil);
+  }
+}
+
 RCT_EXPORT_METHOD(unlink:(NSString*)filepath
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)

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

@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.RandomAccessFile;
 import java.net.URL;
 import java.security.MessageDigest;
 import java.util.HashMap;
@@ -87,6 +88,29 @@ public void appendFile(String filepath, String base64Content, Promise promise) {
     }
   }
 
+  @ReactMethod
+  public void write(String filepath, String base64Content, int position, Promise promise) {
+    try {
+      byte[] bytes = Base64.decode(base64Content, Base64.DEFAULT);
+
+      if (position < 0) {
+        FileOutputStream outputStream = new FileOutputStream(filepath, true);
+        outputStream.write(bytes);
+        outputStream.close();
+      } else {
+        RandomAccessFile file = new RandomAccessFile(filepath, "rw");
+        file.seek(position);
+        file.write(bytes);
+        file.close();
+      }
+
+      promise.resolve(null);
+    } catch (Exception ex) {
+      ex.printStackTrace();
+      reject(promise, filepath, ex);
+    }
+  }
+
   @ReactMethod
   public void exists(String filepath, Promise promise) {
     try {

package.json

@@ -4,7 +4,8 @@
   "description": "Native filesystem access for react-native",
   "main": "FS.common.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "flow": "flow; test $? -eq 0 -o $? -eq 2"
   },
   "repository": {
     "type": "git",
@@ -28,7 +29,7 @@
     "utf8": "^2.1.1"
   },
   "devDependencies": {
-    "flow-bin": "0.27.0",
+    "flow-bin": "0.28.0",
     "react": "^15.4.2",
     "react-native": "^0.40.0"
   }