fix: 🐛 compressed file contains extra path

Author: Koro33

Cargo.toml

@@ -10,13 +10,13 @@ readme = "README.md"
 repository = "https://github.com/Koro33/s-backup"
 
 [dependencies]
-anyhow = "1.0.79"
+anyhow = "1.0.80"
 blake3 = { version = "1.5.0", features = ["mmap", "rayon"] }
 chrono = { version = "0.4.34" }
-clap = { version = "4.5.0", features = ["derive"] }
+clap = { version = "4.5.1", features = ["derive"] }
 humansize = { version = "2.1.3", features = ["impl_style"] }
 opendal = { version = "0.45.0", features = ["layers-tracing"] }
-serde = { version = "1.0.196", features = ["derive"] }
+serde = { version = "1.0.197", features = ["derive"] }
 tempfile = "3.10.0"
 tokio = { version = "1.36.0", features = [
     "macros",

src/main.rs

@@ -26,34 +26,13 @@ async fn main() -> Result<()> {
     let args = Args::parse();
 
     match &args.command {
-        Commands::Run { config } => run(config).await?,
+        Commands::Run { config } => {
+            run(config).await?;
+            graceful_shutdown().await;
+        }
         Commands::Test { config } => test(config).await?,
     }
 
-    #[cfg(unix)]
-    let terminate = async {
-        signal::unix::signal(signal::unix::SignalKind::terminate())
-            .expect("failed to install signal handler")
-            .recv()
-            .await;
-        tracing::warn!("signal terminate received");
-    };
-
-    #[cfg(not(unix))]
-    let terminate = std::future::pending::<()>();
-
-    let ctrl_c = async {
-        signal::ctrl_c()
-            .await
-            .expect("failed to install signal handler");
-        tracing::warn!("signal ctrl_c received");
-    };
-
-    tokio::select! {
-        _ = ctrl_c => {},
-        _ = terminate => {},
-    }
-
     Ok(())
 }
 
@@ -77,7 +56,21 @@ async fn run(config_path: &str) -> Result<()> {
 }
 
 async fn test(config_path: &str) -> Result<()> {
-    tracing::warn!("test unimplemented");
+    // check config file syntax
+    let config = read_config(config_path).await.map_err(|e| {
+        tracing::error!("❌ read config failed at `{}`: {}", config_path, e);
+        e
+    })?;
+    tracing::info!("✅ config file syntax is ok");
+
+    // check s3 instance
+    let s3_op = init_s3(&config.s3).await?;
+    s3_op.check().await.map_err(|e| {
+        tracing::error!("❌ connect to s3 service failed: {}", e);
+        e
+    })?;
+    tracing::info!("✅ connect to s3 service successfully");
+
     Ok(())
 }
 
@@ -123,12 +116,14 @@ async fn backup(b: &Backup, s3_oprator: &Operator) -> Result<()> {
             .to_string(),
     ];
     args.extend(b.exclude.iter().map(|e| format!("--exclude={}", e)));
+    args.push("-C".to_string());
     args.push(
         backup_source
             .to_str()
             .ok_or(anyhow!("failed to convert path to string"))?
             .to_string(),
     );
+    args.push(".".to_string());
 
     cmd.args(args).kill_on_drop(true);
 
@@ -236,5 +231,31 @@ fn find_remove_files(entries: &[opendal::Entry], name: &str, keep: usize) -> Vec
     to_remove
 }
 
+async fn graceful_shutdown() {
+    #[cfg(unix)]
+    let terminate = async {
+        signal::unix::signal(signal::unix::SignalKind::terminate())
+            .expect("failed to install signal handler")
+            .recv()
+            .await;
+        tracing::warn!("signal terminate received");
+    };
+
+    #[cfg(not(unix))]
+    let terminate = std::future::pending::<()>();
+
+    let ctrl_c = async {
+        signal::ctrl_c()
+            .await
+            .expect("failed to install signal handler");
+        tracing::warn!("signal ctrl_c received");
+    };
+
+    tokio::select! {
+        _ = ctrl_c => {},
+        _ = terminate => {},
+    }
+}
+
 #[cfg(test)]
 mod tests {}