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

v2.11.28

Browse Source 
fix: fixed ModuleType variable raw value (#2363)
This commit is contained in:
Serhiy Mytrovtsiy
2025-01-27 11:23:25 +01:00
parent 9325e2001c
commit c640ce2215
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Clock/main.swift
View File

@@ -61,7 +61,7 @@ public class Clock: Module {
private var reader: ClockReader?
static var list: [Clock_t] {
if let objects = Store.shared.data(key: "\(ModuleType.clock.rawValue)_list") {
if let objects = Store.shared.data(key: "\(ModuleType.clock.stringValue)_list") {
let decoder = JSONDecoder()
if let objectsDecoded = try? decoder.decode(Array.self, from: objects) as [Clock_t] {
return objectsDecoded

4
Modules/Disk/main.swift
View File

@@ -156,7 +156,7 @@ public class Disks: Codable {
public struct Disk_process: Process_p, Codable {
public var base: DataSizeBase {
DataSizeBase(rawValue: Store.shared.string(key: "\(ModuleType.disk.rawValue)_base", defaultValue: "byte")) ?? .byte
DataSizeBase(rawValue: Store.shared.string(key: "\(ModuleType.disk.stringValue)_base", defaultValue: "byte")) ?? .byte
}
public var pid: Int
@@ -223,7 +223,7 @@ public class Disk: Module {
}
}
self.selectedDisk = Store.shared.string(key: "\(ModuleType.disk.rawValue)_disk", defaultValue: self.selectedDisk)
self.selectedDisk = Store.shared.string(key: "\(ModuleType.disk.stringValue)_disk", defaultValue: self.selectedDisk)
self.settingsView.selectedDiskHandler = { [weak self] value in
self?.selectedDisk = value

14
Modules/Disk/popup.swift
View File

@@ -287,10 +287,10 @@ internal class DiskView: NSStackView {
}
private var readColor: NSColor {
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor
}
private var writeColor: NSColor {
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor
}
init(width: CGFloat, uuid: String = "", name: String = "", size: Int64 = 1, free: Int64 = 1, path: URL? = nil, smart: smart_t? = nil, resize: @escaping () -> Void) {
@@ -411,10 +411,10 @@ internal class NameView: NSStackView {
private var writeState: NSView? = nil
private var readColor: NSColor {
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor
}
private var writeColor: NSColor {
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor
}
public init(width: CGFloat, name: String, size: Int64, free: Int64, path: URL?) {
@@ -518,13 +518,13 @@ internal class ChartView: NSStackView {
private var ready: Bool = false
private var readColor: NSColor {
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor
}
private var writeColor: NSColor {
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor
SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor
}
private var reverseOrder: Bool {
Store.shared.bool(key: "\(ModuleType.disk.rawValue)_reverseOrder", defaultValue: false)
Store.shared.bool(key: "\(ModuleType.disk.stringValue)_reverseOrder", defaultValue: false)
}
public init(width: CGFloat) {

4
Modules/Disk/readers.swift
View File

@@ -36,7 +36,7 @@ internal class CapacityReader: Reader<Disks> {
internal var list: Disks = Disks()
private var SMART: Bool {
Store.shared.bool(key: "\(ModuleType.disk.rawValue)_SMART", defaultValue: true)
Store.shared.bool(key: "\(ModuleType.disk.stringValue)_SMART", defaultValue: true)
}
public override func read() {
@@ -381,7 +381,7 @@ public class ProcessReader: Reader<[Disk_process]> {
}
private var numberOfProcesses: Int {
Store.shared.int(key: "\(ModuleType.disk.rawValue)_processes", defaultValue: 5)
Store.shared.int(key: "\(ModuleType.disk.stringValue)_processes", defaultValue: 5)
}
public override func setup() {

4
Modules/Sensors/main.swift
View File

@@ -30,7 +30,7 @@ public class Sensors: Module {
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")
self.selectedSensor = Store.shared.string(key: "\(ModuleType.sensors.stringValue)_sensor", defaultValue: "Average System Total")
super.init(
moduleType: .sensors,
@@ -78,7 +78,7 @@ public class Sensors: Module {
}
}
}
self.selectedSensor = Store.shared.string(key: "\(ModuleType.sensors.rawValue)_sensor", defaultValue: self.selectedSensor)
self.selectedSensor = Store.shared.string(key: "\(ModuleType.sensors.stringValue)_sensor", defaultValue: self.selectedSensor)
self.settingsView.selectedHandler = { [weak self] value in
self?.selectedSensor = value
self?.sensorsReader?.read()