Merge pull request #6 from longbai/up_params

upload params check

Author: longbai

QiniuSDK/Storage/QNResumeUpload.m

@@ -279,7 +279,7 @@ - (void)putChunk:(NSString *)uphost
 }
 
 - (BOOL)isCancelled {
-	return self.option && [self.option isCancelled];
+	return self.option && self.option.priv_isCancelled;
 }
 
 - (void)makeFile:(NSString *)uphost

QiniuSDK/Storage/QNUploadManager.m

@@ -72,7 +72,7 @@ - (void)putData:(NSData *)data
 	parameters[@"token"] = token;
 
 	if (option && option.params) {
-		[parameters addEntriesFromDictionary:[option p_convertToPostParams]];
+		[parameters addEntriesFromDictionary:option.params];
 	}
 
 	NSString *mimeType = option.mimeType;

QiniuSDK/Storage/QNUploadOption+Private.h

@@ -10,7 +10,5 @@
 
 @interface QNUploadOption (Private)
 
-@property (nonatomic, readonly, copy) NSDictionary *p_convertToPostParams;
-
-@property (nonatomic, getter = isCancelled, readonly) BOOL cancelled;
+@property (nonatomic, getter = priv_isCancelled, readonly) BOOL cancelled;
 @end

QiniuSDK/Storage/QNUploadOption.m

@@ -18,6 +18,22 @@ - (instancetype)initWithProgessHandler:(QNUpProgressHandler)progress {
 	return self;
 }
 
++ (NSDictionary *)filteParam:(NSDictionary *)params {
+	if (params == nil) {
+		return nil;
+	}
+	NSMutableDictionary *ret = [NSMutableDictionary dictionary];
+	@autoreleasepool {
+		NSEnumerator *e = [params keyEnumerator];
+		for (NSString *key = [e nextObject]; key != nil; key = [e nextObject]) {
+			if ([key hasPrefix:@"x:"]) {
+				ret[key] = params[key];
+			}
+		}
+	}
+	return ret;
+}
+
 - (instancetype)initWithMime:(NSString *)mimeType
              progressHandler:(QNUpProgressHandler)progress
                       params:(NSDictionary *)params
@@ -26,20 +42,15 @@ - (instancetype)initWithMime:(NSString *)mimeType
 	if (self = [super init]) {
 		_mimeType = mimeType;
 		_progressHandler = progress;
-		_params = params;
+		_params = [QNUploadOption filteParam:params];
 		_checkCrc = check;
 		_cancellationSignal = cancel;
 	}
 
 	return self;
 }
 
-- (NSDictionary *)p_convertToPostParams {
-	NSMutableDictionary *params = [NSMutableDictionary dictionaryWithDictionary:self.params];
-	return params;
-}
-
-- (BOOL)isCancelled {
+- (BOOL)priv_isCancelled {
 	return _cancellationSignal && _cancellationSignal();
 }
 

QiniuSDKTests/QNResumeUploadTest.m

@@ -46,7 +46,7 @@ - (void)testCancel {
 	__block BOOL flag = NO;
 	QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler: ^(NSString *key, float percent) {
 	    flag = YES;
-	} params:nil checkCrc:NO cancellationSignal: ^BOOL () {
+	} params:@{ @"x:七牛":@"objc" } checkCrc:NO cancellationSignal: ^BOOL () {
 	    return flag;
 	}];
 	[_upManager putFile:tempFile.path key:keyUp token:g_token complete: ^(QNResponseInfo *i, NSString *k, NSDictionary *resp) {