Merge remote-tracking branch 'origin/remove-tmp-files' into main

Author: root

.github/workflows/build.yml

@@ -28,7 +28,8 @@ jobs:
     # Setup Leiningen. Also supports setting up other commonly used tools.
     - name: Install clojure tools
       uses: DeLaGuardo/[email protected]
-      with: lein: 2.9.1
+      with:
+        lein: 2.9.1
       # Enable cache so our actions run faster.
     - name: Cache clojure dependencies
       uses: actions/cache@v3

src/clj/metafacture_playground/process.clj

@@ -1,6 +1,7 @@
 (ns metafacture-playground.process
   (:require
    [clojure.string :as clj-str]
+   [clojure.java.io :as io]
    [clojure.tools.logging :as log])
   (:import
    (java.io File)
@@ -20,17 +21,29 @@
         (log/trace "Content" content)
         file-path))))
 
+(defn- remove-temp-files [temp-files]
+  (doseq [temp-file temp-files]
+          (try
+            (let [file (io/file temp-file)]
+              (when (.exists file)
+                (io/delete-file file false)))
+            (catch Exception e
+              (log/warn "Could not delete temp file:" temp-file e)))))
 
 (defn process [flux data transformation]
-  (let [inputfile (content->tempfile-path data ".data")
-        transformationFile (content->tempfile-path transformation ".fix")
+  (let [input-file (content->tempfile-path data ".data")
+        transformation-file (content->tempfile-path transformation ".fix")
         out-path (content->tempfile-path "" ".txt")
         output (str "|write(\"" out-path "\");")
-        flux (-> (str "default inputFile = \"" inputfile "\";\n"
-                      "default transformationFile = \"" transformationFile "\";\n"
+        flux (-> (str "default inputFile = \"" input-file "\";\n"
+                      "default transformationFile = \"" transformation-file "\";\n"
                       flux)
                  (clj-str/replace #"\|(\s*|\n*)write\(\".*\"\)(\s*|\n*);" output)
-                 (clj-str/replace #"\|(\s*|\n*)print(\s*|\n*);" output))]
-    (Flux/main (into-array [(content->tempfile-path flux ".flux")]))
-    (log/info "Executed flux file with Flux/main. Result in" out-path)
-    (slurp out-path)))
+                 (clj-str/replace #"\|(\s*|\n*)print(\s*|\n*);" output))
+        flux-file (content->tempfile-path flux ".flux")]
+    (try
+      (Flux/main (into-array [flux-file]))
+      (log/info "Executed flux file with Flux/main. Result in" out-path)
+      (slurp out-path)
+      (finally
+        (remove-temp-files [input-file transformation-file flux-file out-path])))))