Merge pull request #1192 from input-output-hk/jpraynaud/1160-fix-disk-space-warning-client

jpraynaud · web-flow · commit 3673209726ec · 2023-08-31T11:03:02.000+02:00
Fix disk space warning not displayed in client
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mithril-client/Cargo.toml b/mithril-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client"
-version = "0.3.37"
+version = "0.3.38"
 description = "A Mithril Client"
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-client/src/services/snapshot.rs b/mithril-client/src/services/snapshot.rs
@@ -107,16 +107,14 @@ impl MithrilClientSnapshotService {
         }
     }
 
-    fn check_disk_space_error(&self, error: StdError) -> StdResult<()> {
+    fn check_disk_space_error(&self, error: StdError) -> StdResult<StdError> {
         if let Some(SnapshotUnpackerError::NotEnoughSpace {
             left_space: _,
             pathdir: _,
             archive_size: _,
         }) = error.downcast_ref::<SnapshotUnpackerError>()
         {
-            warn!("{error}");
-
-            Ok(())
+            Ok(error)
         } else {
             Err(error)
         }
@@ -220,7 +218,8 @@ impl SnapshotService for MithrilClientSnapshotService {
         let unpacker = SnapshotUnpacker;
 
         if let Err(e) = unpacker.check_prerequisites(&db_dir, snapshot_entity.artifact.size) {
-            self.check_disk_space_error(e)?;
+            progress_bar
+                .report_step(1, &format!("Warning: {}", self.check_disk_space_error(e)?))?;
         }
 
         std::fs::create_dir_all(&db_dir).with_context(|| {

Original file line number	Diff line number	Diff line change
`@@ -107,16 +107,14 @@ impl MithrilClientSnapshotService {`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- fn check_disk_space_error(&self, error: StdError) -> StdResult<()> {`
	`110`	`+ fn check_disk_space_error(&self, error: StdError) -> StdResult<StdError> {`
`111`	`111`	`if let Some(SnapshotUnpackerError::NotEnoughSpace {`
`112`	`112`	`left_space: _,`
`113`	`113`	`pathdir: _,`
`114`	`114`	`archive_size: _,`
`115`	`115`	`}) = error.downcast_ref::<SnapshotUnpackerError>()`
`116`	`116`	`{`
`117`		`- warn!("{error}");`
`118`		`-`
`119`		`- Ok(())`
	`117`	`+ Ok(error)`
`120`	`118`	`} else {`
`121`	`119`	`Err(error)`
`122`	`120`	`}`
`@@ -220,7 +218,8 @@ impl SnapshotService for MithrilClientSnapshotService {`
`220`	`218`	`let unpacker = SnapshotUnpacker;`
`221`	`219`
`222`	`220`	`if let Err(e) = unpacker.check_prerequisites(&db_dir, snapshot_entity.artifact.size) {`
`223`		`- self.check_disk_space_error(e)?;`
	`221`	`+ progress_bar`
	`222`	`+ .report_step(1, &format!("Warning: {}", self.check_disk_space_error(e)?))?;`
`224`	`223`	`}`
`225`	`224`
`226`	`225`	`std::fs::create_dir_all(&db_dir).with_context(\|\| {`