style(macos): swiftformat + swiftlint cleanup

This commit is contained in:
Peter Steinberger
2026-01-07 20:39:03 +00:00
parent 7ce1f635cd
commit 9859ad3176
9 changed files with 30 additions and 20 deletions

View File

@@ -16,12 +16,11 @@ enum GatewayAgentChannel: String, CaseIterable, Sendable {
func shouldDeliver(_ isLast: Bool) -> Bool { func shouldDeliver(_ isLast: Bool) -> Bool {
switch self { switch self {
case .webchat: case .webchat:
return false false
case .last: case .last:
return isLast isLast
case .whatsapp, .telegram: case .whatsapp, .telegram:
return true true
} }
} }
} }

View File

@@ -208,9 +208,15 @@ final class GatewayDiscoveryModel {
return merged return merged
} }
static func parseGatewayTXT(_ txt: [String: String]) struct GatewayTXT: Equatable {
-> (lanHost: String?, tailnetDns: String?, sshPort: Int, gatewayPort: Int?, cliPath: String?) var lanHost: String?
{ var tailnetDns: String?
var sshPort: Int
var gatewayPort: Int?
var cliPath: String?
}
static func parseGatewayTXT(_ txt: [String: String]) -> GatewayTXT {
var lanHost: String? var lanHost: String?
var tailnetDns: String? var tailnetDns: String?
var sshPort = 22 var sshPort = 22
@@ -242,7 +248,12 @@ final class GatewayDiscoveryModel {
cliPath = trimmed.isEmpty ? nil : trimmed cliPath = trimmed.isEmpty ? nil : trimmed
} }
return (lanHost, tailnetDns, sshPort, gatewayPort, cliPath) return GatewayTXT(
lanHost: lanHost,
tailnetDns: tailnetDns,
sshPort: sshPort,
gatewayPort: gatewayPort,
cliPath: cliPath)
} }
static func buildSSHTarget(user: String, host: String, port: Int) -> String { static func buildSSHTarget(user: String, host: String, port: Int) -> String {

View File

@@ -62,7 +62,11 @@ enum GatewayLaunchAgentManager {
let desiredBind = self.preferredGatewayBind() ?? "loopback" let desiredBind = self.preferredGatewayBind() ?? "loopback"
let desiredToken = self.preferredGatewayToken() let desiredToken = self.preferredGatewayToken()
let desiredPassword = self.preferredGatewayPassword() let desiredPassword = self.preferredGatewayPassword()
let desiredConfig = DesiredConfig(port: port, bind: desiredBind, token: desiredToken, password: desiredPassword) let desiredConfig = DesiredConfig(
port: port,
bind: desiredBind,
token: desiredToken,
password: desiredPassword)
// If launchd already loaded the job (common on login), avoid `bootout` unless we must // If launchd already loaded the job (common on login), avoid `bootout` unless we must
// change the config. `bootout` can kill a just-started gateway and cause attach loops. // change the config. `bootout` can kill a just-started gateway and cause attach loops.

View File

@@ -79,4 +79,3 @@ enum LaunchAgentPlist {
return token.isEmpty ? nil : token return token.isEmpty ? nil : token
} }
} }

View File

@@ -267,7 +267,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
let rows = self.usageRows let rows = self.usageRows
let errorText = self.cachedUsageErrorText let errorText = self.cachedUsageErrorText
if rows.isEmpty && errorText == nil { if rows.isEmpty, errorText == nil {
return cursor return cursor
} }

View File

@@ -42,4 +42,3 @@ struct MenuUsageHeaderView: View {
return "\(self.count) providers" return "\(self.count) providers"
} }
} }

View File

@@ -41,8 +41,8 @@ final class RemotePortTunnel {
static func create( static func create(
remotePort: Int, remotePort: Int,
preferredLocalPort: UInt16? = nil, preferredLocalPort: UInt16? = nil,
allowRemoteUrlOverride: Bool = true allowRemoteUrlOverride: Bool = true) async throws -> RemotePortTunnel
) async throws -> RemotePortTunnel { {
let settings = CommandResolver.connectionSettings() let settings = CommandResolver.connectionSettings()
guard settings.mode == .remote, let parsed = CommandResolver.parseSSHTarget(settings.target) else { guard settings.mode == .remote, let parsed = CommandResolver.parseSSHTarget(settings.target) else {
throw NSError( throw NSError(

View File

@@ -29,8 +29,8 @@ struct UsageRow: Identifiable {
let error: String? let error: String?
var titleText: String { var titleText: String {
if let plan, !plan.isEmpty { return "\(displayName) (\(plan))" } if let plan, !plan.isEmpty { return "\(self.displayName) (\(plan))" }
return displayName return self.displayName
} }
var remainingPercent: Int? { var remainingPercent: Int? {
@@ -107,4 +107,3 @@ enum UsageLoader {
return try JSONDecoder().decode(GatewayUsageSummary.self, from: data) return try JSONDecoder().decode(GatewayUsageSummary.self, from: data)
} }
} }

View File

@@ -21,7 +21,7 @@ struct UsageMenuLabelView: View {
} }
HStack(alignment: .firstTextBaseline, spacing: 6) { HStack(alignment: .firstTextBaseline, spacing: 6) {
Text(row.titleText) Text(self.row.titleText)
.font(.caption.weight(.semibold)) .font(.caption.weight(.semibold))
.foregroundStyle(self.primaryTextColor) .foregroundStyle(self.primaryTextColor)
.lineLimit(1) .lineLimit(1)
@@ -30,7 +30,7 @@ struct UsageMenuLabelView: View {
Spacer(minLength: 4) Spacer(minLength: 4)
Text(row.detailText()) Text(self.row.detailText())
.font(.caption.monospacedDigit()) .font(.caption.monospacedDigit())
.foregroundStyle(self.secondaryTextColor) .foregroundStyle(self.secondaryTextColor)
.lineLimit(1) .lineLimit(1)
@@ -43,4 +43,3 @@ struct UsageMenuLabelView: View {
.padding(.trailing, self.paddingTrailing) .padding(.trailing, self.paddingTrailing)
} }
} }