slipenkomk/sequoia-sq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cause sq download to fail faster if the output file can't be used.

Browse Source 
- Open the output file before downloading anything so that we fail
    earlier.
This commit is contained in:
Neal H. Walfield 2024-11-13 16:36:22 +01:00
parent 4d5e481b08
commit a8567be5ed
No known key found for this signature in database
GPG Key ID: 6863C9AD5B4D22D3
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/commands/download.rs
View File

@ -168,6 +168,34 @@ pub fn dispatch(sq: Sq, c: download::Command)
}
// Create the output file early. Otherwise we may download a lot
// of data and then fail to copy it.
let mut output_file_;
let mut stdout_;
let mut output_file: &mut dyn Write = if let Some(file) = output.path() {
output_file_ = if sq.overwrite {
File::create(file)
.with_context(|| format!("Opening {}", file.display()))?
} else {
File::options().write(true).create_new(true).open(file)
.map_err(|err| {
if err.kind() == std::io::ErrorKind::AlreadyExists {
return anyhow::anyhow!(
"File {} exists, use \"sq --overwrite ...\" to overwrite",
file.display(),
);
}
err.into()
})
.with_context(|| format!("Opening {}", file.display()))?
};
&mut output_file_
} else {
stdout_ = std::io::stdout();
&mut stdout_
};
// Create the progress bar.
let progress_bar = if sq.verbose || sq.batch {
ProgressBar::hidden()
@ -478,20 +506,6 @@ pub fn dispatch(sq: Sq, c: download::Command)
data_file.as_mut().rewind()?;
let mut output_file_;
let mut stdout_;
let mut output_file: &mut dyn Write = if let Some(file) = output.path() {
output_file_ = if sq.overwrite {
File::create(file)
} else {
File::options().write(true).create_new(true).open(file)
}.with_context(|| format!("Opening {}", file.display()))?;
&mut output_file_
} else {
stdout_ = std::io::stdout();
&mut stdout_
};
let result = verify(
sq,
data_file.as_mut(),