Merge pull request #285 from iOSOfSunXp/master

QNFormUpload addParam:fileName

Author: longbai

QiniuSDK/Storage/QNFormUpload.h

@@ -15,6 +15,7 @@
 
 - (instancetype)initWithData:(NSData *)data
                      withKey:(NSString *)key
+                withFileName:(NSString *)fileName
                    withToken:(QNUpToken *)token
        withCompletionHandler:(QNUpCompletionHandler)block
                   withOption:(QNUploadOption *)option

QiniuSDK/Storage/QNFormUpload.m

@@ -25,6 +25,7 @@ @interface QNFormUpload ()
 @property (nonatomic, strong) QNUploadOption *option;
 @property (nonatomic, strong) QNUpCompletionHandler complete;
 @property (nonatomic, strong) QNConfiguration *config;
+@property (nonatomic, strong) NSString *fileName;
 @property (nonatomic) float previousPercent;
 
 @property (nonatomic, strong) NSString *access; //AK
@@ -35,6 +36,7 @@ @implementation QNFormUpload
 
 - (instancetype)initWithData:(NSData *)data
                      withKey:(NSString *)key
+                withFileName:(NSString *)fileName
                    withToken:(QNUpToken *)token
        withCompletionHandler:(QNUpCompletionHandler)block
                   withOption:(QNUploadOption *)option
@@ -48,6 +50,7 @@ - (instancetype)initWithData:(NSData *)data
         _complete = block;
         _httpManager = http;
         _config = config;
+        _fileName = fileName != nil ? fileName : @"?";
         _previousPercent = 0;
         _access = token.access;
     }
@@ -56,11 +59,8 @@ - (instancetype)initWithData:(NSData *)data
 
 - (void)put {
     NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
-    NSString *fileName = _key;
     if (_key) {
         parameters[@"key"] = _key;
-    } else {
-        fileName = @"?";
     }
     parameters[@"token"] = _token.token;
     [parameters addEntriesFromDictionary:_option.params];
@@ -119,7 +119,7 @@ - (void)put {
             [_httpManager multipartPost:thirdHost
                                withData:_data
                              withParams:parameters
-                           withFileName:fileName
+                           withFileName:_fileName
                            withMimeType:_option.mimeType
                       withCompleteBlock:thirdComplete
                       withProgressBlock:p
@@ -129,7 +129,7 @@ - (void)put {
         [_httpManager multipartPost:nextHost
                            withData:_data
                          withParams:parameters
-                       withFileName:fileName
+                       withFileName:_fileName
                        withMimeType:_option.mimeType
                   withCompleteBlock:retriedComplete
                   withProgressBlock:p
@@ -139,7 +139,7 @@ - (void)put {
     [_httpManager multipartPost:upHost
                        withData:_data
                      withParams:parameters
-                   withFileName:fileName
+                   withFileName:_fileName
                    withMimeType:_option.mimeType
               withCompleteBlock:complete
               withProgressBlock:p

QiniuSDK/Storage/QNUploadManager.m

@@ -119,6 +119,15 @@ - (void)putData:(NSData *)data
           token:(NSString *)token
        complete:(QNUpCompletionHandler)completionHandler
          option:(QNUploadOption *)option {
+    [self putData:data fileName:nil key:key token:token complete:completionHandler option:option];
+}
+
+- (void)putData:(NSData *)data
+       fileName:(NSString *)fileName
+            key:(NSString *)key
+          token:(NSString *)token
+       complete:(QNUpCompletionHandler)completionHandler
+         option:(QNUploadOption *)option {
     if ([QNUploadManager checkAndNotifyError:key token:token input:data complete:completionHandler]) {
         return;
     }
@@ -152,6 +161,7 @@ - (void)putData:(NSData *)data
         QNFormUpload *up = [[QNFormUpload alloc]
                      initWithData:data
                           withKey:key
+                        withFileName:fileName
                         withToken:t
             withCompletionHandler:complete
                        withOption:option
@@ -193,7 +203,8 @@ - (void)putFileInternal:(id<QNFileDelegate>)file
 
             if ([file size] <= _config.putThreshold) {
                 NSData *data = [file readAll];
-                [self putData:data key:key token:token complete:complete option:option];
+                NSString *fileName = [[file path] lastPathComponent];
+                [self putData:data fileName:fileName key:key token:token complete:completionHandler option:option];
                 return;
             }