From 65994dbd463d5cd1788bd2f55bc6eaec0025be9f Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Wed, 28 Sep 2022 22:50:06 +0900 Subject: [PATCH] Removed First Timestamp and Last Timestamp with -d option #707 - 1. [x] Unified output one table with -s and -d option - 2. [] add channel column to table output - 3. [x] Remove First Timestamp and Last Timestamp with -d option - 4. [] Output csv with -o and -s option - 5. [x] Separete two column Count and Percent - 6. [x] change table format output crate from prettytable-rs to comfy_table. --- src/timeline/metrics.rs | 1 - src/timeline/timelines.rs | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/timeline/metrics.rs b/src/timeline/metrics.rs index fe756572..6a376611 100644 --- a/src/timeline/metrics.rs +++ b/src/timeline/metrics.rs @@ -93,7 +93,6 @@ impl EventMetrics { }; } - // return evtstat_map; } // Login event fn stats_login_eventid(&mut self, records: &[EvtxRecordInfo]) { diff --git a/src/timeline/timelines.rs b/src/timeline/timelines.rs index fd27612b..f09c22c2 100644 --- a/src/timeline/timelines.rs +++ b/src/timeline/timelines.rs @@ -43,11 +43,15 @@ impl Timeline { } // 出力メッセージ作成 let mut sammsges: Vec = Vec::new(); - sammsges.push("---------------------------------------".to_string()); - sammsges.push(format!("Evtx File Path: {}", self.stats.filepath)); - sammsges.push(format!("Total Event Records: {}\n", self.stats.total)); - sammsges.push(format!("First Timestamp: {}", self.stats.start_time)); - sammsges.push(format!("Last Timestamp: {}\n", self.stats.end_time)); + let total_event_record = format!("\nTotal Event Records: {}\n", self.stats.total); + if CONFIG.read().unwrap().args.filepath.is_some() { + sammsges.push(format!("Evtx File Path: {}", self.stats.filepath)); + sammsges.push(total_event_record); + sammsges.push(format!("First Timestamp: {}", self.stats.start_time)); + sammsges.push(format!("Last Timestamp: {}\n", self.stats.end_time)); + } else { + sammsges.push(total_event_record); + } let mut stats_tb = Table::new(); stats_tb.load_preset(UTF8_FULL).apply_modifier(UTF8_ROUND_CORNERS);