From 9faf97566f066a8a6445af56672cd284fd52c930 Mon Sep 17 00:00:00 2001 From: SkuldNorniern Date: Thu, 21 Mar 2024 16:22:37 +0900 Subject: [PATCH] refactor: remove useless `async` --- src/net/live_fluereflow.rs | 8 ++++---- src/net/offline_fluereflows.rs | 4 ++-- src/net/online_fluereflow.rs | 8 ++++---- src/net/packet_pcap.rs | 4 ++-- src/utils/time_file_get.rs | 5 +++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/net/live_fluereflow.rs b/src/net/live_fluereflow.rs index 78c3a5f..3bc3ec8 100644 --- a/src/net/live_fluereflow.rs +++ b/src/net/live_fluereflow.rs @@ -100,8 +100,8 @@ pub async fn online_packet_capture(arg: Args) { .as_secs(), )); let last_export = Arc::new(Mutex::new(Instant::now())); - let mut file_path = cur_time_file(csv_file.as_str(), file_dir, ".csv").await; - let mut file = fs::File::create(file_path.clone()).unwrap(); + let mut file_path = cur_time_file(csv_file.as_str(), file_dir, ".csv"); + let mut file = fs::File::create(file_path.as_ref()).unwrap(); //let mut wtr = csv::Writer::from_writer(file); @@ -304,8 +304,8 @@ pub async fn online_packet_capture(arg: Args) { /*if verbose >= 1 { println!("Export {} result: {:?}", file_path, result); }*/ - file_path = cur_time_file(csv_file.as_str(), file_dir, ".csv").await; - file = fs::File::create(file_path.clone()).unwrap(); + file_path = cur_time_file(csv_file.as_str(), file_dir, ".csv"); + file = fs::File::create(file_path.as_ref()).unwrap(); *last_export_guard = Instant::now(); *last_export_unix_time_guard = SystemTime::now() .duration_since(SystemTime::UNIX_EPOCH) diff --git a/src/net/offline_fluereflows.rs b/src/net/offline_fluereflows.rs index 7a477a2..a9b3207 100644 --- a/src/net/offline_fluereflows.rs +++ b/src/net/offline_fluereflows.rs @@ -33,8 +33,8 @@ pub async fn fluereflow_fileparse(arg: Args) -> Result<(), FluereError> { }; let start = Instant::now(); - let file_path = cur_time_file(csv_file.as_str(), file_dir, ".csv").await; - let file = fs::File::create(file_path.clone()).unwrap(); + let file_path = cur_time_file(csv_file.as_str(), file_dir, ".csv"); + let file = fs::File::create(file_path.as_ref()).unwrap(); //let mut wtr = csv::Writer::from_writer(file); diff --git a/src/net/online_fluereflow.rs b/src/net/online_fluereflow.rs index a0e6f15..b08bbaa 100644 --- a/src/net/online_fluereflow.rs +++ b/src/net/online_fluereflow.rs @@ -67,8 +67,8 @@ pub async fn packet_capture(arg: Args) -> Result<(), FluereError> { let start = Instant::now(); let mut last_export = Instant::now(); - let mut file_path = cur_time_file(csv_file.as_str(), file_dir, ".csv").await; - let mut file = fs::File::create(file_path.clone()).unwrap(); + let mut file_path = cur_time_file(csv_file.as_str(), file_dir, ".csv"); + let mut file = fs::File::create(file_path.as_ref()).unwrap(); //let mut wtr = csv::Writer::from_writer(file); @@ -217,8 +217,8 @@ pub async fn packet_capture(arg: Args) -> Result<(), FluereError> { let result = tasks.await; info!("Export {} result: {:?}", file_path, result); - file_path = cur_time_file(csv_file.as_str(), file_dir, ".csv").await; - file = fs::File::create(file_path.clone()).unwrap(); + file_path = cur_time_file(csv_file.as_str(), file_dir, ".csv"); + file = fs::File::create(file_path.as_ref()).unwrap(); last_export = Instant::now(); } diff --git a/src/net/packet_pcap.rs b/src/net/packet_pcap.rs index 4526d5b..a5be5e0 100644 --- a/src/net/packet_pcap.rs +++ b/src/net/packet_pcap.rs @@ -25,8 +25,8 @@ pub async fn pcap_capture(args: Args) { Err(error) => panic!("Problem creating directory: {:?}", error), }; - let file_path = cur_time_file(pcap_file.as_str(), file_dir, ".pcap").await; - let mut file: pcap::Savefile = match cap.savefile(file_path) { + let file_path = cur_time_file(pcap_file.as_str(), file_dir, ".pcap"); + let mut file: pcap::Savefile = match cap.savefile(file_path.as_ref()) { Ok(f) => f, Err(_) => std::process::exit(1), }; diff --git a/src/utils/time_file_get.rs b/src/utils/time_file_get.rs index eea76b1..db73740 100644 --- a/src/utils/time_file_get.rs +++ b/src/utils/time_file_get.rs @@ -1,6 +1,7 @@ use chrono::Local; +use std::borrow::Cow; -pub async fn cur_time_file(name: &str, dir: &str, format: &str) -> String { +pub fn cur_time_file(name: &str, dir: &str, format: &str) -> Cow<'static, str> { let date = Local::now(); let file_path = format!( "{}/{}_{}{}", @@ -10,5 +11,5 @@ pub async fn cur_time_file(name: &str, dir: &str, format: &str) -> String { format ); - file_path + Cow::Owned(file_path) }