Use user catalog displayname when displaying an account node

diff --git a/pithos-macos/PithosAccount.m b/pithos-macos/PithosAccount.m
index 5329bcd..1edfbc3 100644 (file)
--- a/pithos-macos/PithosAccount.m
+++ b/pithos-macos/PithosAccount.m
@@ -372,6 +372,7 @@
         sharingAccountsNode = [[PithosSharingAccountsNode alloc] initWithPithos:self.pithos];
         sharingAccountsNode.childrenUpdatedNotificationName = nil;
         sharingAccountsNode.inheritChildrenUpdatedNotificationName = YES;
+        sharingAccountsNode.pithosAccountManager = self;
     }
     return sharingAccountsNode;
 }

diff --git a/pithos-macos/PithosAccountNode.m b/pithos-macos/PithosAccountNode.m
index 51b5c61..ee1ded1 100644 (file)
--- a/pithos-macos/PithosAccountNode.m
+++ b/pithos-macos/PithosAccountNode.m
@@ -185,8 +185,15 @@ static NSImage *sharedIcon = nil;
 }
 
 - (NSString *)displayName {
-    if (displayName == nil)
-        return [NSString stringWithString:(sharingAccount ? sharingAccount : @"account")];
+    if (displayName == nil) {
+        if (!sharingAccount) {
+            return @"account";
+        } else if (pithosAccountManager) {
+            return [pithosAccountManager displaynameForUUID:sharingAccount safe:YES];
+        } else {
+            return [sharingAccount copy];
+        }
+    }
     return [displayName copy];
 }
 
@@ -254,6 +261,7 @@ static NSImage *sharedIcon = nil;
                         node.shared = shared;
                         node.sharingAccount = sharingAccount;
                         node.inheritChildrenUpdatedNotificationName = inheritChildrenUpdatedNotificationName;
+                        node.pithosAccountManager = pithosAccountManager;
                         if (children) {
                             NSUInteger oldIndex = [children indexOfObject:node];
                             if (oldIndex != NSNotFound) {

diff --git a/pithos-macos/PithosBrowserController.h b/pithos-macos/PithosBrowserController.h
index 6a307f8..4473c55 100644 (file)
--- a/pithos-macos/PithosBrowserController.h
+++ b/pithos-macos/PithosBrowserController.h
@@ -38,6 +38,7 @@
 #import <Cocoa/Cocoa.h>
 #import "PithosActivityFacility.h"
 @class ASIPithos;
+@class PithosAccount;
 @class PithosNode;
 @class PithosAccountNode;
 @class PithosSharingAccountsNode;
@@ -51,6 +52,7 @@
     
     ASIPithos *pithos;
     
+    PithosAccount *__unsafe_unretained pithosAccountManager;
     PithosNode *rootNode;
     PithosAccountNode *accountNode;
     PithosEmptyNode *containersNode;
@@ -104,6 +106,7 @@
 
 @property (nonatomic, strong) ASIPithos *pithos;
 
+@property (nonatomic, unsafe_unretained) PithosAccount *pithosAccountManager;
 @property (nonatomic, strong) PithosAccountNode *accountNode;
 
 @property (nonatomic, unsafe_unretained) IBOutlet NSSplitView *verticalSplitView;

diff --git a/pithos-macos/PithosBrowserController.m b/pithos-macos/PithosBrowserController.m
index d753e9f..205bfb8 100644 (file)
--- a/pithos-macos/PithosBrowserController.m
+++ b/pithos-macos/PithosBrowserController.m
@@ -109,7 +109,7 @@
 
 @implementation PithosBrowserController
 @synthesize pithos;
-@synthesize accountNode;
+@synthesize pithosAccountManager, accountNode;
 @synthesize verticalSplitView, horizontalSplitView, leftTopView, leftBottomView, outlineView, browser, outlineViewMenu, browserMenu;
 @synthesize draggedNodes, draggedParentNode;
 @synthesize clipboardNodes, clipboardParentNode, clipboardCopy;
@@ -212,14 +212,17 @@
     activityFacility = [PithosActivityFacility defaultPithosActivityFacility];
     
     self.accountNode = [[PithosAccountNode alloc] initWithPithos:pithos];
+    accountNode.pithosAccountManager = pithosAccountManager;
     containersNode = [[PithosEmptyNode alloc] initWithDisplayName:@"CONTAINERS" icon:nil];
     containersNodeChildren = [[NSMutableArray alloc] init];
     sharedNode = [[PithosEmptyNode alloc] initWithDisplayName:@"SHARED" icon:nil];
     mySharedNode = [[PithosAccountNode alloc] initWithPithos:pithos];
+    mySharedNode.pithosAccountManager = pithosAccountManager;
     mySharedNode.displayName = @"shared by me";
     mySharedNode.shared = YES;
     mySharedNode.icon = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kUserIcon)];
     othersSharedNode = [[PithosSharingAccountsNode alloc] initWithPithos:pithos];
+    othersSharedNode.pithosAccountManager = pithosAccountManager;
     othersSharedNode.displayName = @"shared with me";
     othersSharedNode.icon = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kGroupIcon)];
     
@@ -336,10 +339,13 @@
     [downloadCallbackQueue setSuspended:NO];
 
     accountNode.pithos = pithos;
+    accountNode.pithosAccountManager = pithosAccountManager;
     [accountNode forceRefresh];
     mySharedNode.pithos = pithos;
+    mySharedNode.pithosAccountManager = pithosAccountManager;
     [mySharedNode forceRefresh];
     othersSharedNode.pithos = pithos;
