Fix 1.1.1

Author: CrashSystemZ

ChargeMonitor.xcodeproj/project.pbxproj

@@ -293,7 +293,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 26.0;
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lsqlite3",
@@ -352,7 +352,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 26.0;
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lsqlite3",

ChargeMonitor/Services/AppBehaviorCoordinator.swift

@@ -0,0 +1,36 @@
+import Combine
+import Foundation
+
+@MainActor
+final class AppBehaviorCoordinator: ObservableObject {
+	private let settingEffects: [any SettingEffect]
+	private var cancellables: Set<AnyCancellable> = []
+	
+	convenience init(configurationManager: ConfigurationManager) {
+		self.init(
+			configurationManager: configurationManager,
+			settingEffects: SettingEffectFactory.makeDefault()
+		)
+	}
+	
+	init(configurationManager: ConfigurationManager, settingEffects: [any SettingEffect]) {
+		self.settingEffects = settingEffects
+		bind(to: configurationManager)
+	}
+	
+	private func bind(to configurationManager: ConfigurationManager) {
+		applyConfiguration(configurationManager.configuration)
+		
+		configurationManager.$configuration
+			.sink { [weak self] config in
+				self?.applyConfiguration(config)
+			}
+			.store(in: &cancellables)
+	}
+	
+	private func applyConfiguration(_ configuration: AppConfiguration) {
+		for effect in settingEffects {
+			effect.apply(isEnabled: configuration.enabledOptions.contains(effect.option))
+		}
+	}
+}

ChargeMonitor/Services/IOKitBatteryReader.swift

@@ -51,7 +51,7 @@ struct IOKitBatteryReader {
 		let isFastCharging = chargingByWire && chargingPower >= Self.fastChargePowerThresholdW
 
 		var snapshot = BatterySnapshot()
-		snapshot.systemUptimeSeconds = ProcessInfo.processInfo.systemUptime
+		snapshot.systemUptimeSeconds = Self.readUptimeSeconds()
 		snapshot.powerSource = powerSource
 		snapshot.isCharging = isCharging
 		snapshot.isFastCharging = isFastCharging
@@ -256,6 +256,17 @@ struct IOKitBatteryReader {
 		(value * 100).rounded() / 100
 	}
 
+	private static func readUptimeSeconds() -> TimeInterval {
+		var mib = [CTL_KERN, KERN_BOOTTIME]
+		var bootTime = timeval()
+		var size = MemoryLayout<timeval>.size
+		guard sysctl(&mib, 2, &bootTime, &size, nil, 0) == 0 else {
+			return ProcessInfo.processInfo.systemUptime
+		}
+		let bootDate = Date(timeIntervalSince1970: TimeInterval(bootTime.tv_sec) + TimeInterval(bootTime.tv_usec) / 1_000_000)
+		return Date().timeIntervalSince(bootDate)
+	}
+
 	private func isFull(_ soc: Int?) -> Bool {
 		guard let soc, (0...100).contains(soc) else { return false }
 		return soc >= 100

ChargeMonitor/Services/SettingEffect.swift

@@ -0,0 +1,77 @@
+import Foundation
+
+@MainActor
+protocol SettingEffect {
+	var option: DisplayOption { get }
+	func apply(isEnabled: Bool)
+}
+
+@MainActor
+final class StartAtLoginSettingEffect: SettingEffect {
+	let option: DisplayOption = .startAtLogin
+	
+	private let loginItemController: LoginItemController
+	private var appliedValue: Bool?
+
+	init(loginItemController: LoginItemController) {
+		self.loginItemController = loginItemController
+	}
+
+	@MainActor
+	convenience init() {
+		self.init(loginItemController: StartAtLoginSettingEffect.makeDefaultLoginItemController())
+	}
+	
+	private static func makeDefaultLoginItemController() -> LoginItemController {
+		LoginItemController()
+	}
+	
+	func apply(isEnabled: Bool) {
+		guard appliedValue != isEnabled else { return }
+		appliedValue = isEnabled
+		
+		do {
+			try loginItemController.setEnabled(isEnabled)
+		} catch {
+			NSLog("Failed to update Start at Login: \(error)")
+		}
+	}
+}
+
+@MainActor
+final class PreventSleepingSettingEffect: SettingEffect {
+	let option: DisplayOption = .preventSleeping
+	
+	private let sleepController: SleepController
+	private var appliedValue: Bool?
+	
+	init(sleepController: SleepController) {
+		self.sleepController = sleepController
+	}
+	
+	@MainActor
+	convenience init() {
+		self.init(sleepController: PreventSleepingSettingEffect.makeDefaultSleepController())
+	}
+	
+	private static func makeDefaultSleepController() -> SleepController {
+		SleepController()
+	}
+	
+	func apply(isEnabled: Bool) {
+		guard appliedValue != isEnabled else { return }
+		appliedValue = isEnabled
+		sleepController.setPreventSleepEnabled(isEnabled)
+	}
+}
+
+enum SettingEffectFactory {
+	@MainActor
+	static func makeDefault() -> [any SettingEffect] {
+		[
+			StartAtLoginSettingEffect(),
+			PreventSleepingSettingEffect()
+		]
+	}
+}
+