batteryの最適化

Kyome22 · Mar 17, 2024 · cb90348 · cb90348
1 parent bf821c3
commit cb90348
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/Sources/SystemInfoKit/Entity/BatteryInfo.swift b/Sources/SystemInfoKit/Entity/BatteryInfo.swift
@@ -2,8 +2,8 @@ public struct BatteryInfo: SystemInfo {
     public let type: SystemInfoType = .battery
     public internal(set) var value: Double = .zero
     public let installed: Bool
-    private(set) var isCharging: Bool = false
-    private var powerSourceValue: String
+    public internal(set) var isCharging: Bool = false
+    private var adapterName: String?
     private var healthValue: Double = .zero
     private var maxCapacityValue: Double = .zero
     private var cycleValue: Int = .zero
@@ -35,6 +35,14 @@ public struct BatteryInfo: SystemInfo {
         }
     }
 
+    private var powerSourceValue: String {
+        if isCharging {
+            return adapterName ?? String(localized: "batteryUnknown", bundle: .module)
+        } else {
+            return String(localized: "battery", bundle: .module)
+        }
+    }
+
     private var healthOrMaxCapacity: String {
 #if arch(x86_64) // Intel chip
         return String(localized: "batteryHealth\(healthValue)", bundle: .module)
@@ -54,15 +62,14 @@ public struct BatteryInfo: SystemInfo {
 
     init(installed: Bool = false) {
         self.installed = installed
-        self.powerSourceValue = String(localized: "batteryUnknown", bundle: .module)
     }
 
     mutating func setIsCharging(_ value: Bool) {
         self.isCharging = value
     }
 
-    mutating func setPowerSource(_ value: String) {
-        self.powerSourceValue = value
+    mutating func setAdapterName(_ value: String) {
+        self.adapterName = value
     }
 
     mutating func setHealthValue(_ value: Double) {

diff --git a/Sources/SystemInfoKit/Repository/BatteryRepository.swift b/Sources/SystemInfoKit/Repository/BatteryRepository.swift
@@ -50,7 +50,7 @@ final class BatteryRepositoryImpl: BatteryRepository {
         }
         if let adapter = dict["AdapterDetails"] as? [String: AnyObject],
            let name = adapter["Name"] as? String {
-            result.setPowerSource(name)
+            result.setAdapterName(name)
         }
         if let cycleCount = dict["CycleCount"] as? Int {
             result.setCycleValue(cycleCount)

diff --git a/Sources/SystemInfoKit/Resources/en.lproj/Localizable.strings b/Sources/SystemInfoKit/Resources/en.lproj/Localizable.strings
@@ -17,6 +17,7 @@
 "memoryCompressed%lf" = "Compressed: %4.1f GB";
 
 // Battery
+"battery" = "Battery";
 "battery%lf" = "Battery: %5.1f%%";
 "batteryIsNotInstalled" = "Battery: not installed";
 "batteryHealth%lf" = "Health: %5.1f%%";

diff --git a/Sources/SystemInfoKit/Resources/ja.lproj/Localizable.strings b/Sources/SystemInfoKit/Resources/ja.lproj/Localizable.strings
@@ -17,6 +17,7 @@
 "memoryCompressed%lf" = "圧縮: %4.1f GB";
 
 // Battery
+"battery" = "バッテリー";
 "battery%lf" = "バッテリー: %5.1f%%";
 "batteryIsNotInstalled" = "バッテリー: 非搭載";
 "batteryHealth%lf" = "ヘルス: %5.1f%%";