@v0.6.4

- update edition to 2024
- fix initializing logging with unsafe code
- fix home dir var for exporting

Author: Chleba

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "netscanner"
-version = "0.6.3"
-edition = "2021"
+version = "0.6.4"
+edition = "2024"
 description = "Network Scanner"
 license = "MIT"
 authors = ["Chleba <chlebik@gmail.com>"]

Cargo.toml

@@ -6,7 +6,7 @@ use ratatui::{prelude::*, widgets::*};
 use std::env;
 use tokio::sync::mpsc::UnboundedSender;
 
-use super::{discovery::ScannedIp, ports::ScannedIpPorts, Component, Frame};
+use super::{Component, Frame, discovery::ScannedIp, ports::ScannedIpPorts};
 use crate::{action::Action, enums::PacketsInfoTypesEnum};
 
 #[derive(Default)]
@@ -29,14 +29,20 @@ impl Export {
 
     #[cfg(target_os = "linux")]
     fn get_user_home_dir(&mut self) {
-        let mut home_dir = String::from("/root");
+        let mut home_dir: Option<String> = None;
         if let Some(h_dir) = env::var_os("HOME") {
-            home_dir = String::from(h_dir.to_str().unwrap());
+            home_dir = Some(String::from(h_dir.to_str().unwrap()));
         }
-        if let Some(sudo_user) = env::var_os("SUDO_USER") {
-            home_dir = format!("/home/{}", sudo_user.to_str().unwrap());
+        if let Some(sudo_user) = env::var_os("SUDO_USER")
+            && home_dir.is_none()
+        {
+            home_dir = Some(format!("/home/{}", sudo_user.to_str().unwrap()));
+        }
+        if let Some(home_dir) = home_dir {
+            self.home_dir = format!("{}/.netscanner", home_dir)
+        } else {
+            self.home_dir = String::from("/root");
         }
-        self.home_dir = format!("{}/.netscanner", home_dir);
 
         // -- create dot folder
         if std::fs::metadata(self.home_dir.clone()).is_err()
@@ -84,7 +90,6 @@ impl Export {
         }
     }
 
-
     pub fn write_discovery(&mut self, data: Vec<ScannedIp>, timestamp: &String) -> Result<()> {
         let mut w = Writer::from_path(format!("{}/scanned_ips.{}.csv", self.home_dir, timestamp))?;
 

src/components/export.rs

@@ -1,5 +1,6 @@
 use std::cmp;
 use std::path::PathBuf;
+use std::sync::Mutex;
 
 use cidr::Ipv4Cidr;
 use color_eyre::eyre::Result;
@@ -9,9 +10,7 @@ use lazy_static::lazy_static;
 use std::net::Ipv4Addr;
 use tracing::error;
 use tracing_error::ErrorLayer;
-use tracing_subscriber::{
-    self, prelude::__tracing_subscriber_SubscriberExt, util::SubscriberInitExt, Layer,
-};
+use tracing_subscriber::{Layer, layer::SubscriberExt, util::SubscriberInitExt};
 
 use crate::components::sniff::IPTraffic;
 
@@ -122,7 +121,7 @@ pub fn initialize_panic_handler() -> Result<()> {
 
         #[cfg(not(debug_assertions))]
         {
-            use human_panic::{handle_dump, print_msg, Metadata};
+            use human_panic::{Metadata, handle_dump, print_msg};
             let meta = metadata!()
                 .authors("Chleba <chlebik@gmail.com>")
                 .homepage("https://github.com/Chleba/netscanner")
@@ -176,26 +175,33 @@ pub fn get_config_dir() -> PathBuf {
 
 pub fn initialize_logging() -> Result<()> {
     let directory = get_data_dir();
-    std::fs::create_dir_all(directory.clone())?;
-    let log_path = directory.join(LOG_FILE.clone());
+    std::fs::create_dir_all(&directory)?;
+
+    let log_path = directory.join(&*LOG_FILE);
     let log_file = std::fs::File::create(log_path)?;
-    std::env::set_var(
-        "RUST_LOG",
-        std::env::var("RUST_LOG")
-            .or_else(|_| std::env::var(LOG_ENV.clone()))
-            .unwrap_or_else(|_| format!("{}=info", env!("CARGO_CRATE_NAME"))),
-    );
+
+    let env_filter_str = std::env::var("RUST_LOG")
+        .or_else(|_| std::env::var(&*LOG_ENV))
+        .unwrap_or_else(|_| format!("{}=info", env!("CARGO_CRATE_NAME")));
+
+    let env_filter = tracing_subscriber::filter::EnvFilter::new(env_filter_str);
+
+    let log_file = Mutex::new(log_file);
+
     let file_subscriber = tracing_subscriber::fmt::layer()
         .with_file(true)
         .with_line_number(true)
-        .with_writer(log_file)
+        .with_writer(log_file) // Now accepts the Mutex<File>
         .with_target(false)
         .with_ansi(false)
-        .with_filter(tracing_subscriber::filter::EnvFilter::from_default_env());
-    tracing_subscriber::registry()
+        .with_filter(env_filter);
+
+    // 4. SAFETY: try_init prevents crashes if logging is initialized twice (e.g. tests)
+    let _ = tracing_subscriber::registry()
         .with(file_subscriber)
         .with(ErrorLayer::default())
-        .init();
+        .try_init();
+
     Ok(())
 }