Skip to content

Commit 718f6f2

Browse files
committed
[ci skip]format
1 parent 0f0bd08 commit 718f6f2

20 files changed

+205
-208
lines changed

QiniuSDK/Http/QNHttpManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
@interface QNHttpManager : NSObject <QNHttpDelegate>
1313

14-
- (instancetype)initWithTimeout:(UInt32) timeout;
14+
- (instancetype)initWithTimeout:(UInt32)timeout;
1515

1616
- (void)multipartPost:(NSString *)url
1717
withData:(NSData *)data

QiniuSDK/Http/QNHttpManager.m

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,20 @@ @interface QNHttpManager ()
2020

2121
@implementation QNHttpManager
2222

23-
- (instancetype)initWithTimeout:(UInt32) timeout {
23+
- (instancetype)initWithTimeout:(UInt32)timeout {
2424
if (self = [super init]) {
2525
_httpManager = [[AFHTTPRequestOperationManager alloc] init];
2626
_httpManager.responseSerializer = [AFJSONResponseSerializer serializer];
27-
_timeout = timeout;
27+
_timeout = timeout;
2828
}
2929

3030
return self;
3131
}
3232

3333
- (instancetype)init {
34-
return [self initWithTimeout:60];
34+
return [self initWithTimeout:60];
3535
}
3636

37-
3837
+ (QNResponseInfo *)buildResponseInfo:(AFHTTPRequestOperation *)operation
3938
withError:(NSError *)error
4039
withDuration:(double)duration

QiniuSDK/Http/QNResponseInfo.m

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,52 +15,52 @@
1515
const int kQNNetworkError = -1;
1616

1717
/**
18-
https://developer.apple.com/library/ios/documentation/Cocoa/Reference/Foundation/Miscellaneous/Foundation_Constants/index.html#//apple_ref/doc/constant_group/URL_Loading_System_Error_Codes
19-
20-
NSURLErrorUnknown = -1,
21-
NSURLErrorCancelled = -999,
22-
NSURLErrorBadURL = -1000,
23-
NSURLErrorTimedOut = -1001,
24-
NSURLErrorUnsupportedURL = -1002,
25-
NSURLErrorCannotFindHost = -1003,
26-
NSURLErrorCannotConnectToHost = -1004,
27-
NSURLErrorDataLengthExceedsMaximum = -1103,
28-
NSURLErrorNetworkConnectionLost = -1005,
29-
NSURLErrorDNSLookupFailed = -1006,
30-
NSURLErrorHTTPTooManyRedirects = -1007,
31-
NSURLErrorResourceUnavailable = -1008,
32-
NSURLErrorNotConnectedToInternet = -1009,
33-
NSURLErrorRedirectToNonExistentLocation = -1010,
34-
NSURLErrorBadServerResponse = -1011,
35-
NSURLErrorUserCancelledAuthentication = -1012,
36-
NSURLErrorUserAuthenticationRequired = -1013,
37-
NSURLErrorZeroByteResource = -1014,
38-
NSURLErrorCannotDecodeRawData = -1015,
39-
NSURLErrorCannotDecodeContentData = -1016,
40-
NSURLErrorCannotParseResponse = -1017,
41-
NSURLErrorInternationalRoamingOff = -1018,
42-
NSURLErrorCallIsActive = -1019,
43-
NSURLErrorDataNotAllowed = -1020,
44-
NSURLErrorRequestBodyStreamExhausted = -1021,
45-
NSURLErrorFileDoesNotExist = -1100,
46-
NSURLErrorFileIsDirectory = -1101,
47-
NSURLErrorNoPermissionsToReadFile = -1102,
48-
NSURLErrorSecureConnectionFailed = -1200,
49-
NSURLErrorServerCertificateHasBadDate = -1201,
50-
NSURLErrorServerCertificateUntrusted = -1202,
51-
NSURLErrorServerCertificateHasUnknownRoot = -1203,
52-
NSURLErrorServerCertificateNotYetValid = -1204,
53-
NSURLErrorClientCertificateRejected = -1205,
54-
NSURLErrorClientCertificateRequired = -1206,
55-
NSURLErrorCannotLoadFromNetwork = -2000,
56-
NSURLErrorCannotCreateFile = -3000,
57-
NSURLErrorCannotOpenFile = -3001,
58-
NSURLErrorCannotCloseFile = -3002,
59-
NSURLErrorCannotWriteToFile = -3003,
60-
NSURLErrorCannotRemoveFile = -3004,
61-
NSURLErrorCannotMoveFile = -3005,
62-
NSURLErrorDownloadDecodingFailedMidStream = -3006,
63-
NSURLErrorDownloadDecodingFailedToComplete = -3007
18+
https://developer.apple.com/library/ios/documentation/Cocoa/Reference/Foundation/Miscellaneous/Foundation_Constants/index.html#//apple_ref/doc/constant_group/URL_Loading_System_Error_Codes
19+
20+
NSURLErrorUnknown = -1,
21+
NSURLErrorCancelled = -999,
22+
NSURLErrorBadURL = -1000,
23+
NSURLErrorTimedOut = -1001,
24+
NSURLErrorUnsupportedURL = -1002,
25+
NSURLErrorCannotFindHost = -1003,
26+
NSURLErrorCannotConnectToHost = -1004,
27+
NSURLErrorDataLengthExceedsMaximum = -1103,
28+
NSURLErrorNetworkConnectionLost = -1005,
29+
NSURLErrorDNSLookupFailed = -1006,
30+
NSURLErrorHTTPTooManyRedirects = -1007,
31+
NSURLErrorResourceUnavailable = -1008,
32+
NSURLErrorNotConnectedToInternet = -1009,
33+
NSURLErrorRedirectToNonExistentLocation = -1010,
34+
NSURLErrorBadServerResponse = -1011,
35+
NSURLErrorUserCancelledAuthentication = -1012,
36+
NSURLErrorUserAuthenticationRequired = -1013,
37+
NSURLErrorZeroByteResource = -1014,
38+
NSURLErrorCannotDecodeRawData = -1015,
39+
NSURLErrorCannotDecodeContentData = -1016,
40+
NSURLErrorCannotParseResponse = -1017,
41+
NSURLErrorInternationalRoamingOff = -1018,
42+
NSURLErrorCallIsActive = -1019,
43+
NSURLErrorDataNotAllowed = -1020,
44+
NSURLErrorRequestBodyStreamExhausted = -1021,
45+
NSURLErrorFileDoesNotExist = -1100,
46+
NSURLErrorFileIsDirectory = -1101,
47+
NSURLErrorNoPermissionsToReadFile = -1102,
48+
NSURLErrorSecureConnectionFailed = -1200,
49+
NSURLErrorServerCertificateHasBadDate = -1201,
50+
NSURLErrorServerCertificateUntrusted = -1202,
51+
NSURLErrorServerCertificateHasUnknownRoot = -1203,
52+
NSURLErrorServerCertificateNotYetValid = -1204,
53+
NSURLErrorClientCertificateRejected = -1205,
54+
NSURLErrorClientCertificateRequired = -1206,
55+
NSURLErrorCannotLoadFromNetwork = -2000,
56+
NSURLErrorCannotCreateFile = -3000,
57+
NSURLErrorCannotOpenFile = -3001,
58+
NSURLErrorCannotCloseFile = -3002,
59+
NSURLErrorCannotWriteToFile = -3003,
60+
NSURLErrorCannotRemoveFile = -3004,
61+
NSURLErrorCannotMoveFile = -3005,
62+
NSURLErrorDownloadDecodingFailedMidStream = -3006,
63+
NSURLErrorDownloadDecodingFailedToComplete = -3007
6464
*/
6565

6666
static QNResponseInfo *cancelledInfo = nil;

QiniuSDK/Http/QNSessionManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@interface QNSessionManager : NSObject <QNHttpDelegate>
77

88
- (instancetype)initWithProxy:(NSDictionary *)proxyDict
9-
timeout:(UInt32)timeout;
9+
timeout:(UInt32)timeout;
1010

1111
- (void)multipartPost:(NSString *)url
1212
withData:(NSData *)data

QiniuSDK/Http/QNSessionManager.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,22 @@ + (void)initialize {
6565
}
6666

6767
- (instancetype)initWithProxy:(NSDictionary *)proxyDict
68-
timeout:(UInt32)timeout{
68+
timeout:(UInt32)timeout {
6969
if (self = [super init]) {
7070
NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
7171
if (proxyDict != nil) {
7272
configuration.connectionProxyDictionary = proxyDict;
7373
}
7474
_httpManager = [[AFHTTPSessionManager alloc] initWithSessionConfiguration:configuration];
7575
_httpManager.responseSerializer = [AFHTTPResponseSerializer serializer];
76-
_timeout = timeout;
76+
_timeout = timeout;
7777
}
7878

7979
return self;
8080
}
8181

8282
- (instancetype)init {
83-
return [self initWithProxy:nil timeout:60];
83+
return [self initWithProxy:nil timeout:60];
8484
}
8585

8686
+ (QNResponseInfo *)buildResponseInfo:(NSHTTPURLResponse *)response

QiniuSDK/Storage/QNConfiguration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ typedef void (^QNConfigurationBuilderBlock)(QNConfigurationBuilder *builder);
7171
@property (nonatomic, strong, readonly) NSDictionary *proxy;
7272

7373

74-
+(instancetype) build:(QNConfigurationBuilderBlock)block;
74+
+ (instancetype)build:(QNConfigurationBuilderBlock)block;
7575

7676
@end
7777

QiniuSDK/Storage/QNConfiguration.m

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,38 @@
1212

1313
@implementation QNConfiguration
1414

15-
+(instancetype) build:(QNConfigurationBuilderBlock)block{
16-
QNConfigurationBuilder *builder = [[QNConfigurationBuilder alloc] init];
17-
block(builder);
18-
return [[QNConfiguration alloc] initWithBuilder:builder];
15+
+ (instancetype)build:(QNConfigurationBuilderBlock)block {
16+
QNConfigurationBuilder *builder = [[QNConfigurationBuilder alloc] init];
17+
block(builder);
18+
return [[QNConfiguration alloc] initWithBuilder:builder];
1919
}
2020

21-
-(instancetype) initWithBuilder:(QNConfigurationBuilder *)builder{
22-
if (self = [super init]) {
23-
_upHost = builder.zone.upHost;
24-
_upHostBackup = builder.zone.upHostBackup;
25-
_upIp = builder.zone.upIp;
26-
_chunkSize = builder.chunkSize;
27-
_putThreshold = builder.putThreshold;
28-
_retryMax = builder.retryMax;
29-
_timeoutInterval = builder.timeoutInterval;
30-
}
31-
return self;
21+
- (instancetype)initWithBuilder:(QNConfigurationBuilder *)builder {
22+
if (self = [super init]) {
23+
_upHost = builder.zone.upHost;
24+
_upHostBackup = builder.zone.upHostBackup;
25+
_upIp = builder.zone.upIp;
26+
_chunkSize = builder.chunkSize;
27+
_putThreshold = builder.putThreshold;
28+
_retryMax = builder.retryMax;
29+
_timeoutInterval = builder.timeoutInterval;
30+
}
31+
return self;
3232
}
3333

3434
@end
3535

3636
@implementation QNConfigurationBuilder
3737

38-
-(instancetype) init{
39-
if (self = [super init]) {
40-
_zone = [QNZone zone0];
41-
_chunkSize = 256 *1024;
42-
_putThreshold = 512 *1024;
43-
_retryMax = 5;
44-
_timeoutInterval = 60;
45-
}
46-
return self;
38+
- (instancetype)init {
39+
if (self = [super init]) {
40+
_zone = [QNZone zone0];
41+
_chunkSize = 256 * 1024;
42+
_putThreshold = 512 * 1024;
43+
_retryMax = 5;
44+
_timeoutInterval = 60;
45+
}
46+
return self;
4747
}
4848

4949
@end
@@ -53,33 +53,31 @@ @implementation QNZone
5353
- (instancetype)initWithUpHost:(NSString *)upHost
5454
upHostBackup:(NSString *)upHostBackup
5555
upIp:(NSString *)upIp {
56-
if (self = [super init]) {
57-
_upHost = upHost;
58-
_upHostBackup = upHostBackup;
59-
_upIp = upIp;
60-
}
61-
62-
return self;
56+
if (self = [super init]) {
57+
_upHost = upHost;
58+
_upHostBackup = upHostBackup;
59+
_upIp = upIp;
60+
}
61+
62+
return self;
6363
}
6464

6565
+ (instancetype)zone0 {
66-
static QNZone *z0 = nil;
67-
static dispatch_once_t onceToken;
68-
dispatch_once(&onceToken, ^{
69-
z0 = [[QNZone alloc] initWithUpHost:@"upload.qiniu.com" upHostBackup:@"up.qiniu.com" upIp:@"183.136.139.10"];
70-
});
71-
return z0;
66+
static QNZone *z0 = nil;
67+
static dispatch_once_t onceToken;
68+
dispatch_once(&onceToken, ^{
69+
z0 = [[QNZone alloc] initWithUpHost:@"upload.qiniu.com" upHostBackup:@"up.qiniu.com" upIp:@"183.136.139.10"];
70+
});
71+
return z0;
7272
}
7373

7474
+ (instancetype)zone1 {
75-
static QNZone *z1 = nil;
76-
static dispatch_once_t onceToken;
77-
dispatch_once(&onceToken, ^{
78-
z1 = [[self alloc] initWithUpHost:@"upload-z1.qiniu.com" upHostBackup:@"up-z1.qiniu.com" upIp:@"106.38.227.28"];
79-
});
80-
return z1;
75+
static QNZone *z1 = nil;
76+
static dispatch_once_t onceToken;
77+
dispatch_once(&onceToken, ^{
78+
z1 = [[self alloc] initWithUpHost:@"upload-z1.qiniu.com" upHostBackup:@"up-z1.qiniu.com" upIp:@"106.38.227.28"];
79+
});
80+
return z1;
8181
}
8282

83-
84-
8583
@end

QiniuSDK/Storage/QNFormUpload.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
withCompletionHandler:(QNUpCompletionHandler)block
2020
withOption:(QNUploadOption *)option
2121
withHttpManager:(id <QNHttpDelegate> )http
22-
withConfiguration:(QNConfiguration*) config;
22+
withConfiguration:(QNConfiguration *)config;
2323

2424
- (void)put;
2525

QiniuSDK/Storage/QNFormUpload.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ @interface QNFormUpload ()
2525
@property (nonatomic, strong) NSString *token;
2626
@property (nonatomic, strong) QNUploadOption *option;
2727
@property (nonatomic, strong) QNUpCompletionHandler complete;
28-
@property (nonatomic, strong) QNConfiguration* config;
28+
@property (nonatomic, strong) QNConfiguration *config;
2929

3030
@end
3131

@@ -37,15 +37,15 @@ - (instancetype)initWithData:(NSData *)data
3737
withCompletionHandler:(QNUpCompletionHandler)block
3838
withOption:(QNUploadOption *)option
3939
withHttpManager:(id <QNHttpDelegate> )http
40-
withConfiguration:(QNConfiguration*) config{
40+
withConfiguration:(QNConfiguration *)config {
4141
if (self = [super init]) {
4242
_data = data;
4343
_key = key;
4444
_token = token;
4545
_option = option != nil ? option : [QNUploadOption defaultOptions];
4646
_complete = block;
4747
_httpManager = http;
48-
_config = config;
48+
_config = config;
4949
}
5050
return self;
5151
}

QiniuSDK/Storage/QNResumeUpload.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
withRecorder:(id <QNRecorderDelegate> )recorder
2424
withRecorderKey:(NSString *)recorderKey
2525
withHttpManager:(id <QNHttpDelegate> )http
26-
withConfiguration:(QNConfiguration*)config;
26+
withConfiguration:(QNConfiguration *)config;
2727

2828
- (void)run;
2929

0 commit comments

Comments
 (0)