Fix bug in excluding "shared to me" container and testing for equality of two sets...

diff --git a/pithos-macos/PithosAccount.m b/pithos-macos/PithosAccount.m
index c149f32..27fc3da 100644 (file)
--- a/pithos-macos/PithosAccount.m
+++ b/pithos-macos/PithosAccount.m
@@ -177,7 +177,7 @@
 
 - (NSMutableDictionary *)syncAccountsDictionary {
     if (!syncAccountsDictionary) {
-        syncAccountsDictionary = [[NSMutableDictionary dictionaryWithObject:[NSMutableDictionary dictionaryWithObject:[NSMutableArray array] 
+        syncAccountsDictionary = [[NSMutableDictionary dictionaryWithObject:[NSMutableDictionary dictionaryWithObject:[NSMutableSet set] 
                                                                                                                forKey:@"pithos"] 
                                                                      forKey:@""] retain];
     }        
@@ -452,7 +452,7 @@
             NSMutableDictionary *syncContainersDictionary = [NSMutableDictionary dictionary];
             for (NSString *containerName in [immutableAccountsDictionary objectForKey:accountName]) {
                 if (![accountName isEqualToString:@""] || ![[containerName lowercaseString] isEqualToString:@"shared to me"])
-                    [syncContainersDictionary setObject:[NSMutableArray arrayWithArray:[immutableContainersDictionary objectForKey:containerName]] 
+                    [syncContainersDictionary setObject:[NSMutableSet setWithSet:[immutableContainersDictionary objectForKey:containerName]] 
                                                  forKey:containerName];
             }
             if ([syncContainersDictionary count])

diff --git a/pithos-macos/PithosPreferencesController.m b/pithos-macos/PithosPreferencesController.m
index bc2fa33..3ab435d 100644 (file)
--- a/pithos-macos/PithosPreferencesController.m
+++ b/pithos-macos/PithosPreferencesController.m
@@ -234,7 +234,7 @@
         NSMutableDictionary *syncContainersDictionary = [NSMutableDictionary dictionary];
         for (NSString *containerName in aSyncContainersDictionary) {
             if (![accountName isEqualToString:@""] || ![[containerName lowercaseString] isEqualToString:@"shared to me"])
-                [syncContainersDictionary setObject:[NSMutableArray arrayWithArray:[aSyncContainersDictionary objectForKey:containerName]] 
+                [syncContainersDictionary setObject:[NSMutableSet setWithSet:[aSyncContainersDictionary objectForKey:containerName]] 
                                              forKey:containerName];
         }
         if ([syncContainersDictionary count])
@@ -371,8 +371,14 @@
                 return 1;
         } else if (item == syncAccountsMyAccountNode) {
             // root/<my account>: #<container>
-            if (selectedPithosAccount.accountNode.children)
-                return selectedPithosAccount.accountNode.children.count;
+            if (selectedPithosAccount.accountNode.children) {
+                NSInteger containersCount = 0;
+                for (PithosContainerNode *node in selectedPithosAccount.accountNode.children) {
+                    if (![[node.displayName lowercaseString] isEqualToString:@"shared to me"])
+                        containersCount++;
+                }
+                return containersCount;
+            }
         } else if ([item class] == [PithosAccountNode class]) {
             // root/<sharing account>: #<container>
             PithosAccountNode *accountNode = (PithosAccountNode *)item;
@@ -405,7 +411,14 @@
                 return [selectedPithosAccount.sharingAccountsNode.children objectAtIndex:(index - 1)];
         } else if (item == syncAccountsMyAccountNode) {
             // root/<my account>: [ <container>+ ]
-            return [selectedPithosAccount.accountNode.children objectAtIndex:index];
+            NSInteger currentContainerIndex = -1;
+            for (PithosContainerNode *node in selectedPithosAccount.accountNode.children) {
+                if (![[node.displayName lowercaseString] isEqualToString:@"shared to me"]) {
+                    currentContainerIndex++;
+                    if (currentContainerIndex == index)
+                        return node;
+                }
+            }
         } else if ([item class] == [PithosAccountNode class]) {
             // root/<sharing account>: [ <container>+ ]
             return [((PithosAccountNode *)item).children objectAtIndex:index];
@@ -464,9 +477,11 @@
                 NSMutableDictionary *syncContainersDictionary = [syncAccountsDictionary objectForKey:@""];
                 if (syncContainersDictionary) {
                     for (PithosContainerNode *node in selectedPithosAccount.accountNode.children) {
-                        NSMutableArray *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.displayName];
-                        if (!containerExcludedDirectories || [containerExcludedDirectories count])
-                            return [NSNumber numberWithUnsignedInteger:NSMixedState];
+                        if (![[node.displayName lowercaseString] isEqualToString:@"shared to me"]) {
+                            NSMutableSet *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.displayName];
+                            if (!containerExcludedDirectories || [containerExcludedDirectories count])
+                                return [NSNumber numberWithUnsignedInteger:NSMixedState];
+                        }
                     }
                     return [NSNumber numberWithUnsignedInteger:NSOnState];
                 }
@@ -481,7 +496,7 @@
                 NSMutableDictionary *syncContainersDictionary = [syncAccountsDictionary objectForKey:accountNode.displayName];
                 if (syncContainersDictionary) {
                     for (PithosContainerNode *node in accountNode.children) {
-                        NSMutableArray *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.displayName];
+                        NSMutableSet *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.displayName];
                         if (!containerExcludedDirectories || [containerExcludedDirectories count])
                             return [NSNumber numberWithUnsignedInteger:NSMixedState];
                     }
@@ -498,7 +513,7 @@
                 NSString *accountName = node.sharingAccount;
                 if (!accountName)
                     accountName = @"";
-                NSMutableArray *containerExcludedDirectories = [[syncAccountsDictionary objectForKey:accountName] 
+                NSMutableSet *containerExcludedDirectories = [[syncAccountsDictionary objectForKey:accountName] 
                                                                 objectForKey:node.displayName];
                 if (containerExcludedDirectories) {
                     if ([containerExcludedDirectories count])
@@ -515,7 +530,7 @@
                 NSString *accountName = node.sharingAccount;
                 if (!accountName)
                     accountName = @"";
-                NSMutableArray *containerExcludedDirectories = [[syncAccountsDictionary objectForKey:accountName] 
+                NSMutableSet *containerExcludedDirectories = [[syncAccountsDictionary objectForKey:accountName] 
                                                                 objectForKey:node.parent.displayName];
                 if (!containerExcludedDirectories || 
                     [containerExcludedDirectories 
@@ -530,7 +545,7 @@
                 NSString *accountName = node.parent.sharingAccount;
                 if (!accountName)
                     accountName = @"";
-                NSMutableArray *containerExcludedDirectories = [[syncAccountsDictionary objectForKey:accountName] 
+                NSMutableSet *containerExcludedDirectories = [[syncAccountsDictionary objectForKey:accountName] 
                                                                 objectForKey:node.parent.displayName];
                 if (!containerExcludedDirectories || [containerExcludedDirectories containsObject:@""])
                     return [NSNumber numberWithUnsignedInteger:NSOffState];
@@ -557,7 +572,8 @@
                 if ((newState == NSOnState) || (newState == NSMixedState)) {
                     NSMutableDictionary *syncContainersDictionary = [NSMutableDictionary dictionary];
                     for (PithosContainerNode *node in selectedPithosAccount.accountNode.children) {
-                        [syncContainersDictionary setObject:[NSMutableArray array] forKey:node.displayName];
+                        if (![[node.displayName lowercaseString] isEqualToString:@"shared to me"])
+                            [syncContainersDictionary setObject:[NSMutableSet set] forKey:node.displayName];
                     }
                     [syncAccountsDictionary setObject:syncContainersDictionary forKey:@""];
                 } else {
@@ -573,7 +589,7 @@
                 if ((newState == NSOnState) || (newState == NSMixedState)) {
                     NSMutableDictionary *syncContainersDictionary = [NSMutableDictionary dictionary];
                     for (PithosContainerNode *node in accountNode.children) {
-                        [syncContainersDictionary setObject:[NSMutableArray array] forKey:node.displayName];
+                        [syncContainersDictionary setObject:[NSMutableSet set] forKey:node.displayName];
                     }
                     [syncAccountsDictionary setObject:syncContainersDictionary forKey:accountNode.displayName];
                 } else {
@@ -592,17 +608,13 @@
                     accountName = @"";
                     accountNode = syncAccountsMyAccountNode;
                 }
-                if ([accountName isEqualToString:@""] && [[node.displayName lowercaseString] isEqualToString:@"shared to me"]) {
-                    [outlineView reloadItem:item];
-                    return;
-                }
                 NSMutableDictionary *syncContainersDictionary = [syncAccountsDictionary objectForKey:accountName];
                 if ((newState == NSOnState) || (newState == NSMixedState)) {
                     if (!syncContainersDictionary) {
                         syncContainersDictionary = [NSMutableDictionary dictionary];
                         [syncAccountsDictionary setObject:syncContainersDictionary forKey:accountName];
                     }
-                    [syncContainersDictionary setObject:[NSMutableArray array] forKey:node.displayName];
+                    [syncContainersDictionary setObject:[NSMutableSet set] forKey:node.displayName];
                 } else if (syncContainersDictionary) {
                     [syncContainersDictionary removeObjectForKey:node.displayName];
                     if (![syncContainersDictionary count])
@@ -622,7 +634,7 @@
                     accountNode = syncAccountsMyAccountNode;
                 }
                 NSMutableDictionary *syncContainersDictionary = [syncAccountsDictionary objectForKey:accountName];
-                NSMutableArray *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.parent.displayName];
+                NSMutableSet *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.parent.displayName];
                 NSString *directoryName = [[node.displayName lowercaseString] stringByReplacingOccurrencesOfString:@"/" withString:@":"];
                 if ((newState == NSOnState) || (newState == NSMixedState)) {
                     if (containerExcludedDirectories) {
@@ -632,7 +644,7 @@
                             syncContainersDictionary = [NSMutableDictionary dictionary];
                             [syncAccountsDictionary setObject:syncContainersDictionary forKey:accountName];
                         }
-                        NSMutableArray *newContainerExcludeDirectories = [NSMutableArray arrayWithObject:@""];
+                        NSMutableSet *newContainerExcludeDirectories = [NSMutableSet setWithObject:@""];
                         for (PithosNode *siblingNode in node.parent.children) {
                             if ([siblingNode class] == [PithosSubdirNode class]) {
                                 NSString *siblingDirectoryName = [[siblingNode.displayName lowercaseString] 
@@ -662,7 +674,7 @@
                     accountNode = syncAccountsMyAccountNode;
                 }
                 NSMutableDictionary *syncContainersDictionary = [syncAccountsDictionary objectForKey:accountName];
-                NSMutableArray *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.parent.displayName];
+                NSMutableSet *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.parent.displayName];
                 if ((newState == NSOnState) || (newState == NSMixedState)) {
                     if (containerExcludedDirectories) {
                         [containerExcludedDirectories removeObject:@""];
@@ -671,7 +683,7 @@
                             syncContainersDictionary = [NSMutableDictionary dictionary];
                             [syncAccountsDictionary setObject:syncContainersDictionary forKey:accountName];
                         }
-                        NSMutableArray *newContainerExcludeDirectories = [NSMutableArray array];
+                        NSMutableSet *newContainerExcludeDirectories = [NSMutableSet set];
                         for (PithosNode *siblingNode in node.parent.children) {
                             if ([siblingNode class] == [PithosSubdirNode class]) {
                                 NSString *siblingDirectoryName = [[siblingNode.displayName lowercaseString] 

diff --git a/pithos-macos/PithosSyncDaemon.m b/pithos-macos/PithosSyncDaemon.m
index a61b81d..0e74d76 100644 (file)
--- a/pithos-macos/PithosSyncDaemon.m
+++ b/pithos-macos/PithosSyncDaemon.m
@@ -1470,7 +1470,7 @@
         for (NSString *accountName in accountsNames) {
             for (ASIPithosContainer *pithosContainer in [accountsPithosContainers objectForKey:accountName]) {
                 NSString *containerDirectoryPath = [self dirPathForAccount:accountName container:pithosContainer.name];
-                NSArray *containerExcludedDirectories = [[accountsDictionary objectForKey:accountName] objectForKey:pithosContainer.name];
+                NSSet *containerExcludedDirectories = [[accountsDictionary objectForKey:accountName] objectForKey:pithosContainer.name];
                 BOOL containerExludeRootFiles = [containerExcludedDirectories containsObject:@""];
                 NSMutableDictionary *containerStoredLocalObjectStates = [[storedLocalObjectStates objectForKey:accountName] 
                                                                          objectForKey:pithosContainer.name];
@@ -1545,7 +1545,7 @@
         // Add an empty stored state for legal new remote objects since last sync
         for (NSString *accountName in accountsNames) {
             for (ASIPithosContainer *pithosContainer in [accountsPithosContainers objectForKey:accountName]) {
-                NSArray *containerExcludedDirectories = [[accountsDictionary objectForKey:accountName] objectForKey:pithosContainer.name];
+                NSSet *containerExcludedDirectories = [[accountsDictionary objectForKey:accountName] objectForKey:pithosContainer.name];
                 BOOL containerExludeRootFiles = [containerExcludedDirectories containsObject:@""];
                 NSMutableDictionary *containerStoredLocalObjectStates = [[storedLocalObjectStates objectForKey:accountName] 
                                                                          objectForKey:pithosContainer.name];
@@ -1600,7 +1600,7 @@
         for (NSString *accountName in accountsNames) {
             for (ASIPithosContainer *pithosContainer in [accountsPithosContainers objectForKey:accountName]) {
                 NSString *containerDirectoryPath = [self dirPathForAccount:accountName container:pithosContainer.name];
-                NSArray *containerExcludedDirectories = [[accountsDictionary objectForKey:accountName] objectForKey:pithosContainer.name];
+                NSSet *containerExcludedDirectories = [[accountsDictionary objectForKey:accountName] objectForKey:pithosContainer.name];
                 BOOL containerExludeRootFiles = [containerExcludedDirectories containsObject:@""];
                 NSMutableDictionary *containerStoredLocalObjectStates = [[storedLocalObjectStates objectForKey:accountName] 
                                                                          objectForKey:pithosContainer.name];