Adds shouldWaitUntilDone to LFHTTPRequest for making synchronous calls.

mattwright · Jun 16, 2009 · b0f93bb · b0f93bb
1 parent 440cbfc
commit b0f93bb
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 14 deletions.
diff --git a/LFWebAPIKit/LFHTTPRequest.h b/LFWebAPIKit/LFHTTPRequest.h
@@ -75,15 +75,18 @@ extern NSString *LFHTTPRequestPOSTMethod;
     size_t _readBufferSize;
 
     id _sessionInfo;
+
+    BOOL _shouldWaitUntilDone;
 }
-// + (NSData *)fetchDataSynchronouslyFromURL:(NSURL *)url;
-// + (NSData *)fetchDataSynchronouslyFromURL:(NSURL *)url byPostingData:(NSData *)data;
-// + (NSData *)fetchDataSynchronouslyFromURL:(NSURL *)url byPostingMultipartData:(NSArray *)arrayOfData;
-// + (NSData *)fetchDataSynchronouslyFromURL:(NSURL *)url byPostingDictionary:(NSDictionary *)dictionary;
+
 - (id)init;
 - (BOOL)isRunning;
 - (void)cancel;
 - (void)cancelWithoutDelegateMessage;
+
+- (BOOL)shouldWaitUntilDone;
+- (void)setShouldWaitUnitlDone:(BOOL)waitUntilDone;
+
 - (BOOL)performMethod:(NSString *)methodName onURL:(NSURL *)url withData:(NSData *)data;
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4

diff --git a/LFWebAPIKit/LFHTTPRequest.m b/LFWebAPIKit/LFHTTPRequest.m
@@ -294,7 +294,7 @@ - (void)readStreamEndEncountered
     if (![self isRunning]) {
         return;
     }
-    
+
     [self cleanUp];
 
     if ([_delegate respondsToSelector:@selector(httpRequestDidComplete:)]) {
@@ -392,15 +392,6 @@ - (BOOL)_performMethod:(NSString *)methodName onURL:(NSURL *)url withData:(NSDat
         CFHTTPMessageSetBody(request, (CFDataRef)data); 
     }
 
-	// for debug only, we comment them out here
-	/*
-    NSDictionary *headerCheck = (NSDictionary*)CFHTTPMessageCopyAllHeaderFields(request);
-	#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4
-    NSMakeCollectable((CFTypeRef)headerCheck);
-    #endif
-    [headerCheck release];
-	 */
-
     CFReadStreamRef tmpReadStream;
 
     if (inputStream) {
@@ -494,6 +485,19 @@ - (BOOL)_performMethod:(NSString *)methodName onURL:(NSURL *)url withData:(NSDat
     [[NSRunLoop currentRunLoop] addTimer:_requestMessageBodyTracker forMode:NSModalPanelRunLoopMode];
     #endif
 
+    if (_shouldWaitUntilDone) {
+        NSRunLoop *currentRunLoop = [NSRunLoop currentRunLoop];
+        NSString *currentMode = [currentRunLoop currentMode];
+
+		if (![currentMode length]) {
+			currentMode = NSDefaultRunLoopMode;
+		}
+
+        while ([self isRunning]) {
+            [currentRunLoop runMode:currentMode beforeDate:[NSDate distantFuture]];
+        }
+    }    
+
     return YES;
 }
 
@@ -628,11 +632,22 @@ - (void)setReadBufferSize:(size_t)newSize
     bzero(_readBuffer, newSize);
 }
 
+- (BOOL)shouldWaitUntilDone
+{
+    return _shouldWaitUntilDone;
+}
+
+- (void)setShouldWaitUnitlDone:(BOOL)waitUntilDone
+{
+    _shouldWaitUntilDone = waitUntilDone;
+}
+
 @end
 
 void LFHRReadStreamClientCallBack(CFReadStreamRef stream, CFStreamEventType eventType, void *clientCallBackInfo)
 {
     id pool = [NSAutoreleasePool new];
+
     LFHTTPRequest *request = (LFHTTPRequest *)clientCallBackInfo;
     switch (eventType) {
         case kCFStreamEventHasBytesAvailable: