From cee4af44b3d0ad3131045606a50a2d303c33b28e Mon Sep 17 00:00:00 2001
From: Antoine Rosset <rossetantoine@bluewin.ch>
Date: Sat, 9 Feb 2013 08:02:44 +0000
Subject: [PATCH] MD-114

git-svn-id: https://svn.code.sf.net/p/osirix/code/osirix@10934 4e9e6e3d-4551-47eb-9dbe-a6127f9400a1
---
 BonjourBrowser.m            |  22 ---
 BrowserController+Sources.h |   2 -
 BrowserController+Sources.m | 341 +++++++++++++++++++-----------------
 browserController.m         |   5 +-
 4 files changed, 179 insertions(+), 191 deletions(-)

diff --git a/BonjourBrowser.m b/BonjourBrowser.m
index 05808cd629..a1962d32b7 100644
--- a/BonjourBrowser.m
+++ b/BonjourBrowser.m
@@ -205,33 +205,11 @@ - (void) buildLocalPathsList
 
 - (void) updateFixedList: (NSNotification*) note
 {
-	int i = [[BrowserController currentBrowser] currentBonjourService];
-	
-	NSDictionary *selectedDict = nil;
-	if( i >= 0 && i < services.count)
-		selectedDict = [[services objectAtIndex: i] retain];
-	
 	[self buildFixedIPList];
 	[self buildLocalPathsList];
 	//[[BrowserController currentBrowser] loadDICOMFromiPod];
 	[self buildDICOMDestinationsList];
 	[self arrangeServices];
-	
-	[interfaceOsiriX displayBonjourServices];
-	
-	if( selectedDict)
-	{
-		NSInteger index = [services indexOfObject: selectedDict];
-		
-		if( index == NSNotFound)
-			[[BrowserController currentBrowser] resetToLocalDatabase];
-		else
-			[[BrowserController currentBrowser] setCurrentBonjourService: index];
-		
-		[selectedDict release];
-	}
-	
-	[interfaceOsiriX displayBonjourServices];
 }
 
 - (void) arrangeServices
diff --git a/BrowserController+Sources.h b/BrowserController+Sources.h
index 3b343f4116..d6187f2736 100644
--- a/BrowserController+Sources.h
+++ b/BrowserController+Sources.h
@@ -28,8 +28,6 @@
 -(DataNodeIdentifier*)sourceIdentifierForDatabase:(DicomDatabase*)database;
 -(void)selectCurrentDatabaseSource;
 
--(long)currentBonjourService __deprecated;
--(void)setCurrentBonjourService:(int)index __deprecated;
 -(int)findDBPath:(NSString*)path dbFolder:(NSString*)DBFolderLocation __deprecated;
 -(void)removePathFromSources:(NSString*) path;
 @end
diff --git a/BrowserController+Sources.m b/BrowserController+Sources.m
index 19e0ea48c5..f2d607810c 100644
--- a/BrowserController+Sources.m
+++ b/BrowserController+Sources.m
@@ -55,6 +55,8 @@ @interface BrowserSourcesHelper : NSObject<NSNetServiceBrowserDelegate, NSNetSer
 	NSNetServiceBrowser* _nsbOsirix;
 	NSNetServiceBrowser* _nsbDicom;
 	NSMutableArray* _bonjourSources, *_bonjourServices;
+    
+    BOOL dontListenToSourcesChanges;
 }
 
 -(id)initWithBrowser:(BrowserController*)browser;
@@ -201,6 +203,7 @@ -(void)selectCurrentDatabaseSource
     {
 		NSDictionary* source = [NSDictionary dictionaryWithObjectsAndKeys: [_database.baseDirPath stringByDeletingLastPathComponent], @"Path", [_database.baseDirPath.stringByDeletingLastPathComponent.lastPathComponent stringByAppendingString:@" DB"], @"Description", nil];
 		[[NSUserDefaults standardUserDefaults] setObject:[[[NSUserDefaults standardUserDefaults] objectForKey:@"localDatabasePaths"] arrayByAddingObject:source] forKey:@"localDatabasePaths"];
+        
 		i = [self rowForDatabase:_database];
 	}
     if (i != [_sourcesTableView selectedRow])
