summaryrefslogtreecommitdiff
path: root/system/admin/handlers.go
diff options
context:
space:
mode:
authorOllie Phillips <oliver@eantics.co.uk>2019-03-25 22:51:15 +0000
committerOllie Phillips <oliver@eantics.co.uk>2019-03-25 22:51:15 +0000
commit9ea64498a0752d261e45f15e45843ef09c506cf9 (patch)
treeaa9b1ca113a5f73abd8b9aabb19174ad68e8a0f5 /system/admin/handlers.go
parent20da628b140cd90b5937c412a8fa6670389bff38 (diff)
delete physical upload from disk
Diffstat (limited to 'system/admin/handlers.go')
-rw-r--r--system/admin/handlers.go22
1 files changed, 3 insertions, 19 deletions
diff --git a/system/admin/handlers.go b/system/admin/handlers.go
index c47755f..40477fa 100644
--- a/system/admin/handlers.go
+++ b/system/admin/handlers.go
@@ -8,7 +8,6 @@ import (
"fmt"
"log"
"net/http"
- "os"
"strconv"
"strings"
"time"
@@ -2201,24 +2200,9 @@ func deleteUploadHandler(res http.ResponseWriter, req *http.Request) {
return
}
- // get upload data
- upload := item.FileUpload{}
- data, err := db.Upload(t + ":" + id)
- if err != nil {
- log.Println(err)
- res.WriteHeader(http.StatusInternalServerError)
- return
- }
-
- if err = json.Unmarshal(data, &upload); err != nil {
- log.Println(err)
- res.WriteHeader(http.StatusInternalServerError)
- return
- }
-
- // use path to delete the physical file from disk
- delPath := strings.Replace(upload.Path, "/api/", "./", 1)
- err = os.Remove(delPath)
+ // delete from file system, if good, we continue to delete
+ // from database, if bad error 500
+ err = deleteUploadFromDisk(t + ":" + id)
if err != nil {
log.Println(err)
res.WriteHeader(http.StatusInternalServerError)