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

feat: moved all modules to the new way of reader mode with a small refactoring

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2024-02-10 17:03:47 +01:00
parent 1e9073424b
commit 7e833176d9
30 changed files with 222 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Modules/Battery/main.swift
View File

@@ -59,9 +59,9 @@ public class Battery: Module {
private var notificationID: String? = nil
public init() {
self.settingsView = Settings("Battery")
self.popupView = Popup("Battery")
self.portalView = Portal("Battery")
self.settingsView = Settings(.battery)
self.popupView = Popup(.battery)
self.portalView = Portal(.battery)
self.notificationsView = Notifications(.battery)
super.init(
@@ -72,8 +72,14 @@ public class Battery: Module {
)
guard self.available else { return }
self.usageReader = UsageReader(.battery)
self.processReader = ProcessReader(.battery)
self.usageReader = UsageReader(.battery) { [weak self] value in
self?.usageCallback(value)
}
self.processReader = ProcessReader(.battery) { [weak self] value in
if let list = value {
self?.popupView.processCallback(list)
}
}
self.settingsView.callback = { [weak self] in
DispatchQueue.global(qos: .background).async {
@@ -87,25 +93,7 @@ public class Battery: Module {
}
}
self.usageReader?.callbackHandler = { [weak self] value in
self?.usageCallback(value)
}
self.usageReader?.readyCallback = { [weak self] in
self?.readyHandler()
}
self.processReader?.callbackHandler = { [weak self] value in
if let list = value {
self?.popupView.processCallback(list)
}
}
if let reader = self.usageReader {
self.addReader(reader)
}
if let reader = self.processReader {
self.addReader(reader)
}
self.setReaders([self.usageReader, self.processReader])
}
public override func willTerminate() {

4
Modules/Battery/popup.swift
View File

@@ -64,8 +64,8 @@ internal class Popup: PopupWrapper {
Store.shared.string(key: "\(self.title)_timeFormat", defaultValue: "short")
}
public init(_ title: String) {
self.title = title
public init(_ module: ModuleType) {
self.title = module.rawValue
super.init(frame: NSRect(
x: 0,

4
Modules/Battery/portal.swift
View File

@@ -25,8 +25,8 @@ internal class Portal: NSStackView, Portal_p {
Store.shared.string(key: "\(self.name)_timeFormat", defaultValue: "short")
}
init(_ name: String) {
self.name = name
public init(_ module: ModuleType) {
self.name = module.rawValue
super.init(frame: NSRect.zero)

4
Modules/Battery/settings.swift
View File

@@ -23,8 +23,8 @@ internal class Settings: NSStackView, Settings_v {
private var numberOfProcesses: Int = 8
private var timeFormat: String = "short"
public init(_ title: String) {
self.title = title
public init(_ module: ModuleType) {
self.title = module.rawValue
self.numberOfProcesses = Store.shared.int(key: "\(self.title)_processes", defaultValue: self.numberOfProcesses)
self.timeFormat = Store.shared.string(key: "\(self.title)_timeFormat", defaultValue: self.timeFormat)