simplify the driver interface

This commit is contained in:
alu
2026-08-07 09:29:17 -07:00
parent b99bb45877
commit 31c409a94c
13 changed files with 181 additions and 197 deletions
+27 -3
View File
@@ -10,12 +10,36 @@ import (
type DmiDecodeDriver struct{}
func NewDmiDecodeDriver() *DmiDecodeDriver {
return &DmiDecodeDriver{}
func NewDmiDecodeDriver() (*DmiDecodeDriver, error) {
r := DmiDecodeDriver{}
_, err := r.Read()
return &r, err
}
func (r *DmiDecodeDriver) Render(console *strings.Builder) error {
h, err := r.Read()
if err != nil {
return err
}
hardware := h.(MemoryHardware)
for i := range len(hardware.ModelNames) {
fmt.Fprintf(console, "--- RAM Module %d ---\n", i)
modelName := hardware.ModelNames[i]
fmt.Fprintf(console, "%-16s | %-16s \033[K\n", "Model Name", modelName)
generation := hardware.Generations[i]
speed := hardware.Speeds[i]
fmt.Fprintf(console, "%-16s | %s@%s \033[K\n", "Speed", generation, speed)
formFactor := hardware.FormFactors[i]
fmt.Fprintf(console, "%-16s | %s \033[K\n", "Form Factor", formFactor)
}
return nil
}
// Parses dmidecode to extract physical hardware limits, slot counts, and module details
func (r *DmiDecodeDriver) ReadHardwareSensors() (MemoryHardware, error) {
func (r *DmiDecodeDriver) Read() (any, error) {
hw := MemoryHardware{}
// Query Memory Array (Type 16) for Max Capacity and Slot Count
-8
View File
@@ -8,10 +8,6 @@ type MemoryUsage struct {
UsedPercent float64
}
type UsageDriver interface {
ReadUsageSensors() (MemoryUsage, error)
}
// MemoryHardware holds physical RAM slot and module details
type MemoryHardware struct {
MaxCapacityGB float64
@@ -22,7 +18,3 @@ type MemoryHardware struct {
FormFactors []string
ModelNames []string
}
type HardwareDriver interface {
ReadHardwareSensors() (MemoryHardware, error)
}
+22 -3
View File
@@ -2,6 +2,7 @@ package drivers
import (
"bufio"
"fmt"
"os"
"strconv"
"strings"
@@ -9,12 +10,30 @@ import (
type MemInfoDriver struct{}
func NewMemInfoDriver() *MemInfoDriver {
return &MemInfoDriver{}
func NewMemInfoDriver() (*MemInfoDriver, error) {
r := MemInfoDriver{}
_, err := r.Read()
return &r, err
}
func (r *MemInfoDriver) Render(console *strings.Builder) error {
u, err := r.Read()
if err != nil {
return err
}
usage := u.(MemoryUsage)
fmt.Fprintf(console, "--- Usage ---\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)
return nil
}
// Read /proc/meminfo for active system memory statistics
func (r *MemInfoDriver) ReadUsageSensors() (MemoryUsage, error) {
func (r *MemInfoDriver) Read() (any, error) {
usage := MemoryUsage{}
file, err := os.Open("/proc/meminfo")
if err != nil {