simplify the driver interface

app/proc/proc.go

@@ -2,58 +2,22 @@ package proc
 
 import (
 	"bufio"
-	"finally-a-monolithic-linux-hw-monitor/app/proc/drivers"
+	"finally-a-monolithic-linux-hw-monitor/app/common"
 	"fmt"
 	"os"
 	"strings"
 )
 
-func RenderProc(console *strings.Builder, proc *Proc) {
+func (proc *Proc) RenderProc(console *strings.Builder) {
 	fmt.Fprintf(console, "=== %s ===\n", proc.Model())
-
-	RenderTemperatureSensors(console, proc)
-	RenderPowerSensors(console, proc)
-	RenderClockSensors(console, proc)
-}
-
-func RenderTemperatureSensors(console *strings.Builder, proc *Proc) {
-	temps, _ := proc.SensorReader.ReadTemperatureSensors()
-	fmt.Fprint(console, "--- Temperature ---\n")
-	for _, sensor := range temps {
-		tempC := sensor.TempC
-		tempF := (tempC * 9 / 5) + 32
-		// \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)
-	}
-}
-
-func RenderPowerSensors(console *strings.Builder, proc *Proc) {
-	fmt.Fprint(console, "--- Power ---\n")
-	power, _ := proc.SensorReader.ReadPowerSensors()
-	for _, sensor := range power {
-		// \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)
-	}
-}
-
-func RenderClockSensors(console *strings.Builder, proc *Proc) {
-	fmt.Fprint(console, "--- Clock Frequency ---\n")
-	power, _ := proc.SensorReader.ReadClockSensors()
-	for _, sensor := range power {
-		// \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)
+	for _, driver := range proc.drivers {
+		driver.Render(console)
 	}
 }
 
 type Proc struct {
-	SensorReader ProcSensorReader
-	Info         map[string]string
-}
-
-type ProcSensorReader interface {
-	ReadTemperatureSensors() ([]drivers.TemperatureSensor, error)
-	ReadPowerSensors() ([]drivers.PowerSensor, error)
-	ReadClockSensors() ([]drivers.ClockSensor, error)
+	drivers []common.Driver
+	Info    map[string]string
 }
 
 const (
@@ -96,12 +60,12 @@ func GetProc() (Proc, error) {
 
 	switch vendor {
 	case VendorIntel:
-		intelReader, err := NewIntelReader()
-		proc.SensorReader = intelReader
+		drivers, err := NewIntelDrivers()
+		proc.drivers = drivers
 		return proc, err
 	case VendorAMD:
-		amdReader, err := NewAMDReader()
-		proc.SensorReader = amdReader
+		drivers, err := NewAMDDrivers()
+		proc.drivers = drivers
 		return proc, err
 	default:
 		return proc, fmt.Errorf("proc type %s is not supported", vendor)