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

fix: fixed RAM memory format (#2586)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2025-06-05 23:48:34 +02:00
parent b2b799dba4
commit 1c8383d129
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Modules/RAM/main.swift
View File

@@ -174,8 +174,8 @@ public class RAM: Module {
circle_segment(value: value.compressed/total, color: self.compressedColor)
])
case let widget as MemoryWidget:
let free = Units(bytes: Int64(value.free)).getReadableMemory()
let used = Units(bytes: Int64(value.used)).getReadableMemory()
let free = Units(bytes: Int64(value.free)).getReadableMemory(style: .memory)
let used = Units(bytes: Int64(value.used)).getReadableMemory(style: .memory)
widget.setValue((free, used), usedPercentage: value.usage)
widget.setPressure(value.pressure.value)
case let widget as Tachometer:
@@ -193,24 +193,24 @@ public class RAM: Module {
switch pair.key {
case "$mem":
switch pair.value {
case "total": replacement = Units(bytes: Int64(value.total)).getReadableMemory()
case "used": replacement = Units(bytes: Int64(value.used)).getReadableMemory()
case "free": replacement = Units(bytes: Int64(value.free)).getReadableMemory()
case "active": replacement = Units(bytes: Int64(value.active)).getReadableMemory()
case "inactive": replacement = Units(bytes: Int64(value.inactive)).getReadableMemory()
case "wired": replacement = Units(bytes: Int64(value.wired)).getReadableMemory()
case "compressed": replacement = Units(bytes: Int64(value.compressed)).getReadableMemory()
case "app": replacement = Units(bytes: Int64(value.app)).getReadableMemory()
case "cache": replacement = Units(bytes: Int64(value.cache)).getReadableMemory()
case "total": replacement = Units(bytes: Int64(value.total)).getReadableMemory(style: .memory)
case "used": replacement = Units(bytes: Int64(value.used)).getReadableMemory(style: .memory)
case "free": replacement = Units(bytes: Int64(value.free)).getReadableMemory(style: .memory)
case "active": replacement = Units(bytes: Int64(value.active)).getReadableMemory(style: .memory)
case "inactive": replacement = Units(bytes: Int64(value.inactive)).getReadableMemory(style: .memory)
case "wired": replacement = Units(bytes: Int64(value.wired)).getReadableMemory(style: .memory)
case "compressed": replacement = Units(bytes: Int64(value.compressed)).getReadableMemory(style: .memory)
case "app": replacement = Units(bytes: Int64(value.app)).getReadableMemory(style: .memory)
case "cache": replacement = Units(bytes: Int64(value.cache)).getReadableMemory(style: .memory)
case "swapins": replacement = "\(value.swapins)"
case "swapouts": replacement = "\(value.swapouts)"
default: return
}
case "$swap":
switch pair.value {
case "total": replacement = Units(bytes: Int64(value.swap.total)).getReadableMemory()
case "used": replacement = Units(bytes: Int64(value.swap.used)).getReadableMemory()
case "free": replacement = Units(bytes: Int64(value.swap.free)).getReadableMemory()
case "total": replacement = Units(bytes: Int64(value.swap.total)).getReadableMemory(style: .memory)
case "used": replacement = Units(bytes: Int64(value.swap.used)).getReadableMemory(style: .memory)
case "free": replacement = Units(bytes: Int64(value.swap.free)).getReadableMemory(style: .memory)
default: return
}
case "$pressure":

2
Modules/RAM/popup.swift
View File

@@ -273,7 +273,7 @@ internal class Popup: PopupWrapper {
for i in 0..<list.count {
let process = list[i]
self.processes?.set(i, process, [Units(bytes: Int64(process.usage)).getReadableMemory()])
self.processes?.set(i, process, [Units(bytes: Int64(process.usage)).getReadableMemory(style: .memory)])
}
self.processesInitialized = true

6
Modules/RAM/portal.swift
View File

@@ -100,9 +100,9 @@ public class Portal: PortalWrapper {
internal func callback(_ value: RAM_Usage) {
DispatchQueue.main.async(execute: {
if (self.window?.isVisible ?? false) || !self.initialized {
self.usedField?.stringValue = Units(bytes: Int64(value.used)).getReadableMemory()
self.freeField?.stringValue = Units(bytes: Int64(value.free)).getReadableMemory()
self.swapField?.stringValue = Units(bytes: Int64(value.swap.used)).getReadableMemory()
self.usedField?.stringValue = Units(bytes: Int64(value.used)).getReadableMemory(style: .memory)
self.freeField?.stringValue = Units(bytes: Int64(value.free)).getReadableMemory(style: .memory)
self.swapField?.stringValue = Units(bytes: Int64(value.swap.used)).getReadableMemory(style: .memory)
self.pressureLevelField?.stringValue = value.pressure.value.rawValue
self.usedField?.toolTip = "\(Int(value.usage.rounded(toPlaces: 2) * 100))%"

4
Modules/RAM/widget.swift
View File

@@ -101,13 +101,13 @@ public struct RAMWidget: Widget {
Rectangle().fill(self.usedColor).frame(width: 12, height: 12).cornerRadius(2)
Text(localizedString("Used")).font(.system(size: 12, weight: .regular)).foregroundColor(.secondary)
Spacer()
Text(Units(bytes: Int64(value.used)).getReadableMemory())
Text(Units(bytes: Int64(value.used)).getReadableMemory(style: .memory))
}
HStack {
Rectangle().fill(self.freeColor).frame(width: 12, height: 12).cornerRadius(2)
Text(localizedString("Free")).font(.system(size: 12, weight: .regular)).foregroundColor(.secondary)
Spacer()
Text(Units(bytes: Int64(value.free)).getReadableMemory())
Text(Units(bytes: Int64(value.free)).getReadableMemory(style: .memory))
}
HStack {
Text(localizedString("Pressure level")).font(.system(size: 12, weight: .regular)).foregroundColor(.secondary)