Added server and tracker bookmarks. Reordering in Servers window. Delete. All stored securely in Keychain.

3 files changed, 133 insertions, 67 deletions

diff --git a/Hotline/Models/Bookmarks.swift b/Hotline/Models/Bookmarks.swift
new file mode 100644
index 0000000..3f4971c
--- /dev/null
+++ b/Hotline/Models/Bookmarks.swift
@@ -0,0 +1,126 @@
+import SwiftUI
+
+extension NSNotification {
+  static let BookmarkAdded = Notification.Name("BookmarkAdded")
+  static let BookmarkRemoved = Notification.Name("BookmarkRemoved")
+}
+
+enum BookmarkType: String, Codable {
+  case tracker = "tracker"
+  case server = "server"
+}
+
+struct Bookmark: Codable, Equatable {
+  let type: BookmarkType
+  let name: String
+  let address: String
+  let port: Int
+  let login: String?
+  let password: String?
+  
+  init(type: BookmarkType, name: String, address: String, port: Int = HotlinePorts.DefaultServerPort, login: String? = nil, password: String? = nil) {
+    self.type = type
+    self.name = name
+    self.address = address
+    self.port = port
+    self.login = login
+    self.password = password
+  }
+}
+
+@Observable final class Bookmarks {
+  var bookmarks: [Bookmark]? = nil
+  
+  static let DefaultBookmarks: [Bookmark] = [
+    Bookmark(type: .server, name: "System 7 Today", address: "hotline.system7today.com"),
+    Bookmark(type: .server, name: "The Mobius Strip", address: "67.174.208.111"),
+    Bookmark(type: .tracker, name: "Featured Servers", address: "hltracker.com"),
+  ]
+  
+  init() {
+    self.load()
+  }
+  
+  func apply(_ newBookmarks: [Bookmark], save shouldSave: Bool = true) {
+    self.bookmarks = newBookmarks
+    if shouldSave {
+      self.save()
+    }
+  }
+  
+  func load() {
+    let jsonString: String? = DAKeychain.shared["Hotline Bookmarks"]
+    let jsonData: Data? = jsonString?.data(using: .utf8, allowLossyConversion: false)
+    
+    let decoder = JSONDecoder()
+    var decodedBookmarks = try? decoder.decode([Bookmark].self, from: jsonData ?? Data())
+    if decodedBookmarks == nil || decodedBookmarks?.isEmpty == true {
+      print("Bookmarks: using default bookmarks")
+      decodedBookmarks = Bookmarks.DefaultBookmarks
+    }
+    else {
+      print("Bookmarks: using saved bookmarks")
+    }
+    
+    self.bookmarks = [Bookmark](decodedBookmarks!)
+  }
+  
+  func save() {
+    var bookmarksToSave = self.bookmarks
+    if bookmarksToSave == Bookmarks.DefaultBookmarks {
+      print("Bookmarks: skipping saving default bookmarks")
+      bookmarksToSave = []
+    }
+    
+    let encoder = JSONEncoder()
+    encoder.outputFormatting = .prettyPrinted
+    if let jsonData = try? encoder.encode(bookmarksToSave) {
+      if let jsonString = String(data: jsonData, encoding: .utf8) {
+        DAKeychain.shared["Hotline Bookmarks"] = jsonString
+      }
+    }
+  }
+  
+  // MARK: -
+  
+  func add(_ bookmark: Bookmark, save shouldSave: Bool = true) {
+    self.bookmarks?.insert(bookmark, at: 0)
+    
+    if shouldSave {
+      self.save()
+    }
+    
+    DispatchQueue.main.async {
+      NotificationCenter.default.post(name: NSNotification.BookmarkAdded, object: nil, userInfo: ["index": 0])
+    }
+  }
+  
+  func delete(_ bookmark: Bookmark, save shouldSave: Bool = true) -> Bool {
+    if let i = self.bookmarks?.firstIndex(where: { b in b.address.lowercased() == bookmark.address.lowercased() && b.port == bookmark.port }) {
+      self.bookmarks?.remove(at: i)
+      
+      if shouldSave {
+        self.save()
+      }
+      
+      DispatchQueue.main.async {
+        NotificationCenter.default.post(name: NSNotification.BookmarkRemoved, object: nil, userInfo: ["index": i])
+      }
+      return true
+    }
+    
+    return false
+  }
+  
+  func update(_ bookmark: Bookmark, save shouldSave: Bool = true) -> Bool {
+    if let i = self.bookmarks?.firstIndex(where: { b in b.address.lowercased() == bookmark.address.lowercased() && b.port == bookmark.port }) {
+      self.bookmarks?[i] = bookmark
+      if shouldSave {
+        self.save()
+      }
+      return true
+    }
+    
+    return false
+  }
+}
diff --git a/Hotline/Models/Hotline.swift b/Hotline/Models/Hotline.swift
index 77d4d59..6b5e3a7 100644
--- a/Hotline/Models/Hotline.swift
+++ b/Hotline/Models/Hotline.swift
@@ -103,73 +103,6 @@ final class Hotline: HotlineClientDelegate, HotlineFileClientDelegate {
     6029, 6030, 6031, 6032, 6033, 6034, 6035
   ]
   
