From 8cc73e20c9762a5a88739239781b8fe39545a78b Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Sat, 24 Sep 2022 16:55:58 +0900 Subject: [PATCH] refactoring --- src/main.rs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main.rs b/src/main.rs index b8c986db..b8212d1e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,7 +18,7 @@ use hayabusa::detections::pivot::PivotKeyword; use hayabusa::detections::pivot::PIVOT_KEYWORD; use hayabusa::detections::rule::{get_detection_keys, RuleNode}; use hayabusa::omikuji::Omikuji; -use hayabusa::options::htmlreport::HTML_REPORTER; +use hayabusa::options::htmlreport::{HTML_REPORTER, self}; use hayabusa::options::profile::PROFILES; use hayabusa::options::{level_tuning::LevelTuning, update_rules::UpdateRules}; use hayabusa::{afterfact::after_fact, detections::utils}; @@ -505,7 +505,6 @@ impl App { } } } - fn analysis_files(&mut self, evtx_files: Vec, time_filter: &TargetEventTime) { let level = configs::CONFIG .read() @@ -533,16 +532,8 @@ impl App { println!(); if configs::CONFIG.read().unwrap().args.html_report.is_some() { - let mut html_report_data = HTML_REPORTER - .write() - .unwrap().md_datas.clone(); - let entry = html_report_data - .entry("General Overview".to_string()) - .or_insert(Vec::new()); - entry.push(format!("- Analyzed event files: {:?}", evtx_files.len())); - entry.push("".to_string()); - entry.push(format!("- {}", total_size_output)); - HTML_REPORTER.write().unwrap().md_datas = html_report_data; + let html_report_data = HTML_REPORTER.write().unwrap().md_datas.clone(); + htmlreport::add_md_data(html_report_data, "General Overview".to_string(),format!("- Analyzed event files: {}", evtx_files.len())); } let rule_files = detection::Detection::parse_rule_files(