shadowfacts
/
MongoView
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Combine for MongoController status changes

This commit is contained in:
Shadowfacts 2020-07-06 10:45:53 -04:00
parent bb695fbf53
commit 967a2518b4
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MongoView/MongoController.swift
View File

@ -9,6 +9,7 @@
import Foundation import Foundation
import MongoSwift import MongoSwift
import NIO import NIO
import Combine
class MongoController { class MongoController {
let connectionString: String let connectionString: String
@ -17,12 +18,7 @@ class MongoController {
var client: MongoClient! var client: MongoClient!
var status: Status = .connecting { @Published var status: ConnectionStatus = .connecting
didSet {
statusDidChange.forEach { $0(status) }
}
}
var statusDidChange = [(Status) -> Void]()
init(connectionString: String) { init(connectionString: String) {
self.connectionString = connectionString self.connectionString = connectionString
@ -40,7 +36,7 @@ class MongoController {
do { do {
client = try MongoClient(connectionString, using: group) client = try MongoClient(connectionString, using: group)
status = .success status = .connected
} catch { } catch {
status = .failed status = .failed
print("Failed to connect to Mongo: \(error)") print("Failed to connect to Mongo: \(error)")
@ -58,7 +54,7 @@ class MongoController {
} }
extension MongoController { extension MongoController {
enum Status { enum ConnectionStatus {
case connecting, success, failed case connecting, connected, failed
} }
} }

21
MongoView/Windows/DatabaseWindowController.swift
View File

@ -7,6 +7,7 @@
// //
import Cocoa import Cocoa
import Combine
class DatabaseWindowController: NSWindowController { class DatabaseWindowController: NSWindowController {
@ -21,6 +22,8 @@ class DatabaseWindowController: NSWindowController {
private var databaseViewController: DatabaseViewController! private var databaseViewController: DatabaseViewController!
private var statusDidChangeHandler: Cancellable?
convenience init() { convenience init() {
self.init(windowNibName: "DatabaseWindowController") self.init(windowNibName: "DatabaseWindowController")
} }
@ -32,17 +35,15 @@ class DatabaseWindowController: NSWindowController {
if setupMongo { if setupMongo {
mongoController = MongoController(connectionString: "mongodb://localhost:27017") mongoController = MongoController(connectionString: "mongodb://localhost:27017")
} }
mongoController.statusDidChange.append({ [weak self] (status) in statusDidChangeHandler = mongoController.$status
guard let self = self else { return } .receive(on: DispatchQueue.main)
self.updateStatusText(status) .sink { (status) in
self.updateStatusText(status)
if status == .success {
DispatchQueue.main.async { if status == .connected {
self.initializeUI() self.initializeUI()
} }
} }
})
self.updateStatusText(mongoController.status)
if setupMongo { if setupMongo {
mongoController.setup() mongoController.setup()
} }
@ -65,14 +66,14 @@ class DatabaseWindowController: NSWindowController {
window?.title = databaseViewController?.title ?? "MongoView" window?.title = databaseViewController?.title ?? "MongoView"
} }
private func updateStatusText(_ status: MongoController.Status) { private func updateStatusText(_ status: MongoController.ConnectionStatus) {
guard let statusView = self.statusView else { return } guard let statusView = self.statusView else { return }
switch status { switch status {
case .connecting: case .connecting:
statusView.setText("Connecting...") statusView.setText("Connecting...")
case .failed: case .failed:
statusView.setText("Failed to connect") statusView.setText("Failed to connect")
case .success: case .connected:
statusView.setText("Connected to \(self.mongoController.connectionString)") statusView.setText("Connected to \(self.mongoController.connectionString)")
} }
} }