From 17a681a2762d105816c48c94e8928656c3222716 Mon Sep 17 00:00:00 2001 From: Mario Krehl Date: Sun, 31 Dec 2017 17:34:48 +0100 Subject: Use the configured file instead of the alias as unique key --- src/main.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 43d9a48..ea2dee5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -105,8 +105,8 @@ fn hash_map_targets<'a>(c : &'a Config, targets : Vec) for li in c.items() { for t in targets.clone() { if li.aliases().contains(&t.target) { - if _res.contains_key(&li.alias()) { - if let Some(&mut (_litem, ref mut cnames)) = _res.get_mut(&li.alias()) { + if _res.contains_key(&li.file()) { + if let Some(&mut (_litem, ref mut cnames)) = _res.get_mut(&li.file()) { cnames.push(( cname_from_target(&t.target)?, t.target.clone()) @@ -115,7 +115,7 @@ fn hash_map_targets<'a>(c : &'a Config, targets : Vec) } else { _res.insert( - li.alias(), + li.file(), ( &li, vec![(cname_from_target(&t.target)?, t.target.clone())] @@ -143,7 +143,7 @@ fn hash_map_iter(h : HashMap<&String, (&LogItem, Vec<(String, String)>)>, d_from -> Result> { let mut _res = Vec::new(); - for (_alias, &(logitem, ref cns)) in h.iter() { + for (file, &(logitem, ref cns)) in h.iter() { // prepare an empty Vector of Series let mut series_vec = Vec::new(); @@ -153,7 +153,7 @@ fn hash_map_iter(h : HashMap<&String, (&LogItem, Vec<(String, String)>)>, d_from // open the current file for reading let mut line_iter = BufReader::new( - File::open(logitem.file()) + File::open(file) .chain_err(|| format!("antikoerper log file could not be opened: {}", logitem.file()))? ).lines(); -- cgit v1.2.3