+    othersSharedNode.pithosAccountManager = pithosAccountManager;
     [othersSharedNode forceRefresh];
             
 //    [activityFacility reset];

diff --git a/pithos-macos/PithosContainerNode.m b/pithos-macos/PithosContainerNode.m
index c144fd5..8336b31 100644 (file)
--- a/pithos-macos/PithosContainerNode.m
+++ b/pithos-macos/PithosContainerNode.m
@@ -276,6 +276,7 @@ static NSImage *sharedIcon = nil;
                                     node.shared = shared;
                                     node.sharingAccount = sharingAccount;
                                     node.inheritChildrenUpdatedNotificationName = inheritChildrenUpdatedNotificationName;
+                                    node.pithosAccountManager = pithosAccountManager;
                                     if (children) {
                                         NSUInteger oldIndex = [children indexOfObject:node];
                                         if (oldIndex != NSNotFound) {
@@ -299,6 +300,7 @@ static NSImage *sharedIcon = nil;
                                 node.shared = shared;
                                 node.sharingAccount = sharingAccount;
                                 node.inheritChildrenUpdatedNotificationName = inheritChildrenUpdatedNotificationName;
+                                node.pithosAccountManager = pithosAccountManager;
                                 if (children) {
                                     NSUInteger oldIndex = [children indexOfObject:node];
                                     if (oldIndex != NSNotFound) {
@@ -319,6 +321,7 @@ static NSImage *sharedIcon = nil;
                                 node.shared = shared;
                                 node.sharingAccount = sharingAccount;
                                 node.inheritChildrenUpdatedNotificationName = inheritChildrenUpdatedNotificationName;
+                                node.pithosAccountManager = pithosAccountManager;
                                 if (children) {
                                     NSUInteger oldIndex = [children indexOfObject:node];
                                     if (oldIndex != NSNotFound) {

diff --git a/pithos-macos/PithosSharingAccountsNode.m b/pithos-macos/PithosSharingAccountsNode.m
index a04650d..b03192d 100644 (file)
--- a/pithos-macos/PithosSharingAccountsNode.m
+++ b/pithos-macos/PithosSharingAccountsNode.m
@@ -41,6 +41,7 @@
 #import "ASIPithos.h"
 #import "ASIPithosAccount.h"
 #import "ASIDownloadCache.h"
+#import "PithosAccount.h"
 #import "PithosUtilities.h"
 #import "PithosActivityFacility.h"
 
@@ -184,13 +185,16 @@
                     DLog(@"using newChildren");
                     newChildren = [[NSMutableArray alloc] init];
                     NSMutableIndexSet *keptNodes = [NSMutableIndexSet indexSet];
+                    NSMutableArray *sharingAccountsNames = [NSMutableArray arrayWithCapacity:sharingAccounts.count];
                     for (ASIPithosAccount *account in sharingAccounts) {
+                        [sharingAccountsNames addObject:account.name];
                         if (![account.name isEqualToString:pithos.authUser]) {
                             PithosAccountNode *node = [[PithosAccountNode alloc] initWithPithos:pithos];
                             node.parent = self;
                             node.shared = shared;
                             node.sharingAccount = account.name;
                             node.inheritChildrenUpdatedNotificationName = inheritChildrenUpdatedNotificationName;
+                            node.pithosAccountManager = pithosAccountManager;
                             if (children) {
                                 NSUInteger oldIndex = [children indexOfObject:node];
                                 if (oldIndex != NSNotFound) {
@@ -202,6 +206,7 @@
                             [newChildren addObject:node];
                         }
                     }
+                    [pithosAccountManager updateUserCatalogForForDisplaynames:nil UUIDs:sharingAccountsNames];
                     [[children objectsAtIndexes:
                       [[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [children count])] indexesPassingTest:^(NSUInteger idx, BOOL *stop){
                         if ([keptNodes containsIndex:idx])

diff --git a/pithos-macos/pithos_macosAppDelegate.m b/pithos-macos/pithos_macosAppDelegate.m
index 72b75da..3c78a73 100644 (file)
--- a/pithos-macos/pithos_macosAppDelegate.m
+++ b/pithos-macos/pithos_macosAppDelegate.m
@@ -104,6 +104,7 @@ currentPithosAccount, pithosAccounts, pithosAccountsDictionary, syncPithosAccoun
     
     if (currentPithosAccount.active) {
         [self savePithosAccounts:self];
+        self.pithosBrowserController.pithosAccountManager = currentPithosAccount;
         [self showPithosBrowser:self];
         self.pithosBrowserController.pithos = currentPithosAccount.pithos;
     } else {
@@ -448,6 +449,7 @@ void LSSharedFileListChanged(LSSharedFileListRef inList, void *context) {
         for (PithosAccount *pithosAccount in pithosAccounts) {
             if (pithosAccount.active) {
                 self.currentPithosAccount = pithosAccount;
+                self.pithosBrowserController.pithosAccountManager = currentPithosAccount;
                 self.pithosBrowserController.pithos = currentPithosAccount.pithos;
                 break;
             }
@@ -555,6 +557,7 @@ void LSSharedFileListChanged(LSSharedFileListRef inList, void *context) {
                 return;
         }
         self.currentPithosAccount = pithosAccount;
+        self.pithosBrowserController.pithosAccountManager = currentPithosAccount;
         [self showPithosBrowser:self];
         self.pithosBrowserController.pithos = currentPithosAccount.pithos;
     }