diff --git a/rules b/rules index 5364222c..ff5732fa 160000 --- a/rules +++ b/rules @@ -1 +1 @@ -Subproject commit 5364222c5459472d8ecbd46c49b482172be9d184 +Subproject commit ff5732fa1788b1c2281fdc3ccaa0dd0301b030d8 diff --git a/src/lib.rs b/src/lib.rs index 45a8b1e5..5faf0723 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,5 +6,3 @@ pub mod omikuji; pub mod options; pub mod timeline; pub mod yaml; -#[macro_use] -extern crate prettytable; diff --git a/src/timeline/timelines.rs b/src/timeline/timelines.rs index a0cad83a..a5fa1b19 100644 --- a/src/timeline/timelines.rs +++ b/src/timeline/timelines.rs @@ -1,6 +1,6 @@ use crate::detections::message::{LOGONSUMMARY_FLAG, STATISTICS_FLAG}; use crate::detections::{configs::CONFIG, detection::EvtxRecordInfo}; -use prettytable::{Cell, Row, Table}; +use comfy_table::*; use super::statistics::EventStatistics; use hashbrown::HashMap; @@ -142,7 +142,7 @@ impl Timeline { } } else { let mut logins_stats_tb = Table::new(); - logins_stats_tb.set_titles(row!["User", "Failed", "Successful"]); + logins_stats_tb.set_header(vec!["User", "Failed", "Successful"]); // 集計件数でソート let mut mapsorted: Vec<_> = self.stats.stats_login_list.iter().collect(); mapsorted.sort_by(|x, y| x.0.cmp(y.0)); @@ -153,13 +153,13 @@ impl Timeline { //key.to_string().pop(); username.pop(); username.remove(0); - logins_stats_tb.add_row(Row::new(vec![ + logins_stats_tb.add_row(vec![ Cell::new(&username), Cell::new(&values[1].to_string()), Cell::new(&values[0].to_string()), - ])); + ]); } - logins_stats_tb.printstd(); + println!("{logins_stats_tb}"); println!(); } }