diff options
| author | Lars Wirzenius <liw@liw.fi> | 2021-08-09 10:37:47 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2021-08-09 10:37:47 +0300 |
| commit | 048c548b9b6395034f75e5f095964ea6c860e953 (patch) | |
| tree | 1ff9aee12772d9afb15ef02fc412fb2fff82fc37 | |
| parent | 06755358f8e8192d75be8dc250fe49066a8d75ac (diff) | |
| download | obnam2-048c548b9b6395034f75e5f095964ea6c860e953.tar.gz | |
refactor: for simplicity
Sponsored-by: author
| -rw-r--r-- | src/backup_progress.rs | 4 | ||||
| -rw-r--r-- | src/backup_run.rs | 17 |
2 files changed, 4 insertions, 17 deletions
diff --git a/src/backup_progress.rs b/src/backup_progress.rs index 741ae7c..30b6228 100644 --- a/src/backup_progress.rs +++ b/src/backup_progress.rs @@ -80,10 +80,6 @@ impl BackupProgress { self.progress.inc(1); } - pub fn found_problems(&self, n: u64) { - self.progress.inc(n); - } - pub fn found_live_file(&self, filename: &Path) { self.progress.inc(1); if self.progress.length() < self.progress.position() { diff --git a/src/backup_run.rs b/src/backup_run.rs index e3bf4b2..7e41173 100644 --- a/src/backup_run.rs +++ b/src/backup_run.rs @@ -135,8 +135,11 @@ impl<'a> BackupRun<'a> { Ok(mut o) => { new_cachedir_tags.append(&mut o.new_cachedir_tags); if !o.warnings.is_empty() { + for err in o.warnings.iter() { + debug!("ignoring backup error {}", err); + self.found_problem(); + } warnings.append(&mut o.warnings); - self.found_problems(o.warnings.len() as u64); } } Err(err) => { @@ -169,9 +172,7 @@ impl<'a> BackupRun<'a> { for entry in iter { match entry { Err(err) => { - debug!("ignoring backup error {}", err); warnings.push(err.into()); - self.found_problem(); } Ok(entry) => { let path = entry.inner.pathbuf(); @@ -180,17 +181,13 @@ impl<'a> BackupRun<'a> { } match self.backup(entry, old).await { Err(err) => { - debug!("ignoring backup error {}", err); warnings.push(err); - self.found_problem(); } Ok(o) => { if let Err(err) = new.insert(o.entry, &o.ids, o.reason, o.is_cachedir_tag) { - debug!("ignoring backup error {}", err); warnings.push(err.into()); - self.found_problem(); } } } @@ -250,12 +247,6 @@ impl<'a> BackupRun<'a> { progress.found_problem(); } } - - fn found_problems(&self, n: u64) { - if let Some(progress) = &self.progress { - progress.found_problems(n); - } - } } async fn backup_file( |