diff options
author | Lars Wirzenius <liw@liw.fi> | 2024-03-03 19:28:57 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2024-03-03 19:28:57 +0200 |
commit | d8521c5040541f1a9a15e4bed3d9969ca3719cd4 (patch) | |
tree | 638b3bf4e07e88d167b6dddfd1daa965bef84e80 /src | |
parent | 2b2faf5972127635c9f6738861cfcc3ccce50e0b (diff) | |
download | obnam2-d8521c5040541f1a9a15e4bed3d9969ca3719cd4.tar.gz |
chore: upgrade dependency on indicatif
Signed-off-by: Lars Wirzenius <liw@liw.fi>
Sponsored-by: author
Diffstat (limited to 'src')
-rw-r--r-- | src/backup_progress.rs | 36 | ||||
-rw-r--r-- | src/cmd/restore.rs | 6 |
2 files changed, 31 insertions, 11 deletions
diff --git a/src/backup_progress.rs b/src/backup_progress.rs index 1e6805c..e3995f0 100644 --- a/src/backup_progress.rs +++ b/src/backup_progress.rs @@ -2,7 +2,7 @@ use crate::generation::GenId; use indicatif::{ProgressBar, ProgressStyle}; -use std::path::Path; +use std::{path::Path, time::Duration}; const SHOW_PROGRESS: bool = true; @@ -29,8 +29,12 @@ impl BackupProgress { "current: {wide_msg}", "{spinner}", ]; - progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n"))); - progress.enable_steady_tick(100); + progress.set_style( + ProgressStyle::default_bar() + .template(&parts.join("\n")) + .expect("create indicatif ProgressStyle value"), + ); + progress.enable_steady_tick(Duration::from_millis(100)); Self { progress } } @@ -50,8 +54,12 @@ impl BackupProgress { "current: {wide_msg}", "{spinner}", ]; - progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n"))); - progress.enable_steady_tick(100); + progress.set_style( + ProgressStyle::default_bar() + .template(&parts.join("\n")) + .expect("create indicatif ProgressStyle value"), + ); + progress.enable_steady_tick(Duration::from_millis(100)); Self { progress } } @@ -64,8 +72,12 @@ impl BackupProgress { "elapsed: {elapsed}", "{spinner}", ]; - progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n"))); - progress.enable_steady_tick(100); + progress.set_style( + ProgressStyle::default_bar() + .template(&parts.join("\n")) + .expect("create indicatif ProgressStyle value"), + ); + progress.enable_steady_tick(Duration::from_millis(100)); Self { progress } } @@ -75,8 +87,12 @@ impl BackupProgress { pub fn download_generation(gen_id: &GenId) -> Self { let progress = ProgressBar::new(0); let parts = ["{msg}", "elapsed: {elapsed}", "{spinner}"]; - progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n"))); - progress.enable_steady_tick(100); + progress.set_style( + ProgressStyle::default_bar() + .template(&parts.join("\n")) + .expect("create indicatif ProgressStyle value"), + ); + progress.enable_steady_tick(Duration::from_millis(100)); progress.set_message(format!( "downloading previous generation metadata: {}", gen_id @@ -102,7 +118,7 @@ impl BackupProgress { /// Update progress bar about number of actual files found. pub fn found_live_file(&self, filename: &Path) { self.progress.inc(1); - if self.progress.length() < self.progress.position() { + if self.progress.length() < Some(self.progress.position()) { self.progress.set_length(self.progress.position()); } self.progress.set_message(format!("{}", filename.display())); diff --git a/src/cmd/restore.rs b/src/cmd/restore.rs index dff72fa..58caf61 100644 --- a/src/cmd/restore.rs +++ b/src/cmd/restore.rs @@ -306,6 +306,10 @@ fn create_progress_bar(file_count: FileId, verbose: bool) -> ProgressBar { "current: {wide_msg}", "{spinner}", ]; - progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n"))); + progress.set_style( + ProgressStyle::default_bar() + .template(&parts.join("\n")) + .expect("create indicatif ProgressStyle value"), + ); progress } |