added dynamic discovery of configurations
This commit is contained in:
@@ -7,13 +7,13 @@ use crate::sal::traits::PlatformSal;
|
||||
use crate::sal::dell_xps_9380::DellXps9380Sal;
|
||||
use crate::sal::generic_linux::GenericLinuxSal;
|
||||
use crate::sal::heuristic::schema::HardwareDb;
|
||||
use crate::sal::heuristic::discovery::{discover_facts};
|
||||
use crate::sal::heuristic::discovery::{discover_facts, SystemFactSheet};
|
||||
|
||||
pub struct HeuristicEngine;
|
||||
|
||||
impl HeuristicEngine {
|
||||
/// Loads the hardware database, probes the system, and builds the appropriate SAL.
|
||||
pub fn detect_and_build() -> Result<Box<dyn PlatformSal>> {
|
||||
pub fn detect_and_build() -> Result<(Box<dyn PlatformSal>, SystemFactSheet)> {
|
||||
// 1. Load Hardware DB
|
||||
let db_path = "assets/hardware_db.toml";
|
||||
let db_content = fs::read_to_string(db_path)
|
||||
@@ -24,7 +24,7 @@ impl HeuristicEngine {
|
||||
.context("Failed to parse hardware_db.toml")?;
|
||||
|
||||
// 2. Discover Facts
|
||||
let facts = discover_facts(&db.discovery.sensors, &db.discovery.actuators, &db.conflicts);
|
||||
let facts = discover_facts(&db.discovery, &db.conflicts);
|
||||
info!("System Identity: {} {}", facts.vendor, facts.model);
|
||||
|
||||
// 3. Routing Logic
|
||||
@@ -32,8 +32,8 @@ impl HeuristicEngine {
|
||||
// --- Special Case: Dell XPS 13 9380 ---
|
||||
if is_match(&facts.vendor, "(?i)Dell.*") && is_match(&facts.model, "(?i)XPS.*13.*9380.*") {
|
||||
info!("Specialized SAL Match Found: Dell XPS 13 9380");
|
||||
let sal = DellXps9380Sal::init().map_err(|e| miette::miette!(e))?;
|
||||
return Ok(Box::new(sal));
|
||||
let sal = DellXps9380Sal::init(facts.clone()).map_err(|e| miette::miette!(e))?;
|
||||
return Ok((Box::new(sal), facts));
|
||||
}
|
||||
|
||||
// --- Fallback: Generic Linux SAL ---
|
||||
@@ -47,7 +47,7 @@ impl HeuristicEngine {
|
||||
return Err(miette::miette!("No RAPL power interface discovered. Generic fallback impossible."));
|
||||
}
|
||||
|
||||
Ok(Box::new(GenericLinuxSal::new(facts, db)))
|
||||
Ok((Box::new(GenericLinuxSal::new(facts.clone(), db)), facts))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user