Publish API bonjour service as Planet or Croptop on 8086 (the new def…

…ault port)

Planet/API/PlanetAPIService.swift

@@ -32,9 +32,14 @@ class PlanetAPIService: NSObject, NetServiceDelegate {
         }
     }
 
-    private func setupService(_ port: Int = 9191) {
+    private func setupService(_ port: Int = 8086) {
         // Initialize NetService object with domain, service type, name, and port.
-        var serviceName = "Planet API Server"
+        var serviceName: String
+        if Bundle.main.executableURL?.lastPathComponent == "Croptop" {
+            serviceName = "Croptop"
+        } else {
+            serviceName = "Planet"
+        }
         if let hostname = getHostname() {
             serviceName = serviceName + " on \(hostname)"
         }

Planet/Entities/MyArticleModel.swift

@@ -110,7 +110,7 @@ class MyArticleModel: ArticleModel, Codable {
         if apiEnabled {
             let apiPort =
                 UserDefaults
-                .standard.string(forKey: String.settingsAPIPort) ?? "9191"
+                .standard.string(forKey: String.settingsAPIPort) ?? "8086"
             return URL(
                 string:
                     "http://127.0.0.1:\(apiPort)/v0/planets/my/\(planet.id.uuidString)/public/\(id.uuidString)/index.html"

Planet/Entities/MyPlanetModel+Aggregate.swift

@@ -85,7 +85,7 @@ extension MyPlanetModel {
                 article.delete()
             }
         }
-        tags = consolidateTags()
+        self.tags = self.consolidateTags()
         try? save()
         try? await savePublic()
         Task { @MainActor in

Planet/PlanetAPI.swift

@@ -21,7 +21,7 @@ actor PlanetAPIHelper {
         server = HttpServer()
         let defaults = UserDefaults.standard
         if defaults.value(forKey: .settingsAPIPort) == nil {
-            defaults.set("9191", forKey: .settingsAPIPort)
+            defaults.set("8086", forKey: .settingsAPIPort)
         }
         if defaults.value(forKey: .settingsAPIEnabled) == nil {
             defaults.set(false, forKey: .settingsAPIEnabled)
@@ -121,7 +121,13 @@ actor PlanetAPIHelper {
         }
         if let portString = UserDefaults.standard.string(forKey: .settingsAPIPort), let port = Int(portString) {
             try server.start(in_port_t(port), forceIPv4: false, priority: .utility)
-            debugPrint("Planet API server started: port=\(portString)")
+            var serviceName: String
+            if Bundle.main.executableURL?.lastPathComponent == "Croptop" {
+                serviceName = "Croptop"
+            } else {
+                serviceName = "Planet"
+            }
+            debugPrint("\(serviceName) API server started: port=\(portString)")
 
             if self.bonjourService == nil {
                 self.bonjourService = PlanetAPIService(port)

Planet/Settings/PlanetSettingsAPIView.swift

@@ -9,14 +9,14 @@ import SwiftUI
 
 
 struct PlanetSettingsAPIView: View {
-    
+
     @AppStorage(String.settingsAPIEnabled) private var apiEnabled: Bool =
     UserDefaults.standard.bool(forKey: String.settingsAPIEnabled)
     @AppStorage(String.settingsAPIUsesPasscode) private var apiUsesPasscode: Bool = UserDefaults.standard.bool(forKey: String.settingsAPIUsesPasscode)
     @AppStorage(String.settingsAPIUsername) private var apiUsername: String = UserDefaults.standard.string(forKey: String.settingsAPIUsername) ?? "Planet"
     @AppStorage(String.settingsAPIPort) private var apiPort: String = UserDefaults
-        .standard.string(forKey: String.settingsAPIPort) ?? "9191"
-    
+        .standard.string(forKey: String.settingsAPIPort) ?? "8086"
+
     @State private var apiPasscode: String = ""
     @State private var isShowingPasscode: Bool = false
 
@@ -111,7 +111,7 @@ struct PlanetSettingsAPIView: View {
             }
         }
     }
-    
+
     private func updatePasscode(_ passcode: String) {
         guard passcode != "" else { return }
         do {
@@ -120,7 +120,7 @@ struct PlanetSettingsAPIView: View {
             debugPrint("failed to save passcode to keychain: \(error)")
         }
     }
-    
+
     private func reloadAPIServer() {
         Task {
             do {

Planet/versioning.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 1824
+CURRENT_PROJECT_VERSION = 1828