Reset state of root nodes when pithos is set. Send verbose messages on all node listi...

diff --git a/pithos-macos/PithosAccountNode.h b/pithos-macos/PithosAccountNode.h
index a57c6f9..a2dc1af 100644 (file)
--- a/pithos-macos/PithosAccountNode.h
+++ b/pithos-macos/PithosAccountNode.h
@@ -49,6 +49,8 @@
     
     ASIPithosAccountRequest *applyMetadataAccountRequest;
     ASIPithosAccountRequest *refreshMetadataAccountRequest;
+    
+    BOOL reset;
 }
 
 @property(nonatomic, retain) ASIPithos *pithos;

diff --git a/pithos-macos/PithosAccountNode.m b/pithos-macos/PithosAccountNode.m
index fed83ed..34b6e8d 100644 (file)
--- a/pithos-macos/PithosAccountNode.m
+++ b/pithos-macos/PithosAccountNode.m
@@ -60,7 +60,7 @@ static NSImage *sharedIcon = nil;
 
 - (id)initWithPithos:(ASIPithos *)aPithos {
     if ((self = [super init])) {
-        self.pithos = aPithos;
+        pithos = [aPithos retain];
     }
     return self;
 }
@@ -87,6 +87,16 @@ static NSImage *sharedIcon = nil;
         pithos = [aPithos retain];
         [url release];
         url = nil;
+        [accountRequest clearDelegatesAndCancel];
+        [accountRequest release];
+        accountRequest = nil;
+        [refreshMetadataAccountRequest clearDelegatesAndCancel];
+        [refreshMetadataAccountRequest release];
+        refreshMetadataAccountRequest = nil;
+        [applyMetadataAccountRequest clearDelegatesAndCancel];
+        [applyMetadataAccountRequest release];
+        applyMetadataAccountRequest = nil;
+        reset = YES;
     }
 }
 
@@ -100,6 +110,26 @@ static NSImage *sharedIcon = nil;
 
 - (NSArray *)children {
     @synchronized(self) {
+        if (reset) {
+            [accountRequest clearDelegatesAndCancel];
+            [accountRequest release];
+            accountRequest = nil;
+            [refreshMetadataAccountRequest clearDelegatesAndCancel];
+            [refreshMetadataAccountRequest release];
+            refreshMetadataAccountRequest = nil;
+            [applyMetadataAccountRequest clearDelegatesAndCancel];
+            [applyMetadataAccountRequest release];
+            applyMetadataAccountRequest = nil;
+            [children release];
+            children = nil;
+            [newChildren release];
+            newChildren = nil;
+            self.pithosAccount = nil;
+            freshness = PithosNodeStateRefreshNeeded;
+            forcedRefresh = YES;
+            reset = NO;
+            [self postChildrenUpdatedNotificationName];
+        }
         switch (freshness) {
             case PithosNodeStateFresh:
                 break;
@@ -158,6 +188,16 @@ static NSImage *sharedIcon = nil;
 
 - (void)accountRequestFailed:(ASIPithosAccountRequest *)request {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSString *message;
+    NSError *error = [accountRequest error];
+    if (error)
+        message = [NSString stringWithFormat:@"Account listing %@ failed: %@", accountRequest.url, [error localizedDescription]];
+    else
+        message = [NSString stringWithFormat:@"Account listing %@ failed: (%d) %@", 
+                   accountRequest.url, accountRequest.responseStatusCode, accountRequest.responseStatusMessage];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [[PithosActivityFacility defaultPithosActivityFacility] startAndEndActivityWithType:PithosActivityOther message:message];
+    });
     NSUInteger retries = [[accountRequest.userInfo objectForKey:@"retries"] unsignedIntegerValue];
     if (retries > 0) {
         ASIPithosAccountRequest *newAccountRequest = (ASIPithosAccountRequest *)[PithosUtilities copyRequest:accountRequest];
@@ -166,16 +206,6 @@ static NSImage *sharedIcon = nil;
         accountRequest = newAccountRequest;
         [[PithosUtilities prepareRequest:accountRequest priority:[[accountRequest.userInfo objectForKey:@"priority"] integerValue]] startAsynchronous];
     } else {
-        NSString *message;
-        NSError *error = [accountRequest error];
-        if (error)
-            message = [NSString stringWithFormat:@"Account listing failed: %@", error];
-        else
-            message = [NSString stringWithFormat:@"Account listing failed: (%d) %@", 
-                       accountRequest.responseStatusCode, accountRequest.responseStatusMessage];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [[PithosActivityFacility defaultPithosActivityFacility] startAndEndActivityWithType:PithosActivityOther message:message];
-        });
         [newChildren release];
         newChildren = nil;
         [accountRequest release];

diff --git a/pithos-macos/PithosContainerNode.m b/pithos-macos/PithosContainerNode.m
index 19f1f77..0d87dbc 100644 (file)
--- a/pithos-macos/PithosContainerNode.m
+++ b/pithos-macos/PithosContainerNode.m
@@ -222,6 +222,16 @@ static NSImage *sharedIcon = nil;
 
 - (void)containerRequestFailed:(ASIPithosContainerRequest *)request {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSString *message;
+    NSError *error = [containerRequest error];
+    if (error)
+        message = [NSString stringWithFormat:@"Container listing %@ failed: %@", containerRequest.url, [error localizedDescription]];
+    else
+        message = [NSString stringWithFormat:@"Container listing %@ failed: (%d) %@", 
+                   containerRequest.url, containerRequest.responseStatusCode, containerRequest.responseStatusMessage];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [[PithosActivityFacility defaultPithosActivityFacility] startAndEndActivityWithType:PithosActivityOther message:message];
+    });
     NSUInteger retries = [[containerRequest.userInfo objectForKey:@"retries"] unsignedIntegerValue];
     if (retries > 0) {
         ASIPithosContainerRequest *newContainerRequest = (ASIPithosContainerRequest *)[PithosUtilities copyRequest:containerRequest];
@@ -230,16 +240,6 @@ static NSImage *sharedIcon = nil;
         containerRequest = newContainerRequest;
         [[PithosUtilities prepareRequest:containerRequest priority:[[containerRequest.userInfo objectForKey:@"priority"] integerValue]] startAsynchronous];
     } else {
-        NSString *message;
-        NSError *error = [containerRequest error];
-        if (error)
-            message = [NSString stringWithFormat:@"Container listing failed: %@", error];
-        else
-            message = [NSString stringWithFormat:@"Container listing failed: (%d) %@", 
-                       containerRequest.responseStatusCode, containerRequest.responseStatusMessage];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [[PithosActivityFacility defaultPithosActivityFacility] startAndEndActivityWithType:PithosActivityOther message:message];
-        });
         [newChildren release];
         newChildren = nil;
         [containerRequest release];

