morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix data update in battery popup

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2020-06-08 13:20:24 +02:00
parent 658545fad2
commit 249ba521a6
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/Battery/popup.swift
View File

@@ -38,8 +38,6 @@ internal class Popup: NSView {
private var powerField: NSTextField? = nil
private var chargingStateField: NSTextField? = nil
private var initialized: Bool = false
public init() {
super.init(frame: NSRect(
x: 0,
@@ -131,10 +129,6 @@ internal class Popup: NSView {
public func usageCallback(_ value: Usage) {
DispatchQueue.main.async(execute: {
if !self.window!.isVisible && self.initialized {
return
}
self.dashboardBatteryView?.setValue(abs(value.level))
self.levelField?.stringValue = "\(Int(abs(value.level) * 100)) %"
@@ -153,7 +147,7 @@ internal class Popup: NSView {
}
}
if value.timeToEmpty == -1 || value.timeToEmpty == -1 {
if value.timeToEmpty == -1 || value.timeToCharge == -1 {
self.timeField?.stringValue = "Calculating"
}
@@ -169,8 +163,6 @@ internal class Popup: NSView {
self.powerField?.stringValue = value.powerSource == "Battery Power" ? "Not connected" : "\(value.ACwatts) W"
self.chargingStateField?.stringValue = value.level > 0 ? "Yes" : "No"
self.initialized = true
})
}
}

22
Modules/Battery/readers.swift
View File

@@ -60,20 +60,20 @@ internal class UsageReader: Reader<Usage> {
self.usage.state = list[kIOPSBatteryHealthKey] as! String
self.usage.isCharged = list[kIOPSIsChargedKey] as? Bool ?? false
var cap = Double(list[kIOPSCurrentCapacityKey] as! Int) / 100
self.usage.timeToEmpty = Int(list[kIOPSTimeToEmptyKey] as! Int)
self.usage.timeToCharge = Int(list[kIOPSTimeToFullChargeKey] as! Int)
self.usage.cycles = self.getIntValue("CycleCount" as CFString) ?? 0
let maxCapacity = self.getIntValue("MaxCapacity" as CFString) ?? 1
let designCapacity = self.getIntValue("DesignCapacity" as CFString) ?? 1
self.usage.health = (100 * maxCapacity) / designCapacity
self.usage.amperage = self.getIntValue("Amperage" as CFString) ?? 0
self.usage.voltage = self.getVoltage() ?? 0
self.usage.temperature = self.getTemperature() ?? 0
var ACwatts: Int = 0
if let ACDetails = IOPSCopyExternalPowerAdapterDetails() {
if let ACList = ACDetails.takeUnretainedValue() as? Dictionary<String, Any> {
@@ -85,12 +85,12 @@ internal class UsageReader: Reader<Usage> {
}
self.usage.ACwatts = ACwatts
self.usage.ACstatus = self.getBoolValue("IsCharging" as CFString) ?? false
if self.usage.powerSource == "Battery Power" {
cap = 0 - cap
}
self.usage.level = cap
DispatchQueue.main.async(execute: {
self.callback(self.usage)
})
@@ -104,28 +104,28 @@ internal class UsageReader: Reader<Usage> {
}
return nil
}
private func getIntValue(_ identifier: CFString) -> Int? {
if let value = IORegistryEntryCreateCFProperty(self.service, identifier, kCFAllocatorDefault, 0) {
return value.takeRetainedValue() as? Int
}
return nil
}
private func getDoubleValue(_ identifier: CFString) -> Double? {
if let value = IORegistryEntryCreateCFProperty(self.service, identifier, kCFAllocatorDefault, 0) {
return value.takeRetainedValue() as? Double
}
return nil
}
private func getVoltage() -> Double? {
if let value = self.getDoubleValue("Voltage" as CFString) {
return value / 1000.0
}
return nil
}
private func getTemperature() -> Double? {
if let value = IORegistryEntryCreateCFProperty(self.service, "Temperature" as CFString, kCFAllocatorDefault, 0) {
return value.takeRetainedValue() as! Double / 100.0