Skip to content

Commit aa430a5

Browse files
committed
Refactor: use runloop instead of NSOperationQueue.
1 parent 94e5479 commit aa430a5

File tree

8 files changed

+164
-244
lines changed

8 files changed

+164
-244
lines changed

STNetTaskQueue/STHTTPNetTaskQueueHandler.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ - (instancetype)initWithBaseURL:(NSURL *)baseURL configuration:(NSURLSessionConf
8484
return self;
8585
}
8686

87-
- (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue task:(STNetTask *)task taskId:(int)taskId
87+
- (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue handleTask:(STNetTask *)task
8888
{
8989
NSAssert([task isKindOfClass:[STHTTPNetTask class]], @"Net task should be subclass of STHTTPNetTask");
9090

@@ -151,10 +151,10 @@ - (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue task:(STNetTask *)task taskI
151151
}
152152

153153
if (error) {
154-
[netTaskQueue didFailWithError:error taskId:taskId];
154+
[netTaskQueue task:task didFailWithError:error];
155155
}
156156
else {
157-
[netTaskQueue didResponse:responseObj taskId:taskId];
157+
[netTaskQueue task:task didResponse:responseObj];
158158
}
159159
}
160160
else {
@@ -165,7 +165,7 @@ - (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue task:(STNetTask *)task taskI
165165
STHTTPNetTaskErrorResponseDataUserInfoKey: data }];
166166
[STNetTaskQueueLog log:@"HTTP error with url: %@\nMethod: %@\nPayload: %@", httpResponse.URL.absoluteString, _methodMap[@(httpTask.method)], parameters];
167167
}
168-
[netTaskQueue didFailWithError:error taskId:taskId];
168+
[netTaskQueue task:task didFailWithError:error];
169169
}
170170
};
171171

STNetTaskQueue/STNetTask.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ FOUNDATION_EXPORT NSString *const STNetTaskUnknownError;
3131

3232
@interface STNetTask : NSObject
3333

34-
@property (nonatomic, strong) NSError *error;
35-
@property (nonatomic, assign) BOOL pending;
36-
@property (nonatomic, assign) BOOL finished;
37-
@property (nonatomic, assign) NSUInteger retryCount;
34+
@property (atomic, strong) NSError *error;
35+
@property (atomic, assign) BOOL pending;
36+
@property (atomic, assign) BOOL finished;
37+
@property (atomic, assign) NSUInteger retryCount;
3838

3939
- (NSString *)uri;
4040
- (void)didResponse:(id)response;

STNetTaskQueue/STNetTaskQueue.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@protocol STNetTaskQueueHandler <NSObject>
1515

16-
- (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue task:(STNetTask *)task taskId:(int)taskId;
16+
- (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue handleTask:(STNetTask *)task;
1717

1818
@end
1919

@@ -32,8 +32,8 @@
3232
- (void)cancelTask:(STNetTask *)task;
3333

3434
// Only used in "STNetTaskQueueHandler".
35-
- (void)didResponse:(id)response taskId:(int)taskId;
36-
- (void)didFailWithError:(NSError *)error taskId:(int)taskId;
35+
- (void)task:(STNetTask *)task didResponse:(id)response;
36+
- (void)task:(STNetTask *)task didFailWithError:(NSError *)error;
3737

3838
// Add a task delegate to "STNetTaskQueue",
3939
// it's a weak reference and adding duplicated delegate with same uri will be ignored.

0 commit comments

Comments
 (0)