diff --git a/pithos-macos/PithosSharingAccountsNode.h b/pithos-macos/PithosSharingAccountsNode.h
index 2875fa8..d411498 100644 (file)
--- a/pithos-macos/PithosSharingAccountsNode.h
+++ b/pithos-macos/PithosSharingAccountsNode.h
@@ -44,6 +44,8 @@
     
     NSMutableArray *sharingAccounts;
     ASIPithosRequest *sharingAccountsRequest;
+    
+    BOOL reset;
 }
 
 @property(nonatomic, retain) ASIPithos *pithos;

diff --git a/pithos-macos/PithosSharingAccountsNode.m b/pithos-macos/PithosSharingAccountsNode.m
index 4be9024..89a4e09 100644 (file)
--- a/pithos-macos/PithosSharingAccountsNode.m
+++ b/pithos-macos/PithosSharingAccountsNode.m
@@ -52,7 +52,7 @@
 
 - (id)initWithPithos:(ASIPithos *)aPithos {
     if ((self = [super init])) {
-        self.pithos = aPithos;
+        pithos = [aPithos retain];
         self.sharingAccount = @"";
     }
     return self;
@@ -75,6 +75,10 @@
         pithos = [aPithos retain];
         [url release];
         url = nil;
+        [sharingAccountsRequest clearDelegatesAndCancel];
+        [sharingAccountsRequest release];
+        sharingAccountsRequest = nil;
+        reset = YES;
     }
 }
 
@@ -86,6 +90,19 @@
 
 - (NSArray *)children {
     @synchronized(self) {
+        if (reset) {
+            [sharingAccountsRequest clearDelegatesAndCancel];
+            [sharingAccountsRequest release];
+            sharingAccountsRequest = nil;
+            [children release];
+            children = nil;
+            [newChildren release];
+            newChildren = nil;
+            freshness = PithosNodeStateRefreshNeeded;
+            forcedRefresh = YES;
+            reset = NO;
+            [self postChildrenUpdatedNotificationName];
+        }
         switch (freshness) {
             case PithosNodeStateFresh:
                 break;
@@ -132,6 +149,17 @@
 
 - (void)sharingAccountsRequestFailed:(ASIPithosRequest *)request {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSString *message;
+    NSError *error = [sharingAccountsRequest error];
+    if (error)
+        message = [NSString stringWithFormat:@"Sharing accounts listing %@ failed: %@", 
+                   sharingAccountsRequest.url, [error localizedDescription]];
+    else
+        message = [NSString stringWithFormat:@"Sharing accounts listing %@ failed: (%d) %@", 
+                   sharingAccountsRequest.url, sharingAccountsRequest.responseStatusCode, sharingAccountsRequest.responseStatusMessage];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [[PithosActivityFacility defaultPithosActivityFacility] startAndEndActivityWithType:PithosActivityOther message:message];
+    });
     NSUInteger retries = [[sharingAccountsRequest.userInfo objectForKey:@"retries"] unsignedIntegerValue];
     if (retries > 0) {
         ASIPithosRequest *newSharingAccountsRequest = (ASIPithosRequest *)[PithosUtilities copyRequest:sharingAccountsRequest];
@@ -140,16 +168,6 @@
         sharingAccountsRequest = newSharingAccountsRequest;
         [[PithosUtilities prepareRequest:sharingAccountsRequest priority:[[sharingAccountsRequest.userInfo objectForKey:@"priority"] integerValue]] startAsynchronous];
     } else {
-        NSString *message;
-        NSError *error = [sharingAccountsRequest error];
-        if (error)
-            message = [NSString stringWithFormat:@"Sharing accounts listing failed: %@", error];
-        else
-            message = [NSString stringWithFormat:@"Sharing accounts listing failed: (%d) %@", 
-                       sharingAccountsRequest.responseStatusCode, sharingAccountsRequest.responseStatusMessage];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [[PithosActivityFacility defaultPithosActivityFacility] startAndEndActivityWithType:PithosActivityOther message:message];
-        });
         [newChildren release];
         newChildren = nil;
         [sharingAccountsRequest release];