abstract terminal interface
This commit is contained in:
+6
-9
@@ -1,12 +1,12 @@
|
|||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"finally-a-monolithic-linux-hw-monitor/app/common"
|
||||||
"finally-a-monolithic-linux-hw-monitor/app/mem"
|
"finally-a-monolithic-linux-hw-monitor/app/mem"
|
||||||
"finally-a-monolithic-linux-hw-monitor/app/proc"
|
"finally-a-monolithic-linux-hw-monitor/app/proc"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"strings"
|
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -25,22 +25,19 @@ func Run() {
|
|||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
term := common.NewTerminal()
|
||||||
proc, _ := proc.GetProc()
|
proc, _ := proc.GetProc()
|
||||||
mem, _ := mem.GetMem()
|
mem, _ := mem.GetMem()
|
||||||
|
|
||||||
ticker := time.NewTicker(1 * time.Second)
|
ticker := time.NewTicker(1 * time.Second)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
for {
|
for {
|
||||||
console := &strings.Builder{}
|
term.Start()
|
||||||
// Move cursor to top-left (0,0) without clearing full buffer (flicker-free)
|
|
||||||
fmt.Fprint(console, "\033[H")
|
|
||||||
|
|
||||||
proc.RenderProc(console)
|
proc.Render(term)
|
||||||
mem.Render(console)
|
mem.Render(term)
|
||||||
|
|
||||||
fmt.Fprint(console, "\nPress Ctrl+C to exit.\033[K\n")
|
term.End()
|
||||||
fmt.Fprint(console, "\033[0J")
|
|
||||||
fmt.Print(console.String())
|
|
||||||
|
|
||||||
<-ticker.C
|
<-ticker.C
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package common
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Terminal interface {
|
||||||
|
Start() error
|
||||||
|
Header(string) error
|
||||||
|
Subheader(string) error
|
||||||
|
Print(string) error
|
||||||
|
End() error
|
||||||
|
}
|
||||||
|
|
||||||
|
type StringBuilderTerminal struct {
|
||||||
|
sb *strings.Builder
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewTerminal() Terminal {
|
||||||
|
return &StringBuilderTerminal{
|
||||||
|
sb: &strings.Builder{},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *StringBuilderTerminal) Start() error {
|
||||||
|
_, err := fmt.Fprint(t.sb, "\033[H")
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *StringBuilderTerminal) Header(header string) error {
|
||||||
|
_, err := fmt.Fprintf(t.sb, "=== %s ===\033[K\n", header)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *StringBuilderTerminal) Subheader(subheader string) error {
|
||||||
|
_, err := fmt.Fprintf(t.sb, "--- %s ---\033[K\n", subheader)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *StringBuilderTerminal) Print(line string) error {
|
||||||
|
_, err := fmt.Fprintf(t.sb, "%s\033[K\n", line)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *StringBuilderTerminal) End() error {
|
||||||
|
fmt.Fprint(t.sb, "\033[0J")
|
||||||
|
_, err := fmt.Print(t.sb.String())
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -1,8 +1,6 @@
|
|||||||
package common
|
package common
|
||||||
|
|
||||||
import "strings"
|
|
||||||
|
|
||||||
type Driver interface {
|
type Driver interface {
|
||||||
Read() (any, error)
|
Read() (any, error)
|
||||||
Render(*strings.Builder) error
|
Render(Terminal) error
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package drivers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
|
"finally-a-monolithic-linux-hw-monitor/app/common"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strconv"
|
"strconv"
|
||||||
@@ -16,23 +17,24 @@ func NewDmiDecodeDriver() (*DmiDecodeDriver, error) {
|
|||||||
return &r, err
|
return &r, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *DmiDecodeDriver) Render(console *strings.Builder) error {
|
func (r *DmiDecodeDriver) Render(term common.Terminal) error {
|
||||||
h, err := r.Read()
|
h, err := r.Read()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
hardware := h.(MemoryHardware)
|
hardware := h.(MemoryHardware)
|
||||||
|
term.Subheader("Modules")
|
||||||
|
|
||||||
for i := range len(hardware.ModelNames) {
|
for i := range len(hardware.ModelNames) {
|
||||||
fmt.Fprintf(console, "--- RAM Module %d ---\033[K\n", i)
|
term.Print(fmt.Sprintf(" Module %d ", i))
|
||||||
modelName := hardware.ModelNames[i]
|
modelName := hardware.ModelNames[i]
|
||||||
fmt.Fprintf(console, "%-16s | %-16s \033[K\n", "Model Name", modelName)
|
term.Print(fmt.Sprintf("%-16s | %-16s", "Model Name", modelName))
|
||||||
generation := hardware.Generations[i]
|
generation := hardware.Generations[i]
|
||||||
speed := hardware.Speeds[i]
|
speed := hardware.Speeds[i]
|
||||||
fmt.Fprintf(console, "%-16s | %s@%s \033[K\n", "Speed", generation, speed)
|
term.Print(fmt.Sprintf("%-16s | %s@%s", "Speed", generation, speed))
|
||||||
formFactor := hardware.FormFactors[i]
|
formFactor := hardware.FormFactors[i]
|
||||||
fmt.Fprintf(console, "%-16s | %s \033[K\n", "Form Factor", formFactor)
|
term.Print(fmt.Sprintf("%-16s | %s", "Form Factor", formFactor))
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package drivers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
|
"finally-a-monolithic-linux-hw-monitor/app/common"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
@@ -16,7 +17,7 @@ func NewMemInfoDriver() (*MemInfoDriver, error) {
|
|||||||
return &r, err
|
return &r, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *MemInfoDriver) Render(console *strings.Builder) error {
|
func (r *MemInfoDriver) Render(term common.Terminal) error {
|
||||||
u, err := r.Read()
|
u, err := r.Read()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -24,10 +25,10 @@ func (r *MemInfoDriver) Render(console *strings.Builder) error {
|
|||||||
|
|
||||||
usage := u.(MemoryUsage)
|
usage := u.(MemoryUsage)
|
||||||
|
|
||||||
fmt.Fprintf(console, "--- Usage ---\033[K\n")
|
term.Subheader("Usage")
|
||||||
fmt.Fprintf(console, "%-16s | %.2f GiB\033[K\n", "Total", usage.TotalGB)
|
term.Print(fmt.Sprintf("%-16s | %.2f GiB", "Total", usage.TotalGB))
|
||||||
fmt.Fprintf(console, "%-16s | %.2f GiB (%.2f%%) \033[K\n", "Used", usage.UsedGB, usage.UsedPercent)
|
term.Print(fmt.Sprintf("%-16s | %.2f GiB (%.2f%%)", "Used", usage.UsedGB, usage.UsedPercent))
|
||||||
fmt.Fprintf(console, "%-16s | %.2f GiB\033[K\n", "Avail", usage.AvailableGB)
|
term.Print(fmt.Sprintf("%-16s | %.2f GiB", "Avail", usage.AvailableGB))
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-5
@@ -3,14 +3,12 @@ package mem
|
|||||||
import (
|
import (
|
||||||
"finally-a-monolithic-linux-hw-monitor/app/common"
|
"finally-a-monolithic-linux-hw-monitor/app/common"
|
||||||
"finally-a-monolithic-linux-hw-monitor/app/mem/drivers"
|
"finally-a-monolithic-linux-hw-monitor/app/mem/drivers"
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func (mem *Mem) Render(console *strings.Builder) {
|
func (mem *Mem) Render(term common.Terminal) {
|
||||||
fmt.Fprintf(console, "=== %s ===\033[K\n", "Memory")
|
term.Header("Memory")
|
||||||
for _, driver := range mem.drivers {
|
for _, driver := range mem.drivers {
|
||||||
driver.Render(console)
|
driver.Render(term)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package drivers
|
package drivers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"finally-a-monolithic-linux-hw-monitor/app/common"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@@ -8,6 +9,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const milliCperC = 1000.0
|
||||||
|
|
||||||
type HwmonDriver struct {
|
type HwmonDriver struct {
|
||||||
hwmonDir string
|
hwmonDir string
|
||||||
hwmonDriver string
|
hwmonDriver string
|
||||||
@@ -38,20 +41,20 @@ func NewHwmonDriver(expectedDrivers []string) (*HwmonDriver, error) {
|
|||||||
return nil, fmt.Errorf("could not find %#v in /sys/class/hwmon", expectedDrivers)
|
return nil, fmt.Errorf("could not find %#v in /sys/class/hwmon", expectedDrivers)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *HwmonDriver) Render(console *strings.Builder) error {
|
func (r *HwmonDriver) Render(term common.Terminal) error {
|
||||||
t, err := r.Read()
|
t, err := r.Read()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
temps := t.([]TemperatureSensor)
|
temps := t.([]TemperatureSensor)
|
||||||
|
term.Subheader("Temperature")
|
||||||
|
|
||||||
fmt.Fprint(console, "--- Temperature ---\033[K\n")
|
|
||||||
for _, sensor := range temps {
|
for _, sensor := range temps {
|
||||||
tempC := sensor.TempC
|
tempC := sensor.TempC
|
||||||
tempF := (tempC * 9 / 5) + 32
|
tempF := (tempC * 9 / 5) + 32
|
||||||
// \033[K clears from cursor to end of line (prevents lingering chars)
|
// \033[K clears from cursor to end of line (prevents lingering chars)
|
||||||
fmt.Fprintf(console, "%-16s | %.2f °C (%.3f °F)\033[K\n", sensor.Name, tempC, tempF)
|
term.Print(fmt.Sprintf("%-16s | %.2f °C (%.3f °F)", sensor.Name, tempC, tempF))
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -87,7 +90,7 @@ func (r *HwmonDriver) Read() (any, error) {
|
|||||||
temps = append(temps, TemperatureSensor{
|
temps = append(temps, TemperatureSensor{
|
||||||
path: inputPath,
|
path: inputPath,
|
||||||
Name: label,
|
Name: label,
|
||||||
TempC: milliC / 1000.0,
|
TempC: milliC / milliCperC,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package drivers
|
package drivers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"finally-a-monolithic-linux-hw-monitor/app/common"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@@ -28,18 +29,18 @@ func NewRaplDriver() (*RaplDriver, error) {
|
|||||||
return &r, err
|
return &r, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *RaplDriver) Render(console *strings.Builder) error {
|
func (r *RaplDriver) Render(term common.Terminal) error {
|
||||||
fmt.Fprint(console, "--- Power ---\033[K\n")
|
|
||||||
p, err := r.Read()
|
p, err := r.Read()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
power := p.([]PowerSensor)
|
power := p.([]PowerSensor)
|
||||||
|
term.Subheader("Power")
|
||||||
|
|
||||||
for _, sensor := range power {
|
for _, sensor := range power {
|
||||||
// \033[K clears from cursor to end of line (prevents lingering chars)
|
// \033[K clears from cursor to end of line (prevents lingering chars)
|
||||||
fmt.Fprintf(console, "%-16s | %.2f W\033[K\n", sensor.Name, sensor.Watts)
|
term.Print(fmt.Sprintf("%-16s | %.2f W", sensor.Name, sensor.Watts))
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package drivers
|
package drivers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"finally-a-monolithic-linux-hw-monitor/app/common"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@@ -17,18 +18,18 @@ func NewSysDriver() (*SysDriver, error) {
|
|||||||
return &r, err
|
return &r, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *SysDriver) Render(console *strings.Builder) error {
|
func (r *SysDriver) Render(term common.Terminal) error {
|
||||||
fmt.Fprint(console, "--- Clock Frequency ---\033[K\n")
|
|
||||||
c, err := r.Read()
|
c, err := r.Read()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
clock := c.([]ClockSensor)
|
clock := c.([]ClockSensor)
|
||||||
|
term.Subheader("Frequency")
|
||||||
|
|
||||||
for _, sensor := range clock {
|
for _, sensor := range clock {
|
||||||
// \033[K clears from cursor to end of line (prevents lingering chars)
|
// \033[K clears from cursor to end of line (prevents lingering chars)
|
||||||
fmt.Fprintf(console, "%-16s | %.2f GHz\033[K\n", sensor.Name, sensor.FrequencyGHz)
|
term.Print(fmt.Sprintf("%-16s | %.2f GHz", sensor.Name, sensor.FrequencyGHz))
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
+3
-3
@@ -8,10 +8,10 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (proc *Proc) RenderProc(console *strings.Builder) {
|
func (proc *Proc) Render(term common.Terminal) {
|
||||||
fmt.Fprintf(console, "=== %s ===\033[K\n", proc.Model())
|
term.Header(proc.Model())
|
||||||
for _, driver := range proc.drivers {
|
for _, driver := range proc.drivers {
|
||||||
driver.Render(console)
|
driver.Render(term)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user