diff options
author | Alexander Batischev <eual.jp@gmail.com> | 2021-04-25 18:29:19 +0300 |
---|---|---|
committer | Alexander Batischev <eual.jp@gmail.com> | 2021-04-26 15:00:05 +0300 |
commit | 36c89315fad651b3b8ce1f8e25310db3ea668fae (patch) | |
tree | 64f15f87468b7eecf41b59b0fbf2f74369ce640b /src/cmd | |
parent | 80aaff3f70f790141fbc8caa8a2f4830cd5e3fee (diff) | |
download | obnam2-36c89315fad651b3b8ce1f8e25310db3ea668fae.tar.gz |
Expose fallibility of individual SQL results
`LocalGeneration::sql::files()` runs an SQL query, iterates over the
results and collects the rows into a `Vec`. This can fail at any step:
the query might fail to run, or one of the rows might fail to be fetched
or processed.
Right now, we lump all those failures into a `Result` that wraps the
whole return value. This is only possible because we process each row
before returning. Once `Vec` is replaced by an iterator, we won't have
that luxury anymore, so we now wrap each individual element into its own
`Result` (as well as wrapping the whole vector into a `Result` of its
own).
Diffstat (limited to 'src/cmd')
-rw-r--r-- | src/cmd/list_files.rs | 1 | ||||
-rw-r--r-- | src/cmd/restore.rs | 2 | ||||
-rw-r--r-- | src/cmd/show_gen.rs | 17 |
3 files changed, 13 insertions, 7 deletions
diff --git a/src/cmd/list_files.rs b/src/cmd/list_files.rs index 22b102e..7f0cfed 100644 --- a/src/cmd/list_files.rs +++ b/src/cmd/list_files.rs @@ -23,6 +23,7 @@ impl ListFiles { let gen = client.fetch_generation(&gen_id, temp.path())?; for file in gen.files()? { + let file = file?; println!("{}", format_entry(&file.entry(), file.reason())); } diff --git a/src/cmd/restore.rs b/src/cmd/restore.rs index a321e80..f8bbaf4 100644 --- a/src/cmd/restore.rs +++ b/src/cmd/restore.rs @@ -41,6 +41,7 @@ impl Restore { info!("restoring {} files", gen.file_count()?); let progress = create_progress_bar(gen.file_count()?, true); for file in gen.files()? { + let file = file?; match file.reason() { Reason::FileError => (), _ => restore_generation( @@ -54,6 +55,7 @@ impl Restore { } } for file in gen.files()? { + let file = file?; if file.entry().is_dir() { restore_directory_metadata(file.entry(), &self.to)?; } diff --git a/src/cmd/show_gen.rs b/src/cmd/show_gen.rs index ba39809..7dc52cf 100644 --- a/src/cmd/show_gen.rs +++ b/src/cmd/show_gen.rs @@ -23,14 +23,17 @@ impl ShowGeneration { let gen = client.fetch_generation(&gen_id, temp.path())?; let files = gen.files()?; - let total_bytes = files.iter().fold(0, |acc, file| { - let e = file.entry(); - if e.kind() == FilesystemKind::Regular { - acc + file.entry().len() - } else { - acc - } + let total_bytes = files.into_iter().try_fold(0, |acc, file| { + file.map(|file| { + let e = file.entry(); + if e.kind() == FilesystemKind::Regular { + acc + e.len() + } else { + acc + } + }) }); + let total_bytes = total_bytes?; println!("generation-id: {}", gen_id); println!("file-count: {}", gen.file_count()?); |