IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2024-11-22 08:16:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

ISSUE #501. Don't ignore the first line of the incoming file as a header. Generally clean up the loading routine.

Browse Source
This commit is contained in:
Herbert Wolverson 2024-06-25 08:56:07 -05:00
parent 2958314d5f
commit 383c410eed
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rust/uisp_integration/src/strategies/full/routes_override.rs
View File

@ -42,6 +42,7 @@ pub fn get_route_overrides(config: &Config) -> Result<Vec<RouteOverride>, UispIn
let file_path = Path::new(&config.lqos_directory).join("integrationUISProutes.csv");
if file_path.exists() {
let reader = ReaderBuilder::new()
.has_headers(false)
.comment(Some(b'#'))
.trim(csv::Trim::All)
.from_path(file_path);
@ -52,9 +53,28 @@ pub fn get_route_overrides(config: &Config) -> Result<Vec<RouteOverride>, UispIn
}
let mut reader = reader.unwrap();
let mut overrides = Vec::new();
for result in reader.deserialize::<RouteOverride>().flatten() {
overrides.push(result);
for rec in reader.records() {
if let Ok(line) = rec {
if line.len() == 3 {
println!("{line:?}");
// We got a line
if let Ok(cost) = &line[2].parse::<u32>() {
overrides.push(RouteOverride {
from_site: line[0].to_string(),
to_site: line[1].to_string(),
cost: *cost,
});
} else {
error!("{line:?} is not a valid integer for cost");
}
}
} else {
error!("Unable to read route overrides CSV");
error!("{rec:?}");
}
}
info!("Loaded {} route overrides", overrides.len());
Ok(overrides)
} else {