cargo fmt --all

src/detections/detection.rs

@@ -1,22 +1,21 @@
 extern crate quick_xml;
 
-use std::collections::BTreeMap;
-use std::collections::HashMap;
-use crate::models::event;
-use evtx::EvtxParser;
+use crate::detections::application;
 use crate::detections::common;
 use crate::detections::security;
 use crate::detections::system;
-use crate::detections::application;
-use quick_xml::de::{DeError};
+use crate::models::event;
+use evtx::EvtxParser;
+use quick_xml::de::DeError;
+use std::collections::BTreeMap;
+use std::collections::HashMap;
 
 #[derive(Debug)]
 pub struct Detection {
-    timeline_list : BTreeMap<String, String>,
+    timeline_list: BTreeMap<String, String>,
 }
 
 impl Detection {
-
     pub fn new() -> Detection {
         Detection {
             timeline_list: BTreeMap::new(),
@@ -24,12 +23,11 @@ impl Detection {
     }
 
     pub fn start(&mut self, mut parser: EvtxParser<std::fs::File>) -> Result<(), DeError> {
-    
         let mut common: common::Common = common::Common::new();
         let mut security = security::Security::new();
         let mut system = system::System::new();
         let mut application = application::Application::new();
-            
+
         for record in parser.records() {
             match record {
                 Ok(r) => {
@@ -37,19 +35,19 @@ impl Detection {
                     let event_id = event.system.event_id.to_string();
                     let channel = event.system.channel.to_string();
                     let event_data = event.parse_event_data();
-                    
+
                     &common.detection(&event.system, &event_data);
-                        //&common.detection(&event.system, &event_data);
+                    //&common.detection(&event.system, &event_data);
                     if channel == "Security" {
                         &security.detection(event_id, &event.system, event_data);
                     } else if channel == "System" {
                         &system.detection();
                     } else if channel == "Application" {
-                        &application.detection();
+                        &application.detection(event_id, &event.system, event_data);
                     } else {
                         //&other.detection();
                     }
-                },
+                }
                 Err(e) => eprintln!("{}", e),
             }
         }
@@ -59,9 +57,7 @@ impl Detection {
         ////////////////////////////
         common.disp();
         security.disp();
-        
-        return Ok(())
+
+        return Ok(());
     }
-
 }
-