feat: added system uptime to the CPU popup (#1398)

exelban · Apr 22, 2024 · bd810e8 · bd810e8
1 parent 368be82
commit bd810e8
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/Modules/CPU/popup.swift b/Modules/CPU/popup.swift
@@ -21,10 +21,7 @@ internal class Popup: PopupWrapper {
     private let chartHeight: CGFloat = 120 + Constants.Popup.separatorHeight
     private var detailsHeight: CGFloat {
         get {
-            var count: CGFloat = 5
-            if isARM {
-                count = 3
-            }
+            var count: CGFloat = isARM ? 4 : 6
             if SystemKit.shared.device.info.cpu?.eCores != nil {
                 count += 1
             }
@@ -44,6 +41,7 @@ internal class Popup: PopupWrapper {
     private var speedLimitField: NSTextField? = nil
     private var eCoresField: NSTextField? = nil
     private var pCoresField: NSTextField? = nil
+    private var uptimeField: NSTextField? = nil
     private var average1Field: NSTextField? = nil
     private var average5Field: NSTextField? = nil
     private var average15Field: NSTextField? = nil
@@ -93,6 +91,19 @@ internal class Popup: PopupWrapper {
     private var processesHeight: CGFloat {
         (self.processHeight*CGFloat(self.numberOfProcesses)) + (self.numberOfProcesses == 0 ? 0 : Constants.Popup.separatorHeight + 22)
     }
+    private var uptimeValue: String {
+        let form = DateComponentsFormatter()
+        form.maximumUnitCount = 2
+        form.unitsStyle = .full
+        form.allowedUnits = [.day, .hour, .minute]
+        var value = localizedString("Unknown")
+        if let bootDate = SystemKit.shared.device.bootDate {
+            if let duration = form.string(from: bootDate, to: Date()) {
+                value = duration
+            }
+        }
+        return value
+    }
 
     public init(_ module: ModuleType) {
         self.title = module.rawValue
@@ -142,6 +153,10 @@ internal class Popup: PopupWrapper {
         self.lineChart?.display()
     }
 
+    public override func appear() {
+        self.uptimeField?.stringValue = self.uptimeValue
+    }
+
     public override func disappear() {
         self.processes?.setLock(false)
     }
@@ -260,6 +275,7 @@ internal class Popup: PopupWrapper {
         (self.systemColorView, _, self.systemField) = popupWithColorRow(container, color: self.systemColor, n: 4, title: "\(localizedString("System")):", value: "")
         (self.userColorView, _, self.userField) = popupWithColorRow(container, color: self.userColor, n: 3, title: "\(localizedString("User")):", value: "")
         (self.idleColorView, _, self.idleField) = popupWithColorRow(container, color: self.idleColor.withAlphaComponent(0.5), n: 2, title: "\(localizedString("Idle")):", value: "")
+
         if !isARM {
             self.shedulerLimitField = popupRow(container, n: 1, title: "\(localizedString("Scheduler limit")):", value: "").1
             self.speedLimitField = popupRow(container, n: 0, title: "\(localizedString("Speed limit")):", value: "").1
@@ -272,6 +288,9 @@ internal class Popup: PopupWrapper {
             (self.pCoresColorView, _, self.pCoresField) = popupWithColorRow(container, color: self.pCoresColor, n: 0, title: "\(localizedString("Performance cores")):", value: "")
         }
 
+        self.uptimeField = popupRow(container, n: 0, title: "\(localizedString("Uptime")):", value: self.uptimeValue).1
+        self.uptimeField?.font = NSFont.systemFont(ofSize: 11, weight: .regular)
+
         view.addSubview(separator)
         view.addSubview(container)