fionera
/
datatrash
forked from neri/datatrash
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor: construct filepaths more idiomatically

This commit is contained in:
neri 2023-01-23 11:23:48 +01:00
parent e538d93d80
commit 900d9ac449
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/download.rs
View File

@ -37,8 +37,7 @@ pub async fn download(
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
let id = req.match_info().query("id"); let id = req.match_info().query("id");
let (file_id, file_name, valid_till, content_type, delete) = load_file_info(id, &db).await?; let (file_id, file_name, valid_till, content_type, delete) = load_file_info(id, &db).await?;
let mut path = config.files_dir.clone(); let path = config.files_dir.join(&file_id);
path.push(&file_id);
let mime = Mime::from_str(&content_type).unwrap_or(APPLICATION_OCTET_STREAM); let mime = Mime::from_str(&content_type).unwrap_or(APPLICATION_OCTET_STREAM);
let mut response = match get_view_type(&req, &mime, &path, delete).await { let mut response = match get_view_type(&req, &mime, &path, delete).await {

3
src/upload.rs
View File

@ -103,8 +103,7 @@ async fn create_unique_file(
) -> Result<(String, PathBuf), std::io::Error> { ) -> Result<(String, PathBuf), std::io::Error> {
loop { loop {
let file_id = gen_file_id(); let file_id = gen_file_id();
let mut file_path = config.files_dir.clone(); let file_path = config.files_dir.join(&file_id);
file_path.push(&file_id);
match OpenOptions::new() match OpenOptions::new()
.write(true) .write(true)
.create_new(true) .create_new(true)