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

feat: added Mini widget to the Sensors module. It has quite a lot of limitations and only one sensor could be visualized (I hope understandable why) (#2029)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2024-08-23 20:34:10 +02:00
parent bdbaeb8c4d
commit bcabd48fa4
7 changed files with 159 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Modules/Sensors/config.plist
View File

@@ -19,6 +19,24 @@
<key>Order</key>
<integer>0</integer>
</dict>
<key>mini</key>
<dict>
<key>Default</key>
<true/>
<key>Title</key>
<string>Sensor</string>
<key>Preview</key>
<dict>
<key>Value</key>
<string>0.12</string>
</dict>
<key>Unsupported colors</key>
<array>
<string>pressure</string>
</array>
<key>Order</key>
<integer>1</integer>
</dict>
<key>sensors</key>
<dict>
<key>Default</key>
@@ -29,7 +47,7 @@
<string>38°,41°</string>
</dict>
<key>Order</key>
<integer>1</integer>
<integer>2</integer>
</dict>
<key>bar_chart</key>
<dict>
@@ -48,7 +66,7 @@
<string>cluster</string>
</array>
<key>Order</key>
<integer>2</integer>
<integer>3</integer>
</dict>
</dict>
<key>Settings</key>

71
Modules/Sensors/main.swift
View File

@@ -23,11 +23,14 @@ public class Sensors: Module {
FanValue(rawValue: Store.shared.string(key: "\(self.config.name)_fanValue", defaultValue: "percentage")) ?? .percentage
}
private var selectedSensor: String
public init() {
self.settingsView = Settings(.sensors)
self.popupView = Popup()
self.portalView = Portal(.sensors)
self.notificationsView = Notifications(.sensors)
self.selectedSensor = Store.shared.string(key: "\(ModuleType.sensors.rawValue)_sensor", defaultValue: "Average System Total")
super.init(
popup: self.popupView,
@@ -74,6 +77,11 @@ public class Sensors: Module {
}
}
}
self.selectedSensor = Store.shared.string(key: "\(ModuleType.sensors.rawValue)_sensor", defaultValue: self.selectedSensor)
self.settingsView.selectedHandler = { [weak self] value in
self?.selectedSensor = value
self?.sensorsReader?.read()
}
self.setReaders([self.sensorsReader])
}
@@ -90,40 +98,53 @@ public class Sensors: Module {
}
}
private func checkIfNoSensorsEnabled() {
guard let reader = self.sensorsReader else { return }
if reader.list.sensors.filter({ $0.state }).isEmpty {
NotificationCenter.default.post(name: .toggleModule, object: nil, userInfo: ["module": self.config.name, "state": false])
}
}
private func usageCallback(_ raw: Sensors_List?) {
guard let value = raw, self.enabled else { return }
var list: [Stack_t] = []
var flatList: [[ColorValue]] = []
value.sensors.forEach { (s: Sensor_p) in
if s.state {
var value = s.formattedMiniValue
if let f = s as? Fan {
flatList.append([ColorValue(((f.value*100)/f.maxSpeed)/100)])
if self.fanValueState == .percentage {
value = "\(f.percentage)%"
}
}
list.append(Stack_t(key: s.key, value: value))
}
}
self.popupView.usageCallback(value.sensors)
self.portalView.usageCallback(value.sensors)
self.notificationsView.usageCallback(value.sensors)
self.menuBar.widgets.filter{ $0.isActive }.forEach { (w: SWidget) in
switch w.item {
case let widget as StackWidget: widget.setValues(list)
case let widget as BarChart: widget.setValue(flatList)
case let widget as Mini:
if let active = value.sensors.first(where: { $0.key == self.selectedSensor }) {
var value: Double = active.value/100
var unit: String = active.miniUnit
if let fan = active as? Fan, self.fanValueState == .percentage {
value = Double(fan.percentage)/100
unit = "%"
}
if value > 999 {
unit = ""
}
widget.setValue(value)
widget.setSuffix(unit)
}
case let widget as StackWidget:
var list: [Stack_t] = []
value.sensors.forEach { (s: Sensor_p) in
if s.state {
var value = s.formattedMiniValue
if let f = s as? Fan {
if self.fanValueState == .percentage {
value = "\(f.percentage)%"
}
}
list.append(Stack_t(key: s.key, value: value))
}
}
widget.setValues(list)
case let widget as BarChart:
var flatList: [[ColorValue]] = []
value.sensors.filter{ $0 is Fan }.forEach { (s: Sensor_p) in
if s.state, let f = s as? Fan {
flatList.append([ColorValue(((f.value*100)/f.maxSpeed)/100)])
}
}
widget.setValue(flatList)
default: break
}
}

46
Modules/Sensors/settings.swift
View File

@@ -20,14 +20,17 @@ internal class Settings: NSStackView, Settings_v {
private var unknownSensorsState: Bool = false
private var fanValueState: FanValue = .percentage
private let title: String
private var button: NSPopUpButton?
private var list: [Sensor_p] = []
private var widgets: [widget_t] = []
public var callback: (() -> Void) = {}
public var HIDcallback: (() -> Void) = {}
public var unknownCallback: (() -> Void) = {}
public var setInterval: ((_ value: Int) -> Void) = {_ in }
public var selectedHandler: (String) -> Void = {_ in }
private let title: String
private var button: NSPopUpButton?
private var list: [Sensor_p] = []
private var sensorsPrefs: PreferencesSection?
private var selectedSensor: String = "Average System Total"
public init(_ module: ModuleType) {
self.title = module.rawValue
@@ -43,6 +46,7 @@ internal class Settings: NSStackView, Settings_v {
self.fansSyncState = Store.shared.bool(key: "\(self.title)_fansSync", defaultValue: self.fansSyncState)
self.unknownSensorsState = Store.shared.bool(key: "\(self.title)_unknown", defaultValue: self.unknownSensorsState)
self.fanValueState = FanValue(rawValue: Store.shared.string(key: "\(self.title)_fanValue", defaultValue: self.fanValueState.rawValue)) ?? .percentage
self.selectedSensor = Store.shared.string(key: "\(self.title)_sensor", defaultValue: self.selectedSensor)
self.addArrangedSubview(PreferencesSection([
PreferencesRow(localizedString("Update interval"), component: selectView(
@@ -68,19 +72,26 @@ internal class Settings: NSStackView, Settings_v {
))
]))
var sensorsPrefs: [PreferencesRow] = [
var sensorsRows: [PreferencesRow] = [
PreferencesRow(localizedString("Show unknown sensors"), component: switchView(
action: #selector(self.toggleuUnknownSensors),
state: self.unknownSensorsState
))
]
if isARM {
sensorsPrefs.append(PreferencesRow(localizedString("HID sensors"), component: switchView(
sensorsRows.append(PreferencesRow(localizedString("HID sensors"), component: switchView(
action: #selector(self.toggleHID),
state: self.hidState
)))
}
self.addArrangedSubview(PreferencesSection(sensorsPrefs))
sensorsRows.append(PreferencesRow(localizedString("Sensor to show"), id: "active_sensor", component: selectView(
action: #selector(self.handleSelection),
items: [],
selected: self.selectedSensor)
))
let sensorsPrefs = PreferencesSection(sensorsRows)
self.sensorsPrefs = sensorsPrefs
self.addArrangedSubview(sensorsPrefs)
}
required init?(coder: NSCoder) {
@@ -107,6 +118,7 @@ internal class Settings: NSStackView, Settings_v {
}
}
var buttonList: [KeyValue_t] = []
types.forEach { (typ: SensorType) in
let section = PreferencesSection(label: typ.rawValue)
section.identifier = NSUserInterfaceItemIdentifier("sensor")
@@ -126,19 +138,29 @@ internal class Settings: NSStackView, Settings_v {
)
btn.identifier = NSUserInterfaceItemIdentifier(rawValue: s.key)
section.add(PreferencesRow(localizedString(s.name), component: btn))
buttonList.append(KeyValue_t(key: s.key, value: "\(localizedString(typ.rawValue)) - \(s.name)"))
}
}
self.addArrangedSubview(section)
}
self.widgets = widgets
if let row = self.sensorsPrefs?.findRow("active_sensor") {
if !widgets.isEmpty {
self.sensorsPrefs?.setRowVisibility(row, newState: widgets.contains(where: { $0 == .mini }))
}
row.replaceComponent(with: selectView(
action: #selector(self.handleSelection),
items: buttonList,
selected: self.selectedSensor
))
}
}
public func setList(_ list: [Sensor_p]?) {
guard let list else { return }
self.list = self.unknownSensorsState ? list : list.filter({ $0.group != .unknown })
self.load(widgets: self.widgets)
self.load(widgets: [])
}
@objc private func toggleSensor(_ sender: NSControl) {
@@ -179,4 +201,10 @@ internal class Settings: NSStackView, Settings_v {
self.callback()
}
}
@objc private func handleSelection(_ sender: NSPopUpButton) {
guard let item = sender.selectedItem, let id = item.representedObject as? String else { return }
self.selectedSensor = id
Store.shared.set(key: "\(self.title)_sensor", value: self.selectedSensor)
self.selectedHandler(self.selectedSensor)
}
}

18
Modules/Sensors/values.swift
View File

@@ -46,6 +46,7 @@ public protocol Sensor_p {
var localValue: Double { get }
var unit: String { get }
var miniUnit: String { get }
var formattedValue: String { get }
var formattedMiniValue: String { get }
var formattedPopupValue: String { get }
@@ -152,6 +153,22 @@ public struct Sensor: Sensor_p, Codable {
return "RPM"
}
}
public var miniUnit: String {
switch self.type {
case .temperature:
return "°"
case .voltage:
return "V"
case .power:
return "W"
case .energy:
return "Wh"
case .current:
return "A"
default:
return ""
}
}
public var formattedValue: String {
switch self.type {
@@ -251,6 +268,7 @@ public struct Fan: Sensor_p, Codable {
public var isComputed: Bool = false
public var average: Bool = false
public var unit: String = "RPM"
public var miniUnit: String = ""
public var formattedValue: String {
"\(Int(self.value)) RPM"