TouchInstinct
/
vk-ios-sdk
316
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #157

This commit is contained in:
Roman Truba 2014-12-25 12:58:46 +03:00
parent 0f8625c9f5
commit a992a451fa
2 changed files with 34 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
sdk/Source/VKRequest.m
View File

@ -87,13 +87,8 @@ static NSOperationQueue * requestsProcessingQueue;
@implementation VKRequest
@synthesize preferredLang = _preferredLang;
+ (NSOperationQueue*) processingQueue {
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
requestsProcessingQueue = [NSOperationQueue new];
requestsProcessingQueue.maxConcurrentOperationCount = 3;
});
return requestsProcessingQueue;
+ (dispatch_queue_t) processingQueue {
return dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0);
}
#pragma mark Init
@ -221,45 +216,37 @@ static NSOperationQueue * requestsProcessingQueue;
}
[operation setCompletionBlockWithSuccess: ^(VKHTTPOperation *operation, id JSON) {
[[VKRequest processingQueue] addOperation:[NSBlockOperation blockOperationWithBlock:^{
[_requestTiming loaded];
if ([JSON objectForKey:@"error"]) {
VKError *error = [VKError errorWithJson:[JSON objectForKey:@"error"]];
if ([self processCommonError:error]) return;
[self provideError:[NSError errorWithVkError:error]];
return;
}
[self provideResponse:JSON];
}]];
[_requestTiming loaded];
if ([JSON objectForKey:@"error"]) {
VKError *error = [VKError errorWithJson:[JSON objectForKey:@"error"]];
if ([self processCommonError:error]) return;
[self provideError:[NSError errorWithVkError:error]];
return;
}
[self provideResponse:JSON responseString:operation.responseString];
} failure: ^(VKHTTPOperation *operation, NSError *error) {
[[VKRequest processingQueue] addOperation:[NSBlockOperation blockOperationWithBlock:^{
[_requestTiming loaded];
if (operation.response.statusCode == 200) {
[self provideResponse:operation.responseJson];
return;
}
if (self.attempts == 0 || ++self.attemptsUsed < self.attempts) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(300 * NSEC_PER_MSEC)), self.responseQueue,
^(void) {
[self start];
});
return;
}
VKError *vkErr = [VKError errorWithCode:operation.response.statusCode];
[self provideError:[error copyWithVkError:vkErr]];
[_requestTiming finished];
}]];
[_requestTiming loaded];
if (operation.response.statusCode == 200) {
[self provideResponse:operation.responseJson responseString:operation.responseString];
return;
}
if (self.attempts == 0 || ++self.attemptsUsed < self.attempts) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(300 * NSEC_PER_MSEC)), self.responseQueue,
^(void) {
[self start];
});
return;
}
VKError *vkErr = [VKError errorWithCode:operation.response.statusCode];
[self provideError:[error copyWithVkError:vkErr]];
[_requestTiming finished];
}];
[self setOperation:operation responseQueue:self.responseQueue];
operation.successCallbackQueue = operation.failureCallbackQueue = [VKRequest processingQueue];
[self setupProgress:operation];
return operation;
}
- (void)setOperation:(VKHTTPOperation*) operation responseQueue:(dispatch_queue_t)responseQueue {
[operation setSuccessCallbackQueue:responseQueue];
[operation setFailureCallbackQueue:responseQueue];
}
- (void)start {
_executionOperation = self.executionOperation;
if (_executionOperation == nil)
@ -271,7 +258,8 @@ static NSOperationQueue * requestsProcessingQueue;
if (!self.waitUntilDone) {
[[VKHTTPClient getClient] enqueueOperation:_executionOperation];
} else {
[self setOperation:(VKHTTPOperation*)_executionOperation responseQueue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0)];
VKHTTPOperation *op = (VKHTTPOperation*)_executionOperation;
op.successCallbackQueue = op.failureCallbackQueue = [VKRequest processingQueue];
_waitUntilDoneSemaphore = dispatch_semaphore_create(0);
[[VKHTTPClient getClient] enqueueOperation:_executionOperation];
dispatch_semaphore_wait(_waitUntilDoneSemaphore, DISPATCH_TIME_FOREVER);
@ -282,9 +270,10 @@ static NSOperationQueue * requestsProcessingQueue;
if (notification.object == _executionOperation)
[self.requestTiming started];
}
- (void)provideResponse:(id)JSON {
- (void)provideResponse:(id)JSON responseString:(NSString*)response {
VKResponse *vkResp = [VKResponse new];
vkResp.request = self;
vkResp.responseString = response;
vkResp.request = self;
if (JSON[@"response"]) {
vkResp.json = JSON[@"response"];

2
sdk/Source/VKResponse.h
View File

@ -33,6 +33,8 @@
@property (nonatomic, weak) VKRequest *request;
/// Json content of response. Can be array or object.
@property (nonatomic, strong) id json;
/// Original response string from server
@property (nonatomic, strong) id responseString;
/// Model parsed from response
@property (nonatomic, strong) id parsedModel;