Merge pull request #1581 from input-output-hk/ensemble/1572/client-cli-optional-existence-check

Accept existing but empty `db` dir for `client-cli` cardano-db download

Author: Alenar

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client-cli"
-version = "0.7.4"
+version = "0.7.5"
 description = "A Mithril Client"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-client-cli/Cargo.toml

@@ -14,7 +14,7 @@ use crate::{
     commands::client_builder,
     configuration::ConfigParameters,
     utils::{
-        CardanoDbUnpacker, CardanoDbUtils, ExpanderUtils, IndicatifFeedbackReceiver,
+        CardanoDbDownloadChecker, CardanoDbUtils, ExpanderUtils, IndicatifFeedbackReceiver,
         ProgressOutputType, ProgressPrinter,
     },
 };
@@ -131,11 +131,13 @@ impl CardanoDbDownloadCommand {
     fn check_local_disk_info(
         step_number: u16,
         progress_printer: &ProgressPrinter,
-        db_dir: &PathBuf,
+        db_dir: &Path,
         cardano_db: &Snapshot,
     ) -> MithrilResult<()> {
         progress_printer.report_step(step_number, "Checking local disk info…")?;
-        if let Err(e) = CardanoDbUnpacker::check_prerequisites(
+
+        CardanoDbDownloadChecker::ensure_dir_exist(db_dir)?;
+        if let Err(e) = CardanoDbDownloadChecker::check_prerequisites(
             db_dir,
             cardano_db.size,
             cardano_db.compression_algorithm.unwrap_or_default(),
@@ -144,13 +146,6 @@ impl CardanoDbDownloadCommand {
                 .report_step(step_number, &CardanoDbUtils::check_disk_space_error(e)?)?;
         }
 
-        std::fs::create_dir_all(db_dir).with_context(|| {
-            format!(
-                "Download: could not create target directory '{}'.",
-                db_dir.display()
-            )
-        })?;
-
         Ok(())
     }
 

mithril-client-cli/src/commands/cardano_db/download.rs

@@ -3,7 +3,7 @@ use futures::Future;
 use indicatif::{MultiProgress, ProgressBar};
 use std::time::Duration;
 
-use super::CardanoDbUnpackerError;
+use super::CardanoDbDownloadCheckerError;
 use mithril_client::{MithrilError, MithrilResult};
 
 /// Utility functions for to the CardanoDb commands
@@ -12,11 +12,11 @@ pub struct CardanoDbUtils;
 impl CardanoDbUtils {
     /// Handle the error return by `check_prerequisites`
     pub fn check_disk_space_error(error: MithrilError) -> MithrilResult<String> {
-        if let Some(CardanoDbUnpackerError::NotEnoughSpace {
+        if let Some(CardanoDbDownloadCheckerError::NotEnoughSpace {
             left_space: _,
             pathdir: _,
             archive_size: _,
-        }) = error.downcast_ref::<CardanoDbUnpackerError>()
+        }) = error.downcast_ref::<CardanoDbDownloadCheckerError>()
         {
             Ok(format!("Warning: {}", error))
         } else {
@@ -51,7 +51,7 @@ mod test {
 
     #[test]
     fn check_disk_space_error_should_return_warning_message_if_error_is_not_enough_space() {
-        let not_enough_space_error = CardanoDbUnpackerError::NotEnoughSpace {
+        let not_enough_space_error = CardanoDbDownloadCheckerError::NotEnoughSpace {
             left_space: 1_f64,
             pathdir: PathBuf::new(),
             archive_size: 2_f64,
@@ -66,15 +66,15 @@ mod test {
 
     #[test]
     fn check_disk_space_error_should_return_error_if_error_is_not_error_not_enough_space() {
-        let error = CardanoDbUnpackerError::UnpackDirectoryAlreadyExists(PathBuf::new());
+        let error = CardanoDbDownloadCheckerError::UnpackDirectoryNotEmpty(PathBuf::new());
 
         let error = CardanoDbUtils::check_disk_space_error(anyhow!(error))
             .expect_err("check_disk_space_error should fail");
 
         assert!(
             matches!(
-                error.downcast_ref::<CardanoDbUnpackerError>(),
-                Some(CardanoDbUnpackerError::UnpackDirectoryAlreadyExists(_))
+                error.downcast_ref::<CardanoDbDownloadCheckerError>(),
+                Some(CardanoDbDownloadCheckerError::UnpackDirectoryNotEmpty(_))
             ),
             "Unexpected error: {:?}",
             error