chore: finished struct refactor
8223b1aa
2 file(s) · +55 −46
| 24 | 24 | return Row{Key: "Host", Value: host} |
|
| 25 | 25 | } |
|
| 26 | 26 | ||
| 27 | - | func GetDistro() string { |
|
| 27 | + | func GetDistro() Row { |
|
| 28 | + | var distro string |
|
| 28 | 29 | file, err := os.Open("/etc/os-release") |
|
| 29 | 30 | if err != nil { |
|
| 30 | - | return "" |
|
| 31 | + | distro = "Unknown" |
|
| 31 | 32 | } |
|
| 32 | 33 | defer file.Close() |
|
| 33 | 34 | ||
| 36 | 37 | line := scanner.Text() |
|
| 37 | 38 | if strings.HasPrefix(line, "PRETTY_NAME=") { |
|
| 38 | 39 | value := strings.TrimPrefix(line, "PRETTY_NAME=") |
|
| 39 | - | return strings.Trim(value, `"`) |
|
| 40 | + | distro = strings.Trim(value, `"`) |
|
| 40 | 41 | } |
|
| 41 | 42 | } |
|
| 42 | - | return "" |
|
| 43 | + | return Row{Key: "Distro", Value: distro} |
|
| 43 | 44 | } |
|
| 44 | 45 | ||
| 45 | - | func GetMachine() string { |
|
| 46 | + | func GetMachine() Row { |
|
| 47 | + | var machine string |
|
| 46 | 48 | brandFile, err := os.ReadFile("/sys/class/dmi/id/sys_vendor") |
|
| 47 | 49 | if err != nil { |
|
| 48 | - | return "" |
|
| 50 | + | machine = "Unknown" |
|
| 49 | 51 | } |
|
| 50 | 52 | productFile, err := os.ReadFile("/sys/class/dmi/id/product_name") |
|
| 51 | 53 | if err != nil { |
|
| 52 | - | return "" |
|
| 54 | + | machine = "Unknown" |
|
| 53 | 55 | } |
|
| 54 | 56 | ||
| 55 | 57 | brand := strings.TrimSpace(string(brandFile)) |
|
| 56 | 58 | product := strings.TrimSpace(string(productFile)) |
|
| 57 | 59 | ||
| 58 | - | return fmt.Sprintf("%s %s", brand, product) |
|
| 60 | + | machine = fmt.Sprintf("%s %s", brand, product) |
|
| 61 | + | return Row{Key: "Machine", Value: machine} |
|
| 59 | 62 | } |
|
| 60 | 63 | ||
| 61 | - | func GetKernel() string { |
|
| 64 | + | func GetKernel() Row { |
|
| 65 | + | var kernel string |
|
| 62 | 66 | kernelFile, err := os.ReadFile("/proc/sys/kernel/osrelease") |
|
| 63 | 67 | if err != nil { |
|
| 64 | - | return "" |
|
| 68 | + | kernel = "Unknown" |
|
| 65 | 69 | } |
|
| 66 | - | kernel := strings.TrimSpace(string(kernelFile)) |
|
| 67 | - | return kernel |
|
| 70 | + | kernel = strings.TrimSpace(string(kernelFile)) |
|
| 71 | + | return Row{Key: "Kernel", Value: kernel} |
|
| 68 | 72 | } |
|
| 69 | 73 | ||
| 70 | - | func GetPackages() string { |
|
| 74 | + | func GetPackages() Row { |
|
| 75 | + | var packages string |
|
| 71 | 76 | var count int |
|
| 72 | 77 | file, err := os.Open("/lib/apk/db/installed") |
|
| 73 | 78 | if err != nil { |
|
| 74 | - | return "" |
|
| 79 | + | packages = "Unknown" |
|
| 75 | 80 | } |
|
| 76 | 81 | defer file.Close() |
|
| 77 | 82 | ||
| 84 | 89 | } |
|
| 85 | 90 | ||
| 86 | 91 | stringCount := strconv.Itoa(count) |
|
| 87 | - | ||
| 88 | - | return stringCount + " (apk)" |
|
| 92 | + | packages = stringCount + " (apk)" |
|
| 93 | + | return Row{Key: "Packages", Value: packages} |
|
| 89 | 94 | } |
|
| 90 | 95 | ||
| 91 | - | func GetShell() string { |
|
| 96 | + | func GetShell() Row { |
|
| 97 | + | var shell string |
|
| 92 | 98 | shellEnv := os.Getenv("SHELL") |
|
| 93 | 99 | if shellEnv == "" { |
|
| 94 | - | return "" |
|
| 100 | + | shell = "Unknown" |
|
| 95 | 101 | } |
|
| 96 | 102 | ||
| 97 | - | shell := filepath.Base(shellEnv) |
|
| 103 | + | shell = filepath.Base(shellEnv) |
|
| 98 | 104 | ||
| 99 | - | return shell |
|
| 105 | + | return Row{Key: "Shell", Value: shell} |
|
| 100 | 106 | } |
|
| 101 | 107 | ||
| 102 | - | func GetCpu() string { |
|
| 108 | + | func GetCpu() Row { |
|
| 109 | + | var cpu string |
|
| 103 | 110 | file, err := os.Open("/proc/cpuinfo") |
|
| 104 | 111 | if err != nil { |
|
| 105 | - | return "" |
|
| 112 | + | cpu = "Unknown" |
|
| 106 | 113 | } |
|
| 107 | 114 | defer file.Close() |
|
| 108 | 115 | ||
| 112 | 119 | if strings.HasPrefix(line, "model name") { |
|
| 113 | 120 | value := strings.TrimPrefix(line, "model name") |
|
| 114 | 121 | cleanSpace := strings.TrimSpace(value) |
|
| 115 | - | valueClean := strings.TrimPrefix(cleanSpace, ": ") |
|
| 116 | - | return valueClean |
|
| 122 | + | cpu = strings.TrimPrefix(cleanSpace, ": ") |
|
| 117 | 123 | } |
|
| 118 | 124 | } |
|
| 119 | - | return "" |
|
| 125 | + | return Row{Key: "CPU", Value: cpu} |
|
| 120 | 126 | } |
|
| 121 | 127 | ||
| 122 | - | func GetMemory() string { |
|
| 128 | + | func GetMemory() Row { |
|
| 129 | + | var memory string |
|
| 123 | 130 | var memTotal string |
|
| 124 | 131 | var memAvailable string |
|
| 125 | 132 | file, err := os.Open("/proc/meminfo") |
|
| 126 | 133 | if err != nil { |
|
| 127 | - | return "" |
|
| 134 | + | memory = "Unknown" |
|
| 128 | 135 | } |
|
| 129 | 136 | defer file.Close() |
|
| 130 | 137 | ||
| 157 | 164 | memAvailableGb := float64(memAvailableInt) / float64(1024) / float64(1024) |
|
| 158 | 165 | memUsed := memTotalGb - memAvailableGb |
|
| 159 | 166 | ||
| 160 | - | result := fmt.Sprintf("%.2f GiB / %.2f GiB", memUsed, memTotalGb) |
|
| 161 | - | return result |
|
| 167 | + | memory = fmt.Sprintf("%.2f GiB / %.2f GiB", memUsed, memTotalGb) |
|
| 168 | + | return Row{Key: "Memory", Value: memory} |
|
| 162 | 169 | } |
|
| 163 | 170 | ||
| 164 | - | func GetUptime() string { |
|
| 171 | + | func GetUptime() Row { |
|
| 172 | + | var uptime string |
|
| 165 | 173 | var si syscall.Sysinfo_t |
|
| 166 | 174 | syscall.Sysinfo(&si) |
|
| 167 | 175 | ||
| 168 | - | uptime := time.Duration(float64(si.Uptime) * float64(time.Second)) |
|
| 176 | + | uptimeValues := time.Duration(float64(si.Uptime) * float64(time.Second)) |
|
| 169 | 177 | ||
| 170 | - | hours := int(uptime.Hours()) |
|
| 171 | - | minutes := int(uptime.Minutes()) % 60 |
|
| 178 | + | hours := int(uptimeValues.Hours()) |
|
| 179 | + | minutes := int(uptimeValues.Minutes()) % 60 |
|
| 172 | 180 | ||
| 173 | - | return fmt.Sprintf("%d hours, %d mins", hours, minutes) |
|
| 181 | + | uptime = fmt.Sprintf("%d hours, %d mins", hours, minutes) |
|
| 182 | + | return Row{Key: "Uptime", Value: uptime} |
|
| 174 | 183 | } |
|
| 1 | 1 | package main |
|
| 2 | 2 | ||
| 3 | 3 | import ( |
|
| 4 | - | internal "github.com/stevedylandev/gobble/internal" |
|
| 4 | + | system "github.com/stevedylandev/gobble/internal" |
|
| 5 | 5 | ) |
|
| 6 | 6 | ||
| 7 | 7 | // Gobble: fetch in go for fun |
|
| 8 | 8 | ||
| 9 | 9 | func main() { |
|
| 10 | - | rows := []internal.Row { |
|
| 11 | - | internal.GetHostname(), |
|
| 12 | - | {"Machine", internal.GetMachine()}, |
|
| 13 | - | {"Kernel", internal.GetKernel()}, |
|
| 14 | - | {"Distro", internal.GetDistro()}, |
|
| 15 | - | {"Packages", internal.GetPackages()}, |
|
| 16 | - | {"Shell", internal.GetShell()}, |
|
| 17 | - | {"CPU", internal.GetCpu()}, |
|
| 18 | - | {"Memory", internal.GetMemory()}, |
|
| 19 | - | {"Uptime", internal.GetUptime()}, |
|
| 10 | + | rows := []system.Row { |
|
| 11 | + | system.GetHostname(), |
|
| 12 | + | system.GetMachine(), |
|
| 13 | + | system.GetKernel(), |
|
| 14 | + | system.GetDistro(), |
|
| 15 | + | system.GetPackages(), |
|
| 16 | + | system.GetShell(), |
|
| 17 | + | system.GetCpu(), |
|
| 18 | + | system.GetMemory(), |
|
| 19 | + | system.GetUptime(), |
|
| 20 | 20 | } |
|
| 21 | - | internal.PrintRows(rows, false) |
|
| 21 | + | system.PrintRows(rows, false) |
|
| 22 | 22 | } |
|
| 23 | 23 |