lukas/Raid_Manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use actual system mdstat file

Browse Source
This commit is contained in:
lukas-heiligenbrunner 2022-12-06 22:22:24 +01:00
parent a0068579b4
commit 3eb1477ffc
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@ -26,4 +26,4 @@ async fn main() -> Result<(), rocket::Error> {
.await?; .await?;
Ok(()) Ok(())
} }

4
src/parser/lsblk_parser.rs
View File

@ -62,5 +62,5 @@ pub fn parse_lsblk() -> Vec<Disk> {
if d.kind != "disk" { continue; }; if d.kind != "disk" { continue; };
disks.push(Disk { name: d.name, size: d.size }); disks.push(Disk { name: d.name, size: d.size });
} }
disks return disks;
} }

10
src/parser/mdstat_parser.rs
View File

@ -20,8 +20,7 @@ pub struct MdRaid {
} }
pub fn parse_mdstat() -> MdRaidSystem { pub fn parse_mdstat() -> MdRaidSystem {
// let mdstat_path = "/proc/mdstat"; let mdstat_path = "/proc/mdstat";
let mdstat_path = "testmdstat.txt";
return match fs::read_to_string(mdstat_path) { return match fs::read_to_string(mdstat_path) {
Ok(contents) => parse_mdstat_str(contents), Ok(contents) => parse_mdstat_str(contents),
Err(_) => MdRaidSystem{ Err(_) => MdRaidSystem{
@ -40,10 +39,7 @@ fn parse_mdstat_str(contents: String) -> MdRaidSystem {
} }
for cap in RE.captures_iter(&contents) { for cap in RE.captures_iter(&contents) {
if cap.len() != 5 { if cap.len() == 5 {
// todo error handling
continue
} else {
let devicesplit = cap[4].split(" "); let devicesplit = cap[4].split(" ");
let mut devices = Vec::new(); let mut devices = Vec::new();
for i in devicesplit { for i in devicesplit {
@ -166,4 +162,4 @@ md0 : active raid1 sdb1[1] sda1[0]
unused devices: <none> unused devices: <none>
"#.to_string())).to_string(), exp); "#.to_string())).to_string(), exp);
} }
} }