Merge pull request #6 from jpfiset/progress_callback

Progress callback

Author: andrewgleave

Diff for: CouchDBAttachmentUploader.h

@@ -21,11 +21,13 @@
 @interface CouchDBAttachmentUploadDelegate : NSObject {
     NSString* successCallback;
     NSString* failureCallback;
+    NSString* progressCallback;
     CouchDBAttachmentUploader *uploader;
 }
 
 @property (nonatomic, copy) NSString *successCallback;
 @property (nonatomic, copy) NSString *failureCallback;
+@property (nonatomic, copy) NSString *progressCallback;
 @property (nonatomic, retain) NSMutableData *responseData;
 @property (nonatomic, retain) CouchDBAttachmentUploader *uploader;
 

Diff for: CouchDBAttachmentUploader.m

@@ -10,7 +10,7 @@
 
 @implementation CouchDBAttachmentUploadDelegate
 
-@synthesize successCallback, failureCallback, responseData, uploader;
+@synthesize successCallback, failureCallback, progressCallback, responseData, uploader;
 
 - (id)init {
     self = [super init];
@@ -43,9 +43,16 @@ - (void)connection:(NSURLConnection*)connection didReceiveData:(NSData *)data {
     [responseData appendData:data];
 }
 
+- (void)connection:(NSURLConnection*)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite {
+    if( self.progressCallback ) {
+        [uploader writeJavascript:[NSString stringWithFormat:@"%@(%d,%d);",self.progressCallback,totalBytesWritten,totalBytesExpectedToWrite]];
+    }
+}
+
 - (void)dealloc {
     [successCallback release];
     [failureCallback release];
+    [progressCallback release];
     [responseData release];
     [uploader release];
     [super dealloc];
@@ -61,7 +68,8 @@ - (void)upload:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options
 {
     NSUInteger argc = [arguments count];
 
-	if(argc < 5) {
+	if(argc < 6) {
+        NSLog(@"CouchDBAttachmentUploader called with invalid number of arguments: %d",argc);
         return; 
     }
 
@@ -71,6 +79,7 @@ - (void)upload:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options
     NSString *docRevision = [arguments objectAtIndex:3];
     NSString *successCallback = [arguments objectAtIndex:4];
     NSString *failureCallback = [arguments objectAtIndex:5];
+    NSString *progressCallback = [arguments objectAtIndex:6];
     NSString *contentType = [options valueForKey:@"contentType"];
     NSString *httpMethod = [[options valueForKey:@"method"] uppercaseString];
     NSString *attachmentName = [options valueForKey:@"attachmentName"];
@@ -139,6 +148,7 @@ - (void)upload:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options
     delegate.uploader = self;
     delegate.successCallback = successCallback;
     delegate.failureCallback = failureCallback;
+    delegate.progressCallback = progressCallback;
 
     NSURLConnection * conn = [NSURLConnection connectionWithRequest:req delegate:delegate];
     if( nil == conn ) {

Diff for: README.md

@@ -13,17 +13,22 @@ Enables a Cordova app to push binary attachments straight to a CouchDB database
 
 ###Usage
 
-    window.plugins.CouchDBAttachmentUploader.upload($('#id_camera_image').attr('src'),
+    window.plugins.CouchDBAttachmentUploader.upload(
+        $('#id_camera_image').attr('src'),
         'http://127.0.0.1:5984/couchdb',
         doc.id,
         doc.rev,
-        function() { 
+        function(info) { 
             //success callback
         },
         function(error) {
             //failure callback
         },
-        {contentType: 'image/jpeg',
-        method: 'put',
-        attachmentName: 'photo.jpg'});
+        {
+            contentType: 'image/jpeg',
+            method: 'put',
+            attachmentName: 'photo.jpg',
+            progress: function(bytesUploaded, bytesTotal){}
+        }
+    );
 

Diff for: cordova.plugin.couchdb-attachment-upload.js

@@ -8,6 +8,28 @@
 var CouchDBAttachmentUploader = function() {}
 
 CouchDBAttachmentUploader.prototype.upload = function(filepath, couchURI, docID, docRevision,  success, failure, options) {
+    
+    var request = {};
+    var progress = window.plugins.CouchDBAttachmentUploader.dummyProgress;
+    
+    // Process options
+    for(var key in options) {
+		var value = options[key];
+		
+		if( key === 'progress' && typeof(value) === 'function' ) {
+			// Callback for progress
+			progress = value;
+			
+		} else if( 'contentType' === key
+		  || 'method' === key
+		  || 'attachmentName' === key
+		   ){
+		   // Pass these options to request
+		   request[key] = value;
+		};
+    };
+
+	// Prepare callbacks    
     var key = 'f' + this.callbackIdx++;
     window.plugins.CouchDBAttachmentUploader.callbackMap[key] = {
         success: function(result) {
@@ -22,14 +44,17 @@ CouchDBAttachmentUploader.prototype.upload = function(filepath, couchURI, docID,
             failure(result);
             delete window.plugins.CouchDBAttachmentUploader.callbackMap[key]
         }
+        ,progress: progress
     }
     var callback = 'window.plugins.CouchDBAttachmentUploader.callbackMap.' + key;
     return cordova.exec('CouchDBAttachmentUploader.upload', filepath, couchURI, docID, 
-                         docRevision, callback + '.success', callback + '.failure', options);
+                         docRevision, callback + '.success', callback + '.failure',
+                         callback + '.progress', request);
 }
 
 CouchDBAttachmentUploader.prototype.callbackMap = {};
 CouchDBAttachmentUploader.prototype.callbackIdx = 0;
+CouchDBAttachmentUploader.prototype.dummyProgress = function(bytes, total){};
 
 cordova.addConstructor(function()  {
     if(!window.plugins) {