Commit 9384dc9

Karn Wong <karn@karnwong.me>
2025-02-23 16:11:38
fix(getSystemInfo): use raw values to calculate memory used percent
master
1 parent dd04c30
Changed files (2)
cmd
get
get_system_info.go
go.sum
cmd/get/get_system_info.go
@@ -28,8 +28,8 @@ type SystemInfo struct {
 	CPUThreads   int
 
 	// memory
-	MemoryUsed  int
-	MemoryTotal int
+	MemoryUsed  uint64
+	MemoryTotal uint64
 
 	// disk
 	DiskUsed  int
@@ -78,8 +78,8 @@ func getSystemInfo() SystemInfo {
 	if err != nil {
 		log.Fatal().Msg("Failed to get memory info")
 	}
-	memoryUsed := convertKBtoGB(vmStat.Used)
-	memoryTotal := convertKBtoGB(vmStat.Total)
+	memoryUsed := vmStat.Used
+	memoryTotal := vmStat.Total
 
 	// disk
 	diskStat, err := disk.Usage("/")
@@ -137,7 +137,7 @@ var getSystemInfoCmd = &cobra.Command{
 		cpuStdout := fmt.Sprintf("%s: %s", color.Green("CPU"), cpuInfo)
 
 		memoryUsedPercent := convertToPercent(float64(systemInfo.MemoryUsed) / float64(systemInfo.MemoryTotal))
-		memoryInfo := fmt.Sprintf("%v/%v GB (%s)", systemInfo.MemoryUsed, systemInfo.MemoryTotal, color.Blue(strconv.Itoa(memoryUsedPercent)+"%"))
+		memoryInfo := fmt.Sprintf("%v/%v GB (%s)", convertKBtoGB(systemInfo.MemoryUsed), convertKBtoGB(systemInfo.MemoryTotal), color.Blue(strconv.Itoa(memoryUsedPercent)+"%"))
 		memoryStdout := fmt.Sprintf("%s: %s", color.Green("Memory"), memoryInfo)
 
 		diskUsedPercent := convertToPercent(float64(systemInfo.DiskUsed) / float64(systemInfo.DiskTotal))
go.sum
@@ -77,8 +77,6 @@ github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
 github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sethvargo/go-diceware v0.4.0 h1:T9o5HaG+8Ae6We4LhItjzOSdTkW7hsikNexa5o837IQ=
-github.com/sethvargo/go-diceware v0.4.0/go.mod h1:Lg1SyPS7yQO6BBgTN5r4f2MUDkqGfLWsOjHPY0kA8iw=
 github.com/sethvargo/go-diceware v0.5.0 h1:exrQ7GpaBo00GqRVM1N8ChXSsi3oS7tjQiIehsD+yR0=
 github.com/sethvargo/go-diceware v0.5.0/go.mod h1:Lg1SyPS7yQO6BBgTN5r4f2MUDkqGfLWsOjHPY0kA8iw=
 github.com/sethvargo/go-password v0.3.1 h1:WqrLTjo7X6AcVYfC6R7GtSyuUQR9hGyAj/f1PYQZCJU=