Skip to content

Commit 5f663cc

Browse files
authored
Merge pull request #32 from mgxv/refactor/dedup-snapshot-formatters
Dedup repeated bundle formatting in snapshot log helpers
2 parents 6886a28 + 029bfee commit 5f663cc

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

Sources/SmartController.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -376,25 +376,23 @@ final class SmartController: NSObject {
376376
}
377377

378378
private static func formatFront(_ snap: Snapshot) -> String {
379-
let head = formatNullableString(snap.appKitFrontBundle)
379+
let bundle = formatNullableString(snap.appKitFrontBundle)
380380
let pid = formatNullable(snap.appKitFrontPID?.rawValue)
381381
let name = quoted(snap.appKitFrontName)
382-
let bundle = formatNullableString(snap.appKitFrontBundle)
383382
let resp = formatNullable(snap.appKitFrontPID?.responsiblePID)
384383
let fs = snap.dockFs.isFullScreen
385384
let fsPid = formatNullable(snap.dockFs.fsOwnerPID?.rawValue)
386-
return "\(head)[pid=\(pid),name=\(name),bundle=\(bundle),resp=\(resp),fs=\(fs),fsPid=\(fsPid)]"
385+
return "\(bundle)[pid=\(pid),name=\(name),bundle=\(bundle),resp=\(resp),fs=\(fs),fsPid=\(fsPid)]"
387386
}
388387

389388
private static func formatNowPlaying(_ snap: Snapshot) -> String {
390-
let head = formatNullableString(snap.nowPlayingBundle)
391-
let pid = formatNullable(snap.nowPlayingPID?.rawValue)
392389
let bundle = formatNullableString(snap.nowPlayingBundle)
390+
let pid = formatNullable(snap.nowPlayingPID?.rawValue)
393391
let parent = formatNullableString(snap.nowPlayingParentBundle)
394392
let resp = formatNullable(snap.nowPlayingPID?.responsiblePID)
395393
let play = snap.isPlaying
396394
let title = formatNullableString(snap.nowPlayingTitle)
397-
return "\(head)[pid=\(pid),bundle=\(bundle),parent=\(parent),resp=\(resp),play=\(play),title=\(title)]"
395+
return "\(bundle)[pid=\(pid),bundle=\(bundle),parent=\(parent),resp=\(resp),play=\(play),title=\(title)]"
398396
}
399397

400398
// MARK: - Log formatting — boundary breadcrumbs

0 commit comments

Comments
 (0)