Minor refactoring and reformatting
This commit is contained in:
parent
7147ef61bb
commit
45880fd9a0
1 changed files with 10 additions and 18 deletions
|
|
@ -37,32 +37,24 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
NSSet * AFContentTypesFromHTTPHeader(NSString *string) {
|
NSSet * AFContentTypesFromHTTPHeader(NSString *string) {
|
||||||
static NSCharacterSet *_trimCharacterSet = nil;
|
|
||||||
static dispatch_once_t onceToken;
|
|
||||||
dispatch_once(&onceToken, ^{
|
|
||||||
_trimCharacterSet = [NSCharacterSet whitespaceAndNewlineCharacterSet];
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!string) {
|
if (!string) {
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
NSArray *mediaRanges = [string componentsSeparatedByString:@","];
|
NSArray *mediaRanges = [string componentsSeparatedByString:@","];
|
||||||
|
|
||||||
NSMutableSet *mutableContentTypes = [NSMutableSet setWithCapacity:mediaRanges.count];
|
NSMutableSet *mutableContentTypes = [NSMutableSet setWithCapacity:mediaRanges.count];
|
||||||
|
|
||||||
[mediaRanges enumerateObjectsUsingBlock:^(NSString *mediaRange, NSUInteger idx, BOOL *stop) {
|
[mediaRanges enumerateObjectsUsingBlock:^(NSString *mediaRange, NSUInteger idx, BOOL *stop) {
|
||||||
|
NSRange parametersRange = [mediaRange rangeOfString:@";"];
|
||||||
|
if (parametersRange.location != NSNotFound) {
|
||||||
|
mediaRange = [mediaRange substringToIndex:parametersRange.location];
|
||||||
|
}
|
||||||
|
|
||||||
NSRange startOfParameters = [mediaRange rangeOfString:@";"];
|
mediaRange = [mediaRange stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
|
||||||
if (startOfParameters.location != NSNotFound) {
|
|
||||||
mediaRange = [mediaRange substringToIndex:startOfParameters.location];
|
|
||||||
}
|
|
||||||
|
|
||||||
mediaRange = [mediaRange stringByTrimmingCharactersInSet:_trimCharacterSet];
|
|
||||||
|
|
||||||
if (mediaRange.length > 0)
|
|
||||||
[mutableContentTypes addObject:mediaRange];
|
|
||||||
|
|
||||||
|
if (mediaRange.length > 0) {
|
||||||
|
[mutableContentTypes addObject:mediaRange];
|
||||||
|
}
|
||||||
}];
|
}];
|
||||||
|
|
||||||
return [NSSet setWithSet:mutableContentTypes];
|
return [NSSet setWithSet:mutableContentTypes];
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue