Merge pull request #45 from longbai/fast_cancel

fast_cancel

Author: longbai

QiniuSDK.xcodeproj/project.pbxproj

@@ -203,7 +203,6 @@
 		DFA9B65619E0B53700A15FD1 /* QNFileRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNFileRecorder.h; sourceTree = "<group>"; };
 		DFA9B65719E0B53700A15FD1 /* QNFileRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNFileRecorder.m; sourceTree = "<group>"; };
 		DFA9B65B19E0B58900A15FD1 /* QNRecorderDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNRecorderDelegate.h; sourceTree = "<group>"; };
-		DFA9B65D19E0EDF100A15FD1 /* QNUploadOption+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "QNUploadOption+Private.h"; sourceTree = "<group>"; };
 		DFA9B65E19E391A100A15FD1 /* QNTestConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNTestConfig.h; sourceTree = "<group>"; };
 		DFBC622419DE459800458C4B /* QNHttpTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNHttpTest.m; sourceTree = "<group>"; };
 		DFF5252F1A6235D100D02BA1 /* QNSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNSessionManager.h; sourceTree = "<group>"; };
@@ -360,7 +359,6 @@
 				DF293CAA19DC0E5300799011 /* QNResumeUpload.m */,
 				DFA9B64719E0018800A15FD1 /* QNUploadOption.h */,
 				DFA9B64819E0018800A15FD1 /* QNUploadOption.m */,
-				DFA9B65D19E0EDF100A15FD1 /* QNUploadOption+Private.h */,
 				DF609A031A58E39D00AC7297 /* QNFormUpload.h */,
 				DF609A041A58E39D00AC7297 /* QNFormUpload.m */,
 				DF482FD61B0DA8A2000DAD98 /* QNConfiguration.h */,

QiniuSDK/Http/QNDns.m

@@ -34,7 +34,7 @@
 			const char *p = inet_ntop(AF_INET, &(remoteAddr->sin_addr), buf, 32);
 			NSString *ip = [NSString stringWithUTF8String:p];
 			[ret addObject:ip];
-			NSLog(@"Resolved %u->%@", i, ip);
+//			NSLog(@"Resolved %u->%@", i, ip);
 		}
 	}
 	return ret;

QiniuSDK/Http/QNHttpManager.m

@@ -74,7 +74,8 @@ + (QNResponseInfo *)buildResponseInfo:(AFHTTPRequestOperation *)operation
 
 - (void)  sendRequest:(NSMutableURLRequest *)request
     withCompleteBlock:(QNCompleteBlock)completeBlock
-    withProgressBlock:(QNInternalProgressBlock)progressBlock {
+    withProgressBlock:(QNInternalProgressBlock)progressBlock
+      withCancelBlock:(QNCancelBlock)cancelBlock{
 	NSString *u = request.URL.absoluteString;
 	NSURL *url = request.URL;
 	__block NSString *ip = nil;
@@ -117,9 +118,21 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 	}
 	    ];
 
-	if (progressBlock) {
+	if (progressBlock || cancelBlock) {
+        __block AFHTTPRequestOperation *op = nil;
+        if (cancelBlock) {
+            op = operation;
+        }
 		[operation setUploadProgressBlock: ^(NSUInteger bytesWritten, long long totalBytesWritten, long long totalBytesExpectedToWrite) {
-		    progressBlock(totalBytesWritten, totalBytesExpectedToWrite);
+            if (progressBlock) {
+                progressBlock(totalBytesWritten, totalBytesExpectedToWrite);
+            }
+            if (cancelBlock) {
+                if (cancelBlock()) {
+                    [op cancel];
+                }
+                op = nil;
+            }
 		}];
 	}
 	[request setTimeoutInterval:_timeout];
@@ -148,7 +161,8 @@ - (void)multipartPost:(NSString *)url
 	                                                         error:nil];
 	[self sendRequest:request
 	    withCompleteBlock:completeBlock
-	    withProgressBlock:progressBlock];
+	    withProgressBlock:progressBlock
+     withCancelBlock:cancelBlock];
 }
 
 - (void)         post:(NSString *)url
