evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-indenting and fixing method signature spacing

Browse source
This commit is contained in:
Mattt Thompson 2012-08-23 10:16:43 -07:00
parent 2dc837c26c
commit 1c85deee36
1 changed files with 323 additions and 325 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
AFNetworking/AFHTTPClient.m
View file

@ -58,11 +58,11 @@ NSString * const AFNetworkingReachabilityDidChangeNotification = @"com.alamofire
@interface AFMultipartBodyStream : NSInputStream <NSStreamDelegate> @interface AFMultipartBodyStream : NSInputStream <NSStreamDelegate>
-(id)initWithStringEncoding:(NSStringEncoding)encoding; - (id)initWithStringEncoding:(NSStringEncoding)encoding;
-(BOOL)addFileFromURL:(NSURL *)fileURL name:(NSString *)name error:(NSError **)error; - (BOOL)addFileFromURL:(NSURL *)fileURL name:(NSString *)name error:(NSError **)error;
-(void)addFormData:(NSData *)data name:(NSString *)name; - (void)addFormData:(NSData *)data name:(NSString *)name;
-(BOOL)empty; - (BOOL)empty;
-(NSUInteger)contentLength; - (NSUInteger)contentLength;
@end @end
@ -506,7 +506,7 @@ static void AFNetworkReachabilityReleaseCallback(const void *info) {
__block AFStreamingMultipartFormData * formData = [[[AFStreamingMultipartFormData alloc] initWithURLRequest:request stringEncoding:self.stringEncoding] autorelease]; __block AFStreamingMultipartFormData * formData = [[[AFStreamingMultipartFormData alloc] initWithURLRequest:request stringEncoding:self.stringEncoding] autorelease];
// __block AFMultipartFormData *formData = [[[AFMultipartFormData alloc] initWithURLRequest:request stringEncoding:self.stringEncoding] autorelease]; // __block AFMultipartFormData *formData = [[[AFMultipartFormData alloc] initWithURLRequest:request stringEncoding:self.stringEncoding] autorelease];
for (AFQueryStringComponent *component in AFQueryStringComponentsFromKeyAndValue(nil, parameters)) { for (AFQueryStringComponent *component in AFQueryStringComponentsFromKeyAndValue(nil, parameters)) {
NSData *data = nil; NSData *data = nil;
@ -791,11 +791,11 @@ static inline NSString * AFMultipartFormFinalBoundary() {
[super dealloc]; [super dealloc];
} }
-(void)appendPartWithFormData:(NSData *)data name:(NSString *)name { - (void)appendPartWithFormData:(NSData *)data name:(NSString *)name {
[bodyStream addFormData:data name:name]; [bodyStream addFormData:data name:name];
} }
-(BOOL)appendPartWithFileURL:(NSURL *)fileURL name:(NSString *)name error:(NSError **)error { - (BOOL)appendPartWithFileURL:(NSURL *)fileURL name:(NSString *)name error:(NSError **)error {
return [bodyStream addFileFromURL:fileURL name:name error:error]; return [bodyStream addFileFromURL:fileURL name:name error:error];
} }
@ -810,29 +810,27 @@ static inline NSString * AFMultipartFormFinalBoundary() {
return self.request; return self.request;
} }
-(void)appendData:(NSData *)data { - (void)appendData:(NSData *)data {
} }
@end @end
#pragma mark -- #pragma mark - AFMultipartBodyStream
#pragma mark AFMultipartBodyStream
@interface AFMultipartBodyStream () { @interface AFMultipartBodyStream () {
//all undocumented nsstream/nsinputstream/CFReadStream bull shit
CFReadStreamClientCallBack copiedCallback; CFReadStreamClientCallBack copiedCallback;
CFStreamClientContext copiedContext; CFStreamClientContext copiedContext;
CFOptionFlags requestedEvents; CFOptionFlags requestedEvents;
NSStreamStatus streamStatus; NSStreamStatus streamStatus;
id <NSStreamDelegate> delegate; id <NSStreamDelegate> delegate;
NSMutableArray * fileNames; NSMutableArray *fileNames;
NSMutableDictionary * fileURLs; NSMutableDictionary *fileURLs;
NSMutableDictionary * fileHeaders; NSMutableDictionary *fileHeaders;
NSMutableArray * formNames; NSMutableArray *formNames;
NSMutableDictionary * formDatas; NSMutableDictionary *formDatas;
NSMutableDictionary * formHeaders; NSMutableDictionary *formHeaders;
NSUInteger readElementCursor; NSUInteger readElementCursor;
NSUInteger readOffsetCursor; NSUInteger readOffsetCursor;
NSUInteger readHeaderOffsetCursor; NSUInteger readHeaderOffsetCursor;
@ -845,7 +843,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
@implementation AFMultipartBodyStream @implementation AFMultipartBodyStream
-(id)init { - (id)init {
self = [super init]; self = [super init];
fileNames = [[NSMutableArray alloc] init]; fileNames = [[NSMutableArray alloc] init];
fileURLs = [[NSMutableDictionary alloc] init]; fileURLs = [[NSMutableDictionary alloc] init];
@ -857,23 +855,23 @@ static inline NSString * AFMultipartFormFinalBoundary() {
stringEncoding = NSUTF8StringEncoding; stringEncoding = NSUTF8StringEncoding;
streamStatus = NSStreamStatusNotOpen; streamStatus = NSStreamStatusNotOpen;
[self resetCursors]; [self resetCursors];
// [self setDelegate:self]; // [self setDelegate:self];
return self; return self;
} }
-(id)initWithStringEncoding:(NSStringEncoding)encoding { - (id)initWithStringEncoding:(NSStringEncoding)encoding {
self = [self init]; self = [self init];
stringEncoding = encoding; stringEncoding = encoding;
return self; return self;
} }
-(void)resetCursors { - (void)resetCursors {
readElementCursor = 0; readElementCursor = 0;
readOffsetCursor = 0; readOffsetCursor = 0;
readHeaderOffsetCursor = 0; readHeaderOffsetCursor = 0;
} }
-(void)dealloc { - (void)dealloc {
[fileNames release]; [fileNames release];
[fileURLs release]; [fileURLs release];
[fileHeaders release]; [fileHeaders release];
@ -888,7 +886,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
[super dealloc]; [super dealloc];
} }
-(BOOL)empty { - (BOOL)empty {
if (([fileURLs count] + [formDatas count]) == 0) if (([fileURLs count] + [formDatas count]) == 0)
return YES; return YES;
else else
@ -896,7 +894,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
} }
-(BOOL)addFileFromURL:(NSURL *)fileURL name:(NSString *)name error:(NSError **)error { - (BOOL)addFileFromURL:(NSURL *)fileURL name:(NSString *)name error:(NSError **)error {
assert([self streamStatus] == NSStreamStatusNotOpen); assert([self streamStatus] == NSStreamStatusNotOpen);
NSMutableDictionary *userInfo = [NSMutableDictionary dictionary]; NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
@ -926,14 +924,14 @@ static inline NSString * AFMultipartFormFinalBoundary() {
return YES; return YES;
} }
-(void)addFormData:(NSData *)data name:(NSString *)name { - (void)addFormData:(NSData *)data name:(NSString *)name {
assert([self streamStatus] == NSStreamStatusNotOpen); assert([self streamStatus] == NSStreamStatusNotOpen);
[formNames addObject:name]; [formNames addObject:name];
[formDatas setObject:data forKey:name]; [formDatas setObject:data forKey:name];
[self generateHeaders]; [self generateHeaders];
} }
-(void)generateHeaders { - (void)generateHeaders {
[formHeaders removeAllObjects]; [formHeaders removeAllObjects];
for (NSString * formName in formNames) { for (NSString * formName in formNames) {
[formHeaders setObject:[self headersDataForForm:formName] forKey:formName]; [formHeaders setObject:[self headersDataForForm:formName] forKey:formName];
@ -944,7 +942,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
} }
} }
-(NSString *)stringForHeaders:(NSDictionary *)headers { - (NSString *)stringForHeaders:(NSDictionary *)headers {
NSMutableString * headerString = [NSMutableString string]; NSMutableString * headerString = [NSMutableString string];
for (NSString *field in [headers allKeys]) { for (NSString *field in [headers allKeys]) {
[headerString appendString:[NSString stringWithFormat:@"%@: %@%@", field, [headers valueForKey:field], kAFMultipartFormCRLF]]; [headerString appendString:[NSString stringWithFormat:@"%@: %@%@", field, [headers valueForKey:field], kAFMultipartFormCRLF]];
@ -952,7 +950,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
return [NSString stringWithString:headerString]; return [NSString stringWithString:headerString];
} }
-(NSData *)headersDataForDict:(NSDictionary *)headersDict { - (NSData *)headersDataForDict:(NSDictionary *)headersDict {
NSMutableString * headerString = [NSMutableString string]; NSMutableString * headerString = [NSMutableString string];
if ([formHeaders count] == 0 && [fileHeaders count] == 0) { if ([formHeaders count] == 0 && [fileHeaders count] == 0) {
[headerString appendString:AFMultipartFormInitialBoundary()]; [headerString appendString:AFMultipartFormInitialBoundary()];
@ -965,7 +963,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
return [headerString dataUsingEncoding:stringEncoding]; return [headerString dataUsingEncoding:stringEncoding];
} }
-(NSData *)headersDataForFile:(NSString *)name { - (NSData *)headersDataForFile:(NSString *)name {
NSURL * fileURL = [fileURLs objectForKey:name]; NSURL * fileURL = [fileURLs objectForKey:name];
NSString * fileName = [[fileURL pathComponents] objectAtIndex:([[fileURL pathComponents] count] - 1)]; NSString * fileName = [[fileURL pathComponents] objectAtIndex:([[fileURL pathComponents] count] - 1)];
NSMutableDictionary * mutableHeaders = [NSMutableDictionary dictionary]; NSMutableDictionary * mutableHeaders = [NSMutableDictionary dictionary];
@ -977,11 +975,11 @@ static inline NSString * AFMultipartFormFinalBoundary() {
return [self headersDataForDict:mutableHeaders]; return [self headersDataForDict:mutableHeaders];
} }
-(NSData *)headersDataForForm:(NSString *)name { - (NSData *)headersDataForForm:(NSString *)name {
return [self headersDataForDict:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"form-data; name=\"%@\"", name] forKey:@"Content-Disposition"]]; return [self headersDataForDict:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"form-data; name=\"%@\"", name] forKey:@"Content-Disposition"]];
} }
-(NSInteger)readData:(NSData *)data intoBuffer:(uint8_t *)buffer maxLength:(NSUInteger)len offsetCursor:(NSUInteger*)offsetCursorPtr { - (NSInteger)readData:(NSData *)data intoBuffer:(uint8_t *)buffer maxLength:(NSUInteger)len offsetCursor:(NSUInteger*)offsetCursorPtr {
NSInteger bytesAvailable = [data length] - *offsetCursorPtr; NSInteger bytesAvailable = [data length] - *offsetCursorPtr;
if (len > bytesAvailable) { if (len > bytesAvailable) {
[data getBytes:buffer range:NSMakeRange(*offsetCursorPtr, bytesAvailable)]; [data getBytes:buffer range:NSMakeRange(*offsetCursorPtr, bytesAvailable)];
@ -994,7 +992,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
} }
} }
-(void)nextElement { - (void)nextElement {
readOffsetCursor = 0; readOffsetCursor = 0;
readHeaderOffsetCursor = 0; readHeaderOffsetCursor = 0;
readElementCursor += 1; readElementCursor += 1;
@ -1006,7 +1004,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
} }
} }
-(NSUInteger)contentLength { - (NSUInteger)contentLength {
NSUInteger total = 0; NSUInteger total = 0;
for (NSString * formName in formNames) { for (NSString * formName in formNames) {
total += [[formHeaders objectForKey:formName] length]; total += [[formHeaders objectForKey:formName] length];
@ -1022,21 +1020,21 @@ static inline NSString * AFMultipartFormFinalBoundary() {
return total; return total;
} }
-(NSUInteger)totalElements { - (NSUInteger)totalElements {
return [formDatas count] + [fileURLs count] + 1; //one extra for final boundary return [formDatas count] + [fileURLs count] + 1; //one extra for final boundary
} }
-(NSData *)finalBoundaryData { - (NSData *)finalBoundaryData {
return [AFMultipartFormFinalBoundary() dataUsingEncoding:stringEncoding]; return [AFMultipartFormFinalBoundary() dataUsingEncoding:stringEncoding];
} }
#pragma mark - NSStream subclass overrides #pragma mark - NSStream subclass overrides
-(void)open { - (void)open {
streamStatus = NSStreamStatusOpen; streamStatus = NSStreamStatusOpen;
} }
-(void)close { - (void)close {
streamStatus = NSStreamStatusClosed; streamStatus = NSStreamStatusClosed;
[self resetCursors]; [self resetCursors];
} }
@ -1079,7 +1077,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
#pragma mark - NSInputStream subclass overrides #pragma mark - NSInputStream subclass overrides
-(NSInteger)read:(uint8_t *)buffer maxLength:(NSUInteger)len { - (NSInteger)read:(uint8_t *)buffer maxLength:(NSUInteger)len {
if ([self streamStatus] == NSStreamStatusClosed) { if ([self streamStatus] == NSStreamStatusClosed) {
return 0; return 0;
} }
@ -1117,7 +1115,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
} else { } else {
if (!currentFileStream) { if (!currentFileStream) {
currentFileStream = [[NSInputStream inputStreamWithURL:currentFileURL] retain]; currentFileStream = [[NSInputStream inputStreamWithURL:currentFileURL] retain];
// currentFileStream.delegate = self; // currentFileStream.delegate = self;
[currentFileStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes]; [currentFileStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
[currentFileStream open]; [currentFileStream open];
} }
@ -1154,7 +1152,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
return bytesRead; return bytesRead;
} }
-(BOOL)hasBytesAvailable { - (BOOL)hasBytesAvailable {
if ([self streamStatus] != NSStreamStatusOpen) { if ([self streamStatus] != NSStreamStatusOpen) {
return NO; return NO;
} }
@ -1163,7 +1161,7 @@ static inline NSString * AFMultipartFormFinalBoundary() {
} }
} }
-(BOOL)getBuffer:(uint8_t **)buffer length:(NSUInteger *)len { - (BOOL)getBuffer:(uint8_t **)buffer length:(NSUInteger *)len {
return NO; return NO;
} }