Add detailed memory usage labels to memory widget

cjbassi · May 24, 2018 · 42a949c · 42a949c
1 parent ae2fff9
commit 42a949c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/src/widgets/cpu.go b/src/widgets/cpu.go
@@ -67,9 +67,11 @@ func (self *CPU) update() {
 			key := "CPU" + strconv.Itoa(i)
 			percent := percents[i]
 			self.Data[key] = append(self.Data[key], percent)
+			self.Labels[key] = fmt.Sprintf("%3.0f%%", percent)
 		}
 	} else {
 		percent, _ := psCPU.Percent(self.interval, false)
 		self.Data["Average"] = append(self.Data["Average"], percent[0])
+		self.Labels["Average"] = fmt.Sprintf("%3.0f%%", percent[0])
 	}
 }
diff --git a/src/widgets/mem.go b/src/widgets/mem.go
@@ -1,8 +1,10 @@
 package widgets
 
 import (
+	"fmt"
 	"time"
 
+	"github.com/cjbassi/gotop/src/utils"
 	ui "github.com/cjbassi/termui"
 	psMem "github.com/shirou/gopsutil/mem"
 )
@@ -39,4 +41,11 @@ func (self *Mem) update() {
 	swap, _ := psMem.SwapMemory()
 	self.Data["Main"] = append(self.Data["Main"], main.UsedPercent)
 	self.Data["Swap"] = append(self.Data["Swap"], swap.UsedPercent)
+
+	mainTotalBytes, mainTotalMagnitude := utils.ConvertBytes(main.Total)
+	swapTotalBytes, swapTotalMagnitude := utils.ConvertBytes(swap.Total)
+	mainUsedBytes, mainUsedMagnitude := utils.ConvertBytes(main.Used)
+	swapUsedBytes, swapUsedMagnitude := utils.ConvertBytes(swap.Used)
+	self.Labels["Main"] = fmt.Sprintf("%3.0f%% %.0f%s/%.0f%s", main.UsedPercent, mainUsedBytes, mainUsedMagnitude, mainTotalBytes, mainTotalMagnitude)
+	self.Labels["Swap"] = fmt.Sprintf("%3.0f%% %.0f%s/%.0f%s", swap.UsedPercent, swapUsedBytes, swapUsedMagnitude, swapTotalBytes, swapTotalMagnitude)
 }
diff --git a/vendor/github.com/cjbassi/termui/linegraph.go b/vendor/github.com/cjbassi/termui/linegraph.go