@@ -171,7 +185,8 @@ - (void)         post:(NSString *)url
 	[request setHTTPBody:data];
 	[self sendRequest:request
 	    withCompleteBlock:completeBlock
-	    withProgressBlock:progressBlock];
+	    withProgressBlock:progressBlock
+     withCancelBlock:cancelBlock];
 }
 
 @end

QiniuSDK/Http/QNResponseInfo.m

@@ -169,7 +169,7 @@ - (NSString *)description {
 }
 
 - (BOOL)isCancelled {
-	return _statusCode == kQNRequestCancelled;
+	return _statusCode == kQNRequestCancelled || _statusCode == -999;
 }
 
 - (BOOL)isOK {

QiniuSDK/Http/QNSessionManager.m

@@ -21,6 +21,8 @@ @interface QNProgessDelegate : NSObject
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context;
 @property (nonatomic, strong) QNInternalProgressBlock progressBlock;
 @property (nonatomic, strong) NSProgress *progress;
+@property (nonatomic, strong) NSURLSessionUploadTask *task;
+@property (nonatomic, strong) QNCancelBlock cancelBlock;
 - (instancetype)initWithProgress:(QNInternalProgressBlock)progressBlock;
 @end
 
@@ -51,6 +53,9 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 	void *p = (__bridge void *)(self);
 	if (p == context) {
 		_progressBlock(progress.completedUnitCount, progress.totalUnitCount);
+        if (_cancelBlock && _cancelBlock()) {
+            [_task cancel];
+        }
 	}
 	else {
 		[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
@@ -126,7 +131,8 @@ + (QNResponseInfo *)buildResponseInfo:(NSHTTPURLResponse *)response
 
 - (void)  sendRequest:(NSMutableURLRequest *)request
     withCompleteBlock:(QNCompleteBlock)completeBlock
-    withProgressBlock:(QNInternalProgressBlock)progressBlock {
+    withProgressBlock:(QNInternalProgressBlock)progressBlock
+      withCancelBlock:(QNCancelBlock)cancelBlock{
 	__block NSDate *startTime = [NSDate date];
 	NSProgress *progress = nil;
 	__block NSString *host = request.URL.host;
@@ -188,6 +194,8 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 	if (progress != nil) {
 		[progress addObserver:delegate forKeyPath:@"fractionCompleted" options:NSKeyValueObservingOptionNew context:(__bridge void *)delegate];
 		delegate.progress = progress;
+        delegate.task = uploadTask;
+        delegate.cancelBlock = cancelBlock;
 	}
 
 	[request setTimeoutInterval:_timeout];
@@ -216,7 +224,8 @@ - (void)multipartPost:(NSString *)url
 	                                                         error:nil];
 	[self sendRequest:request
 	    withCompleteBlock:completeBlock
-	    withProgressBlock:progressBlock];
+	    withProgressBlock:progressBlock
+     withCancelBlock:cancelBlock];
 }
 
 - (void)         post:(NSString *)url
@@ -240,7 +249,8 @@ - (void)         post:(NSString *)url
 	QNAsyncRun( ^{
 		[self sendRequest:request
 		    withCompleteBlock:completeBlock
-		    withProgressBlock:progressBlock];
+		    withProgressBlock:progressBlock
+         withCancelBlock:cancelBlock];
 	});
 }
 

QiniuSDK/Storage/QNFormUpload.m

@@ -86,6 +86,10 @@ - (void)put {
 			_complete(info, _key, resp);
 			return;
 		}
