Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-file

Author: purplecabbage

src/ios/CDVFile.m

@@ -411,11 +411,9 @@ - (NSNumber*)checkFreeDiskSpace:(NSString*)appPath
 
 - (void)requestFileSystem:(CDVInvokedUrlCommand*)command
 {
-    NSArray* arguments = command.arguments;
-
     // arguments
-    NSString* strType = [arguments objectAtIndex:0];
-    unsigned long long size = [[arguments objectAtIndex:1] longLongValue];
+    NSString* strType = [command argumentAtIndex:0];
+    unsigned long long size = [[command argumentAtIndex:1] longLongValue];
 
     int type = [strType intValue];
     CDVPluginResult* result = nil;
@@ -536,7 +534,7 @@ - (NSDictionary *)makeEntryForURL:(NSURL *)URL
 - (void)resolveLocalFileSystemURI:(CDVInvokedUrlCommand*)command
 {
     // arguments
-    NSString* localURIstr = [command.arguments objectAtIndex:0];
+    NSString* localURIstr = [command argumentAtIndex:0];
     CDVPluginResult* result;
 
     localURIstr = [self encodePath:localURIstr]; //encode path before resolving
@@ -584,7 +582,7 @@ - (void)getDirectory:(CDVInvokedUrlCommand*)command
     NSMutableDictionary* options = nil;
 
     if ([arguments count] >= 3) {
-        options = [arguments objectAtIndex:2 withDefault:nil];
+        options = [command argumentAtIndex:2 withDefault:nil];
     }
     // add getDir to options and call getFile()
     if (options != nil) {
@@ -622,10 +620,10 @@ - (void)getDirectory:(CDVInvokedUrlCommand*)command
  */
 - (void)getFile:(CDVInvokedUrlCommand*)command
 {
-    NSString* baseURIstr = [command.arguments objectAtIndex:0];
+    NSString* baseURIstr = [command argumentAtIndex:0];
     CDVFilesystemURL* baseURI = [self fileSystemURLforArg:baseURIstr];
-    NSString* requestedPath = [command.arguments objectAtIndex:1];
-    NSDictionary* options = [command.arguments objectAtIndex:2 withDefault:nil];
+    NSString* requestedPath = [command argumentAtIndex:1];
+    NSDictionary* options = [command argumentAtIndex:2 withDefault:nil];
 
     NSObject<CDVFileSystem> *fs = [self filesystemForURL:baseURI];
     CDVPluginResult* result = [fs getFileForURL:baseURI requestedPath:requestedPath options:options];
@@ -662,7 +660,7 @@ - (void)setMetadata:(CDVInvokedUrlCommand*)command
 {
     // arguments
     CDVFilesystemURL* localURI = [self fileSystemURLforArg:command.arguments[0]];
-    NSDictionary* options = [command.arguments objectAtIndex:1 withDefault:nil];
+    NSDictionary* options = [command argumentAtIndex:1 withDefault:nil];
     NSObject<CDVFileSystem> *fs = [self filesystemForURL:localURI];
     CDVPluginResult* result = [fs setMetadataForURL:localURI withObject:options];
 
@@ -741,8 +739,8 @@ - (void)doCopyMove:(CDVInvokedUrlCommand*)command isCopy:(BOOL)bCopy
     NSArray* arguments = command.arguments;
 
     // arguments
-    NSString* srcURLstr = [arguments objectAtIndex:0];
-    NSString* destURLstr = [arguments objectAtIndex:1];
+    NSString* srcURLstr = [command argumentAtIndex:0];
+    NSString* destURLstr = [command argumentAtIndex:1];
 
     CDVPluginResult *result;
 
@@ -760,7 +758,7 @@ - (void)doCopyMove:(CDVInvokedUrlCommand*)command isCopy:(BOOL)bCopy
     NSObject<CDVFileSystem> *destFs = [self filesystemForURL:destURL];
 
     // optional argument; use last component from srcFullPath if new name not provided
-    NSString* newName = ([arguments count] > 2) ? [arguments objectAtIndex:2] : [srcURL.url lastPathComponent];
+    NSString* newName = ([arguments count] > 2) ? [command argumentAtIndex:2] : [srcURL.url lastPathComponent];
     if ([newName rangeOfString:@":"].location != NSNotFound) {
         // invalid chars in new name
         result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION messageAsInt:ENCODING_ERR];
@@ -870,8 +868,8 @@ - (void)readAsDataURL:(CDVInvokedUrlCommand*)command
         [fs readFileAtURL:localURI start:start end:end callback:^(NSData* data, NSString* mimeType, CDVFileError errorCode) {
             CDVPluginResult* result = nil;
             if (data != nil) {
-                // TODO: Would be faster to base64 encode directly to the final string.
-                NSString* output = [NSString stringWithFormat:@"data:%@;base64,%@", mimeType, [data base64EncodedString]];
+                NSString* b64str = [data base64EncodedStringWithOptions:0];
+                NSString* output = [NSString stringWithFormat:@"data:%@;base64,%@", mimeType, b64str];
                 result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:output];
             } else {
                 result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION messageAsInt:errorCode];
@@ -941,7 +939,7 @@ - (void)truncate:(CDVInvokedUrlCommand*)command
 {
     // arguments
     CDVFilesystemURL* localURI = [self fileSystemURLforArg:command.arguments[0]];
-    unsigned long long pos = (unsigned long long)[[command.arguments objectAtIndex:1] longLongValue];
+    unsigned long long pos = (unsigned long long)[[command argumentAtIndex:1] longLongValue];
 
     NSObject<CDVFileSystem> *fs = [self filesystemForURL:localURI];
     CDVPluginResult *result = [fs truncateFileAtURL:localURI atPosition:pos];
@@ -960,12 +958,11 @@ - (void)write:(CDVInvokedUrlCommand*)command
 {
     [self.commandDelegate runInBackground:^ {
         NSString* callbackId = command.callbackId;
-        NSArray* arguments = command.arguments;
 
         // arguments
         CDVFilesystemURL* localURI = [self fileSystemURLforArg:command.arguments[0]];
-        id argData = [arguments objectAtIndex:1];
-        unsigned long long pos = (unsigned long long)[[arguments objectAtIndex:2] longLongValue];
+        id argData = [command argumentAtIndex:1];
+        unsigned long long pos = (unsigned long long)[[command argumentAtIndex:2] longLongValue];
 
         NSObject<CDVFileSystem> *fs = [self filesystemForURL:localURI];
 
@@ -1003,7 +1000,7 @@ - (NSString *)filesystemPathForURL:(CDVFilesystemURL *)localURL
 - (void)testFileExists:(CDVInvokedUrlCommand*)command
 {
     // arguments
-    NSString* argPath = [command.arguments objectAtIndex:0];
+    NSString* argPath = [command argumentAtIndex:0];
 
     // Get the file manager
     NSFileManager* fMgr = [NSFileManager defaultManager];
@@ -1018,7 +1015,7 @@ - (void)testFileExists:(CDVInvokedUrlCommand*)command
 - (void)testDirectoryExists:(CDVInvokedUrlCommand*)command
 {
     // arguments
-    NSString* argPath = [command.arguments objectAtIndex:0];
+    NSString* argPath = [command argumentAtIndex:0];
 
     // Get the file manager
     NSFileManager* fMgr = [[NSFileManager alloc] init];

src/ios/CDVLocalFilesystem.m

@@ -161,6 +161,16 @@ - (NSString *)normalizePath:(NSString *)rawPath
 
 }
 
+- (BOOL)valueForKeyIsNumber:(NSDictionary*)dict key:(NSString*)key
+{
+    BOOL bNumber = NO;
+    NSObject* value = dict[key];
+    if (value) {
+        bNumber = [value isKindOfClass:[NSNumber class]];
+    }
+    return bNumber;
+}
+
 - (CDVPluginResult *)getFileForURL:(CDVFilesystemURL *)baseURI requestedPath:(NSString *)requestedPath options:(NSDictionary *)options
 {
     CDVPluginResult* result = nil;
@@ -169,14 +179,13 @@ - (CDVPluginResult *)getFileForURL:(CDVFilesystemURL *)baseURI requestedPath:(NS
     BOOL exclusive = NO;
     int errorCode = 0;  // !!! risky - no error code currently defined for 0
 
-    if ([options valueForKeyIsNumber:@"create"]) {
+    if ([self valueForKeyIsNumber:options key:@"create"]) {
         create = [(NSNumber*)[options valueForKey:@"create"] boolValue];
     }
-    if ([options valueForKeyIsNumber:@"exclusive"]) {
+    if ([self valueForKeyIsNumber:options key:@"exclusive"]) {
         exclusive = [(NSNumber*)[options valueForKey:@"exclusive"] boolValue];
     }
-
-    if ([options valueForKeyIsNumber:@"getDir"]) {
+    if ([self valueForKeyIsNumber:options key:@"getDir"]) {
         // this will not exist for calls directly to getFile but will have been set by getDirectory before calling this method
         bDirRequest = [(NSNumber*)[options valueForKey:@"getDir"] boolValue];
     }