Added some synchronous runloop omg wtf code.

ccgus · Jul 6, 2010 · bf3f4d5 · bf3f4d5
1 parent 80f5dc1
commit bf3f4d5
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/davtest/FMWebDAVRequest.h b/davtest/FMWebDAVRequest.h
@@ -50,6 +50,7 @@ enum {
     NSInteger _responseStatusCode;
 
     BOOL _synchronous;
+    BOOL _rlSynchronous;
 
     NSError *_error;
 }
@@ -64,6 +65,7 @@ enum {
 @property (retain) NSError *error;
 
 + (id) requestToURL:(NSURL*)url;
++ (id) requestToURL:(NSURL*)url delegate:(id)del;
 + (id) requestToURL:(NSURL*)url delegate:(id)del endSelector:(SEL)anEndSelector contextInfo:(id)context;
 
 - (FMWebDAVRequest*) fetchDirectoryListingWithDepth:(NSUInteger)depth extraToPropfind:(NSString*)extra;
@@ -82,6 +84,7 @@ enum {
 - (FMWebDAVRequest*) moveToDestinationURL:(NSURL*)dest;
 
 - (FMWebDAVRequest*) synchronous;
+- (FMWebDAVRequest*) rlsynchronous;
 
 - (FMWebDAVRequest*) propfind;
 

diff --git a/davtest/FMWebDAVRequest.m b/davtest/FMWebDAVRequest.m
@@ -30,6 +30,17 @@ + (id) requestToURL:(NSURL*)url {
     return request;
 }
 
++ (id) requestToURL:(NSURL*)url delegate:(id)del {
+
+    FMWebDAVRequest *request = [url isFileURL] ? [[FMFileDAVRequest alloc] init] : [[FMWebDAVRequest alloc] init];;
+
+    [request setUrl:url];
+    [request setDelegate:del];
+
+    return request;
+}
+
+
 + (id) requestToURL:(NSURL*)url delegate:(id)del endSelector:(SEL)anEndSelector contextInfo:(id)context {
 
     FMWebDAVRequest *request = [url isFileURL] ? [[FMFileDAVRequest alloc] init] : [[FMWebDAVRequest alloc] init];;
@@ -60,6 +71,11 @@ - (FMWebDAVRequest*) synchronous {
     return [self autorelease];
 }
 
+- (FMWebDAVRequest*) rlsynchronous {
+    _rlSynchronous = YES;
+    return [self retain];
+}
+
 - (void) sendRequest:(NSMutableURLRequest *)req {
 
 
@@ -77,7 +93,20 @@ - (void) sendRequest:(NSMutableURLRequest *)req {
 
 
 
-    if (_synchronous) {
+
+    if (_rlSynchronous) {
+
+        self.connection = [NSURLConnection connectionWithRequest:req delegate:self];
+        // we do this so we get our delegate callbacks.
+        // just regular [foo syncronous] won't work for that.
+        NSRunLoop *currentRunLoop = [NSRunLoop currentRunLoop];
+        while (_rlSynchronous && [currentRunLoop runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]]) {
+            // Empty
+        }
+
+        [self autorelease];
+    }
+    else if (_synchronous) {
         NSURLResponse *response = 0x00;
 
         self.responseData = (NSMutableData*)[NSURLConnection sendSynchronousRequest:req returningResponse:&response error:&_error];
@@ -93,9 +122,8 @@ - (void) sendRequest:(NSMutableURLRequest *)req {
         }
     }
     else {
-        [NSURLConnection connectionWithRequest:req delegate:self];
+        self.connection  = [NSURLConnection connectionWithRequest:req delegate:self];
     }
-
 }
 
 - (FMWebDAVRequest*) createDirectory {
@@ -240,6 +268,7 @@ - (FMWebDAVRequest*) head {
 }
 
 - (FMWebDAVRequest*) propfind {
+    debug(@"%s:%d", __FUNCTION__, __LINE__);
 
     if (!_endSelector) {
         _endSelector = @selector(requestDidPropfind:);
@@ -341,6 +370,7 @@ - (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
 }
 
 - (void)connection:(NSURLConnection *)connection didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge {
+    debug(@"%s:%d", __FUNCTION__, __LINE__);
     if (self.delegate && [self.delegate respondsToSelector:@selector(request:didReceiveAuthenticationChallenge:)]) {
         [self.delegate request:self didReceiveAuthenticationChallenge:challenge];
     }
@@ -381,6 +411,8 @@ - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)err
         [self.delegate performSelector:_endSelector withObject:self];
     }
 
+    _rlSynchronous = NO;
+
     [self autorelease];
 }
 
@@ -391,6 +423,8 @@ -(void)connectionDidFinishLoading:(NSURLConnection *)connection {
         [self.delegate performSelector:_endSelector withObject:self];
     }
 
+    _rlSynchronous = NO;
+
     [self autorelease];
 }