Update main.rs

Author: michal92299

source-code/src/main.rs

@@ -6,6 +6,7 @@ mod db;
 mod deb;
 mod download;
 mod fs_install;
+mod log;
 mod package;
 mod solver;
 mod ui;
@@ -15,24 +16,30 @@ use cli::{parse_args, Command};
 
 #[tokio::main]
 async fn main() {
+    // Log every invocation
+    let argv: Vec<String> = std::env::args().skip(1).collect();
+    log::session_start();
+    log::cmd(&argv);
+
     if let Err(e) = run().await {
-        ui::fatal(&format!("{:#}", e));
+        let msg = format!("{:#}", e);
+        log::error(&msg);
+        ui::fatal(&msg);
         std::process::exit(1);
     }
 }
 
 async fn run() -> Result<()> {
     let cmd = parse_args()?;
 
-    // Commands that touch the system need root
     let needs_root = matches!(
         &cmd,
         Command::Install { .. }
-        | Command::Remove { .. }
-        | Command::Upgrade { .. }
-        | Command::Update
-        | Command::Clean
-        | Command::Autoremove { .. }
+            | Command::Remove { .. }
+            | Command::Upgrade { .. }
+            | Command::Update
+            | Command::Clean
+            | Command::Autoremove { .. }
     );
 
     if needs_root && !is_root() {
@@ -44,36 +51,33 @@ async fn run() -> Result<()> {
 
     match cmd {
         Command::Install { packages, assume_yes, no_recommends } =>
-        cli::cmd_install(&packages, assume_yes, no_recommends).await,
+            cli::cmd_install(&packages, assume_yes, no_recommends).await,
         Command::Remove { packages, assume_yes, purge } =>
-        cli::cmd_remove(&packages, assume_yes, purge).await,
+            cli::cmd_remove(&packages, assume_yes, purge).await,
         Command::Update =>
-        cli::cmd_update().await,
+            cli::cmd_update().await,
         Command::Upgrade { assume_yes } =>
-        cli::cmd_upgrade(assume_yes).await,
+            cli::cmd_upgrade(assume_yes).await,
         Command::Autoremove { assume_yes } =>
-        cli::cmd_autoremove(assume_yes).await,
+            cli::cmd_autoremove(assume_yes).await,
         Command::Search { query, installed } =>
-        cli::cmd_search(&query, installed).await,
+            cli::cmd_search(&query, installed).await,
         Command::Info { package } =>
-        cli::cmd_info(&package).await,
+            cli::cmd_info(&package).await,
         Command::List { installed, upgradeable, available } =>
-        cli::cmd_list(installed, upgradeable, available).await,
+            cli::cmd_list(installed, upgradeable, available).await,
         Command::Clean =>
-        cli::cmd_clean().await,
+            cli::cmd_clean().await,
         Command::History =>
-        cli::cmd_history().await,
+            cli::cmd_history().await,
         Command::Version => { cli::print_version(); Ok(()) }
-        Command::Help =>    { cli::print_help();    Ok(()) }
+        Command::Help    => { cli::print_help();    Ok(()) }
     }
 }
 
 fn is_root() -> bool {
-    // Works on Linux/macOS; on Windows always true for testing
     #[cfg(unix)]
-    {
-        unsafe { libc::getuid() == 0 }
-    }
+    { unsafe { libc::getuid() == 0 } }
     #[cfg(not(unix))]
     { true }
 }