xenofem/transbeam
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Wiki Activity

cargo fmt

Browse source
This commit is contained in:
xenofem 2022-07-05 19:28:25 -04:00
parent e05886aac5
commit 446c0f0264
3 changed files with 77 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/upload.rs
View file

@ -290,30 +290,37 @@ impl Uploader {
.write(true)
.create_new(true)
.open(&storage_path)?;
let (writer, name, size, modtime, contents): (Box<dyn Write>, _, _, _, _) = if files.len() > 1 {
info!("Wrapping in zipfile generator");
let now = OffsetDateTime::now_utc();
let collection_name =
collection_name.map(|f| sanitise(&f, 4)).unwrap_or_else(|| {
super::APP_NAME.to_owned() + &now.format(FILENAME_DATE_FORMAT).unwrap()
});
let file_set = FileSet {
files,
directory_name: Some(collection_name.clone()),
let (writer, name, size, modtime, contents): (Box<dyn Write>, _, _, _, _) =
if files.len() > 1 {
info!("Wrapping in zipfile generator");
let now = OffsetDateTime::now_utc();
let collection_name =
collection_name.map(|f| sanitise(&f, 4)).unwrap_or_else(|| {
super::APP_NAME.to_owned()
+ &now.format(FILENAME_DATE_FORMAT).unwrap()
});
let file_set = FileSet {
files,
directory_name: Some(collection_name.clone()),
};
let zip_writer = super::zip::ZipGenerator::new(file_set.clone(), writer);
let size = zip_writer.total_size();
(
Box::new(zip_writer),
collection_name + ".zip",
size,
now,
Some(file_set),
)
} else {
(
Box::new(writer),
files[0].name.clone(),
files[0].size,
files[0].modtime,
None,
)
};
let zip_writer =
super::zip::ZipGenerator::new(file_set.clone(), writer);
let size = zip_writer.total_size();
(Box::new(zip_writer), collection_name + ".zip", size, now, Some(file_set))
} else {
(
Box::new(writer),
files[0].name.clone(),
files[0].size,
files[0].modtime,
None
)
};
self.writer = Some(writer);
let stored_file = StoredFile {
name,