feat: ✨ add cli

Author: Koro33

Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["koro33 <[email protected]>"]
 edition = "2021"
 name = "s-backup"
-version = "0.1.0"
+version = "0.1.2"
 
 license = "MIT"
 publish = false
@@ -13,6 +13,7 @@ repository = "https://github.com/Koro33/s-backup"
 anyhow = "1.0.79"
 blake3 = { version = "1.5.0", features = ["mmap", "rayon"] }
 chrono = { version = "0.4.34" }
+clap = { version = "4.5.0", 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"] }
@@ -23,7 +24,6 @@ tokio = { version = "1.36.0", features = [
     "rt-multi-thread",
     "signal",
 ] }
-tokio-cron-scheduler = "0.10.0"
 toml = "0.8.10"
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt"] }

src/lib.rs

@@ -6,13 +6,39 @@ use anyhow::anyhow;
 use blake3::Hash;
 use chrono::prelude::*;
 
+use clap::{Parser, Subcommand};
 use std::{
     fs::File,
     io::{BufReader, Error},
     path::Path,
 };
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
+// Simple program to greet a person
+#[derive(Parser, Debug)]
+#[command(version, about, long_about = None)]
+pub struct Args {
+    #[command(subcommand)]
+    pub command: Commands,
+}
+
+#[derive(Subcommand, Debug)]
+pub enum Commands {
+    /// Run Backup
+    Run {
+        /// config file path
+        #[arg(short, long, default_value = "./config.toml")]
+        config: String,
+    },
+
+    /// Test Config
+    Test {
+        /// config file path
+        #[arg(short, long, default_value = "./config.toml")]
+        config: String,
+    },
+}
+
 #[derive(Debug, Clone)]
 pub struct CpsdFileName {
     pub prefix: String,

src/main.rs

@@ -1,14 +1,15 @@
-use anyhow::{anyhow, Result};
-use humansize::{FormatSize, DECIMAL};
-use opendal::Operator;
 use s_backup::{
     calc_hash_mmap_rayon,
     config::{read_config, Backup},
     init_tracing,
     s3::init_s3,
-    CpsdFileName,
+    Args, Commands, CpsdFileName,
 };
 
+use anyhow::{anyhow, Result};
+use clap::Parser;
+use humansize::{FormatSize, DECIMAL};
+use opendal::Operator;
 use std::{os::linux::fs::MetadataExt, path::Path, process::Stdio};
 use tempfile::TempDir;
 use tokio::{
@@ -22,28 +23,11 @@ use tokio::{
 async fn main() -> Result<()> {
     init_tracing();
 
-    let default_config_path = if cfg!(debug_assertions) {
-        "./tests/config.toml"
-    } else {
-        "./config.toml"
-    };
+    let args = Args::parse();
 
-    let config =
-        read_config(std::env::var("SB_CONFIG_PATH").unwrap_or(default_config_path.to_string()))
-            .await
-            .map_err(|e| {
-                tracing::error!("read config failed: {}", e);
-                e
-            })?;
-
-    let s3_op = init_s3(&config.s3).await?;
-
-    for b in &config.backup {
-        let b_clone = b.clone();
-        let s3_op_clone = s3_op.clone();
-        let _handle = tokio::spawn(async move {
-            period_backup(&b_clone, &s3_op_clone).await.unwrap();
-        });
+    match &args.command {
+        Commands::Run { config } => run(config).await?,
+        Commands::Test { config } => test(config).await?,
     }
 
     #[cfg(unix)]
@@ -73,13 +57,43 @@ async fn main() -> Result<()> {
     Ok(())
 }
 
+async fn run(config_path: &str) -> Result<()> {
+    let config = read_config(config_path).await.map_err(|e| {
+        tracing::error!("read config failed at `{}`: {}", config_path, e);
+        e
+    })?;
+
+    let s3_op = init_s3(&config.s3).await?;
+
+    for b in &config.backup {
+        let b_clone = b.clone();
+        let s3_op_clone = s3_op.clone();
+        let _handle = tokio::spawn(async move {
+            period_backup(&b_clone, &s3_op_clone).await.unwrap();
+        });
+    }
+
+    Ok(())
+}
+
+async fn test(config_path: &str) -> Result<()> {
+    tracing::warn!("test unimplemented");
+    Ok(())
+}
+
 async fn period_backup(b: &Backup, s3_oprator: &Operator) -> Result<()> {
     loop {
         let _ = backup(b, s3_oprator).await.map_err(|e| {
             tracing::error!("backup failed: {}", e);
             e
         });
 
+        let next_run_date = chrono::Utc::now() + chrono::Duration::seconds(b.interval as i64);
+        tracing::info!(
+            "The next backup will be run at {}",
+            next_run_date.to_rfc2822()
+        );
+
         tokio::time::sleep(std::time::Duration::from_secs(b.interval as u64)).await
     }
 }
@@ -115,8 +129,7 @@ async fn backup(b: &Backup, s3_oprator: &Operator) -> Result<()> {
             .to_string(),
     );
 
-    cmd.args(args)
-    .kill_on_drop(true);
+    cmd.args(args).kill_on_drop(true);
 
     cmd.stdin(Stdio::piped());
     cmd.stdout(Stdio::null());
@@ -129,7 +142,6 @@ async fn backup(b: &Backup, s3_oprator: &Operator) -> Result<()> {
         tracing::warn!("{}", line);
     }
     if !child.wait().await?.success() {
-        tracing::error!("failed to compress");
         return Err(anyhow!("failed to compress"));
     };
 
@@ -173,6 +185,7 @@ async fn backup(b: &Backup, s3_oprator: &Operator) -> Result<()> {
         .unwrap();
 
     // start upload
+    tracing::info!("start uploading...",);
     match tokio::io::copy(&mut reader, &mut writer).await {
         Ok(_) => writer.close().await?,
         Err(_e) => {

src/s3.rs

@@ -24,19 +24,16 @@ mod tests {
 
     #[tokio::test]
     async fn test_init_s3() {
-        let config = read_config(
-            std::env::var("SB_CONFIG_PATH").unwrap_or("./tests/config.toml".to_string()),
-        )
-        .await
-        .map_err(|e| {
-            tracing::error!("read config failed: {}", e);
-            e
-        })
-        .unwrap();
+        let config = read_config("./tests/config.toml")
+            .await
+            .map_err(|e| {
+                tracing::error!("read config failed: {}", e);
+                e
+            })
+            .unwrap();
         let s3_op = init_s3(&config.s3).await.unwrap();
 
         let entries = s3_op.list("/backup/").await.unwrap();
         println!("{:#?}", entries);
-
     }
 }