Case-insensitive comparison of service names.

Fix for lapcat#7

source/BonjourNode.swift

@@ -3,7 +3,7 @@ import Cocoa
 protocol BonjourNode:NSObjectProtocol {
 	var children:[Any] { get }
 	var objectValue:String { get }
-	var persistentName:String { get }
+	var persistentName:String { get set }
 	func start()
 	func stop()
 }

source/BrowserDelegate.swift

@@ -7,7 +7,7 @@ class BrowserDelegate:NSObject, NetServiceBrowserDelegate, BonjourNode {
 	// These need to be overridden
 	var children:[Any] { fatalError() }
 	var objectValue:String { fatalError() }
-	var persistentName:String { fatalError() }
+	var persistentName:String = ""
 
 	func start() {
 		browser.includesPeerToPeer = true

source/BrowserWindowController.swift

@@ -2,6 +2,7 @@ import Cocoa
 
 class BrowserWindowController:NSObject, NSOutlineViewDataSource, NSOutlineViewDelegate, NSWindowDelegate {
 	static let expandedUserDefaultsKey = "ExpandedItems"
+	static let lowercasedExpandedUserDefaultsKey = "LowercasedExpandedItems"
 	let browserDelegate = RootBrowserDelegate()
 	let outlineView = CopyOutlineView()
 	let window:NSWindow = {
@@ -15,6 +16,7 @@ class BrowserWindowController:NSObject, NSOutlineViewDataSource, NSOutlineViewDe
 	}()
 
 	func open(_ title:String) {
+		migrateUserDefaultsIfNecessary()
 		browserDelegate.start()
 
 		window.center()
@@ -204,4 +206,24 @@ class BrowserWindowController:NSObject, NSOutlineViewDataSource, NSOutlineViewDe
 			standardUserDefaults.set([persistentName:expanded], forKey:key)
 		}
 	}
+
+	func migrateUserDefaultsIfNecessary() {
+		// UserDefaults keys are lowercased starting in Bonjeff 1.0.2
+		// Migrate Bonjeff 1.0.0 and 1.0.1 keys if necessary
+		let standardUserDefaults = UserDefaults.standard
+		let lowercaseExpandedKey = BrowserWindowController.lowercasedExpandedUserDefaultsKey
+		let lowercasedExpanded = standardUserDefaults.bool(forKey:lowercaseExpandedKey)
+		if !lowercasedExpanded {
+			standardUserDefaults.set(true, forKey:lowercaseExpandedKey)
+
+			let expandedKey = BrowserWindowController.expandedUserDefaultsKey
+			if let expandedDefaults = standardUserDefaults.dictionary(forKey:expandedKey) {
+				var newDefaults = [String:Any]()
+				for (key, value) in expandedDefaults {
+					newDefaults[key.lowercased()] = value
+				}
+				standardUserDefaults.set(newDefaults, forKey:expandedKey)
+			}
+		}
+	}
 }

source/DomainBrowserDelegate.swift

@@ -5,11 +5,11 @@ class DomainBrowserDelegate:BrowserDelegate {
 	var delegates = [ServiceBrowserDelegate]()
 	override var children:[Any] { return delegates }
 	override var objectValue:String { return domain }
-	override var persistentName:String { return domain }
 
 	required init(_ domain:String) {
 		self.domain = domain
 		super.init()
+		persistentName = domain.lowercased()
 	}
 
 	@available(*, unavailable)
@@ -51,7 +51,7 @@ class DomainBrowserDelegate:BrowserDelegate {
 		}
 
 		for delegate in delegates {
-			if delegate.type == type {
+			if delegate.type.caseInsensitiveCompare(type) == .orderedSame {
 				NSLog("didFind duplicate service:%@", service)
 				return
 			}
@@ -70,7 +70,7 @@ class DomainBrowserDelegate:BrowserDelegate {
 		}
 
 		for (index, delegate) in delegates.enumerated() {
-			if delegate.type == type {
+			if delegate.type.caseInsensitiveCompare(type) == .orderedSame {
 				delegates.remove(at:index)
 				delegate.stop()
 				NotificationCenter.default.post(name:.nodeDidRemove, object:self)

source/RootBrowserDelegate.swift

@@ -11,7 +11,7 @@ class RootBrowserDelegate:BrowserDelegate {
 
 	func netServiceBrowser(_ sender:NetServiceBrowser, didFindDomain domain:String, moreComing:Bool) {
 		for delegate in delegates {
-			if delegate.domain == domain {
+			if delegate.domain.caseInsensitiveCompare(domain) == .orderedSame {
 				NSLog("didFind duplicate domain:%@", domain)
 				return
 			}
@@ -26,7 +26,7 @@ class RootBrowserDelegate:BrowserDelegate {
 
 	func netServiceBrowser(_ sender:NetServiceBrowser, didRemoveDomain domain:String, moreComing:Bool) {
 		for (index, delegate) in delegates.enumerated() {
-			if delegate.domain == domain {
+			if delegate.domain.caseInsensitiveCompare(domain) == .orderedSame {
 				delegates.remove(at:index)
 				delegate.stop()
 				NotificationCenter.default.post(name:.nodeDidRemove, object:nil) // nil is root item for outline view

source/ServiceBrowserDelegate.swift

@@ -6,12 +6,13 @@ class ServiceBrowserDelegate:BrowserDelegate {
 	var delegates = [ServiceDelegate]()
 	override var children:[Any] { return delegates }
 	override var objectValue:String { return type }
-	override var persistentName:String { return type + domain }
 
 	required init(type:String, domain:String) {
 		self.type = type
 		self.domain = domain
 		super.init()
+		let name = type + domain
+		persistentName = name.lowercased()
 	}
 
 	@available(*, unavailable)

source/ServiceDelegate.swift

@@ -11,7 +11,7 @@ class ServiceDelegate:NSObject, NetServiceDelegate, BonjourNode {
 
 	required init(_ service:NetService) {
 		self.service = service
-		persistentName = "\(service.name).\(service.type)\(service.domain)"
+		persistentName = "\(service.name).\(service.type)\(service.domain)".lowercased()
 		super.init()
 	}