fix #4259: mirror: add ignore-errors option

[proxmox-offline-mirror.git] / src / bin / proxmox-offline-mirror.rs

diff --git a/src/bin/proxmox-offline-mirror.rs b/src/bin/proxmox-offline-mirror.rs
index 7a285d3fe26fe0dcfd9f4c8ce4fca19715f6453c..222b561b616cd198acaa03bfa9e453f2d05eb107 100644 (file)
--- a/src/bin/proxmox-offline-mirror.rs
+++ b/src/bin/proxmox-offline-mirror.rs
@@ -362,7 +362,6 @@ fn action_add_mirror(config: &SectionConfigData) -> Result<Vec<MirrorConfig>, Er
             break path;
         }
     };
-    let dir = format!("{base_dir}/{id}");
 
     let verify = read_bool_from_tty(
         "Should already mirrored files be re-verified when updating the mirror? (io-intensive!)",
@@ -377,7 +376,6 @@ fn action_add_mirror(config: &SectionConfigData) -> Result<Vec<MirrorConfig>, Er
             eprintln!("config section '{suggested_id}' already exists, skipping..");
         } else {
             let repository = format!("deb {url}");
-            let dir = format!("{base_dir}/{suggested_id}");
 
             configs.push(MirrorConfig {
                 id: suggested_id,
@@ -386,8 +384,9 @@ fn action_add_mirror(config: &SectionConfigData) -> Result<Vec<MirrorConfig>, Er
                 key_path,
                 verify,
                 sync,
-                dir,
+                base_dir: base_dir.clone(),
                 use_subscription: None,
+                ignore_errors: false,
             });
         }
     }
@@ -399,8 +398,9 @@ fn action_add_mirror(config: &SectionConfigData) -> Result<Vec<MirrorConfig>, Er
         key_path,
         verify,
         sync,
-        dir,
+        base_dir,
         use_subscription,
+        ignore_errors: false,
     };
 
     configs.push(main_config);
@@ -409,7 +409,7 @@ fn action_add_mirror(config: &SectionConfigData) -> Result<Vec<MirrorConfig>, Er
 
 fn action_add_medium(config: &SectionConfigData) -> Result<MediaConfig, Error> {
     let id = loop {
-        let id = read_string_from_tty("Enter medium ID", None)?;
+        let id = read_string_from_tty("Enter new medium ID", None)?;
         if let Err(err) = MEDIA_ID_SCHEMA.parse_simple_value(&id) {
             eprintln!("Not a valid medium ID: {err}");
             continue;
@@ -593,7 +593,7 @@ async fn setup(config: Option<String>, _param: Value) -> Result<(), Error> {
         bail!("Setup wizard can only run interactively.");
     }
 
-    let config_file = config.unwrap_or_else(|| get_config_path());
+    let config_file = config.unwrap_or_else(get_config_path);
 
     let _lock = proxmox_offline_mirror::config::lock_config(&config_file)?;
 
@@ -647,7 +647,7 @@ async fn setup(config: Option<String>, _param: Value) -> Result<(), Error> {
                     config.set_data(&id, "mirror", mirror_config)?;
                     save_config(&config_file, &config)?;
                     println!("Config entry '{id}' added");
-                    println!("Run \"proxmox-offline-mirror mirror snapshot create --config '{config_file}' --id '{id}'\" to create a new mirror snapshot.");
+                    println!("Run \"proxmox-offline-mirror mirror snapshot create --config '{config_file}' '{id}'\" to create a new mirror snapshot.");
                 }
             }
             Action::AddMedium => {
@@ -656,7 +656,7 @@ async fn setup(config: Option<String>, _param: Value) -> Result<(), Error> {
                 config.set_data(&id, "medium", media_config)?;
                 save_config(&config_file, &config)?;
                 println!("Config entry '{id}' added");
-                println!("Run \"proxmox-offline-mirror medium sync --config '{config_file}' --id '{id}'\" to sync mirror snapshots to medium.");
+                println!("Run \"proxmox-offline-mirror medium sync --config '{config_file}' '{id}'\" to sync mirror snapshots to medium.");
             }
         }
     }