feat: improve inspur parsing and pci.ids integration

internal/exporter/exporter.go

@@ -4,6 +4,7 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"io"
+	"strings"
 
 	"git.mchus.pro/mchus/logpile/internal/models"
 )
@@ -34,7 +35,7 @@ func (e *Exporter) ExportCSV(w io.Writer) error {
 
 	// FRU data
 	for _, fru := range e.result.FRU {
-		if fru.SerialNumber == "" {
+		if !hasUsableSerial(fru.SerialNumber) {
 			continue
 		}
 		name := fru.ProductName
@@ -53,9 +54,36 @@ func (e *Exporter) ExportCSV(w io.Writer) error {
 
 	// Hardware data
 	if e.result.Hardware != nil {
+		// Board
+		if hasUsableSerial(e.result.Hardware.BoardInfo.SerialNumber) {
+			if err := writer.Write([]string{
+				e.result.Hardware.BoardInfo.ProductName,
+				strings.TrimSpace(e.result.Hardware.BoardInfo.SerialNumber),
+				e.result.Hardware.BoardInfo.Manufacturer,
+				"Board",
+			}); err != nil {
+				return err
+			}
+		}
+
+		// CPUs
+		for _, cpu := range e.result.Hardware.CPUs {
+			if !hasUsableSerial(cpu.SerialNumber) {
+				continue
+			}
+			if err := writer.Write([]string{
+				cpu.Model,
+				strings.TrimSpace(cpu.SerialNumber),
+				"",
+				"CPU",
+			}); err != nil {
+				return err
+			}
+		}
+
 		// Memory
 		for _, mem := range e.result.Hardware.Memory {
-			if mem.SerialNumber == "" {
+			if !hasUsableSerial(mem.SerialNumber) {
 				continue
 			}
 			location := mem.Location
@@ -64,7 +92,7 @@ func (e *Exporter) ExportCSV(w io.Writer) error {
 			}
 			if err := writer.Write([]string{
 				mem.PartNumber,
-				mem.SerialNumber,
+				strings.TrimSpace(mem.SerialNumber),
 				mem.Manufacturer,
 				location,
 			}); err != nil {
@@ -74,12 +102,12 @@ func (e *Exporter) ExportCSV(w io.Writer) error {
 
 		// Storage
 		for _, stor := range e.result.Hardware.Storage {
-			if stor.SerialNumber == "" {
+			if !hasUsableSerial(stor.SerialNumber) {
 				continue
 			}
 			if err := writer.Write([]string{
 				stor.Model,
-				stor.SerialNumber,
+				strings.TrimSpace(stor.SerialNumber),
 				stor.Manufacturer,
 				stor.Slot,
 			}); err != nil {
@@ -87,20 +115,88 @@ func (e *Exporter) ExportCSV(w io.Writer) error {
 			}
 		}
 
+		// GPUs
+		for _, gpu := range e.result.Hardware.GPUs {
+			if !hasUsableSerial(gpu.SerialNumber) {
+				continue
+			}
+			component := gpu.Model
+			if component == "" {
+				component = "GPU"
+			}
+			if err := writer.Write([]string{
+				component,
+				strings.TrimSpace(gpu.SerialNumber),
+				gpu.Manufacturer,
+				gpu.Slot,
+			}); err != nil {
+				return err
+			}
+		}
+
 		// PCIe devices
 		for _, pcie := range e.result.Hardware.PCIeDevices {
-			if pcie.SerialNumber == "" {
+			if !hasUsableSerial(pcie.SerialNumber) {
 				continue
 			}
 			if err := writer.Write([]string{
 				pcie.DeviceClass,
-				pcie.SerialNumber,
+				strings.TrimSpace(pcie.SerialNumber),
 				pcie.Manufacturer,
 				pcie.Slot,
 			}); err != nil {
 				return err
 			}
 		}
+
+		// Network adapters
+		for _, nic := range e.result.Hardware.NetworkAdapters {
+			if !hasUsableSerial(nic.SerialNumber) {
+				continue
+			}
+			location := nic.Location
+			if location == "" {
+				location = nic.Slot
+			}
+			if err := writer.Write([]string{
+				nic.Model,
+				strings.TrimSpace(nic.SerialNumber),
+				nic.Vendor,
+				location,
+			}); err != nil {
+				return err
+			}
+		}
+
+		// Legacy network cards
+		for _, nic := range e.result.Hardware.NetworkCards {
+			if !hasUsableSerial(nic.SerialNumber) {
+				continue
+			}
+			if err := writer.Write([]string{
+				nic.Model,
+				strings.TrimSpace(nic.SerialNumber),
+				"",
+				"Network",
+			}); err != nil {
+				return err
+			}
+		}
+
+		// Power supplies
+		for _, psu := range e.result.Hardware.PowerSupply {
+			if !hasUsableSerial(psu.SerialNumber) {
+				continue
+			}
+			if err := writer.Write([]string{
+				psu.Model,
+				strings.TrimSpace(psu.SerialNumber),
+				psu.Vendor,
+				psu.Slot,
+			}); err != nil {
+				return err
+			}
+		}
 	}
 
 	return nil
@@ -112,3 +208,16 @@ func (e *Exporter) ExportJSON(w io.Writer) error {
 	encoder.SetIndent("", "  ")
 	return encoder.Encode(e.result)
 }
+
+func hasUsableSerial(serial string) bool {
+	s := strings.TrimSpace(serial)
+	if s == "" {
+		return false
+	}
+	switch strings.ToUpper(s) {
+	case "N/A", "NA", "NONE", "NULL", "UNKNOWN", "-":
+		return false
+	default:
+		return true
+	}
+}