schrottkatze/karton
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 2 Packages Wiki Activity

fixes #6 adding the size of the attached file

Browse source
This commit is contained in:
dvdsk 2022-07-13 23:50:10 +02:00
parent 0687f44137
commit 39233e9447
No known key found for this signature in database
GPG key ID: 6CF9D20C5709A836
6 changed files with 32 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/util/misc.rs
View file

@ -3,7 +3,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
use linkify::{LinkFinder, LinkKind};
use std::fs;
use crate::{dbio, Pasta};
use crate::{dbio, pasta::PastaFile, Pasta};
pub fn remove_expired(pastas: &mut Vec<Pasta>) {
// get current time - this will be needed to check which pastas have expired
@ -22,20 +22,17 @@ pub fn remove_expired(pastas: &mut Vec<Pasta>) {
true
} else {
// remove the file itself
match fs::remove_file(format!("./pasta_data/{}/{}", p.id_as_animals(), p.file)) {
Ok(_) => {}
Err(_) => {
log::error!("Failed to delete file {}!", p.file)
if let Some(PastaFile { name, .. }) = &p.file {
if fs::remove_file(format!("./pasta_data/{}/{}", p.id_as_animals(), name)).is_err()
{
log::error!("Failed to delete file {}!", name)
}
// and remove the containing directory
if fs::remove_dir(format!("./pasta_data/{}/", p.id_as_animals())).is_err() {
log::error!("Failed to delete directory {}!", name)
}
}
// and remove the containing directory
match fs::remove_dir(format!("./pasta_data/{}/", p.id_as_animals())) {
Ok(_) => {}
Err(_) => {
log::error!("Failed to delete directory {}!", p.file)
}
}
// remove
false
}
});