Formatting

This commit is contained in:
Félix Saparelli 2022-05-31 23:19:56 +12:00
parent dee45f4b81
commit 1cac046ffd
No known key found for this signature in database
GPG key ID: B948C4BAE44FC474

View file

@ -1,5 +1,8 @@
use std::io::{stderr, stdin, Write}; use std::{
use std::path::{Path, PathBuf}; fs,
io::{stderr, stdin, Write},
path::{Path, PathBuf},
};
use log::{debug, info}; use log::{debug, info};
@ -58,8 +61,8 @@ pub async fn download<P: AsRef<Path>>(url: &str, path: P) -> Result<(), Binstall
let path = path.as_ref(); let path = path.as_ref();
debug!("Download OK, writing to file: '{}'", path.display()); debug!("Download OK, writing to file: '{}'", path.display());
std::fs::create_dir_all(path.parent().unwrap())?; fs::create_dir_all(path.parent().unwrap())?;
std::fs::write(&path, bytes)?; fs::write(&path, bytes)?;
Ok(()) Ok(())
} }
@ -79,7 +82,7 @@ pub fn extract<S: AsRef<Path>, P: AsRef<Path>>(
path.as_ref() path.as_ref()
); );
let dat = std::fs::File::open(source)?; let dat = fs::File::open(source)?;
let mut tar = Archive::new(dat); let mut tar = Archive::new(dat);
tar.unpack(path)?; tar.unpack(path)?;
@ -92,7 +95,7 @@ pub fn extract<S: AsRef<Path>, P: AsRef<Path>>(
path.as_ref() path.as_ref()
); );
let dat = std::fs::File::open(source)?; let dat = fs::File::open(source)?;
let tar = GzDecoder::new(dat); let tar = GzDecoder::new(dat);
let mut tgz = Archive::new(tar); let mut tgz = Archive::new(tar);
@ -106,7 +109,7 @@ pub fn extract<S: AsRef<Path>, P: AsRef<Path>>(
path.as_ref() path.as_ref()
); );
let dat = std::fs::File::open(source)?; let dat = fs::File::open(source)?;
let tar = XzDecoder::new(dat); let tar = XzDecoder::new(dat);
let mut txz = Archive::new(tar); let mut txz = Archive::new(tar);
@ -139,7 +142,7 @@ pub fn extract<S: AsRef<Path>, P: AsRef<Path>>(
path.as_ref() path.as_ref()
); );
let dat = std::fs::File::open(source)?; let dat = fs::File::open(source)?;
let mut zip = ZipArchive::new(dat)?; let mut zip = ZipArchive::new(dat)?;
zip.extract(path)?; zip.extract(path)?;
@ -151,7 +154,7 @@ pub fn extract<S: AsRef<Path>, P: AsRef<Path>>(
path.as_ref() path.as_ref()
); );
// Copy to install dir // Copy to install dir
std::fs::copy(source, path)?; fs::copy(source, path)?;
} }
}; };