From 7c816d082214ec7bb7550b162310db3c45eac0bc Mon Sep 17 00:00:00 2001 From: veeso Date: Thu, 6 May 2021 22:24:55 +0200 Subject: [PATCH] Removed log width --- .../activities/filetransfer_activity/mod.rs | 1 - .../filetransfer_activity/update.rs | 69 +++++++------------ .../activities/filetransfer_activity/view.rs | 3 - 3 files changed, 23 insertions(+), 50 deletions(-) diff --git a/src/ui/activities/filetransfer_activity/mod.rs b/src/ui/activities/filetransfer_activity/mod.rs index d02eac5..33d004b 100644 --- a/src/ui/activities/filetransfer_activity/mod.rs +++ b/src/ui/activities/filetransfer_activity/mod.rs @@ -60,7 +60,6 @@ use tuirealm::View; // -- Storage keys const STORAGE_EXPLORER_WIDTH: &str = "FILETRANSFER_EXPLORER_WIDTH"; -const STORAGE_LOGBOX_WIDTH: &str = "LOGBOX_WIDTH"; // -- components diff --git a/src/ui/activities/filetransfer_activity/update.rs b/src/ui/activities/filetransfer_activity/update.rs index 66295de..7e332c5 100644 --- a/src/ui/activities/filetransfer_activity/update.rs +++ b/src/ui/activities/filetransfer_activity/update.rs @@ -807,19 +807,9 @@ impl FileTransferActivity { pub(super) fn update_logbox(&mut self) -> Option<(String, Msg)> { match self.view.get_props(super::COMPONENT_LOG_BOX) { Some(props) => { - // Get width - let width: usize = self - .context - .as_ref() - .unwrap() - .store - .get_unsigned(super::STORAGE_LOGBOX_WIDTH) - .unwrap_or(256); // Make log entries let mut table: TableBuilder = TableBuilder::default(); for (idx, record) in self.log_records.iter().enumerate() { - // Split rows by width NOTE: -37 'cause log prefix -3 cause of log line cursor - let record_rows = textwrap::wrap(record.msg.as_str(), (width as usize) - 40); // Add row if not first row if idx > 0 { table.add_row(); @@ -829,42 +819,29 @@ impl FileTransferActivity { LogLevel::Warn => Color::Yellow, LogLevel::Info => Color::Green, }; - for (idx, row) in record_rows.iter().enumerate() { - match idx { - 0 => { - // First row - table - .add_col(TextSpan::from(format!( - "{}", - record.time.format("%Y-%m-%dT%H:%M:%S%Z") - ))) - .add_col(TextSpan::from(" [")) - .add_col( - TextSpanBuilder::new( - format!( - "{:5}", - match record.level { - LogLevel::Error => "ERROR", - LogLevel::Warn => "WARN", - LogLevel::Info => "INFO", - } - ) - .as_str(), - ) - .with_foreground(fg) - .build(), - ) - .add_col(TextSpan::from("]: ")) - .add_col(TextSpan::from(row.as_ref())); - } - _ => { - table.add_col(TextSpan::from(textwrap::indent( - row.as_ref(), - " ", - ))); - } - } - } + table + .add_col(TextSpan::from(format!( + "{}", + record.time.format("%Y-%m-%dT%H:%M:%S%Z") + ))) + .add_col(TextSpan::from(" [")) + .add_col( + TextSpanBuilder::new( + format!( + "{:5}", + match record.level { + LogLevel::Error => "ERROR", + LogLevel::Warn => "WARN", + LogLevel::Info => "INFO", + } + ) + .as_str(), + ) + .with_foreground(fg) + .build(), + ) + .add_col(TextSpan::from("]: ")) + .add_col(TextSpan::from(record.msg.as_ref())); } let table = table.build(); let props = LogboxPropsBuilder::from(props) diff --git a/src/ui/activities/filetransfer_activity/view.rs b/src/ui/activities/filetransfer_activity/view.rs index a0a321e..3cd50c1 100644 --- a/src/ui/activities/filetransfer_activity/view.rs +++ b/src/ui/activities/filetransfer_activity/view.rs @@ -148,9 +148,6 @@ impl FileTransferActivity { if !store.isset(super::STORAGE_EXPLORER_WIDTH) { store.set_unsigned(super::STORAGE_EXPLORER_WIDTH, tabs_chunks[0].width as usize); } - if !store.isset(super::STORAGE_LOGBOX_WIDTH) { - store.set_unsigned(super::STORAGE_LOGBOX_WIDTH, chunks[1].width as usize); - } // Draw explorers // @! Local explorer (Find or default) match self.tab {