abstract terminal interface
This commit is contained in:
@@ -2,6 +2,7 @@ package drivers
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"finally-a-monolithic-linux-hw-monitor/app/common"
|
||||
"fmt"
|
||||
"os/exec"
|
||||
"strconv"
|
||||
@@ -16,23 +17,24 @@ func NewDmiDecodeDriver() (*DmiDecodeDriver, error) {
|
||||
return &r, err
|
||||
}
|
||||
|
||||
func (r *DmiDecodeDriver) Render(console *strings.Builder) error {
|
||||
func (r *DmiDecodeDriver) Render(term common.Terminal) error {
|
||||
h, err := r.Read()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
hardware := h.(MemoryHardware)
|
||||
term.Subheader("Modules")
|
||||
|
||||
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]
|
||||
fmt.Fprintf(console, "%-16s | %-16s \033[K\n", "Model Name", modelName)
|
||||
term.Print(fmt.Sprintf("%-16s | %-16s", "Model Name", modelName))
|
||||
generation := hardware.Generations[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]
|
||||
fmt.Fprintf(console, "%-16s | %s \033[K\n", "Form Factor", formFactor)
|
||||
term.Print(fmt.Sprintf("%-16s | %s", "Form Factor", formFactor))
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@@ -2,6 +2,7 @@ package drivers
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"finally-a-monolithic-linux-hw-monitor/app/common"
|
||||
"fmt"
|
||||
"os"
|
||||
"strconv"
|
||||
@@ -16,7 +17,7 @@ func NewMemInfoDriver() (*MemInfoDriver, error) {
|
||||
return &r, err
|
||||
}
|
||||
|
||||
func (r *MemInfoDriver) Render(console *strings.Builder) error {
|
||||
func (r *MemInfoDriver) Render(term common.Terminal) error {
|
||||
u, err := r.Read()
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -24,10 +25,10 @@ func (r *MemInfoDriver) Render(console *strings.Builder) error {
|
||||
|
||||
usage := u.(MemoryUsage)
|
||||
|
||||
fmt.Fprintf(console, "--- Usage ---\033[K\n")
|
||||
fmt.Fprintf(console, "%-16s | %.2f GiB\033[K\n", "Total", usage.TotalGB)
|
||||
fmt.Fprintf(console, "%-16s | %.2f GiB (%.2f%%) \033[K\n", "Used", usage.UsedGB, usage.UsedPercent)
|
||||
fmt.Fprintf(console, "%-16s | %.2f GiB\033[K\n", "Avail", usage.AvailableGB)
|
||||
term.Subheader("Usage")
|
||||
term.Print(fmt.Sprintf("%-16s | %.2f GiB", "Total", usage.TotalGB))
|
||||
term.Print(fmt.Sprintf("%-16s | %.2f GiB (%.2f%%)", "Used", usage.UsedGB, usage.UsedPercent))
|
||||
term.Print(fmt.Sprintf("%-16s | %.2f GiB", "Avail", usage.AvailableGB))
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
+3
-5
@@ -3,14 +3,12 @@ package mem
|
||||
import (
|
||||
"finally-a-monolithic-linux-hw-monitor/app/common"
|
||||
"finally-a-monolithic-linux-hw-monitor/app/mem/drivers"
|
||||
"fmt"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func (mem *Mem) Render(console *strings.Builder) {
|
||||
fmt.Fprintf(console, "=== %s ===\033[K\n", "Memory")
|
||||
func (mem *Mem) Render(term common.Terminal) {
|
||||
term.Header("Memory")
|
||||
for _, driver := range mem.drivers {
|
||||
driver.Render(console)
|
||||
driver.Render(term)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user