Auto clean up and use temp folder

Author: ericwang401

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 on:
     push:
         tags:
-            - 'v*'
+            - 'v*.*.*'
 
 jobs:
     release:

src-tauri/Cargo.lock

@@ -23,6 +23,7 @@ reqwest = "0.11.20"
 zip-extract = "0.1.2"
 uuid = { version = "1.4.1", features = ["v4", "fast-rng"] }
 csv = "1.3.0"
+tempfile = "3.10.1"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

src-tauri/Cargo.toml

@@ -2,6 +2,7 @@ use std::io::Cursor;
 use std::path::PathBuf;
 use csv::ReaderBuilder;
 use tokio::fs;
+use tokio::fs::remove_file;
 
 pub struct Calculation {
     pub protein: String,
@@ -25,6 +26,8 @@ pub async fn aggregate(spreadsheets: &Vec<(PathBuf, u64)>) -> Result<Vec<Calcula
     for spreadsheet in spreadsheets {
         let mut spreadsheet_calculations = parse_calculations(spreadsheet).await?;
         calculations.append(&mut spreadsheet_calculations);
+
+        remove_file(&spreadsheet.0).await?;
     }
 
     Ok(calculations)

src-tauri/src/aggregator.rs

@@ -1,4 +1,5 @@
 use std::path::{Path, PathBuf};
+use tokio::fs::remove_file;
 use tokio::process::Command;
 use crate::serializer::Dataset;
 
@@ -27,6 +28,9 @@ async fn analyze_single(deps_dir: &Path, data_dir: &Path, dataset: &Dataset) ->
         .await
         .map_err(|err| format!("Command couldn't run: {err}"))?;
 
+    remove_file(&dataset.heavy_water).await.map_err(|err| format!("Couldn't delete heavy water file: {err}"))?;
+    remove_file(&dataset.spreadsheet).await.map_err(|err| format!("Couldn't delete spreadsheet file: {err}"))?;
+
     if output.status.success() {
         Ok((data_dir.join(format!("{input_file_name}.RateConst.csv")), dataset.samples_removed))
     } else {

src-tauri/src/analyzer.rs

@@ -1,3 +1,4 @@
+use std::env::temp_dir;
 use std::io::Cursor;
 use std::path::Path;
 
@@ -48,11 +49,9 @@ pub async fn process_data(
     tolerance_multiplier: f64,
     input_file_path: String,
 ) -> Result<(), String> {
-    let data_dir = app_handle
-        .path_resolver()
-        .app_local_data_dir()
-        .unwrap()
-        .join("data");
+    let temp_dir = tempfile::tempdir().map_err(|e| e.to_string())?;
+    let data_dir = temp_dir.path().join("data");
+    dbg!(temp_dir.path());
     let dependencies_dir = app_handle
         .path_resolver()
         .app_local_data_dir()
@@ -96,6 +95,6 @@ pub async fn process_data(
         serialize_calculations(&file_path, &calculations).map_err(|e| e.to_string())?;
     }
 
-
+    temp_dir.close().map_err(|e| e.to_string())?;
     Ok(())
 }