1) wkh237#491 "writeStream() does not create file if it doesn't exist?"

lll000111 · lll000111 · commit 3292b3821d45 · 2017-08-17T20:51:06.000+02:00
2) I had gone overboard with the "@[..]" in the ios code, making some error strings arrays
3) fix typos: rename all ENODIR =&gt; ENOTDIR
diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java
@@ -59,7 +59,7 @@ static void writeFile(String path, String encoding, String data, final boolean a
             if(!f.exists()) {
                 if(!dir.exists()) {
                     if (!dir.mkdirs()) {
-                        promise.reject("EUNSPECIFIED", "Failed to create parent directory '" + path + "'");
+                        promise.reject("EUNSPECIFIED", "Failed to create parent directory of '" + path + "'");
                         return;
                     }
                 }
@@ -118,7 +118,7 @@ static void writeFile(String path, ReadableArray data, final boolean append, fin
             if(!f.exists()) {
                 if(!dir.exists()) {
                     if (!dir.mkdirs()) {
-                        promise.reject("EUNSPECIFIED", "Failed to create parent directory '" + path + "'");
+                        promise.reject("ENOTDIR", "Failed to create parent directory of '" + path + "'");
                         return;
                     }
                 }
@@ -366,16 +366,26 @@ else if(resolved == null) {
      * @param callback  Callback
      */
     void writeStream(String path, String encoding, boolean append, Callback callback) {
-        File dest = new File(path);
-        if(!dest.exists()) {
-            callback.invoke("ENOENT", "No such file `" + path + "'");
-            return;
-        }
-        if(dest.isDirectory()) {
-            callback.invoke("EISDIR", "Expecting a file but '" + path + "' is a directory");
-            return;
-        }
         try {
+            File dest = new File(path);
+            File dir = dest.getParentFile();
+
+            if(!dest.exists()) {
+                if(!dir.exists()) {
+                    if (!dir.mkdirs()) {
+                        callback.invoke("ENOTDIR", "Failed to create parent directory of '" + path + "'");
+                        return;
+                    }
+                }
+                if(!dest.createNewFile()) {
+                    callback.invoke("ENOENT", "File '" + path + "' does not exist and could not be created");
+                    return;
+                }
+            } else if(dest.isDirectory()) {
+                callback.invoke("EISDIR", "Expecting a file but '" + path + "' is a directory");
+                return;
+            }
+
             OutputStream fs = new FileOutputStream(path, append);
             this.encoding = encoding;
             String streamId = UUID.randomUUID().toString();
@@ -609,7 +619,7 @@ static void ls(String path, Promise promise) {
                 return;
             }
             if (!src.isDirectory()) {
-                promise.reject("ENODIR", "Not a directory '" + path + "'");
+                promise.reject("ENOTDIR", "Not a directory '" + path + "'");
                 return;
             }
             String[] files = new File(path).list();
diff --git a/ios/RNFetchBlob/RNFetchBlob.m b/ios/RNFetchBlob/RNFetchBlob.m
@@ -159,14 +159,14 @@ - (NSDictionary *)constantsToExport
     }
 
     if ([fm fileExistsAtPath:path]) {
-        reject(@"EEXIST", @[[NSString stringWithFormat:@"File '%@' already exists", path]], nil);
+        reject(@"EEXIST", [NSString stringWithFormat:@"File '%@' already exists", path], nil);
     }
     else {
         BOOL success = [fm createFileAtPath:path contents:fileContent attributes:NULL];
         if(success == YES)
             resolve(@[[NSNull null]]);
         else
-            reject(@"EUNSPECIFIED", @[[NSString stringWithFormat:@"Failed to create new file at path '%@', please ensure the folder exists", path]], nil);
+            reject(@"EUNSPECIFIED", [NSString stringWithFormat:@"Failed to create new file at path '%@', please ensure the folder exists", path], nil);
     }
 }
 
@@ -189,14 +189,14 @@ - (NSDictionary *)constantsToExport
     [fileContent appendBytes:bytes length:dataArray.count];
 
     if ([fm fileExistsAtPath:path]) {
-        reject(@"EEXIST", @[[NSString stringWithFormat:@"File '%@' already exists", path]], nil);
+        reject(@"EEXIST", [NSString stringWithFormat:@"File '%@' already exists", path], nil);
     }
     else {
         BOOL success = [fm createFileAtPath:path contents:fileContent attributes:NULL];
         if(success == YES)
             resolve(@[[NSNull null]]);
         else
-            reject(@"EUNSPECIFIED", @[[NSString stringWithFormat:@"failed to create new file at path '%@', please ensure the folder exists", path]], nil);
+            reject(@"EUNSPECIFIED", [NSString stringWithFormat:@"failed to create new file at path '%@', please ensure the folder exists", path], nil);
     }
 
     free(bytes);
@@ -238,16 +238,24 @@ - (NSDictionary *)constantsToExport
 {
     RNFetchBlobFS * fileStream = [[RNFetchBlobFS alloc] initWithBridgeRef:self.bridge];
     NSFileManager * fm = [NSFileManager defaultManager];
-    BOOL isDir = nil;
-    BOOL exist = [fm fileExistsAtPath:path isDirectory:&isDir];
-    if(exist == NO) {
-        callback(@[@"ENOENT", [NSString stringWithFormat:@"No such file `%@`", path]]);
-        return;
+    NSString * folder = [path stringByDeletingLastPathComponent];
+
+    BOOL isDir = NO;
+    BOOL exists = [fm fileExistsAtPath:path isDirectory: &isDir];
+
+    if(!exists) {
+        [fm createDirectoryAtPath:folder withIntermediateDirectories:YES attributes:NULL error:&err];
+        if(err != nil) {
+            callback(@[@"ENOTDIR", [NSString stringWithFormat:@"Failed to create parent directory of '%@'; error: %@", path, [err description]]]);
+        }
+        if(![fm createFileAtPath:path contents:nil attributes:nil]) {
+            callback(@[@"ENOENT", [NSString stringWithFormat:@"File '%@' does not exist and could not be created", path]]);
+        }
     }
-    if(isDir == YES) {
+    else if(isDir) {
         callback(@[@"EISDIR", [NSString stringWithFormat:@"Expecting a file but '%@' is a directory", path]]);
-        return;
     }
+
     NSString * streamId = [fileStream openWithPath:path encode:encoding appendData:append];
     callback(@[[NSNull null], @[NSNull null], streamId]);
 }
@@ -323,7 +331,7 @@ - (NSDictionary *)constantsToExport
         return reject(@"ENOENT", [NSString stringWithFormat:@"No such file '%@'", path], nil);
     }
     if(isDir == NO) {
-        return reject(@"ENODIR", [NSString stringWithFormat:@"Not a directory '%@'", path], nil);
+        return reject(@"ENOTDIR", [NSString stringWithFormat:@"Not a directory '%@'", path], nil);
     }
     NSError * error = nil;
     NSArray * result = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:&error];
diff --git a/ios/RNFetchBlobFS.m b/ios/RNFetchBlobFS.m
@@ -349,7 +349,7 @@ + (void) writeFile:(NSString *)path
 
         BOOL isDir = NO;
         BOOL exists = NO;
-        exists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory: &isDir];
+        exists = [fm fileExistsAtPath:path isDirectory: &isDir];
 
         if (isDir) {
             return reject(@"EISDIR", [NSString stringWithFormat:@"Expecting a file but '%@' is a directory", path], nil);
@@ -358,7 +358,7 @@ + (void) writeFile:(NSString *)path
         if(!exists) {
             [fm createDirectoryAtPath:folder withIntermediateDirectories:YES attributes:NULL error:&err];
             if(err != nil) {
-                return reject(@"EUNSPECIFIED", @[[NSString stringWithFormat:@"Failed to create parent directory '%@', error: %@", path, [err description]]]], nil);
+                return reject(@"ENOTDIR", [NSString stringWithFormat:@"Failed to create parent directory of '%@'; error: %@", path, [err description]], nil);
             }
             if(![fm createFileAtPath:path contents:nil attributes:nil]) {
                 return reject(@"ENOENT", [NSString stringWithFormat:@"File '%@' does not exist and could not be created", path], nil);
@@ -426,7 +426,7 @@ + (void) writeFileArray:(NSString *)path
         if(!exists) {
             [fm createDirectoryAtPath:folder withIntermediateDirectories:YES attributes:NULL error:&err];
             if(err != nil) {
-                return reject(@"EUNSPECIFIED", @[[NSString stringWithFormat:@"Failed to create parent directory '%@', error: %@", path, [err description]]]], nil);
+                return reject(@"EUNSPECIFIED", [NSString stringWithFormat:@"Failed to create parent directory of '%@'; error: %@", path, [err description]], nil);
             }
         }
 
@@ -616,7 +616,7 @@ + (void) mkdir:(NSString *) path resolver:(RCTPromiseResolveBlock)resolve reject
     BOOL isDir = NO;
     NSError * err = nil;
     if([[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir]) {
-        reject(@"EEXIST", @[[NSString stringWithFormat:@"%@ '%@' already exists", isDir ? @"Directory" : @"File", path]], nil);
+        reject(@"EEXIST", [NSString stringWithFormat:@"%@ '%@' already exists", isDir ? @"Directory" : @"File", path], nil);
     }
     else {
         [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:&err];
@@ -625,7 +625,7 @@ + (void) mkdir:(NSString *) path resolver:(RCTPromiseResolveBlock)resolve reject
         resolve(@YES);
     }
     else {
-        reject(@"EUNSPECIFIED", @[[NSString stringWithFormat:@"Error creating folder '%@', error: %@", path, [err description]]]], nil);
+        reject(@"EUNSPECIFIED", [NSString stringWithFormat:@"Error creating folder '%@', error: %@", path, [err description]], nil);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ + (void) writeFile:(NSString *)path`
`349`	`349`
`350`	`350`	`BOOL isDir = NO;`
`351`	`351`	`BOOL exists = NO;`
`352`		`- exists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory: &isDir];`
	`352`	`+ exists = [fm fileExistsAtPath:path isDirectory: &isDir];`
`353`	`353`
`354`	`354`	`if (isDir) {`
`355`	`355`	`return reject(@"EISDIR", [NSString stringWithFormat:@"Expecting a file but '%@' is a directory", path], nil);`
`@@ -358,7 +358,7 @@ + (void) writeFile:(NSString *)path`
`358`	`358`	`if(!exists) {`
`359`	`359`	`[fm createDirectoryAtPath:folder withIntermediateDirectories:YES attributes:NULL error:&err];`
`360`	`360`	`if(err != nil) {`
`361`		`- return reject(@"EUNSPECIFIED", @[[NSString stringWithFormat:@"Failed to create parent directory '%@', error: %@", path, [err description]]]], nil);`
	`361`	`+ return reject(@"ENOTDIR", [NSString stringWithFormat:@"Failed to create parent directory of '%@'; error: %@", path, [err description]], nil);`
`362`	`362`	`}`
`363`	`363`	`if(![fm createFileAtPath:path contents:nil attributes:nil]) {`
`364`	`364`	`return reject(@"ENOENT", [NSString stringWithFormat:@"File '%@' does not exist and could not be created", path], nil);`
`@@ -426,7 +426,7 @@ + (void) writeFileArray:(NSString *)path`
`426`	`426`	`if(!exists) {`
`427`	`427`	`[fm createDirectoryAtPath:folder withIntermediateDirectories:YES attributes:NULL error:&err];`
`428`	`428`	`if(err != nil) {`
`429`		`- return reject(@"EUNSPECIFIED", @[[NSString stringWithFormat:@"Failed to create parent directory '%@', error: %@", path, [err description]]]], nil);`
	`429`	`+ return reject(@"EUNSPECIFIED", [NSString stringWithFormat:@"Failed to create parent directory of '%@'; error: %@", path, [err description]], nil);`
`430`	`430`	`}`
`431`	`431`	`}`
`432`	`432`
`@@ -616,7 +616,7 @@ + (void) mkdir:(NSString *) path resolver:(RCTPromiseResolveBlock)resolve reject`
`616`	`616`	`BOOL isDir = NO;`
`617`	`617`	`NSError * err = nil;`
`618`	`618`	`if([[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir]) {`
`619`		`- reject(@"EEXIST", @[[NSString stringWithFormat:@"%@ '%@' already exists", isDir ? @"Directory" : @"File", path]], nil);`
	`619`	`+ reject(@"EEXIST", [NSString stringWithFormat:@"%@ '%@' already exists", isDir ? @"Directory" : @"File", path], nil);`
`620`	`620`	`}`
`621`	`621`	`else {`
`622`	`622`	`[[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:&err];`
`@@ -625,7 +625,7 @@ + (void) mkdir:(NSString *) path resolver:(RCTPromiseResolveBlock)resolve reject`
`625`	`625`	`resolve(@YES);`
`626`	`626`	`}`
`627`	`627`	`else {`
`628`		`- reject(@"EUNSPECIFIED", @[[NSString stringWithFormat:@"Error creating folder '%@', error: %@", path, [err description]]]], nil);`
	`628`	`+ reject(@"EUNSPECIFIED", [NSString stringWithFormat:@"Error creating folder '%@', error: %@", path, [err description]], nil);`
`629`	`629`	`}`
`630`	`630`	`}`
`631`	`631`