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

- update structure name in modules

Browse Source 
- add arguments support (--reset, --disable)
- update a README
This commit is contained in:
Serhiy Mytrovtsiy
2020-06-28 22:31:40 +02:00
parent 8669bb0c2b
commit 3f8ee3bd65
17 changed files with 107 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Battery/main.swift
View File

@@ -14,7 +14,7 @@ import StatsKit
import ModuleKit
import IOKit.ps
struct Usage: value_t {
struct Battery_Usage: value_t {
var powerSource: String = ""
var state: String = ""
var isCharged: Bool = false
@@ -66,7 +66,7 @@ public class Battery: Module {
return sources.count > 0
}
private func usageCallback(_ value: Usage?) {
private func usageCallback(_ value: Battery_Usage?) {
if value == nil {
return
}

2
Modules/Battery/popup.swift
View File

@@ -127,7 +127,7 @@ internal class Popup: NSView {
self.adapterView = view
}
public func usageCallback(_ value: Usage) {
public func usageCallback(_ value: Battery_Usage) {
DispatchQueue.main.async(execute: {
self.dashboardBatteryView?.setValue(abs(value.level))

4
Modules/Battery/readers.swift
View File

@@ -12,13 +12,13 @@
import Cocoa
import ModuleKit
internal class UsageReader: Reader<Usage> {
internal class UsageReader: Reader<Battery_Usage> {
private var service: io_connect_t = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("AppleSmartBattery"))
private var source: CFRunLoopSource?
private var loop: CFRunLoop?
private var usage: Usage = Usage()
private var usage: Battery_Usage = Battery_Usage()
public override func start() {
let context = UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque())

16
Modules/CPU/main.swift
View File

@@ -10,7 +10,7 @@ import Cocoa
import ModuleKit
import StatsKit
public struct Load: value_t {
public struct CPU_Load: value_t {
var totalUsage: Double = 0
var usagePerCore: [Double] = []
@@ -35,13 +35,13 @@ public class CPU: Module {
private let popupView: Popup = Popup()
private var settingsView: Settings
private var loadReader: LoadReader = LoadReader()
private var loadReader: LoadReader? = LoadReader()
private let smc: UnsafePointer<SMCService>?
public init(_ store: UnsafePointer<Store>, _ smc: UnsafePointer<SMCService>) {
self.smc = smc
self.settingsView = Settings("CPU", store: store)
self.loadReader.store = store
self.loadReader!.store = store
super.init(
store: store,
@@ -50,20 +50,20 @@ public class CPU: Module {
)
self.settingsView.callback = { [unowned self] in
self.loadReader.read()
self.loadReader?.read()
}
self.loadReader.readyCallback = { [unowned self] in
self.loadReader?.readyCallback = { [unowned self] in
self.readyHandler()
}
self.loadReader.callbackHandler = { [unowned self] value in
self.loadReader?.callbackHandler = { [unowned self] value in
self.loadCallback(value)
}
self.addReader(self.loadReader)
self.addReader(self.loadReader!)
}
private func loadCallback(_ value: Load?) {
private func loadCallback(_ value: CPU_Load?) {
if value == nil {
return
}

2
Modules/CPU/popup.swift
View File

@@ -95,7 +95,7 @@ internal class Popup: NSView {
return valueView
}
public func loadCallback(_ value: Load, tempValue: Double?) {
public func loadCallback(_ value: CPU_Load, tempValue: Double?) {
var temperature: String = "Unknown"
DispatchQueue.main.async(execute: {

4
Modules/CPU/readers.swift
View File

@@ -13,7 +13,7 @@ import Cocoa
import StatsKit
import ModuleKit
internal class LoadReader: Reader<Load> {
internal class LoadReader: Reader<CPU_Load> {
public var store: UnsafePointer<Store>? = nil
private var cpuInfo: processor_info_array_t!
@@ -24,7 +24,7 @@ internal class LoadReader: Reader<Load> {
private let CPUUsageLock: NSLock = NSLock()
private var previousInfo = host_cpu_load_info()
private var response: Load = Load()
private var response: CPU_Load = CPU_Load()
private var numCPUsU: natural_t = 0
private var usagePerCore: [Double] = []

4
Modules/Memory/main.swift
View File

@@ -13,7 +13,7 @@ import Cocoa
import StatsKit
import ModuleKit
public struct Usage: value_t {
public struct RAM_Usage: value_t {
var active: Double?
var inactive: Double?
var wired: Double?
@@ -52,7 +52,7 @@ public class Memory: Module {
self.addReader(self.usageReader)
}
private func loadCallback(value: Usage?) {
private func loadCallback(value: RAM_Usage?) {
if value == nil {
return
}

2
Modules/Memory/popup.swift
View File

@@ -99,7 +99,7 @@ internal class Popup: NSView {
return valueView
}
public func loadCallback(_ value: Usage) {
public func loadCallback(_ value: RAM_Usage) {
DispatchQueue.main.async(execute: {
if self.window!.isVisible || !self.initialized {
self.activeField?.stringValue = Units(bytes: Int64(value.active!)).getReadableMemory()

4
Modules/Memory/readers.swift
View File

@@ -12,7 +12,7 @@
import Cocoa
import ModuleKit
internal class UsageReader: Reader<Usage> {
internal class UsageReader: Reader<RAM_Usage> {
public var totalSize: Double = 0
public override func setup() {
@@ -53,7 +53,7 @@ internal class UsageReader: Reader<Usage> {
let used = active + wired + compressed
let free = self.totalSize - used
self.callback(Usage(
self.callback(RAM_Usage(
active: active,
inactive: inactive,
wired: wired,

4
Modules/Net/main.swift
View File

@@ -18,7 +18,7 @@ public enum Network_t: String {
case ethernet
}
public struct Usage: value_t {
public struct Network_Usage: value_t {
var active: Bool = false
var download: Int64 = 0
@@ -73,7 +73,7 @@ public class Network: Module {
self.addReader(self.usageReader)
}
private func usageCallback(_ value: Usage?) {
private func usageCallback(_ value: Network_Usage?) {
if value == nil {
return
}

2
Modules/Net/popup.swift
View File

@@ -145,7 +145,7 @@ internal class Popup: NSView {
self.addSubview(view)
}
public func usageCallback(_ value: Usage) {
public func usageCallback(_ value: Network_Usage) {
DispatchQueue.main.async(execute: {
if !self.window!.isVisible && self.initialized && value.active {
return

4
Modules/Net/readers.swift
View File

@@ -16,9 +16,9 @@ import Reachability
import os.log
import CoreWLAN
internal class UsageReader: Reader<Usage> {
internal class UsageReader: Reader<Network_Usage> {
private var reachability: Reachability? = nil
private var usage: Usage = Usage()
private var usage: Network_Usage = Network_Usage()
private var interfaceID: String? = nil