Compare commits
3 Commits
ba2332ecb6
...
70e14ec63c
| Author | SHA1 | Date | |
|---|---|---|---|
|
70e14ec63c
|
|||
|
664ae1f7d3
|
|||
|
ae65322aa0
|
@@ -15,6 +15,7 @@ const GETSPECIFICSVGSQL string = "SELECT * FROM svg WHERE id = ?;"
|
||||
const GETSVGSQL string = "SELECT * FROM svg;"
|
||||
const DELETESVGSQL string = "DELETE FROM svg WHERE id = ?;"
|
||||
const RENAMESVGSQL string = "UPDATE svg SET name = ? WHERE id = ?;"
|
||||
const EXISTSSVGSQL string = "SELECT COUNT(*) FROM svg WHERE id = ?;"
|
||||
|
||||
func InsertSVG(data *svg.TemplateData) error {
|
||||
if _, err := database.Exec(INSERTSVGSQL, data.Id, data.Name); err != nil {
|
||||
@@ -93,3 +94,15 @@ func RenameSvg(id string, name string) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func Exists(id string) (bool, error) {
|
||||
res := database.QueryRow(EXISTSSVGSQL, id)
|
||||
|
||||
var count int
|
||||
|
||||
if err := res.Scan(&count); err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return count > 0, nil
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@ const GETSPECIFICSVGPAGESSQL string = "SELECT * FROM svgpage WHERE id = ?;"
|
||||
const DELETESVGPAGESQL string = "DELETE FROM svgpage WHERE id = ? AND page = ?;"
|
||||
const DELETEALLSVGPAGESQL string = "DELETE FROM svgpage WHERE id = ?;"
|
||||
const COUNTSVGPAGESQL string = "SELECT COUNT(*) FROM svgpage WHERE id = ?;"
|
||||
const UPDATEPAGESQL string = "UPDATE svgpage SET page = page - 1 WHERE page > ?;"
|
||||
|
||||
func InsertSVGPage(data *svg.TemplatePage) (int, error) {
|
||||
json, err := json.Marshal(data.TemplateKeys)
|
||||
@@ -86,6 +87,11 @@ func DeleteSVGPage(id string, page int) (bool, error) {
|
||||
if num == 0 {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
if err := movePages(id, page); err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return true, nil
|
||||
}
|
||||
|
||||
@@ -116,3 +122,8 @@ func GetPageCount(id string) (int, error) {
|
||||
|
||||
return count, nil
|
||||
}
|
||||
|
||||
func movePages(id string, deletedPage int) error {
|
||||
_, err := database.Exec(UPDATEPAGESQL, deletedPage)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
package routes
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"io"
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"tomatentum.net/svg-templater/pkg/svg"
|
||||
"tomatentum.net/svg-templater/pkg/svg/actions"
|
||||
)
|
||||
|
||||
func AddPage(w http.ResponseWriter, r *http.Request) {
|
||||
if err := r.ParseMultipartForm(128000000); err != nil {
|
||||
http.Error(w, "Couldn't parse form data.", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
fileheaders := r.MultipartForm.File["files"]
|
||||
|
||||
id := r.PathValue("id")
|
||||
|
||||
pages := make([]svg.TemplatePage, len(fileheaders))
|
||||
|
||||
for i, fileh := range fileheaders {
|
||||
file, err := fileh.Open()
|
||||
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
buf, err := io.ReadAll(file)
|
||||
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
page, err := actions.AddPage(id, buf)
|
||||
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
pages[i] = page
|
||||
}
|
||||
|
||||
err := json.NewEncoder(w).Encode(pages)
|
||||
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func DeletePage(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
id, pagestring := r.PathValue("id"), r.PathValue("page")
|
||||
|
||||
page, err := strconv.Atoi(pagestring)
|
||||
|
||||
if err != nil {
|
||||
http.Error(w, "Page must be a number", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
ok, err := actions.DeletePage(id, page)
|
||||
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if !ok {
|
||||
http.Error(w, "Could not delete page", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -43,6 +43,22 @@ func PrepareHTTP() {
|
||||
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||
|
||||
})
|
||||
|
||||
registerAuthorizedFunc("/svg/{id}/page/", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != "POST" {
|
||||
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
routes.AddPage(w, r)
|
||||
})
|
||||
|
||||
registerAuthorizedFunc("/svg/{id}/page/{page}", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != "DELETE" {
|
||||
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
routes.DeletePage(w, r)
|
||||
})
|
||||
registerAuthorizedFunc("/font/", func(w http.ResponseWriter, r *http.Request) {
|
||||
switch r.Method {
|
||||
case "GET":
|
||||
|
||||
@@ -2,6 +2,7 @@ package actions
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
@@ -15,6 +16,17 @@ import (
|
||||
const FILEFORMAT string = "%s-%d"
|
||||
|
||||
func AddPage(id string, svgbuf []byte) (svg.TemplatePage, error) {
|
||||
|
||||
exists, err := database.Exists(id)
|
||||
|
||||
if err != nil {
|
||||
return svg.TemplatePage{}, err
|
||||
}
|
||||
|
||||
if !exists {
|
||||
return svg.TemplatePage{}, errors.New("Template does not exist.")
|
||||
}
|
||||
|
||||
data := svg.TemplatePage{TemplateId: id}
|
||||
populateKeys(&data, svgbuf)
|
||||
|
||||
|
||||
@@ -10,11 +10,15 @@ import (
|
||||
)
|
||||
|
||||
func Create(svgbufs [][]byte, name string) (svg.TemplateData, error) {
|
||||
id := generateId()
|
||||
data := svg.TemplateData{Id: generateId(), Name: name}
|
||||
|
||||
if err := database.InsertSVG(&data); err != nil {
|
||||
return svg.TemplateData{}, err
|
||||
}
|
||||
|
||||
pages := make([]svg.TemplatePage, len(svgbufs))
|
||||
for i, pagebuf := range svgbufs {
|
||||
page, err := AddPage(id, pagebuf)
|
||||
page, err := AddPage(data.Id, pagebuf)
|
||||
|
||||
if err != nil {
|
||||
return svg.TemplateData{}, err
|
||||
@@ -23,11 +27,7 @@ func Create(svgbufs [][]byte, name string) (svg.TemplateData, error) {
|
||||
pages[i] = page
|
||||
}
|
||||
|
||||
data := svg.TemplateData{Id: id, Name: name, Pages: pages}
|
||||
|
||||
if err := database.InsertSVG(&data); err != nil {
|
||||
return svg.TemplateData{}, err
|
||||
}
|
||||
data.Pages = pages
|
||||
|
||||
log.Println("Created SVG Template " + data.Id)
|
||||
return data, nil
|
||||
|
||||
Reference in New Issue
Block a user