Merge pull request #311 from ponzu-cms/ponzu-dev

Merging ponzu-dev to master as v0.11.0

2 files changed, 43 insertions, 1 deletions

diff --git a/system/admin/filesystem.go b/system/admin/filesystem.go
index 77c721e..758966b 100644
--- a/system/admin/filesystem.go
+++ b/system/admin/filesystem.go
@@ -1,10 +1,41 @@
 package admin
 
 import (
+	"encoding/json"
 	"net/http"
 	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/ponzu-cms/ponzu/system/db"
+	"github.com/ponzu-cms/ponzu/system/item"
 )
 
+func deleteUploadFromDisk(target string) error {
+	// get data on file
+	data, err := db.Upload(target)
+	if err != nil {
+		return err
+	}
+
+	// unmarshal data
+	upload := item.FileUpload{}
+	if err = json.Unmarshal(data, &upload); err != nil {
+		return err
+	}
+
+	// split and rebuild path in OS friendly way
+	// use path to delete the physical file from disk
+	pathSplit := strings.Split(strings.TrimPrefix(upload.Path, "/api/"), "/")
+	pathJoin := filepath.Join(pathSplit...)
+	err = os.Remove(pathJoin)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func restrict(dir http.Dir) justFilesFilesystem {
 	return justFilesFilesystem{dir}
 }
diff --git a/system/admin/handlers.go b/system/admin/handlers.go
index d0818ec..8850f03 100644
--- a/system/admin/handlers.go
+++ b/system/admin/handlers.go
@@ -2200,7 +2200,18 @@ func deleteUploadHandler(res http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	err = db.DeleteUpload(t + ":" + id)
+	dbTarget := t + ":" + id
+
+	// delete from file system, if good, we continue to delete
+	// from database, if bad error 500
+	err = deleteUploadFromDisk(dbTarget)
+	if err != nil {
+		log.Println(err)
+		res.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	err = db.DeleteUpload(dbTarget)
 	if err != nil {
 		log.Println(err)
 		res.WriteHeader(http.StatusInternalServerError)