+		if (_option.cancellationSignal()) {
+			_complete([QNResponseInfo cancel], _key, nil);
+			return;
+		}
 		NSString *nextHost = _config.upHost;
 		if (info.isConnectionBroken || info.needSwitchServer) {
 			nextHost = _config.upHostBackup;
@@ -105,7 +109,7 @@ - (void)put {
 		               withMimeType:_option.mimeType
 		          withCompleteBlock:retriedComplete
 		          withProgressBlock:p
-		            withCancelBlock:nil];
+		            withCancelBlock:_option.cancellationSignal];
 	};
 
 	[_httpManager multipartPost:[NSString stringWithFormat:@"http://%@:%u/", _config.upHost, (unsigned int)_config.upPort]
@@ -115,7 +119,7 @@ - (void)put {
 	               withMimeType:_option.mimeType
 	          withCompleteBlock:complete
 	          withProgressBlock:p
-	            withCancelBlock:nil];
+	            withCancelBlock:_option.cancellationSignal];
 }
 
 @end

QiniuSDK/Storage/QNResumeUpload.m

@@ -31,7 +31,6 @@ @interface QNResumeUpload ()
 @property (nonatomic, strong) QNUpToken *token;
 @property (nonatomic, strong) QNUpCompletionHandler complete;
 @property (nonatomic, strong) NSMutableArray *contexts;
-@property (nonatomic, readonly, getter = isCancelled) BOOL cancelled;
 
 @property int64_t modifyTime;
 @property (nonatomic, strong) id <QNRecorderDelegate> recorder;
@@ -172,7 +171,7 @@ - (UInt32)recoveryFromRecord {
 }
 
 - (void)nextTask:(UInt32)offset retriedTimes:(int)retried host:(NSString *)host {
-	if (self.isCancelled) {
+	if (self.option.cancellationSignal()) {
 		self.complete([QNResponseInfo cancel], self.key, nil);
 		return;
 	}
@@ -281,10 +280,6 @@ - (void)putChunk:(NSString *)uphost
 	[self post:url withData:data withCompleteBlock:complete withProgressBlock:progressBlock];
 }
 
-- (BOOL)isCancelled {
-	return self.option.priv_isCancelled;
-}
-
 - (void)makeFile:(NSString *)uphost
         complete:(QNCompleteBlock)complete {
 	NSString *mime = [[NSString alloc] initWithFormat:@"/mimeType/%@", [QNUrlSafeBase64 encodeString:self.option.mimeType]];
@@ -311,7 +306,7 @@ - (void)         post:(NSString *)url
              withData:(NSData *)data
     withCompleteBlock:(QNCompleteBlock)completeBlock
     withProgressBlock:(QNInternalProgressBlock)progressBlock {
-	[_httpManager post:url withData:data withParams:nil withHeaders:_headers withCompleteBlock:completeBlock withProgressBlock:progressBlock withCancelBlock:nil];
+	[_httpManager post:url withData:data withParams:nil withHeaders:_headers withCompleteBlock:completeBlock withProgressBlock:progressBlock withCancelBlock:_option.cancellationSignal];
 }
 
 - (void)run {

QiniuSDK/Storage/QNUploadOption.m

@@ -56,10 +56,6 @@ - (instancetype)initWithMime:(NSString *)mimeType
 	return self;
 }
 
-- (BOOL)priv_isCancelled {
-	return _cancellationSignal && _cancellationSignal();
-}
-
 + (instancetype)defaultOptions {
 	return [[QNUploadOption alloc] initWithMime:nil progressHandler:nil params:nil checkCrc:NO cancellationSignal:nil];
 }

QiniuSDKTests/QNFileRecorderTest.m

@@ -68,7 +68,7 @@ - (void)template:(int)size pos:(float)pos {
 	} option:opt];
 	AGWW_WAIT_WHILE(key == nil, 60 * 30);
 	NSLog(@"info %@", info);
-	XCTAssert(info.statusCode == kQNRequestCancelled, @"Pass");
+	XCTAssert(info.isCancelled, @"Pass");
 	XCTAssert([keyUp isEqualToString:key], @"Pass");
 
 	// continue