Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

enable TUI to actually handle newline character.

Browse Source 
but we are not sure if NEWLINEs are wanted in logs as it could cause problems with automated parsing.
This commit is contained in:
Marcel Märtens 2021-05-09 18:53:25 +02:00
parent 3a437f2bda
commit 863e11d5e3
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server-cli/src/tuilog.rs
View File

@ -32,11 +32,24 @@ impl<'a> Write for TuiLog<'a> {
let mut spans = Vec::new();
let mut span = Span::raw("");
let mut lines = Vec::new();
for out in line.ansi_parse() {
match out {
Output::TextBlock(text) => {
span.content = format!("{}{}", span.content.to_owned(), text).into()
Output::TextBlock(mut text) => {
// search for newlines (.lines() or .split doesn't work, as this block does not
// need to contain one)
while let Some(newline) = text.find('\n') {
span.content.to_mut().push_str(&text[..newline]);
if span.content.len() != 0 {
spans.push(span);
lines.push(spans);
spans = Vec::new();
span = Span::raw("");
}
text = &text[newline + 1..];
}
span.content.to_mut().push_str(text);
},
Output::Escape(seq) => {
if span.content.len() != 0 {
@ -79,8 +92,12 @@ impl<'a> Write for TuiLog<'a> {
if span.content.len() != 0 {
spans.push(span);
}
if !spans.is_empty() {
lines.push(spans);
}
self.inner.lock().unwrap().lines.push(Spans(spans));
let mut lines = lines.into_iter().map(Spans).collect::<Vec<_>>();
self.inner.lock().unwrap().lines.append(&mut lines);
Ok(buf.len())
}