NationTech/harmony
6
0
Fork 1
Code Issues 35 Pull Requests 6 Actions Packages Projects Releases 1 Wiki Activity

chore(inventory_agent): Cargo fmt
Some checks failed
Run Check Script / check (pull_request) Failing after 24s
Details

Browse Source
This commit is contained in:
Jean-Gabriel Gill-Couture 2025-08-19 12:44:49 -04:00
parent 19cb7f73bc
commit 01da8631da
1 changed files with 181 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
harmony_inventory_agent/src/hwinfo.rs
View File

@ -140,8 +140,7 @@ impl PhysicalHost {
.map(|s| s.trim().to_string()) .map(|s| s.trim().to_string())
.unwrap_or_default(); .unwrap_or_default();
let size_str = let size_str = device.get("size").and_then(|v| v.as_str()).unwrap_or("0");
device.get("size").and_then(|v| v.as_str()).unwrap_or("0");
let size_bytes = Self::parse_size(size_str).unwrap_or(0); let size_bytes = Self::parse_size(size_str).unwrap_or(0);
let rotational = device let rotational = device
@ -179,12 +178,10 @@ impl PhysicalHost {
// Enhance with additional sysfs info if available // Enhance with additional sysfs info if available
if device_path.exists() { if device_path.exists() {
if drive.model.is_empty() { if drive.model.is_empty() {
drive.model = drive.model = Self::read_sysfs_string(&device_path.join("device/model"));
Self::read_sysfs_string(&device_path.join("device/model"));
} }
if drive.serial.is_empty() { if drive.serial.is_empty() {
drive.serial = drive.serial = Self::read_sysfs_string(&device_path.join("device/serial"));
Self::read_sysfs_string(&device_path.join("device/serial"));
} }
} }
@ -207,7 +204,8 @@ impl PhysicalHost {
.output() .output()
&& output.status.success() && output.status.success()
&& let Ok(json) = serde_json::from_slice::<Value>(&output.stdout) && let Ok(json) = serde_json::from_slice::<Value>(&output.stdout)
&& let Some(devices) = json.as_array() { && let Some(devices) = json.as_array()
{
for device in devices { for device in devices {
if let Some(device_info) = device.as_object() if let Some(device_info) = device.as_object()
&& let Some(name) = device_info && let Some(name) = device_info
@ -227,7 +225,8 @@ impl PhysicalHost {
&& let Ok(output) = Command::new("lspci") && let Ok(output) = Command::new("lspci")
.args(["-nn", "-d", "::0100"]) // Storage controllers class .args(["-nn", "-d", "::0100"]) // Storage controllers class
.output() .output()
&& output.status.success() { && output.status.success()
{
let output_str = String::from_utf8_lossy(&output.stdout); let output_str = String::from_utf8_lossy(&output.stdout);
if let Some(line) = output_str.lines().next() { if let Some(line) = output_str.lines().next() {
let parts: Vec<&str> = line.split(':').collect(); let parts: Vec<&str> = line.split(':').collect();
@ -239,7 +238,8 @@ impl PhysicalHost {
// Try to get driver info from lsmod // Try to get driver info from lsmod
if let Ok(output) = Command::new("lsmod").output() if let Ok(output) = Command::new("lsmod").output()
&& output.status.success() { && output.status.success()
{
let output_str = String::from_utf8_lossy(&output.stdout); let output_str = String::from_utf8_lossy(&output.stdout);
for line in output_str.lines() { for line in output_str.lines() {
if line.contains("ahci") if line.contains("ahci")
@ -263,7 +263,8 @@ impl PhysicalHost {
let mut modules = Vec::new(); let mut modules = Vec::new();
if let Ok(output) = Command::new("dmidecode").arg("--type").arg("17").output() if let Ok(output) = Command::new("dmidecode").arg("--type").arg("17").output()
&& output.status.success() { && output.status.success()
{
let output_str = String::from_utf8_lossy(&output.stdout); let output_str = String::from_utf8_lossy(&output.stdout);
let sections: Vec<&str> = output_str.split("Memory Device").collect(); let sections: Vec<&str> = output_str.split("Memory Device").collect();
@ -282,7 +283,8 @@ impl PhysicalHost {
if let Some(size_str) = line.strip_prefix("Size: ") { if let Some(size_str) = line.strip_prefix("Size: ") {
if size_str != "No Module Installed" if size_str != "No Module Installed"
&& let Some((num, unit)) = size_str.split_once(' ') && let Some((num, unit)) = size_str.split_once(' ')
&& let Ok(num) = num.parse::<u64>() { && let Ok(num) = num.parse::<u64>()
{
module.size_bytes = match unit { module.size_bytes = match unit {
"MB" => num * 1024 * 1024, "MB" => num * 1024 * 1024,
"GB" => num * 1024 * 1024 * 1024, "GB" => num * 1024 * 1024 * 1024,
@ -519,7 +521,8 @@ impl PhysicalHost {
.output() .output()
&& output.status.success() && output.status.success()
&& let Ok(json) = serde_json::from_slice::<Value>(&output.stdout) && let Ok(json) = serde_json::from_slice::<Value>(&output.stdout)
&& let Some(addrs) = json.as_array() { && let Some(addrs) = json.as_array()
{
for addr_info in addrs { for addr_info in addrs {
if let Some(addr_info_obj) = addr_info.as_object() if let Some(addr_info_obj) = addr_info.as_object()
&& let Some(addr_info) = && let Some(addr_info) =
@ -527,8 +530,7 @@ impl PhysicalHost {
{ {
for addr in addr_info { for addr in addr_info {
if let Some(addr_obj) = addr.as_object() if let Some(addr_obj) = addr.as_object()
&& let Some(ip) = && let Some(ip) = addr_obj.get("local").and_then(|v| v.as_str())
addr_obj.get("local").and_then(|v| v.as_str())
{ {
ipv4.push(ip.to_string()); ipv4.push(ip.to_string());
} }
@ -543,7 +545,8 @@ impl PhysicalHost {
.output() .output()
&& output.status.success() && output.status.success()
&& let Ok(json) = serde_json::from_slice::<Value>(&output.stdout) && let Ok(json) = serde_json::from_slice::<Value>(&output.stdout)
&& let Some(addrs) = json.as_array() { && let Some(addrs) = json.as_array()
{
for addr_info in addrs { for addr_info in addrs {
if let Some(addr_info_obj) = addr_info.as_object() if let Some(addr_info_obj) = addr_info.as_object()
&& let Some(addr_info) = && let Some(addr_info) =
@ -551,8 +554,7 @@ impl PhysicalHost {
{ {
for addr in addr_info { for addr in addr_info {
if let Some(addr_obj) = addr.as_object() if let Some(addr_obj) = addr.as_object()
&& let Some(ip) = && let Some(ip) = addr_obj.get("local").and_then(|v| v.as_str())
addr_obj.get("local").and_then(|v| v.as_str())
{ {
// Skip link-local addresses // Skip link-local addresses
if !ip.starts_with("fe80::") { if !ip.starts_with("fe80::") {