diff options
author | Matthias Beyer <matthias.beyer@atos.net> | 2021-05-10 14:53:34 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2021-05-11 10:47:59 +0200 |
commit | 62e9c1a7d3552c797dfde11a0e84851821071a88 (patch) | |
tree | ac73f626712029285061951a16e4ce9f60b5f907 /src/commands/build.rs | |
parent | 2b65556f90a1dd007a435e1aa5a5261da58c6a02 (diff) |
Refactor: Replace manual string-formatting with LogItem::display() call
Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
Diffstat (limited to 'src/commands/build.rs')
-rw-r--r-- | src/commands/build.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/commands/build.rs b/src/commands/build.rs index 84a8be6..df4b672 100644 --- a/src/commands/build.rs +++ b/src/commands/build.rs @@ -412,20 +412,19 @@ pub async fn build( let mut error_catched = false; let lines = crate::log::ParsedLog::from_str(&data.0.log_text)? .into_iter() - .map(|line_item| match line_item { - LogItem::Line(s) => Ok(String::from_utf8(s.to_vec())?.normal()), - LogItem::Progress(u) => Ok(format!("#BUTIDO:PROGRESS:{}", u).bright_black()), - LogItem::CurrentPhase(p) => { + .map(|line_item| { + if let LogItem::CurrentPhase(ref p) = line_item { if !error_catched { last_phase = Some(p.clone()); } - Ok(format!("#BUTIDO:PHASE:{}", p).bright_black()) } - LogItem::State(Ok(())) => Ok("#BUTIDO:STATE:OK".to_string().green()), - LogItem::State(Err(s)) => { + + if let LogItem::State(_) = line_item { error_catched = true; - Ok(format!("#BUTIDO:STATE:ERR:{}", s).red()) } + + + line_item.display().map(|d| d.to_string()) }) .collect::<Result<Vec<_>>>()?; |