chore(swabble): apply swiftformat

This commit is contained in:
Peter Steinberger
2025-12-09 15:36:41 +01:00
parent 336c9d6caa
commit 318457cb2c
13 changed files with 74 additions and 75 deletions

View File

@@ -14,14 +14,14 @@ struct DoctorCommand: ParsableCommand {
init() {}
init(parsed: ParsedValues) {
self.init()
if let cfg = parsed.options["config"]?.last { self.configPath = cfg }
if let cfg = parsed.options["config"]?.last { configPath = cfg }
}
mutating func run() async throws {
let auth = await SFSpeechRecognizer.authorizationStatus()
print("Speech auth: \(auth)")
do {
_ = try ConfigLoader.load(at: self.configURL)
_ = try ConfigLoader.load(at: configURL)
print("Config: OK")
} catch {
print("Config missing or invalid; run setup")
@@ -33,5 +33,5 @@ struct DoctorCommand: ParsableCommand {
print("Mics found: \(session.devices.count)")
}
private var configURL: URL? { self.configPath.map { URL(fileURLWithPath: $0) } }
private var configURL: URL? { configPath.map { URL(fileURLWithPath: $0) } }
}

View File

@@ -47,16 +47,16 @@ struct MicSet: ParsableCommand {
init() {}
init(parsed: ParsedValues) {
self.init()
if let value = parsed.positional.first, let intVal = Int(value) { self.index = intVal }
if let cfg = parsed.options["config"]?.last { self.configPath = cfg }
if let value = parsed.positional.first, let intVal = Int(value) { index = intVal }
if let cfg = parsed.options["config"]?.last { configPath = cfg }
}
mutating func run() async throws {
var cfg = try ConfigLoader.load(at: self.configURL)
cfg.audio.deviceIndex = self.index
try ConfigLoader.save(cfg, at: self.configURL)
print("saved device index \(self.index)")
var cfg = try ConfigLoader.load(at: configURL)
cfg.audio.deviceIndex = index
try ConfigLoader.save(cfg, at: configURL)
print("saved device index \(index)")
}
private var configURL: URL? { self.configPath.map { URL(fileURLWithPath: $0) } }
private var configURL: URL? { configPath.map { URL(fileURLWithPath: $0) } }
}

View File

@@ -17,19 +17,19 @@ struct ServeCommand: ParsableCommand {
init(parsed: ParsedValues) {
self.init()
if parsed.flags.contains("noWake") { self.noWake = true }
if let cfg = parsed.options["config"]?.last { self.configPath = cfg }
if parsed.flags.contains("noWake") { noWake = true }
if let cfg = parsed.options["config"]?.last { configPath = cfg }
}
mutating func run() async throws {
var cfg: SwabbleConfig
do {
cfg = try ConfigLoader.load(at: self.configURL)
cfg = try ConfigLoader.load(at: configURL)
} catch {
cfg = SwabbleConfig()
try ConfigLoader.save(cfg, at: self.configURL)
try ConfigLoader.save(cfg, at: configURL)
}
if self.noWake {
if noWake {
cfg.wake.enabled = false
}
@@ -64,7 +64,7 @@ struct ServeCommand: ParsableCommand {
}
private var configURL: URL? {
self.configPath.map { URL(fileURLWithPath: $0) }
configPath.map { URL(fileURLWithPath: $0) }
}
private static func matchesWake(text: String, cfg: SwabbleConfig) -> Bool {

View File

@@ -28,11 +28,11 @@ private enum LaunchdHelper {
"KeepAlive": true,
]
let data = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
try data.write(to: self.plistURL)
try data.write(to: plistURL)
}
static func removePlist() throws {
try? FileManager.default.removeItem(at: self.plistURL)
try? FileManager.default.removeItem(at: plistURL)
}
}

View File

@@ -13,14 +13,14 @@ struct SetupCommand: ParsableCommand {
init() {}
init(parsed: ParsedValues) {
self.init()
if let cfg = parsed.options["config"]?.last { self.configPath = cfg }
if let cfg = parsed.options["config"]?.last { configPath = cfg }
}
mutating func run() async throws {
let cfg = SwabbleConfig()
try ConfigLoader.save(cfg, at: self.configURL)
print("wrote config to \(self.configURL?.path ?? SwabbleConfig.defaultPath.path)")
try ConfigLoader.save(cfg, at: configURL)
print("wrote config to \(configURL?.path ?? SwabbleConfig.defaultPath.path)")
}
private var configURL: URL? { self.configPath.map { URL(fileURLWithPath: $0) } }
private var configURL: URL? { configPath.map { URL(fileURLWithPath: $0) } }
}

View File

@@ -13,11 +13,11 @@ struct StatusCommand: ParsableCommand {
init() {}
init(parsed: ParsedValues) {
self.init()
if let cfg = parsed.options["config"]?.last { self.configPath = cfg }
if let cfg = parsed.options["config"]?.last { configPath = cfg }
}
mutating func run() async throws {
let cfg = try? ConfigLoader.load(at: self.configURL)
let cfg = try? ConfigLoader.load(at: configURL)
let wake = cfg?.wake.word ?? "clawd"
let wakeEnabled = cfg?.wake.enabled ?? false
let latest = await TranscriptsStore.shared.latest().suffix(3)
@@ -30,5 +30,5 @@ struct StatusCommand: ParsableCommand {
}
}
private var configURL: URL? { self.configPath.map { URL(fileURLWithPath: $0) } }
private var configURL: URL? { configPath.map { URL(fileURLWithPath: $0) } }
}

View File

@@ -15,16 +15,16 @@ struct TestHookCommand: ParsableCommand {
init(parsed: ParsedValues) {
self.init()
if let positional = parsed.positional.first { self.text = positional }
if let cfg = parsed.options["config"]?.last { self.configPath = cfg }
if let positional = parsed.positional.first { text = positional }
if let cfg = parsed.options["config"]?.last { configPath = cfg }
}
mutating func run() async throws {
let cfg = try ConfigLoader.load(at: self.configURL)
let cfg = try ConfigLoader.load(at: configURL)
let runner = HookRunner(config: cfg)
try await runner.run(job: HookJob(text: self.text, timestamp: Date()))
try await runner.run(job: HookJob(text: text, timestamp: Date()))
print("hook invoked")
}
private var configURL: URL? { self.configPath.map { URL(fileURLWithPath: $0) } }
private var configURL: URL? { configPath.map { URL(fileURLWithPath: $0) } }
}

View File

@@ -24,12 +24,12 @@ struct TranscribeCommand: ParsableCommand {
init(parsed: ParsedValues) {
self.init()
if let positional = parsed.positional.first { self.inputFile = positional }
if let loc = parsed.options["locale"]?.last { self.locale = loc }
if parsed.flags.contains("censor") { self.censor = true }
if let out = parsed.options["output"]?.last { self.outputFile = out }
if let fmt = parsed.options["format"]?.last { self.format = fmt }
if let len = parsed.options["maxLength"]?.last, let intVal = Int(len) { self.maxLength = intVal }
if let positional = parsed.positional.first { inputFile = positional }
if let loc = parsed.options["locale"]?.last { locale = loc }
if parsed.flags.contains("censor") { censor = true }
if let out = parsed.options["output"]?.last { outputFile = out }
if let fmt = parsed.options["format"]?.last { format = fmt }
if let len = parsed.options["maxLength"]?.last, let intVal = Int(len) { maxLength = intVal }
}
mutating func run() async throws {
@@ -51,7 +51,7 @@ struct TranscribeCommand: ParsableCommand {
transcript += result.text
}
let output = outputFormat.text(for: transcript, maxLength: self.maxLength)
let output = outputFormat.text(for: transcript, maxLength: maxLength)
if let path = outputFile {
try output.write(to: URL(fileURLWithPath: path), atomically: false, encoding: .utf8)
} else {