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 2025-09-25 01:06:55 -04:00
parent cecb0e3db3
commit 80bca69e5e
1 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/upload.rs
View file

@ -1,4 +1,4 @@
use std::{collections::HashSet, fs::File, io::Write, path::Path, path::Component}; use std::{collections::HashSet, fs::File, io::Write, path::Component, path::Path};
use actix::{fut::future::ActorFutureExt, Actor, ActorContext, AsyncContext, StreamHandler}; use actix::{fut::future::ActorFutureExt, Actor, ActorContext, AsyncContext, StreamHandler};
use actix_http::ws::{CloseReason, Item}; use actix_http::ws::{CloseReason, Item};
@ -30,28 +30,32 @@ fn sanitise_path_component(name: &str, extension_length: usize) -> String {
sanitise_with_options( sanitise_with_options(
&name, &name,
&SanOptions { &SanOptions {
length_limit: SanOptions::DEFAULT.length_limit.saturating_sub(extension_length), length_limit: SanOptions::DEFAULT
.length_limit
.saturating_sub(extension_length),
..SanOptions::DEFAULT ..SanOptions::DEFAULT
}, },
) )
} }
fn sanitise_path(path: &str) -> String { fn sanitise_path(path: &str) -> String {
let mut san_path = Path::new(path).components().rfold(String::new(), |subpath, c| { let mut san_path = Path::new(path)
if subpath.len() >= SanOptions::DEFAULT.length_limit*8 { .components()
return subpath; .rfold(String::new(), |subpath, c| {
} if subpath.len() >= SanOptions::DEFAULT.length_limit * 8 {
if let Component::Normal(s) = c { return subpath;
let mut component = sanitise_path_component(&s.to_string_lossy(), 0);
if !subpath.is_empty() {
component.push('/');
component.push_str(&subpath);
} }
component if let Component::Normal(s) = c {
} else { let mut component = sanitise_path_component(&s.to_string_lossy(), 0);
subpath if !subpath.is_empty() {
} component.push('/');
}); component.push_str(&subpath);
}
component
} else {
subpath
}
});
if san_path.is_empty() { if san_path.is_empty() {
san_path.push('_'); san_path.push('_');
} }
@ -306,8 +310,9 @@ impl Uploader {
if files.len() > 1 { if files.len() > 1 {
info!("Wrapping in zipfile generator"); info!("Wrapping in zipfile generator");
let now = OffsetDateTime::now_utc(); let now = OffsetDateTime::now_utc();
let collection_name = let collection_name = collection_name
collection_name.map(|f| sanitise_path_component(&f, 4)).unwrap_or_else(|| { .map(|f| sanitise_path_component(&f, 4))
.unwrap_or_else(|| {
super::APP_NAME.to_owned() super::APP_NAME.to_owned()
+ &now.format(FILENAME_DATE_FORMAT).unwrap() + &now.format(FILENAME_DATE_FORMAT).unwrap()
}); });