@@ -349,14 +352,6 @@ -(void)redrawSources
 	[_sourcesTableView setNeedsDisplay:YES];
 }
 
--(long)currentBonjourService { // __deprecated
-	return [_sourcesTableView selectedRow]-1;
-}
-
--(void)setCurrentBonjourService:(int)index { // __deprecated
-	[_sourcesTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:index+1] byExtendingSelection:NO];
-}
-
 -(int)findDBPath:(NSString*)path dbFolder:(NSString*)DBFolderLocation { // __deprecated
 	NSInteger i = [self rowForSourceIdentifier:[LocalDatabaseNodeIdentifier localDatabaseNodeIdentifierWithPath:path]];
 	if (i < 0) i = [self rowForSourceIdentifier:[LocalDatabaseNodeIdentifier localDatabaseNodeIdentifierWithPath:DBFolderLocation]];
@@ -463,172 +458,187 @@ -(void)observeValueForKeyPath:(NSString*)keyPath ofObject:(id)object change:(NSD
     
 //    NSKeyValueChange changeKind = [[change valueForKey:NSKeyValueChangeKindKey] unsignedIntegerValue];
 	
-	if (context == LocalBrowserSourcesContext)
-    {
-        NSArray* a = [[NSUserDefaults standardUserDefaults] objectForKey:@"localDatabasePaths"];
-        // remove old items
-		for (DataNodeIdentifier* dni in [[_browser.sources.content copy] autorelease])
-        {
-			if ([dni isKindOfClass:[LocalDatabaseNodeIdentifier class]] && dni.entered) // is a local database and is flagged as "entered"
-				if (![[a valueForKey:@"Path"] containsObject:dni.location]) {          // is no longer in the entered list
-					dni.entered = NO;                                                 // mark it as not entered
-                    if (!dni.detected)
-                        [_browser.sources removeObject:dni]; // not entered, not detected.. remove it
-                }
-		}
-		// add new items
-		for (NSDictionary* d in a)
-        {
-			NSString* dpath = [d valueForKey:@"Path"];
-			if ([[DicomDatabase baseDirPathForPath:dpath] isEqualToString:DicomDatabase.defaultDatabase.baseDirPath]) // is already listed as "default database"
-				continue;
-            DataNodeIdentifier* dni;
-			NSUInteger i = [[_browser.sources.content valueForKey:@"location"] indexOfObject:dpath];
-			if (i == NSNotFound) {
-                dni = [LocalDatabaseNodeIdentifier localDatabaseNodeIdentifierWithPath:dpath description:[d objectForKey:@"Description"] dictionary:d];
-                dni.entered = YES;
-				[_browser.sources addObject:dni];
-			} else {
-                dni = [_browser.sources.content objectAtIndex:i];
-                dni.entered = YES;
-				dni.description = [d objectForKey:@"Description"];
-				dni.dictionary = d;
-			}
-		}
-	}
-	
-	if (context == RemoteBrowserSourcesContext)
+    dontListenToSourcesChanges = YES;
+    
+    id previousNode = [_browser sourceIdentifierForDatabase:_browser.database];
+    
+    @try
     {
-        NSHost* currentHost = [DefaultsOsiriX currentHost];
-		NSArray* a = [[NSUserDefaults standardUserDefaults] objectForKey:@"OSIRIXSERVERS"];
-		// remove old items
-		for (DataNodeIdentifier* dni in [[_browser.sources.content copy] autorelease])
+        if (context == LocalBrowserSourcesContext)
         {
-			if ([dni isKindOfClass:[RemoteDatabaseNodeIdentifier class]] && dni.entered) // is a remote database and is flagged as "entered"
-				if (![[a valueForKey:@"Address"] containsObject:dni.location]) {        // is no longer in the entered list
-					dni.entered = NO;                                                  // mark it as not entered
-                    if (!dni.detected)
-                        [_browser.sources removeObject:dni]; // not entered, not detected.. remove it
-                }
-		}
-		// add new items
-//        NSOperationQueue* queue = [[[NSOperationQueue alloc] init] autorelease];
-		for (NSDictionary* d in a)
-        {
-            [NSThread performBlockInBackground:^{
-                // we're now in a background thread
-                NSString* dadd = [d valueForKey:@"Address"];
-                if ([[self class] host:[NSHost hostWithAddressOrName:dadd] isEqualToHost:currentHost]) // don't list self
-                    return;
-                [[NSOperationQueue mainQueue] addOperationWithBlock:^{
-                    // we're now back in the main thread
-                    DataNodeIdentifier* dni;
-                    NSUInteger i = [[_browser.sources.content valueForKey:@"location"] indexOfObject:dadd];
-                    if (i == NSNotFound) {
-                        dni = [RemoteDatabaseNodeIdentifier remoteDatabaseNodeIdentifierWithLocation:dadd description:[d objectForKey:@"Description"] dictionary:d];
-                        dni.entered = YES;
-                        [_browser.sources addObject:dni];
-                    } else {
-                        dni = [_browser.sources.content objectAtIndex:i];
-                        dni.entered = YES;
-                        dni.description = [d objectForKey:@"Description"];
-                        dni.dictionary = d;
+            NSArray* a = [[NSUserDefaults standardUserDefaults] objectForKey:@"localDatabasePaths"];
+            // remove old items
+            for (DataNodeIdentifier* dni in [[_browser.sources.content copy] autorelease])
+            {
+                if ([dni isKindOfClass:[LocalDatabaseNodeIdentifier class]] && dni.entered) // is a local database and is flagged as "entered"
+                    if (![[a valueForKey:@"Path"] containsObject:dni.location]) {          // is no longer in the entered list
+                        dni.entered = NO;                                                 // mark it as not entered
+                        if (!dni.detected)
+                            [_browser.sources removeObject:dni]; // not entered, not detected.. remove it
                     }
-                }];
-            }];
-		}
-	}
-	
-	if (context == DicomBrowserSourcesContext)
-    {
-        NSHost* currentHost = [DefaultsOsiriX currentHost];
-		NSArray* a = [[NSUserDefaults standardUserDefaults] objectForKey:@"SERVERS"];
-		NSMutableDictionary* aa = [NSMutableDictionary dictionary];
-		for (NSDictionary* ai in a)
-        {
-            if( [[ai objectForKey: @"Send"] boolValue])
-                [aa setObject:ai forKey:[DicomNodeIdentifier locationWithAddress:[ai objectForKey:@"Address"] port:[[ai objectForKey:@"Port"] integerValue] aet:[ai objectForKey:@"AETitle"]]];
-		}
-        // remove old items
-		for (DataNodeIdentifier* dni in [[_browser.sources.content copy] autorelease])
-        {
-			if ([dni isKindOfClass:[DicomNodeIdentifier class]] && dni.entered) // is a dicom node and is flagged as "entered"
-				if (![[aa allKeys] containsObject:dni.location]) {             // is no longer in the entered list
-					dni.entered = NO;                                         // mark it as not entered
-                    if (!dni.detected)
-                        [_browser.sources removeObject:dni]; // not entered, not detected.. remove it
+            }
+            // add new items
+            for (NSDictionary* d in a)
+            {
+                NSString* dpath = [d valueForKey:@"Path"];
+                if ([[DicomDatabase baseDirPathForPath:dpath] isEqualToString:DicomDatabase.defaultDatabase.baseDirPath]) // is already listed as "default database"
+                    continue;
+                DataNodeIdentifier* dni;
+                NSUInteger i = [[_browser.sources.content valueForKey:@"location"] indexOfObject:dpath];
+                if (i == NSNotFound) {
+                    dni = [LocalDatabaseNodeIdentifier localDatabaseNodeIdentifierWithPath:dpath description:[d objectForKey:@"Description"] dictionary:d];
+                    dni.entered = YES;
+                    [_browser.sources addObject:dni];
+                } else {
+                    dni = [_browser.sources.content objectAtIndex:i];
+                    dni.entered = YES;
+                    dni.description = [d objectForKey:@"Description"];
+                    dni.dictionary = d;
                 }
-		}
-		// add new items
-		for (NSString* aak in aa)
+            }
+        }
+        
+        if (context == RemoteBrowserSourcesContext)
         {
-            [NSThread performBlockInBackground:^{
-                // we're now in a background thread
-                NSString* aet = nil;
-                if ([[self class] host:[DicomNodeIdentifier location:aak toHost:NULL port:NULL aet:&aet] isEqualToHost:currentHost] && [aet isEqualToString:[[NSUserDefaults standardUserDefaults] stringForKey:@"AETITLE"]]) // don't list self
-                    return;
-                [[NSOperationQueue mainQueue] addOperationWithBlock:^{
-                    // we're now back in the main thread
-                    DataNodeIdentifier* dni;
-                    NSUInteger i = [[_browser.sources.content valueForKey:@"location"] indexOfObject:aak];
-                    if (i == NSNotFound) {
-                        dni = [DicomNodeIdentifier dicomNodeIdentifierWithLocation:aak description:[[aa objectForKey:aak] objectForKey:@"Description"] dictionary:[aa objectForKey:aak]];
-                        dni.entered = YES;
-                        [_browser.sources addObject:dni];
-                    } else {
-                        dni = [_browser.sources.content objectAtIndex:i];
-                        dni.entered = YES;
-                        dni.dictionary = [aa objectForKey:aak];
-                        dni.description = [dni.dictionary objectForKey:@"Description"];
-                    }
-                }];
-            }];
-		}
-	}
-	
-	if (context == SearchBonjourNodesContext)
-		@synchronized (_bonjourSources) {
-            if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DoNotSearchForBonjourServices"]) // add remote databases detected with bonjour
-            { // remove remote databases detected with bonjour
-                for (DataNodeIdentifier* dni in _bonjourSources)
-                    if ([dni isKindOfClass:[RemoteDatabaseNodeIdentifier class]] && dni.detected) {
-                        dni.detected = NO;
-                        if (!dni.entered && [_browser.sources.content containsObject:dni])
-                            [_browser.sources removeObject:dni];
+            NSHost* currentHost = [DefaultsOsiriX currentHost];
+            NSArray* a = [[NSUserDefaults standardUserDefaults] objectForKey:@"OSIRIXSERVERS"];
+            // remove old items
+            for (DataNodeIdentifier* dni in [[_browser.sources.content copy] autorelease])
+            {
+                if ([dni isKindOfClass:[RemoteDatabaseNodeIdentifier class]] && dni.entered) // is a remote database and is flagged as "entered"
+                    if (![[a valueForKey:@"Address"] containsObject:dni.location]) {        // is no longer in the entered list
+                        dni.entered = NO;                                                  // mark it as not entered
+                        if (!dni.detected)
+                            [_browser.sources removeObject:dni]; // not entered, not detected.. remove it
                     }
-            } else 
-            { // add remote databases detected with bonjour
-                for (DataNodeIdentifier* dni in _bonjourSources)
-                    if ([dni isKindOfClass:[RemoteDatabaseNodeIdentifier class]] && !dni.detected && dni.location) {
-                        dni.detected = YES;
-                        if (![_browser.sources.content containsObject:dni])
+            }
+            // add new items
+    //        NSOperationQueue* queue = [[[NSOperationQueue alloc] init] autorelease];
+            for (NSDictionary* d in a)
+            {
+                [NSThread performBlockInBackground:^{
+                    // we're now in a background thread
+                    NSString* dadd = [d valueForKey:@"Address"];
+                    if ([[self class] host:[NSHost hostWithAddressOrName:dadd] isEqualToHost:currentHost]) // don't list self
+                        return;
+                    [[NSOperationQueue mainQueue] addOperationWithBlock:^{
+                        // we're now back in the main thread
+                        DataNodeIdentifier* dni;
+                        NSUInteger i = [[_browser.sources.content valueForKey:@"location"] indexOfObject:dadd];
+                        if (i == NSNotFound) {
+                            dni = [RemoteDatabaseNodeIdentifier remoteDatabaseNodeIdentifierWithLocation:dadd description:[d objectForKey:@"Description"] dictionary:d];
+                            dni.entered = YES;
                             [_browser.sources addObject:dni];
-                    }
+                        } else {
+                            dni = [_browser.sources.content objectAtIndex:i];
+                            dni.entered = YES;
+                            dni.description = [d objectForKey:@"Description"];
+                            dni.dictionary = d;
+                        }
+                    }];
+                }];
             }
         }
-	
-	if (context == SearchDicomNodesContext)
-		@synchronized (_bonjourSources) {
-            if (![[NSUserDefaults standardUserDefaults] boolForKey:@"searchDICOMBonjour"])
-            { // remove dicom nodes detected with bonjour
-                for (DataNodeIdentifier* dni in _bonjourSources)
-                    if ([dni isKindOfClass:[DicomNodeIdentifier class]] && dni.detected) {
-                        dni.detected = NO;
-                        if (!dni.entered && [_browser.sources.content containsObject:dni])
-                            [_browser.sources removeObject:dni];
+        
+        if (context == DicomBrowserSourcesContext)
+        {
+            NSHost* currentHost = [DefaultsOsiriX currentHost];
+            NSArray* a = [[NSUserDefaults standardUserDefaults] objectForKey:@"SERVERS"];
+            NSMutableDictionary* aa = [NSMutableDictionary dictionary];
+            for (NSDictionary* ai in a)
+            {
+                if( [[ai objectForKey: @"Send"] boolValue])
+                    [aa setObject:ai forKey:[DicomNodeIdentifier locationWithAddress:[ai objectForKey:@"Address"] port:[[ai objectForKey:@"Port"] integerValue] aet:[ai objectForKey:@"AETitle"]]];
+            }
+            // remove old items
+            for (DataNodeIdentifier* dni in [[_browser.sources.content copy] autorelease])
+            {
+                if ([dni isKindOfClass:[DicomNodeIdentifier class]] && dni.entered) // is a dicom node and is flagged as "entered"
+                    if (![[aa allKeys] containsObject:dni.location]) {             // is no longer in the entered list
+                        dni.entered = NO;                                         // mark it as not entered
+                        if (!dni.detected)
+                            [_browser.sources removeObject:dni]; // not entered, not detected.. remove it
                     }
-            } else
-            { // add dicom nodes detected with bonjour
-                for (DataNodeIdentifier* dni in _bonjourSources)
-                    if ([dni isKindOfClass:[DicomNodeIdentifier class]] && !dni.detected && dni.location) {
-                        dni.detected = YES;
-                        if (![_browser.sources.content containsObject:dni])
+            }
+            // add new items
+            for (NSString* aak in aa)
+            {
+                [NSThread performBlockInBackground:^{
+                    // we're now in a background thread
+                    NSString* aet = nil;
+                    if ([[self class] host:[DicomNodeIdentifier location:aak toHost:NULL port:NULL aet:&aet] isEqualToHost:currentHost] && [aet isEqualToString:[[NSUserDefaults standardUserDefaults] stringForKey:@"AETITLE"]]) // don't list self
+                        return;
+                    [[NSOperationQueue mainQueue] addOperationWithBlock:^{
+                        // we're now back in the main thread
+                        DataNodeIdentifier* dni;
+                        NSUInteger i = [[_browser.sources.content valueForKey:@"location"] indexOfObject:aak];
+                        if (i == NSNotFound) {
+                            dni = [DicomNodeIdentifier dicomNodeIdentifierWithLocation:aak description:[[aa objectForKey:aak] objectForKey:@"Description"] dictionary:[aa objectForKey:aak]];
+                            dni.entered = YES;
                             [_browser.sources addObject:dni];
-                    }
+                        } else {
+                            dni = [_browser.sources.content objectAtIndex:i];
+                            dni.entered = YES;
+                            dni.dictionary = [aa objectForKey:aak];
+                            dni.description = [dni.dictionary objectForKey:@"Description"];
+                        }
+                    }];
+                }];
             }
         }
-	
-	// showhide bonjour sources
+        
+        if (context == SearchBonjourNodesContext)
+            @synchronized (_bonjourSources) {
+                if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DoNotSearchForBonjourServices"]) // add remote databases detected with bonjour
+                { // remove remote databases detected with bonjour
+                    for (DataNodeIdentifier* dni in _bonjourSources)
+                        if ([dni isKindOfClass:[RemoteDatabaseNodeIdentifier class]] && dni.detected) {
+                            dni.detected = NO;
+                            if (!dni.entered && [_browser.sources.content containsObject:dni])
+                                [_browser.sources removeObject:dni];
+                        }
+                } else 
+                { // add remote databases detected with bonjour
+                    for (DataNodeIdentifier* dni in _bonjourSources)
+                        if ([dni isKindOfClass:[RemoteDatabaseNodeIdentifier class]] && !dni.detected && dni.location) {
+                            dni.detected = YES;
+                            if (![_browser.sources.content containsObject:dni])
+                                [_browser.sources addObject:dni];
+                        }
+                }
+            }
+        
+        if (context == SearchDicomNodesContext)
+            @synchronized (_bonjourSources) {
+                if (![[NSUserDefaults standardUserDefaults] boolForKey:@"searchDICOMBonjour"])
+                { // remove dicom nodes detected with bonjour
+                    for (DataNodeIdentifier* dni in _bonjourSources)
+                        if ([dni isKindOfClass:[DicomNodeIdentifier class]] && dni.detected) {
+                            dni.detected = NO;
+                            if (!dni.entered && [_browser.sources.content containsObject:dni])
+                                [_browser.sources removeObject:dni];
+                        }
+                } else
+                { // add dicom nodes detected with bonjour
+                    for (DataNodeIdentifier* dni in _bonjourSources)
+                        if ([dni isKindOfClass:[DicomNodeIdentifier class]] && !dni.detected && dni.location) {
+                            dni.detected = YES;
+                            if (![_browser.sources.content containsObject:dni])
+                                [_browser.sources addObject:dni];
+                        }
+                }
+            }
+    }
+    @catch (NSException *exception) {
+        N2LogExceptionWithStackTrace( exception);
+    }
+    
+    dontListenToSourcesChanges = NO;
+    
+    if( [_browser rowForSourceIdentifier: previousNode] == -1)
+        [_browser performSelector: @selector(setDatabase:) withObject: DicomDatabase.defaultDatabase afterDelay: 0.01]; //This will guarantee that this will not happen in middle of a drag & drop, for example
+    else
+        [_browser selectSourceForDatabase: _browser.database];
 }
 
 -(void)netServiceDidResolveAddress:(NSNetService*)service
@@ -1049,9 +1059,12 @@ -(BOOL)tableView:(NSTableView*)tableView acceptDrop:(id<NSDraggingInfo>)info row
 
 -(void)tableViewSelectionDidChange:(NSNotification*)notification
 {
-	NSInteger row = [(NSTableView*)notification.object selectedRow];
-	DataNodeIdentifier* bs = [_browser sourceIdentifierAtRow:row];
-	[_browser setDatabaseFromSourceIdentifier:bs];
+    if( dontListenToSourcesChanges == NO)
+    {
+        NSInteger row = [(NSTableView*)notification.object selectedRow];
+        DataNodeIdentifier* bs = [_browser sourceIdentifierAtRow:row];
+        [_browser setDatabaseFromSourceIdentifier:bs];
+    }
 }
 
 @end
diff --git a/browserController.m b/browserController.m
index 1f8cd42f22..851db14282 100644
--- a/browserController.m
+++ b/browserController.m
@@ -1399,7 +1399,8 @@ -(void)setDatabase:(DicomDatabase*)db
             
 			if ([NSUserDefaults canActivateAnyLocalDatabase] && [db isLocal] && ![db isReadOnly])
 				[DicomDatabase setActiveLocalDatabase:db];
-			if (db) [self selectCurrentDatabaseSource];
+			if (db)
+                [self selectCurrentDatabaseSource];
 
 			[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_observeDatabaseAddNotification:) name:_O2AddToDBAnywayNotification object:_database];
             [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_observeDatabaseDidChangeContextNotification:) name:OsirixDicomDatabaseDidChangeContextNotification object:_database];
@@ -1421,8 +1422,6 @@ -(void)setDatabase:(DicomDatabase*)db
             {
 				[self setDBWindowTitle];
 				
-				[[NSNotificationCenter defaultCenter] postNotificationName: OsirixServerArrayChangedNotification object:nil];
-				
 				[databaseOutline reloadData];
 				[albumTable reloadData];