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

fix: disk memory conversion (macOS report not bytes) (#233)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2020-12-19 21:37:01 +01:00
parent a93994f0f2
commit 8902efbea9
7 changed files with 76 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Modules/Disk/main.swift
View File

@@ -109,7 +109,7 @@ public class Disk: Module {
self.readyHandler()
}
self.capacityReader?.callbackHandler = { [unowned self] value in
self.capacityCallback(value: value)
self.capacityCallback(value)
}
self.settingsView.selectedDiskHandler = { [unowned self] value in
@@ -134,27 +134,22 @@ public class Disk: Module {
}
}
private func capacityCallback(value: DiskList?) {
if value == nil {
private func capacityCallback(_ raw: DiskList?) {
guard raw != nil, let value = raw else {
return
}
DispatchQueue.main.async(execute: {
self.popupView.usageCallback(value!)
self.popupView.usageCallback(value)
})
self.settingsView.setList(value!)
self.settingsView.setList(value)
var d = value!.getDiskByName(self.selectedDisk)
if d == nil {
d = value!.getRootDisk()
}
if d == nil {
guard let d = value.getDiskByName(self.selectedDisk) ?? value.getRootDisk() else {
return
}
let total = d!.size
let free = d!.free
let total = d.size
let free = d.free
let usedSpace = total - free
let percentage = Double(usedSpace) / Double(total)
@@ -165,10 +160,10 @@ public class Disk: Module {
widget.setValue([percentage])
}
if let widget = self.widget as? MemoryWidget {
widget.setValue((free, usedSpace))
widget.setValue((DiskSize(free).getReadableMemory(), DiskSize(usedSpace).getReadableMemory()))
}
if let widget = self.widget as? SpeedWidget {
widget.setValue(upload: d?.stats?.write ?? 0, download: d?.stats?.read ?? 0)
widget.setValue(upload: d.stats?.write ?? 0, download: d.stats?.read ?? 0)
}
}
}