maxmustermann/termscp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Wrap log records using textwrap crate

Browse source
This commit is contained in:
ChristianVisintin 2020-12-01 12:32:33 +01:00
parent 968678503f
commit 4510b9c6b9
3 changed files with 49 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Cargo.lock generated
View file

@ -509,12 +509,22 @@ dependencies = [
"rpassword",
"ssh2",
"tempfile",
"textwrap",
"tui",
"unicode-width",
"users",
"whoami",
]
[[package]]
name = "textwrap"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"
dependencies = [
"unicode-width",
]
[[package]]
name = "time"
version = "0.1.44"

1
Cargo.toml
View file

@ -24,6 +24,7 @@ rpassword = "5.0.0"
unicode-width = "0.1.7"
chrono = "0.4.19"
bytesize = "1.0.1"
textwrap = "0.12.1"
[target.'cfg(any(unix, macos, linux))'.dependencies]
users = "0.11.0"

58
src/ui/activities/filetransfer_activity.rs
View file

@ -26,6 +26,7 @@
// Dependencies
extern crate chrono;
extern crate crossterm;
extern crate textwrap;
extern crate tui;
extern crate unicode_width;
@ -1863,7 +1864,11 @@ impl FileTransferActivity {
let mut log_state: ListState = ListState::default();
log_state.select(Some(self.log_index));
// Draw log
f.render_stateful_widget(self.draw_log_list(), chunks[2], &mut log_state);
f.render_stateful_widget(
self.draw_log_list(chunks[2].width),
chunks[2],
&mut log_state,
);
// Draw popup
if let InputMode::Popup(popup) = &self.input_mode {
// Calculate popup size
@ -1983,34 +1988,47 @@ impl FileTransferActivity {
/// ### draw_log_list
///
/// Draw log list
fn draw_log_list(&self) -> List {
/// Chunk width must be provided to wrap text
fn draw_log_list(&self, width: u16) -> List {
let events: Vec<ListItem> = self
.log_records
.iter()
.map(|record: &LogRecord| {
let record_rows = textwrap::wrap(record.msg.as_str(), (width as usize) - 35); // -35 'cause log prefix
let s = match record.level {
LogLevel::Error => Style::default().fg(Color::Red),
LogLevel::Warn => Style::default().fg(Color::Yellow),
LogLevel::Info => Style::default().fg(Color::Green),
};
let log = Spans::from(vec![
Span::from(format!("{}", record.time.format("%Y-%m-%dT%H:%M:%S%Z"))),
Span::raw(" ["),
Span::styled(
format!(
"{}",
match record.level {
LogLevel::Error => "ERROR",
LogLevel::Warn => "WARN",
LogLevel::Info => "INFO",
}
),
s,
),
Span::raw("]: "),
Span::from(record.msg.clone()),
]);
ListItem::new(log)
let mut rows: Vec<Spans> = Vec::with_capacity(record_rows.len());
// Iterate over remaining rows
for (idx, row) in record_rows.iter().enumerate() {
let row: Spans = match idx {
0 => Spans::from(vec![
Span::from(format!("{}", record.time.format("%Y-%m-%dT%H:%M:%S%Z"))),
Span::raw(" ["),
Span::styled(
format!(
"{:5}",
match record.level {
LogLevel::Error => "ERROR",
LogLevel::Warn => "WARN",
LogLevel::Info => "INFO",
}
),
s,
),
Span::raw("]: "),
Span::from(String::from(row.as_ref())),
]),
_ => Spans::from(vec![Span::from(textwrap::indent(
row.as_ref(),
" ",
))]),
};
rows.push(row);
}
ListItem::new(rows)
})
.collect();
List::new(events)