From e2b94f79e8eca13c2a7f876020af7bcb8bbc9feb Mon Sep 17 00:00:00 2001 From: Louis Pontoise Date: Thu, 9 Apr 2020 17:26:00 +0900 Subject: [PATCH] fix: clearer debug profile (i.e. no "optional") --- src/logic/DebugProfile.swift | 9 ++++++++- src/logic/Preferences.swift | 4 ---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/logic/DebugProfile.swift b/src/logic/DebugProfile.swift index e954e725..54376ae7 100644 --- a/src/logic/DebugProfile.swift +++ b/src/logic/DebugProfile.swift @@ -46,10 +46,17 @@ class DebugProfile { private static func appPreferences() -> String { return nestedSeparator + Preferences.all .sorted { $0.0 < $1.0 } - .map { $0.key + intraSeparator + Preferences.getAsString($0.key) } + .map { $0.key + intraSeparator + appPreference($0.key) } .joined(separator: nestedSeparator) } + private static func appPreference(_ key: String) -> String { + if let preference = defaults.object(forKey: key) { + return String(describing: preference) + } + return "nil" + } + private static func appWindows() -> String { return nestedSeparator + Windows.list .sorted { $0.cgWindowId < $1.cgWindowId } diff --git a/src/logic/Preferences.swift b/src/logic/Preferences.swift index c25b9d8a..ff79e483 100644 --- a/src/logic/Preferences.swift +++ b/src/logic/Preferences.swift @@ -83,10 +83,6 @@ class Preferences { defaults.string(forKey: key) } - static func getAsString(_ key: String) -> String { - String(describing: defaults.object(forKey: key)) - } - static func set(_ key: String, _ value: Any?) { defaults.set(value, forKey: key) }