evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Experimental implementation of download progress block

Browse source 
Renaming progressBlock to uploadProgressBlock
This commit is contained in:
Mattt Thompson 2011-08-23 12:12:05 -05:00
parent 5349a1d4ff
commit 59a98bb937
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AFNetworking/AFHTTPRequestOperation.h
View file

@ -56,6 +56,7 @@ extern NSString * const AFHTTPOperationDidFinishNotification;
outputStream:(NSOutputStream *)outputStream outputStream:(NSOutputStream *)outputStream
completion:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error))completion; completion:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error))completion;
- (void)setProgressBlock:(void (^)(NSUInteger totalBytesWritten, NSUInteger totalBytesExpectedToWrite))block; - (void)setUploadProgressBlock:(void (^)(NSUInteger totalBytesWritten, NSUInteger totalBytesExpectedToWrite))block;
- (void)setDownloadProgressBlock:(void (^)(NSUInteger totalBytesRead, NSUInteger totalBytesExpectedToRead))block;
@end @end

29
AFNetworking/AFHTTPRequestOperation.m
View file

@ -33,7 +33,7 @@ typedef enum {
NSString * const AFHTTPOperationDidStartNotification = @"com.alamofire.http-operation.start"; NSString * const AFHTTPOperationDidStartNotification = @"com.alamofire.http-operation.start";
NSString * const AFHTTPOperationDidFinishNotification = @"com.alamofire.http-operation.finish"; NSString * const AFHTTPOperationDidFinishNotification = @"com.alamofire.http-operation.finish";
typedef void (^AFHTTPRequestOperationProgressBlock)(NSUInteger totalBytesWritten, NSUInteger totalBytesExpectedToWrite); typedef void (^AFHTTPRequestOperationProgressBlock)(NSUInteger totalBytes, NSUInteger totalBytesExpected);
typedef void (^AFHTTPRequestOperationCompletionBlock)(NSURLRequest *request, NSHTTPURLResponse *response, NSData *data, NSError *error); typedef void (^AFHTTPRequestOperationCompletionBlock)(NSURLRequest *request, NSHTTPURLResponse *response, NSData *data, NSError *error);
static inline NSString * AFKeyPathFromOperationState(AFHTTPOperationState state) { static inline NSString * AFKeyPathFromOperationState(AFHTTPOperationState state) {
@ -81,7 +81,8 @@ static inline BOOL AFHTTPOperationStateTransitionIsValid(AFHTTPOperationState fr
@property (nonatomic, assign) BOOL isCancelled; @property (nonatomic, assign) BOOL isCancelled;
@property (readwrite, nonatomic, retain) NSMutableData *dataAccumulator; @property (readwrite, nonatomic, retain) NSMutableData *dataAccumulator;
@property (readwrite, nonatomic, retain) NSOutputStream *outputStream; @property (readwrite, nonatomic, retain) NSOutputStream *outputStream;
@property (readwrite, nonatomic, copy) AFHTTPRequestOperationProgressBlock progress; @property (readwrite, nonatomic, copy) AFHTTPRequestOperationProgressBlock uploadProgress;
@property (readwrite, nonatomic, copy) AFHTTPRequestOperationProgressBlock downloadProgress;
@property (readwrite, nonatomic, copy) AFHTTPRequestOperationCompletionBlock completion; @property (readwrite, nonatomic, copy) AFHTTPRequestOperationCompletionBlock completion;
- (id)initWithRequest:(NSURLRequest *)urlRequest; - (id)initWithRequest:(NSURLRequest *)urlRequest;
@ -98,7 +99,8 @@ static inline BOOL AFHTTPOperationStateTransitionIsValid(AFHTTPOperationState fr
@synthesize responseBody = _responseBody; @synthesize responseBody = _responseBody;
@synthesize dataAccumulator = _dataAccumulator; @synthesize dataAccumulator = _dataAccumulator;
@synthesize outputStream = _outputStream; @synthesize outputStream = _outputStream;
@synthesize progress = _progress; @synthesize uploadProgress = _uploadProgress;
@synthesize downloadProgress = _downloadProgress;
@synthesize completion = _completion; @synthesize completion = _completion;
static NSThread *_networkRequestThread = nil; static NSThread *_networkRequestThread = nil;
@ -175,16 +177,21 @@ static NSThread *_networkRequestThread = nil;
[_connection release]; _connection = nil; [_connection release]; _connection = nil;
[_progress release]; [_uploadProgress release];
[_downloadProgress release];
[_completion release]; [_completion release];
[_progress release];
[super dealloc]; [super dealloc];
} }
- (void)setProgressBlock:(void (^)(NSUInteger totalBytesWritten, NSUInteger totalBytesExpectedToWrite))block { - (void)setUploadProgressBlock:(void (^)(NSUInteger totalBytesWritten, NSUInteger totalBytesExpectedToWrite))block {
self.progress = block; self.uploadProgress = block;
} }
- (void)setDownloadProgressBlock:(void (^)(NSUInteger totalBytesRead, NSUInteger totalBytesExpectedToRead))block {
self.downloadProgress = block;
}
- (void)setState:(AFHTTPOperationState)state { - (void)setState:(AFHTTPOperationState)state {
if (!AFHTTPOperationStateTransitionIsValid(self.state, state)) { if (!AFHTTPOperationStateTransitionIsValid(self.state, state)) {
return; return;
@ -301,6 +308,10 @@ didReceiveResponse:(NSURLResponse *)response
} }
} else { } else {
[self.dataAccumulator appendData:data]; [self.dataAccumulator appendData:data];
if (self.downloadProgress) {
self.downloadProgress([self.dataAccumulator length], self.response.expectedContentLength);
}
} }
} }
@ -332,8 +343,8 @@ didReceiveResponse:(NSURLResponse *)response
totalBytesWritten:(NSInteger)totalBytesWritten totalBytesWritten:(NSInteger)totalBytesWritten
totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite
{ {
if (self.progress) { if (self.uploadProgress) {
self.progress(totalBytesWritten, totalBytesExpectedToWrite); self.uploadProgress(totalBytesWritten, totalBytesExpectedToWrite);
} }
} }