diff options
author | Lars Wirzenius <liw@liw.fi> | 2024-03-03 18:28:05 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2024-03-03 18:28:05 +0000 |
commit | 24ebad6ff9c21cee0932aae2b461877ef0dca58f (patch) | |
tree | 39538ec5075e3dd56c2e297a484d13e802930df2 /src/backup_progress.rs | |
parent | 1e8cbe13ac1872760b49a3b9b077174b652b230f (diff) | |
parent | df85f13f0ddea078837d4e1e79439c7dfee9025a (diff) | |
download | obnam2-main.tar.gz |
update crate dependencies to current ones
See merge request obnam/obnam!254
Diffstat (limited to 'src/backup_progress.rs')
-rw-r--r-- | src/backup_progress.rs | 36 |
1 files changed, 26 insertions, 10 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())); |