-  static let defaultIconSet: [Int: String] = [
-    414: "🙂",
-    2000: "📟",
-    2001: "💀",
-    2002: "🪩",
-    2003: "💥",
-    2004: "🐞",
-    2014: "🍎",
-    2006: "💠",
-    2007: "🦠",
-    2008: "🪀",
-    2009: "🛟",
-    2010: "🍉",
-    2011: "🍁",
-    2012: "🚦",
-    145: "🚔",
-    2015: "👻",
-    2016: "💻",
-    2017: "☀️",
-    2018: "➡️",
-    417: "🧍‍♂️",
-    140: "🎨",
-    141: "👽",
-    142: "🚀",
-    143: "🕷️",
-    138: "😺",
-    146: "🌅",
-    149: "🐮",
-    150: "🦖",
-    151: "🧻",
-    154: "🐖",
-    182: "✋",
-    207: "⚠️",
-    2061: "☕️",
-    2063: "🌮",
-    2064: "🍕",
-    2065: "🍔",
-    2066: "🌭",
-    2067: "🍭",
-    2013: "🐧",
-    2037: "⚠️",
-    2055: "⚡️",
-    2400: "🇨🇦",
-    2036: "☣️",
-    4134: "🦈",
-    4247: "🍗",
-    135: "☯️",
-    137: "🐝",
-    144: "🚀",
-    165: "🎶",
-    166: "❤️",
-    2549: "🇮🇱",
-    2553: "🇺🇸",
-    2555: "🇨🇦",
-    2552: "🇮🇳",
-    2556: "🇦🇺",
-    2565: "🇬🇧",
-    2567: "🇯🇵",
-    2566: "🇫🇷",
-    2564: "🇩🇪",
-    2563: "🇮🇹",
-    2550: "🇭🇺",
-    2551: "🇵🇱",
-    2560: "🇪🇸",
-    2561: "🇸🇪",
-  ]
-  
   var status: HotlineClientStatus = .disconnected
   
   var server: Server?  {
diff --git a/Hotline/Models/Tracker.swift b/Hotline/Models/Tracker.swift
index e9961e9..171cb35 100644
--- a/Hotline/Models/Tracker.swift
+++ b/Hotline/Models/Tracker.swift
@@ -8,4 +8,11 @@ import SwiftUI
     self.address = address
     self.port = port
   }
+  
+  static func parseTrackerAddressAndPort(_ address: String) -> (String, Int) {
+    let url = URL(string: "hotlinetracker://\(address)")
+    let port = url?.port ?? HotlinePorts.DefaultTrackerPort
+    let host = url?.host(percentEncoded: false) ?? ""
+    return (host.lowercased().trimmingCharacters(in: .whitespacesAndNewlines), port)
+  }
 }