Massive UI overhaul

Author: thecodewarrior

SwiftSplit.xcodeproj/xcshareddata/xcschemes/SwiftSplit.xcscheme

@@ -34,6 +34,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      debugAsWhichUser = "root"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

SwiftSplit/AppDelegate.swift

@@ -21,6 +21,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         // Insert code here to tear down your application
     }
 
+    func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
+        return true
+    }
 
 }
 

SwiftSplit/Base.lproj/Main.storyboard

@@ -9,39 +9,4 @@
 import Foundation
 
 class CelesteEventGenerator {
-    var scanner: CelesteScanner
-    var autoSplitterInfo: AutoSplitterInfo = AutoSplitterInfo()
-    
-    init(pid: pid_t) throws {
-        scanner = try CelesteScanner(pid: pid)
-        try scanner.findHeader()
-    }
-    
-    func updateInfo() throws -> [String] {
-        if let info = try scanner.getInfo() {
-            let events = getEvents(from: autoSplitterInfo, to: info)
-            autoSplitterInfo = info
-            return events
-        } else {
-            autoSplitterInfo = AutoSplitterInfo()
-            return []
-        }
-    }
-    
-    func getEvents(from old: AutoSplitterInfo, to new: AutoSplitterInfo) -> [String] {
-        var events: [String] = []
-        if new.level != old.level {
-            events.append("\(old.level) > \(new.level)")
-        }
-        if new.chapterStarted && !old.chapterStarted {
-            events.append("start chapter \(new.chapter)")
-        }
-        if !new.chapterStarted && old.chapterStarted && !old.chapterComplete {
-            events.append("reset chapter")
-        }
-        if new.chapterComplete && !old.chapterComplete {
-            events.append("complete chapter \(old.chapter)")
-        }
-        return events
-    }
 }

SwiftSplit/CelesteEventGenerator.swift

@@ -7,3 +7,124 @@
 //
 
 import Foundation
+
+enum SplitterError: Error {
+    case noHeader
+}
+/**
+ Handles sending split commands based on state changes
+ */
+class CelesteSplitter {
+    let scanner: CelesteScanner
+    let server: LiveSplitServer
+    var autoSplitterInfo: AutoSplitterInfo = AutoSplitterInfo()
+    var routeConfig = RouteConfig(
+        useFileTime: false,
+        reset: "",
+        route: []
+    )
+    
+    init(pid: pid_t, server: LiveSplitServer) throws {
+        self.scanner = try CelesteScanner(pid: pid)
+        self.server = server
+        self.server.pauseGameTime() // make sure gameTimeRunning is accurate
+        try scanner.findHeader()
+        if scanner.headerSignature == nil {
+            throw SplitterError.noHeader
+        }
+    }
+    
+    private var gameTimeRunning = false
+    private(set) var routeIndex = 0
+    
+    func update() throws -> [String] {
+        guard let info = try scanner.getInfo() else {
+            autoSplitterInfo = AutoSplitterInfo()
+            return []
+        }
+        let events = getEvents(from: autoSplitterInfo, to: info)
+        autoSplitterInfo = info
+        
+        if routeConfig.useFileTime {
+            server.setGameTime(seconds: autoSplitterInfo.fileTime)
+        } else {
+            server.setGameTime(seconds: autoSplitterInfo.chapterTime)
+        }
+        if autoSplitterInfo.timerActive {
+            if !gameTimeRunning {
+                server.resumeGameTime()
+                gameTimeRunning = true
+            }
+        } else if gameTimeRunning {
+            server.pauseGameTime()
+            gameTimeRunning = false
+        }
+        processEvents(events)
+        return events
+    }
+    
+    func getEvents(from old: AutoSplitterInfo, to new: AutoSplitterInfo) -> [String] {
+        var events: [String] = []
+        if new.level != old.level && old.level != "" && new.level != "" {
+            events.append("\(old.level) > \(new.level)")
+        }
+        if new.chapterStarted && !old.chapterStarted {
+            events.append("start chapter \(new.chapter)")
+        }
+        if !new.chapterStarted && old.chapterStarted && !old.chapterComplete {
+            events.append("reset chapter")
+        }
+        if new.chapterComplete && !old.chapterComplete {
+            events.append("complete chapter \(old.chapter)")
+        }
+        return events
+    }
+    
+    func processEvents(_ events: [String]) {
+        for event in events {
+            print("Event: `\(event)`")
+            if event == routeConfig.reset {
+                server.reset()
+                routeIndex = 0
+            } else if routeIndex < routeConfig.route.count {
+                let nextEvent = routeConfig.route[routeIndex]
+                if event == nextEvent || "!\(event)" == nextEvent {
+                    if routeIndex == 0 {
+                        server.reset()
+                        server.start()
+                    } else if !nextEvent.starts(with: "!") {
+                        server.split()
+                    }
+                    routeIndex += 1
+                    if routeIndex == routeConfig.route.count {
+                        routeIndex = 0
+                    }
+                }
+            }
+        }
+    }
+}
+
+struct RouteConfig {
+    let useFileTime: Bool
+    let reset: String
+    let route: [String]
+}
+
+extension RouteConfig {
+    init?(json: [String: Any]) {
+        guard let useFileTime = json["useFileTime"] as? Bool,
+            let reset = json["reset"] as? String,
+            let route = json["route"] as? [String]
+            else {
+                return nil
+        }
+        self.useFileTime = useFileTime
+        self.reset = reset
+        self.route = route
+    }
+    
+    init() {
+        self.init(useFileTime: false, reset: "", route: [])
+    }
+}

SwiftSplit/CelesteSplitter.swift

@@ -16,8 +16,11 @@ class LiveSplitServerHandler: MultiClientWebSocketHandler {
 }
 
 class LiveSplitServer {
-    let handler = LiveSplitServerHandler()
-    let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
+    private let handler = LiveSplitServerHandler()
+    private let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
+    var connectedClients: Int {
+        get { handler.connectedClients }
+    }
 
     init(host: String, port: Int) throws {
 

SwiftSplit/Core/LiveSplitServer.swift

@@ -19,6 +19,9 @@ class MultiClientWebSocketHandler: ChannelInboundHandler {
     private let channelsSyncQueue = DispatchQueue(label: "channelsQueue")
     private var channels: [ObjectIdentifier: Channel] = [:]
     private var awaitingClose: Set<ObjectIdentifier> = Set()
+    var connectedClients: Int {
+        get { channels.count }
+    }
 
     func handlerAdded(ctx: ChannelHandlerContext) {
         let channel = ctx.channel