Shift-refresh forces no use of cache.

[pithos-macos] / pithos-macos / PithosAccountNode.m

diff --git a/pithos-macos/PithosAccountNode.m b/pithos-macos/PithosAccountNode.m
index ad47a2a..14d0642 100644 (file)
--- a/pithos-macos/PithosAccountNode.m
+++ b/pithos-macos/PithosAccountNode.m
@@ -42,8 +42,15 @@
 #import "ASIDownloadCache.h"
 #import "PithosFileUtilities.h"
 
+static NSImage *sharedIcon = nil;
+
 @implementation PithosAccountNode
 
++ (void)initialize {
+       if (self == [PithosAccountNode class])
+        sharedIcon = [[[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kUserIcon)] retain];
+}
+
 #pragma mark -
 #pragma mark Object Lifecycle
 
@@ -58,8 +65,10 @@
 #pragma mark Properties
 
 - (NSString *)url {
-    if (url == nil) 
-        url = [[ASIPithosRequest storageURL] copy];
+    if (url == nil)
+        url = [[NSString alloc] initWithFormat:@"%@%@", 
+               (sharingAccount ? [ASIPithosRequest storageURLWithAuthUser:sharingAccount] : [ASIPithosRequest storageURL]), 
+               (shared ? @"?shared" : @"")];
     return url;
 }
 
@@ -74,10 +83,13 @@
                                                                                    marker:nil 
                                                                                    shared:shared 
                                                                                     until:nil] retain];
+                if (sharingAccount)
+                    [accountRequest setRequestUserFromDefaultTo:sharingAccount];
                 accountRequest.delegate = self;
                 accountRequest.didFinishSelector = @selector(accountRequestFinished:);
                 accountRequest.didFailSelector = @selector(accountRequestFailed:);
-                accountRequest.downloadCache = [ASIDownloadCache sharedCache];
+                if (!forcedRefresh)
+                    accountRequest.downloadCache = [ASIDownloadCache sharedCache];
                 [accountRequest startAsynchronous];
                 break;
             case PithosNodeStateRefreshing:
@@ -97,10 +109,15 @@
 }
 
 - (NSString *)displayName {
-    if (displayName == nil) {
-        displayName = [[NSString alloc] initWithString:@"account"];
-    }
-    return displayName;
+    if (displayName == nil)
+        return [NSString stringWithString:(sharingAccount ? sharingAccount : @"account")];
+    return [[displayName copy] autorelease];
+}
+
+- (NSImage *)icon {
+    if (icon == nil)
+        icon = [sharedIcon retain];
+    return icon;
 }
 
 #pragma mark -
@@ -121,26 +138,36 @@
             // Save new children
             NSLog(@"using newChildren");
             newChildren = [[NSMutableArray alloc] init];
+            NSMutableIndexSet *keptNodes = [NSMutableIndexSet indexSet];
             for (ASIPithosContainer *container in containers) {
                 PithosContainerNode *node = [[[PithosContainerNode alloc] initWithPithosContainer:container] autorelease];
+                node.parent = self;
+                node.shared = shared;
+                node.sharingAccount = sharingAccount;
                 if (children) {
                     NSUInteger oldIndex = [children indexOfObject:node];
                     if (oldIndex != NSNotFound) {
                         // Use the same pointer value, if possible
                         node = [children objectAtIndex:oldIndex];
                         node.pithosContainer = container;
+                        [keptNodes addIndex:oldIndex];
                     }
                 }
-                node.parent = self;
-                node.shared = shared;
                 [newChildren addObject:node];
             }
+            [[children objectsAtIndexes:
+              [[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [children count])] indexesPassingTest:^(NSUInteger idx, BOOL *stop){
+                if ([keptNodes containsIndex:idx])
+                    return NO;
+                return YES;
+            }]] makeObjectsPerformSelector:@selector(pithosNodeWillBeRemoved)];
         }
         // Else cache was used and all results were fetched during this request, so existing children can be reused
         [accountRequest release];
         accountRequest = nil;
         [containers release];
         containers = nil;
+        forcedRefresh = NO;
         @synchronized(self) {
             freshness = PithosNodeStateRefreshFinished;
         }
@@ -153,8 +180,11 @@
                                                                            marker:[[someContainers lastObject] name] 
                                                                            shared:shared 
                                                                             until:nil] retain];
+        if (sharingAccount)
+            [accountRequest setRequestUserFromDefaultTo:sharingAccount];
         accountRequest.delegate = self;
-        accountRequest.downloadCache = [ASIDownloadCache sharedCache];
+        if (!forcedRefresh)
+            accountRequest.downloadCache = [ASIDownloadCache sharedCache];
         [accountRequest startAsynchronous];
     }
 }
@@ -167,6 +197,7 @@
     accountRequest = nil;
     [containers release];
     containers = nil;
+    forcedRefresh = NO;
     @synchronized(self) {
         freshness = PithosNodeStateRefreshNeeded;
     }