From 7dd4e0ecf3071c6cbffc4ac08bee99dd2e77a39b Mon Sep 17 00:00:00 2001
From: Serhiy Mytrovtsiy <mitrovtsiy@ukr.net>
Date: Thu, 16 Mar 2023 18:00:52 +0100
Subject: [PATCH] feat: added isBatteryPowered field to the Battery_Usage
 struct. It allows removing the check if the power source is `Battery Power`
 in the different parts of the Battery module

---
 Modules/Battery/main.swift    | 7 ++++---
 Modules/Battery/popup.swift   | 4 ++--
 Modules/Battery/portal.swift  | 2 +-
 Modules/Battery/readers.swift | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Modules/Battery/main.swift b/Modules/Battery/main.swift
index 8b608d5f..f77c5dc2 100644
--- a/Modules/Battery/main.swift
+++ b/Modules/Battery/main.swift
@@ -19,6 +19,7 @@ struct Battery_Usage: value_t {
     var isCharged: Bool = false
     var isCharging: Bool = false
     var isLowPowerMode: Bool? = false
+    var isBatteryPowered: Bool = false
     var optimizedChargingEngaged: Bool = false
     var level: Double = 0
     var cycles: Int = 0
@@ -140,7 +141,7 @@ public class Battery: Module {
             case let widget as BatteryWidget:
                 widget.setValue(
                     percentage: value.level,
-                    ACStatus: value.powerSource != "Battery Power",
+                    ACStatus: !value.isBatteryPowered,
                     isCharging: value.isCharging,
                     lowPowerMode: value.isLowPowerMode,
                     optimizedCharging: value.optimizedChargingEngaged,
@@ -166,7 +167,7 @@ public class Battery: Module {
             return
         }
         
-        if (value.level > notificationLevel || value.powerSource != "Battery Power") && self.lowLevelNotificationState {
+        if (value.level > notificationLevel || !value.isBatteryPowered) && self.lowLevelNotificationState {
             if value.level > notificationLevel {
                 if let id = self.notificationID {
                     removeNotification(id)
@@ -201,7 +202,7 @@ public class Battery: Module {
             return
         }
         
-        if (value.level < notificationLevel || value.powerSource == "Battery Power") && self.highLevelNotificationState {
+        if (value.level < notificationLevel || value.isBatteryPowered) && self.highLevelNotificationState {
             if value.level < notificationLevel {
                 if let id = self.notificationID {
                     removeNotification(id)
diff --git a/Modules/Battery/popup.swift b/Modules/Battery/popup.swift
index 32ae8bb7..54d95b66 100644
--- a/Modules/Battery/popup.swift
+++ b/Modules/Battery/popup.swift
@@ -256,7 +256,7 @@ internal class Popup: NSView, Popup_p {
             self.sourceField?.stringValue = localizedString(value.powerSource)
             self.timeField?.stringValue = ""
             
-            if value.powerSource == "Battery Power" {
+            if value.isBatteryPowered {
                 self.timeLabelField?.stringValue = "\(localizedString("Time to discharge")):"
                 if value.timeToEmpty != -1 && value.timeToEmpty != 0 {
                     self.timeField?.stringValue = Double(value.timeToEmpty*60).printSecondsToHoursMinutesSeconds(short: self.timeFormat == "short")
@@ -319,7 +319,7 @@ internal class Popup: NSView, Popup_p {
             self.batteryPowerField?.stringValue = "\(batteryPower.roundTo(decimalPlaces: 2)) W"
             self.temperatureField?.stringValue = Temperature(value.temperature)
             
-            self.powerField?.stringValue = value.powerSource == "Battery Power" ? localizedString("Not connected") : "\(value.ACwatts) W"
+            self.powerField?.stringValue = value.isBatteryPowered ? localizedString("Not connected") : "\(value.ACwatts) W"
             self.chargingStateField?.stringValue = value.isCharging ? localizedString("Yes") : localizedString("No")
         })
     }
diff --git a/Modules/Battery/portal.swift b/Modules/Battery/portal.swift
index 87d97c08..d31e92c0 100644
--- a/Modules/Battery/portal.swift
+++ b/Modules/Battery/portal.swift
@@ -77,7 +77,7 @@ internal class Portal: NSStackView, Portal_p {
                 
                 var seconds: Double = 0
                 if value.timeToEmpty != -1 && value.timeToEmpty != 0 {
-                    seconds = Double((value.powerSource == "Battery Power" ? value.timeToEmpty : value.timeToCharge)*60)
+                    seconds = Double((value.isBatteryPowered ? value.timeToEmpty : value.timeToCharge)*60)
                 }
                 self.timeField.stringValue = seconds != 0 ? seconds.printSecondsToHoursMinutesSeconds(short: self.timeFormat == "short") : ""
                 
diff --git a/Modules/Battery/readers.swift b/Modules/Battery/readers.swift
index 00715766..19eacf0f 100644
--- a/Modules/Battery/readers.swift
+++ b/Modules/Battery/readers.swift
@@ -69,6 +69,7 @@ internal class UsageReader: Reader<Battery_Usage> {
         for ps in psList {
             if let list = IOPSGetPowerSourceDescription(psInfo, ps).takeUnretainedValue() as? [String: Any] {
                 self.usage.powerSource = list[kIOPSPowerSourceStateKey] as? String ?? "AC Power"
+                self.usage.isBatteryPowered = self.usage.powerSource == "Battery Power"
                 self.usage.isCharged = list[kIOPSIsChargedKey] as? Bool ?? false
                 self.usage.isCharging = self.getBoolValue("IsCharging" as CFString) ?? false
                 self.usage.optimizedChargingEngaged = list["Optimized Battery Charging Engaged"] as? Int == 1