add support for setting custom success/failure callback queues. Defaults to main queue if nothing set.
This commit is contained in:
parent
37559c792c
commit
feaf0814c4
6 changed files with 68 additions and 18 deletions
|
|
@ -31,6 +31,8 @@
|
||||||
NSIndexSet *_acceptableStatusCodes;
|
NSIndexSet *_acceptableStatusCodes;
|
||||||
NSSet *_acceptableContentTypes;
|
NSSet *_acceptableContentTypes;
|
||||||
NSError *_HTTPError;
|
NSError *_HTTPError;
|
||||||
|
dispatch_queue_t _successCallbackQueue;
|
||||||
|
dispatch_queue_t _failureCallbackQueue;
|
||||||
}
|
}
|
||||||
|
|
||||||
///----------------------------------------------
|
///----------------------------------------------
|
||||||
|
|
@ -71,6 +73,17 @@
|
||||||
*/
|
*/
|
||||||
@property (readonly) BOOL hasAcceptableContentType;
|
@property (readonly) BOOL hasAcceptableContentType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
The callback dispatch queue on success. If this is NULL (default), the main queue is used.
|
||||||
|
*/
|
||||||
|
@property (nonatomic) dispatch_queue_t successCallbackQueue;
|
||||||
|
|
||||||
|
/**
|
||||||
|
The callback dispatch queue on failure. If this is NULL (default), the main queue is used.
|
||||||
|
*/
|
||||||
|
@property (nonatomic) dispatch_queue_t failureCallbackQueue;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
A Boolean value determining whether or not the class can process the specified request. For example, `AFJSONRequestOperation` may check to make sure the content type was `application/json` or the URL path extension was `.json`.
|
A Boolean value determining whether or not the class can process the specified request. For example, `AFJSONRequestOperation` may check to make sure the content type was `application/json` or the URL path extension was `.json`.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,9 @@
|
||||||
@synthesize acceptableStatusCodes = _acceptableStatusCodes;
|
@synthesize acceptableStatusCodes = _acceptableStatusCodes;
|
||||||
@synthesize acceptableContentTypes = _acceptableContentTypes;
|
@synthesize acceptableContentTypes = _acceptableContentTypes;
|
||||||
@synthesize HTTPError = _HTTPError;
|
@synthesize HTTPError = _HTTPError;
|
||||||
|
@synthesize successCallbackQueue = _successCallbackQueue;
|
||||||
|
@synthesize failureCallbackQueue = _failureCallbackQueue;
|
||||||
|
|
||||||
|
|
||||||
- (id)initWithRequest:(NSURLRequest *)request {
|
- (id)initWithRequest:(NSURLRequest *)request {
|
||||||
self = [super initWithRequest:request];
|
self = [super initWithRequest:request];
|
||||||
|
|
@ -46,6 +49,8 @@
|
||||||
[_acceptableStatusCodes release];
|
[_acceptableStatusCodes release];
|
||||||
[_acceptableContentTypes release];
|
[_acceptableContentTypes release];
|
||||||
[_HTTPError release];
|
[_HTTPError release];
|
||||||
|
if (_successCallbackQueue) { dispatch_release(_successCallbackQueue), _successCallbackQueue=NULL;}
|
||||||
|
if (_failureCallbackQueue) { dispatch_release(_failureCallbackQueue), _failureCallbackQueue=NULL;}
|
||||||
[super dealloc];
|
[super dealloc];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -85,6 +90,34 @@
|
||||||
return !self.acceptableContentTypes || [self.acceptableContentTypes containsObject:[self.response MIMEType]];
|
return !self.acceptableContentTypes || [self.acceptableContentTypes containsObject:[self.response MIMEType]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)setSuccessCallbackQueue:(dispatch_queue_t)successCallbackQueue {
|
||||||
|
if (successCallbackQueue != _successCallbackQueue) {
|
||||||
|
|
||||||
|
if (_successCallbackQueue) {
|
||||||
|
dispatch_release(_successCallbackQueue);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (successCallbackQueue) {
|
||||||
|
dispatch_retain(successCallbackQueue);
|
||||||
|
_successCallbackQueue = successCallbackQueue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)setFailureCallbackQueue:(dispatch_queue_t)failureCallbackQueue {
|
||||||
|
if (failureCallbackQueue != _failureCallbackQueue) {
|
||||||
|
|
||||||
|
if (_failureCallbackQueue) {
|
||||||
|
dispatch_release(_failureCallbackQueue);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (failureCallbackQueue) {
|
||||||
|
dispatch_retain(failureCallbackQueue);
|
||||||
|
_failureCallbackQueue = failureCallbackQueue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
- (void)setCompletionBlockWithSuccess:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
|
- (void)setCompletionBlockWithSuccess:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
|
||||||
failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
|
failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
|
||||||
{
|
{
|
||||||
|
|
@ -95,13 +128,13 @@
|
||||||
|
|
||||||
if (self.error) {
|
if (self.error) {
|
||||||
if (failure) {
|
if (failure) {
|
||||||
dispatch_async(dispatch_get_main_queue(), ^(void) {
|
dispatch_async(self.failureCallbackQueue ? self.failureCallbackQueue : dispatch_get_main_queue(), ^{
|
||||||
failure(self, self.error);
|
failure(self, self.error);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (success) {
|
if (success) {
|
||||||
dispatch_async(dispatch_get_main_queue(), ^{
|
dispatch_async(self.successCallbackQueue ? self.successCallbackQueue : dispatch_get_main_queue(), ^{
|
||||||
success(self, self.responseData);
|
success(self, self.responseData);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -231,13 +231,13 @@ static dispatch_queue_t image_request_operation_processing_queue() {
|
||||||
dispatch_async(image_request_operation_processing_queue(), ^(void) {
|
dispatch_async(image_request_operation_processing_queue(), ^(void) {
|
||||||
if (self.error) {
|
if (self.error) {
|
||||||
if (failure) {
|
if (failure) {
|
||||||
dispatch_async(dispatch_get_main_queue(), ^(void) {
|
dispatch_async(self.failureCallbackQueue ? self.failureCallbackQueue : dispatch_get_main_queue(), ^{
|
||||||
failure(self, self.error);
|
failure(self, self.error);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (success) {
|
if (success) {
|
||||||
dispatch_async(dispatch_get_main_queue(), ^(void) {
|
dispatch_async(self.successCallbackQueue ? self.successCallbackQueue : dispatch_get_main_queue(), ^{
|
||||||
success(self, self.responseImage);
|
success(self, self.responseImage);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -125,7 +125,7 @@ static dispatch_queue_t json_request_operation_processing_queue() {
|
||||||
|
|
||||||
if (self.error) {
|
if (self.error) {
|
||||||
if (failure) {
|
if (failure) {
|
||||||
dispatch_async(dispatch_get_main_queue(), ^(void) {
|
dispatch_async(self.failureCallbackQueue ? self.failureCallbackQueue : dispatch_get_main_queue(), ^{
|
||||||
failure(self, self.error);
|
failure(self, self.error);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -133,17 +133,19 @@ static dispatch_queue_t json_request_operation_processing_queue() {
|
||||||
dispatch_async(json_request_operation_processing_queue(), ^(void) {
|
dispatch_async(json_request_operation_processing_queue(), ^(void) {
|
||||||
id JSON = self.responseJSON;
|
id JSON = self.responseJSON;
|
||||||
|
|
||||||
dispatch_async(dispatch_get_main_queue(), ^(void) {
|
if (self.JSONError) {
|
||||||
if (self.JSONError) {
|
if (failure) {
|
||||||
if (failure) {
|
dispatch_async(self.failureCallbackQueue ? self.failureCallbackQueue : dispatch_get_main_queue(), ^{
|
||||||
failure(self, self.JSONError);
|
failure(self, self.JSONError);
|
||||||
}
|
});
|
||||||
} else {
|
|
||||||
if (success) {
|
|
||||||
success(self, JSON);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
} else {
|
||||||
|
if (success) {
|
||||||
|
dispatch_async(self.successCallbackQueue ? self.successCallbackQueue : dispatch_get_main_queue(), ^{
|
||||||
|
success(self, JSON);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -125,7 +125,7 @@ static dispatch_queue_t property_list_request_operation_processing_queue() {
|
||||||
|
|
||||||
if (self.error) {
|
if (self.error) {
|
||||||
if (failure) {
|
if (failure) {
|
||||||
dispatch_async(dispatch_get_main_queue(), ^(void) {
|
dispatch_async(self.failureCallbackQueue ? self.failureCallbackQueue : dispatch_get_main_queue(), ^{
|
||||||
failure(self, self.error);
|
failure(self, self.error);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -133,7 +133,7 @@ static dispatch_queue_t property_list_request_operation_processing_queue() {
|
||||||
dispatch_async(property_list_request_operation_processing_queue(), ^(void) {
|
dispatch_async(property_list_request_operation_processing_queue(), ^(void) {
|
||||||
id propertyList = self.responsePropertyList;
|
id propertyList = self.responsePropertyList;
|
||||||
|
|
||||||
dispatch_async(dispatch_get_main_queue(), ^(void) {
|
dispatch_async(self.successCallbackQueue ? self.successCallbackQueue : dispatch_get_main_queue(), ^{
|
||||||
if (self.propertyListError) {
|
if (self.propertyListError) {
|
||||||
if (failure) {
|
if (failure) {
|
||||||
failure(self, self.propertyListError);
|
failure(self, self.propertyListError);
|
||||||
|
|
|
||||||
|
|
@ -188,13 +188,15 @@ static dispatch_queue_t xml_request_operation_processing_queue() {
|
||||||
|
|
||||||
if (self.error) {
|
if (self.error) {
|
||||||
if (failure) {
|
if (failure) {
|
||||||
dispatch_async(dispatch_get_main_queue(), ^(void) {
|
dispatch_async(self.failureCallbackQueue ? self.failureCallbackQueue : dispatch_get_main_queue(), ^{
|
||||||
failure(self, self.error);
|
failure(self, self.error);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (success) {
|
if (success) {
|
||||||
success(self, self.responseXMLParser);
|
dispatch_async(self.successCallbackQueue ? self.successCallbackQueue : dispatch_get_main_queue(), ^{
|
||||||
|
success(self, self.responseXMLParser);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue