fix(trash)+refactor(file life cycle)

* fix issue with the empty trash (wasn't calling thumbnail clean up)
 * refactor file service life cycle (TrashService don't call directly ThumbnailService, but call the on_file_deleted() hook
 * remove unused mehod: _validate_user_ownership()
This commit is contained in:
Edouard Vanbelle
2026-05-21 23:56:14 +02:00
parent dd68d783e0
commit 76a85949e7
8 changed files with 123 additions and 85 deletions
@@ -29,8 +29,8 @@ pub struct FileManagementService {
trash_service: Option<Arc<TrashService>>,
content_cache: Option<Arc<FileContentCache>>,
authz: Arc<PgAclEngine>,
/// Hooks fired after a file is permanently deleted.
file_deleted_hooks: Vec<Arc<dyn FileDeletedHook>>,
/// Hook fired after a file is permanently deleted (typically the FileLifecycleService composite).
file_deleted_hook: Option<Arc<dyn FileDeletedHook>>,
}
impl FileManagementService {
@@ -52,13 +52,13 @@ impl FileManagementService {
trash_service,
content_cache,
authz,
file_deleted_hooks: Vec::new(),
file_deleted_hook: None,
}
}
/// Registers a hook to fire after a file is permanently deleted.
/// Sets the lifecycle hook fired after a file is permanently deleted.
pub fn with_file_deleted_hook(mut self, hook: Arc<dyn FileDeletedHook>) -> Self {
self.file_deleted_hooks.push(hook);
self.file_deleted_hook = Some(hook);
self
}
@@ -185,7 +185,7 @@ impl FileManagementService {
if let Some(cc) = &self.content_cache {
cc.invalidate(id).await;
}
for hook in &self.file_deleted_hooks {
if let Some(hook) = &self.file_deleted_hook {
hook.on_file_deleted(id).await;
}
info!("File permanently deleted: {}", id);