From 2f5bb2ff36db697dcf36b5137a0289c286fb9c7a Mon Sep 17 00:00:00 2001
From: Justin Hawkins <justin@hawkins.id.au>
Date: Wed, 29 Dec 2021 21:55:29 +1030
Subject: [PATCH] Cleanup temp files and return to upload page after editing.

---
 upload/upload.go     | 10 +++++++---
 web/data/editor.html |  1 +
 web/server.go        |  1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/upload/upload.go b/upload/upload.go
index 8c4f1fb..b45dc5a 100644
--- a/upload/upload.go
+++ b/upload/upload.go
@@ -111,6 +111,12 @@ func (u *Uploader) UploadById(id int32) *Upload {
 	return nil
 }
 
+func (u *Upload) RemoveMarkupTempFile() {
+	if len(u.MarkedUpFilename) > 0 {
+		os.Remove(u.MarkedUpFilename)
+	}
+}
+
 func (u *Upload) processUpload() error {
 	daulog.SendLog(fmt.Sprintf("Uploading: %s", u.OriginalFilename), daulog.LogTypeInfo)
 
@@ -264,9 +270,7 @@ func (u *Upload) processUpload() error {
 	}
 
 	// remove any marked up file
-	if len(u.MarkedUpFilename) > 0 {
-		os.Remove(u.MarkedUpFilename)
-	}
+	u.RemoveMarkupTempFile()
 
 	if retriesRemaining == 0 {
 		daulog.SendLog("Failed to upload, even after all retries", daulog.LogTypeError)
diff --git a/web/data/editor.html b/web/data/editor.html
index 43c1bcc..d2f95a0 100644
--- a/web/data/editor.html
+++ b/web/data/editor.html
@@ -148,6 +148,7 @@ function editor() {
           .then(response => response.json())  // convert to json
           .then(json => {
             console.log(json);
+            window.location = '/uploads.html';
           })
 
     }
diff --git a/web/server.go b/web/server.go
index d79b5e6..41a8a18 100644
--- a/web/server.go
+++ b/web/server.go
@@ -273,6 +273,7 @@ func (ws *WebService) modifyUpload(w http.ResponseWriter, r *http.Request) {
 				return
 			} else if change == "skip" {
 				anUpload.State = upload.StateSkipped
+				anUpload.RemoveMarkupTempFile()
 				res := StartUploadResponse{Success: true, Message: "upload skipped"}
 				resString, _ := json.Marshal(res)
 				w.Write(resString)