Remove files when resource is deleted #851

Author: Polleps

browser/data-browser/src/locales/en.po

@@ -1158,17 +1158,14 @@ msgid "Set {0} as current drive"
 msgstr "Set {0} as current drive"
 
 #: src/views/Drive/DrivePage.tsx
-#: src/views/DrivePage.tsx
 msgid "Set as current drive"
 msgstr "Set as current drive"
 
 #: src/views/Drive/DrivePage.tsx
-#: src/views/DrivePage.tsx
 msgid "Default Ontology"
 msgstr "Default Ontology"
 
 #: src/views/Drive/DrivePage.tsx
-#: src/views/DrivePage.tsx
 msgid ""
 "You are running Atomic-Server on `localhost`, which means that it\n"
 "will not be available from any other machine than your current local\n"
@@ -3180,23 +3177,11 @@ msgstr "Plugins"
 msgid "Add Plugin"
 msgstr "Add Plugin"
 
-#~ msgid "<0/> Add Plugin"
-#~ msgstr "<0/> Add Plugin"
-
-#~ msgid "New Plugin"
-#~ msgstr "New Plugin"
-
 #: src/views/Drive/NewPluginButton.tsx
 #: src/views/Drive/NewPluginButton.tsx
 msgid "<0/> Upload Plugin"
 msgstr "<0/> Upload Plugin"
 
-#~ msgid "Invalid plugin zip file. It must contain plugin.wasm and plugin.json at the root, and optionally an assets folder."
-#~ msgstr "Invalid plugin zip file. It must contain plugin.wasm and plugin.json at the root, and optionally an assets folder."
-
-#~ msgid "Invalid plugin zip file."
-#~ msgstr "Invalid plugin zip file."
-
 #. placeholder {0}: metadata.version
 #. placeholder {0}: resource.props.version
 #: src/views/Drive/NewPluginButton.tsx
@@ -3211,9 +3196,6 @@ msgstr "v{0}"
 msgid "by {0}"
 msgstr "by {0}"
 
-#~ msgid "Configure"
-#~ msgstr "Configure"
-
 #: src/routes/SettingsAgent.tsx
 msgid "Cannot fill subject and privatekey fields."
 msgstr "Cannot fill subject and privatekey fields."
@@ -3315,9 +3297,6 @@ msgstr "Invalid URI"
 msgid "Content saved"
 msgstr "Content saved"
 
-#~ msgid "Config <0/>"
-#~ msgstr "Config <0/>"
-
 #: src/views/Drive/NewPluginButton.tsx
 #: src/views/Plugin/PluginPage.tsx
 msgid "Config"
@@ -3343,33 +3322,15 @@ msgstr "Install"
 msgid "Please fill in all fields"
 msgstr "Please fill in all fields"
 
-#~ msgid "Failed to create plugin resource, error: {0}"
-#~ msgstr "Failed to create plugin resource, error: {0}"
-
 #. placeholder {0}: err.message
 #: src/views/Drive/NewPluginButton.tsx
 msgid "Failed to install plugin, error: {0}"
 msgstr "Failed to install plugin, error: {0}"
 
-#~ msgid "Go to plugin"
-#~ msgstr "Go to plugin"
-
-#~ msgid "<0/>Save"
-#~ msgstr "<0/>Save"
-
-#~ msgid "Update"
-#~ msgstr "Update"
-
 #: src/views/Plugin/PluginPage.tsx
 msgid "Uninstall"
 msgstr "Uninstall"
 
-#~ msgid "<0/>Update"
-#~ msgstr "<0/>Update"
-
-#~ msgid "<0/>Uninstall"
-#~ msgstr "<0/>Uninstall"
-
 #: src/views/Plugin/PluginPage.tsx
 msgid "<0/> Update"
 msgstr "<0/> Update"

server/src/appstate.rs

@@ -62,6 +62,9 @@ impl AppState {
         store.add_class_extender(plugins::plugin::build_plugin_extender(
             config.plugin_path.clone(),
         ))?;
+        store.add_class_extender(plugins::files::build_file_extender(
+            config.uploads_path.clone(),
+        ))?;
 
         // Register all built-in endpoints
         store.add_endpoint(plugins::versioning::version_endpoint())?;

server/src/plugins/files.rs

@@ -1,4 +1,11 @@
-use atomic_lib::{endpoints::Endpoint, urls};
+use std::path::PathBuf;
+
+use atomic_lib::{
+    class_extender::{BoxFuture, ClassExtender, ClassExtenderScope, CommitExtenderContext},
+    endpoints::Endpoint,
+    errors::AtomicResult,
+    urls, AtomicError, Storelike, Value,
+};
 
 pub fn upload_endpoint() -> Endpoint {
     Endpoint {
@@ -33,3 +40,55 @@ The following query parameters are available:
         handle_post: None,
     }
 }
+
+// Removes the file from the filesystem after the resource has been deleted.
+fn on_after_commit(
+    context: CommitExtenderContext,
+    uploads_dir: PathBuf,
+) -> BoxFuture<AtomicResult<()>> {
+    Box::pin(async move {
+        let CommitExtenderContext {
+            store,
+            commit,
+            resource,
+        } = context;
+
+        if commit.destroy != Some(true) {
+            return Ok(());
+        }
+
+        let Ok(Value::String(file_name)) = resource.get(urls::INTERNAL_ID) else {
+            return Ok(());
+        };
+
+        let correct_subject = format!("{}/files/{}", store.get_server_url()?, file_name);
+
+        if resource.get_subject() != &correct_subject {
+            return Err(AtomicError::from(format!(
+                "Internal ID {} does not match resource subject {}",
+                file_name,
+                resource.get_subject()
+            )));
+        }
+
+        let file_path = uploads_dir.join(file_name);
+        if file_path.exists() {
+            std::fs::remove_file(file_path)?;
+        }
+
+        Ok(())
+    })
+}
+
+pub fn build_file_extender(uploads_dir: PathBuf) -> ClassExtender {
+    ClassExtender {
+        id: Some("file".to_string()),
+        classes: vec![urls::FILE.to_string()],
+        on_resource_get: None,
+        before_commit: None,
+        after_commit: Some(ClassExtender::wrap_commit_handler(move |context| {
+            on_after_commit(context, uploads_dir.clone())
+        })),
+        scope: ClassExtenderScope::Global,
+    }
+}