Add Proccesses, CPU, Uptime

Author: frenchie0x4ff

config.go

@@ -3,14 +3,17 @@ package main
 type Config struct {
 	ShowUser bool `json:"showUser"`
 	ShowSep bool `json:"showSep"`
+	ShowUptime bool `json:"showUptime"`
 	ShowMem bool `json:"showMem"`
+	ShowCPU bool `json:"showCPU"`
 	ShowTotalCPUCores bool `json:"showTotalCPUCores"`
 	ShowTotalCPUThreads bool `json:"showTotalCPUThreads"`
 	ShowGPUS bool `json:"showGPUS"`
 	ShowTotalDiskSize bool `json:"showTotalDiskSize"`
 	ShowWindowsVersion bool `json:"showWindowsVersion"`
 	ShowBios bool `json:"showBios"`
 	ShowBaseboard bool `json:"showBaseboard"`
+	ShowProcessCount bool `json:"showProcessCount"`
 	ShowAscii bool `json:"showAscii"`
 	UseDefaultColors bool `json:"useDefaultColors"`
 	UseSmallAscii bool `json:"useSmallAscii"`
@@ -26,20 +29,25 @@ type Config struct {
 
 type TitleValues struct {
 	Memory string `json:"memory"`
+	CPU string `json:"cpu"`
 	CPUCores string `json:"cpuCores"`
 	CPUThreads string `json:"cpuThreads"`
 	GPUs string `json:"gpus"`
 	DiskSize string `json:"diskSize"`
 	WindowsVersion string `json:"windowsVersion"`		
 	Bios string `json:"bios"`
 	Baseboard string `json:"baseboard"`
+	ProcessCount string `json:"processCount"`
+	Uptime string `json:"uptime"`
 }
 
 func newConfig() Config {
 	config := Config{}
 	config.ShowUser = true
+	config.ShowUptime = true
 	config.ShowSep = true
 	config.ShowMem = true
+	config.ShowCPU = true
 	config.ShowTotalCPUCores = true
 	config.ShowTotalCPUThreads = true
 	config.ShowGPUS = true
@@ -48,6 +56,7 @@ func newConfig() Config {
 	config.ShowBios = true
 	config.ShowBaseboard = true
 	config.ShowAscii = true
+	config.ShowProcessCount = true
 	config.UseSmallAscii = false
 	config.UseCustomAscii = false
 	config.CustomAsciiPath = ""
@@ -65,5 +74,8 @@ func newConfig() Config {
 	config.Titles.WindowsVersion = "Windows Ver."
 	config.Titles.Bios = "BIOS"
 	config.Titles.Baseboard = "Baseboard"
+	config.Titles.Uptime = "Uptime"
+	config.Titles.ProcessCount = "Processes"
+	config.Titles.CPU = "CPU #"
 	return config
 }

go.mod

@@ -5,5 +5,7 @@ go 1.14
 require (
 	github.com/gilliek/go-xterm256 v1.0.0
 	github.com/jaypipes/ghw v0.6.0
+	github.com/mitchellh/go-ps v1.0.0
+	github.com/shirou/gopsutil v2.20.4+incompatible
 	golang.org/x/sys v0.0.0-20200519105757-fe76b779f299
 )

go.sum

@@ -19,8 +19,12 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mitchellh/go-homedir v1.0.0 h1:vKb8ShqSby24Yrqr/yDYkuFz8d0WUjys40rvnGC8aR0=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
+github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
 github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/shirou/gopsutil v2.20.4+incompatible h1:cMT4rxS55zx9NVUnCkrmXCsEB/RNfG9SwHY9evtX8Ng=
+github.com/shirou/gopsutil v2.20.4+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=

helpers.go

@@ -54,4 +54,46 @@ func ByteFormat(inputNum float64, precision int) string {
 
 	return strconv.FormatFloat(returnVal, 'f', precision, 64) + unit
 
+}
+
+func plural(count int, singular string) (result string) {
+	if (count == 1) || (count == 0) {
+			result = strconv.Itoa(count) + " " + singular + " "
+	} else {
+			result = strconv.Itoa(count) + " " + singular + "s "
+	}
+	return
+}
+
+func secondsToHuman(input int) (result string) {
+	years := math.Floor(float64(input) / 60 / 60 / 24 / 7 / 30 / 12)
+	seconds := input % (60 * 60 * 24 * 7 * 30 * 12)
+	months := math.Floor(float64(seconds) / 60 / 60 / 24 / 7 / 30)
+	seconds = input % (60 * 60 * 24 * 7 * 30)
+	weeks := math.Floor(float64(seconds) / 60 / 60 / 24 / 7)
+	seconds = input % (60 * 60 * 24 * 7)
+	days := math.Floor(float64(seconds) / 60 / 60 / 24)
+	seconds = input % (60 * 60 * 24)
+	hours := math.Floor(float64(seconds) / 60 / 60)
+	seconds = input % (60 * 60)
+	minutes := math.Floor(float64(seconds) / 60)
+	seconds = input % 60
+
+	if years > 0 {
+			result = plural(int(years), "year") + plural(int(months), "month") + plural(int(weeks), "week") + plural(int(days), "day") + plural(int(hours), "hour") + plural(int(minutes), "minute") + plural(int(seconds), "second")
+	} else if months > 0 {
+			result = plural(int(months), "month") + plural(int(weeks), "week") + plural(int(days), "day") + plural(int(hours), "hour") + plural(int(minutes), "minute") + plural(int(seconds), "second")
+	} else if weeks > 0 {
+			result = plural(int(weeks), "week") + plural(int(days), "day") + plural(int(hours), "hour") + plural(int(minutes), "minute") + plural(int(seconds), "second")
+	} else if days > 0 {
+			result = plural(int(days), "day") + plural(int(hours), "hour") + plural(int(minutes), "minute") + plural(int(seconds), "second")
+	} else if hours > 0 {
+			result = plural(int(hours), "hour") + plural(int(minutes), "minute") + plural(int(seconds), "second")
+	} else if minutes > 0 {
+			result = plural(int(minutes), "minute") + plural(int(seconds), "second")
+	} else {
+			result = plural(int(seconds), "second")
+	}
+
+	return
 }

main.go

@@ -10,7 +10,9 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
-
+	ps "github.com/shirou/gopsutil/process"
+	hst "github.com/shirou/gopsutil/host"
+	// cp "github.com/shirou/gopsutil/cpu"
 	"github.com/jaypipes/ghw"
 	"golang.org/x/sys/windows/registry"
 	"github.com/gilliek/go-xterm256/xterm256"
@@ -160,6 +162,15 @@ llllllllllll  lllllllllllllllll
 
 	s = append(s, xterm256.Sprint(userc, strings.ReplaceAll(user.Username, "\\", "@")))
 	s = append(s, xterm256.Sprint(sep, "--------------------------------"))
+	
+	if (config.ShowUptime){
+		uptime, err := hst.Uptime()
+		if (err != nil) {
+			log.Fatal("Failed to Get Uptime!")
+		}
+		uptimes := secondsToHuman(int(uptime))
+		s = append(s, xterm256.Sprint(title, config.Titles.Uptime + ": ") + xterm256.Sprint(info, uptimes))
+	}
 
 	memorySplit := strings.Split(memory.String(), "(")
 	mem := strings.Split(memorySplit[1], ",")
@@ -168,18 +179,33 @@ llllllllllll  lllllllllllllllll
 	if (config.ShowMem) {
 		s = append(s, xterm256.Sprint(title, config.Titles.Memory + ": ") + xterm256.Sprint(info, strings.ReplaceAll(usableMem[0], "MB ", "GB") + "/" + strings.ReplaceAll(physMem[0], "MB", "GB")))
 	}
-	if (config.ShowTotalCPUCores || config.ShowTotalCPUThreads){
+	if (config.ShowTotalCPUCores || config.ShowTotalCPUThreads || config.ShowCPU){
 		cpu, err := ghw.CPU()
 		if err != nil {
 			fmt.Printf("Error getting CPU info: %v", err)
 		}
+		if (config.ShowCPU){
+			in := 0
+			for x := range cpu.Processors {
+				s = append(s, xterm256.Sprint(title, "CPU #" + fmt.Sprint(in) + ": ") + xterm256.Sprint(info, cpu.Processors[x].Model))
+			}
+		}
 		if (config.ShowTotalCPUCores){
 			s = append(s, xterm256.Sprint(title, config.Titles.CPUCores + ": ") +   xterm256.Sprint(info, fmt.Sprint(cpu.TotalCores)))
 		}
 		if (config.ShowTotalCPUThreads){
 			s = append(s, xterm256.Sprint(title, config.Titles.CPUThreads + ": ") +  xterm256.Sprint(info, fmt.Sprint(cpu.TotalThreads)))
 		}
 	}
+	if (config.ShowProcessCount){
+		pids, err := ps.Pids()
+
+		if err != nil {
+			log.Fatal("Couldn't get Processes!")
+		}
+
+		s = append(s, xterm256.Sprint(title, "Proccesses Running: ") + xterm256.Sprint(info, int64(len(pids))))
+	}
 	if (config.ShowWindowsVersion){
 		k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
 
@@ -203,12 +229,9 @@ llllllllllll  lllllllllllllllll
 		}
 		gpuin := 0
 		for _, c := range gpu.GraphicsCards {
-			s = append(s, xterm256.Sprint(title, config.Titles.GPUs + ": " + fmt.Sprint(gpuin) + ": ") +  xterm256.Sprint(info, c.DeviceInfo.Product.Name))
+			s = append(s, xterm256.Sprint(title, config.Titles.GPUs + fmt.Sprint(gpuin) + ": ") +  xterm256.Sprint(info, c.DeviceInfo.Product.Name))
 			gpuin++
 		}
-	}
-	if (config.ShowWindowsVersion){
-		
 	}
 	if (config.ShowBios){
 		bios, err := ghw.BIOS()