passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macOS: Tunnel detail: Refactor calculation of tableViewModelRows 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2019-02-04 16:27:11 +05:30
parent f7a31ca7bb
commit 657ec34d19
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift
View File

@ -78,12 +78,15 @@ class TunnelDetailTableViewController: NSViewController {
let tunnelsManager: TunnelsManager
let tunnel: TunnelContainer
var tunnelViewModel: TunnelViewModel {
didSet {
updateTableViewModelRows()
didSet { updateTableViewModelRowsBySection() }
}
private var tableViewModelRowsBySection = [[(isVisible: Bool, modelRow: TableViewModelRow)]]() {
didSet { updateTableViewModelRows() }
}
private var tableViewModelRows = [TableViewModelRow]()
private var statusObservationToken: AnyObject?
private var tunnelEditVC: TunnelEditViewController?
private var reloadRuntimeConfigurationTimer: Timer?
@ -160,19 +163,34 @@ class TunnelDetailTableViewController: NSViewController {
view = containerView
}
func updateTableViewModelRows() {
tableViewModelRows = []
for field in interfaceFields where !tunnelViewModel.interfaceData[field].isEmpty {
tableViewModelRows.append(.interfaceFieldRow(field))
func updateTableViewModelRowsBySection() {
var modelRowsBySection = [[(isVisible: Bool, modelRow: TableViewModelRow)]]()
var interfaceSection = [(isVisible: Bool, modelRow: TableViewModelRow)]()
for field in interfaceFields {
interfaceSection.append((isVisible: !tunnelViewModel.interfaceData[field].isEmpty, modelRow: .interfaceFieldRow(field)))
}
interfaceSection.append((isVisible: true, modelRow: .spacerRow))
modelRowsBySection.append(interfaceSection)
for peerData in tunnelViewModel.peersData {
tableViewModelRows.append(.spacerRow)
for field in peerFields where !peerData[field].isEmpty {
tableViewModelRows.append(.peerFieldRow(peer: peerData, field: field))
var peerSection = [(isVisible: Bool, modelRow: TableViewModelRow)]()
for field in peerFields {
peerSection.append((isVisible: !peerData[field].isEmpty, modelRow: .peerFieldRow(peer: peerData, field: field)))
}
peerSection.append((isVisible: true, modelRow: .spacerRow))
modelRowsBySection.append(peerSection)
}
tableViewModelRows.append(.spacerRow)
tableViewModelRows.append(.onDemandRow)
var onDemandSection = [(isVisible: Bool, modelRow: TableViewModelRow)]()
onDemandSection.append((isVisible: true, modelRow: .onDemandRow))
modelRowsBySection.append(onDemandSection)
tableViewModelRowsBySection = modelRowsBySection
}
func updateTableViewModelRows() {
tableViewModelRows = tableViewModelRowsBySection.flatMap { $0.filter { $0.isVisible }.map { $0.modelRow } }
}
func updateStatus() {