add timestamp to CLI

This commit is contained in:
Kai Renken 2023-09-25 09:52:40 +02:00
parent ce591db712
commit f2f4526b0b
2 changed files with 7 additions and 5 deletions

View File

@ -62,5 +62,7 @@ flume = { version = "^0", features = ["async"] }
data-encoding = { version = "^2" } data-encoding = { version = "^2" }
indent = { version = "0.1.1" } indent = { version = "0.1.1" }
chrono = "0.4.26"
[dev-dependencies] [dev-dependencies]
serial_test = "^0" serial_test = "^0"

View File

@ -17,6 +17,7 @@ use cursive_flexi_logger_view::{CursiveLogWriter, FlexiLoggerView};
use std::collections::{HashMap, VecDeque}; use std::collections::{HashMap, VecDeque};
use std::io::Write; use std::io::Write;
use thiserror::Error; use thiserror::Error;
use chrono::Local;
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////
/// ///
struct Dirty<T> { struct Dirty<T> {
@ -101,7 +102,6 @@ pub enum DumbError {
impl UI { impl UI {
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
// Private functions // Private functions
fn command_processor(s: &mut Cursive) -> CommandProcessor { fn command_processor(s: &mut Cursive) -> CommandProcessor {
let inner = Self::inner(s); let inner = Self::inner(s);
inner.cmdproc.as_ref().unwrap().clone() inner.cmdproc.as_ref().unwrap().clone()
@ -349,7 +349,7 @@ impl UI {
cursive_flexi_logger_view::parse_lines_to_log( cursive_flexi_logger_view::parse_lines_to_log(
ColorStyle::primary().into(), ColorStyle::primary().into(),
format!("> {}", text), format!("> {} {}",Local::now().format("%Y-%m-%dT%H:%M:%S:%3f"), text),
); );
match Self::run_command(s, text) { match Self::run_command(s, text) {
Ok(_) => {} Ok(_) => {}
@ -463,7 +463,7 @@ impl UI {
let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap(); let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap();
cursive_flexi_logger_view::parse_lines_to_log( cursive_flexi_logger_view::parse_lines_to_log(
color.into(), color.into(),
format!(">> Copied: {}", text.as_ref()), format!(">> {} Copied: {}", Local::now().format("%Y-%m-%dT%H:%M:%S:%3f") ,text.as_ref()),
); );
} else { } else {
let color = *Self::inner_mut(s).log_colors.get(&Level::Warn).unwrap(); let color = *Self::inner_mut(s).log_colors.get(&Level::Warn).unwrap();
@ -488,7 +488,7 @@ impl UI {
let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap(); let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap();
cursive_flexi_logger_view::parse_lines_to_log( cursive_flexi_logger_view::parse_lines_to_log(
color.into(), color.into(),
format!(">> Copied: {}", text.as_ref()), format!(">> {} Copied: {}", Local::now().format("%Y-%m-%dT%H:%M:%S:%3f"), text.as_ref()),
); );
} }
} }
@ -1039,7 +1039,7 @@ impl UISender {
{ {
let inner = self.inner.lock(); let inner = self.inner.lock();
let color = *inner.log_colors.get(&log_color).unwrap(); let color = *inner.log_colors.get(&log_color).unwrap();
cursive_flexi_logger_view::parse_lines_to_log(color.into(), event); cursive_flexi_logger_view::parse_lines_to_log(color.into(), format!("{}: {}", Local::now().format("%Y-%m-%dT%H:%M:%S:%3f"), event));
} }
let _ = self.cb_sink.send(Box::new(UI::update_cb)); let _ = self.cb_sink.send(Box::new(UI::update_cb));
} }