Merge pull request 'Add template delete functionality' (#13) from feat/delete into dev

Reviewed-on: #13

internal/database/database.go

@@ -32,5 +32,8 @@ func InitDB() {
 }
 
 func Close() error {
+	if database == nil {
+		return nil
+	}
 	return database.Close()
 }

internal/database/svgdb.go

@@ -15,6 +15,7 @@ const SVGTABLECREATE string = `
 const INSERTSVGSQL string = "INSERT INTO svg VALUES (?, ?);"
 const GETSPECIFICSVGSQL string = "SELECT * FROM svg WHERE name = ?;"
 const GETSVGSQL string = "SELECT * FROM svg;"
+const DELETESVGSQL string = "DELETE FROM svg WHERE name = ?;"
 
 func InsertSVG(data *svg.TemplateData) error {
 	json, err := json.Marshal(data.TemplateKeys)
@@ -72,3 +73,19 @@ func GetSpecificSVG(id string) (svg.TemplateData, error) {
 	}
 	return svg.TemplateData{Id: id, TemplateKeys: keys}, nil
 }
+
+func DeleteSvg(id string) (bool, error) {
+	res, err := database.Exec(DELETESVGSQL, id)
+	if err != nil {
+		return false, err
+	}
+	num, err := res.RowsAffected()
+	if err != nil {
+		return false, err
+	}
+
+	if num == 0 {
+		return false, nil
+	}
+	return true, nil
+}

internal/routes/delete.go

@@ -0,0 +1,26 @@
+package routes
+
+import (
+	"net/http"
+
+	"tomatentum.net/svg-templater/pkg/svg/actions"
+)
+
+func DeleteSvg(writer http.ResponseWriter, reader *http.Request) {
+
+	id := reader.PathValue("id")
+	if id == "" {
+		http.Error(writer, "No ID provided", http.StatusBadRequest)
+		return
+	}
+
+	success, err := actions.Delete(id)
+	if err != nil {
+		http.Error(writer, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	if !success {
+		http.Error(writer, "No template to delete.", http.StatusBadRequest)
+		return
+	}
+}

internal/routes/upload.go

@@ -41,7 +41,6 @@ func CreateSVG(writer http.ResponseWriter, r *http.Request) {
 
 	writer.Header().Add("Content-Type", "application/json")
 	json.NewEncoder(writer).Encode(data)
-	log.Println("Created SVG Template " + data.Id)
 }
 
 func validateSVG(svgbuf []byte) (bool, error) {

internal/server/http.go

@@ -22,11 +22,16 @@ func PrepareHTTP() {
 		routes.CreateSVG(w, r)
 	})
 	registerAuthorizedFunc("/svg/{id}", func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != "GET" {
+		switch r.Method {
-			http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+		case "GET":
+			routes.DownloadSVG(w, r)
+			return
+		case "DELETE":
+			routes.DeleteSvg(w, r)
 			return
 		}
-		routes.DownloadSVG(w, r)
+		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+
 	})
 	registerAuthorizedFunc("/font/", func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {

pkg/svg/actions/delete.go

@@ -0,0 +1,20 @@
+package actions
+
+import (
+	"log"
+
+	"tomatentum.net/svg-templater/internal/database"
+	"tomatentum.net/svg-templater/pkg/svg"
+)
+
+func Delete(id string) (bool, error) {
+	if success, err := database.DeleteSvg(id); err != nil || !success {
+		return success, err
+	}
+
+	if err := svg.Storage.Delete(id); err != nil {
+		return false, err
+	}
+	log.Println("Deleted SVG Template " + id)
+	return true, nil
+}

pkg/svg/actions/upload.go

@@ -24,6 +24,7 @@ func Create(svgbuf []byte) (svg.TemplateData, error) {
 		return svg.TemplateData{}, err
 	}
 
+	log.Println("Created SVG Template " + data.Id)
 	return data, nil
 }
 

pkg/svg/storage.go

@@ -15,6 +15,7 @@ import (
 type SvgStorage interface {
 	Create(id string, svg io.Reader) (string, error)
 	Get(id string) (io.ReadCloser, error)
+	Delete(id string) error
 	AddFont(reader io.Reader, format string) error
 	GetFonts() ([]string, error)
 	GetFontsDir() (string, error)
@@ -68,6 +69,12 @@ func (f FileSvgStorage) Get(id string) (io.ReadCloser, error) {
 	return file, nil
 }
 
+func (f FileSvgStorage) Delete(id string) error {
+	path := filepath.Join(f.basepath, id+".svg")
+	defer log.Println("Deleted File: " + path)
+	return os.Remove(path)
+}
+
 func (f FileSvgStorage) CreatePublic(data io.Reader, filetype string) (string, error) {
 	path := filepath.Join(f.basepath, f.publicSubPath)
 	if err := os.MkdirAll(path, 0755); err != nil {