This commit is contained in:
+13
-21
@@ -1,25 +1,30 @@
|
||||
package actions
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/rand"
|
||||
"encoding/hex"
|
||||
"log"
|
||||
"regexp"
|
||||
|
||||
"tomatentum.net/svg-templater/internal/database"
|
||||
"tomatentum.net/svg-templater/pkg/svg"
|
||||
)
|
||||
|
||||
func Create(svgbuf []byte, name string) (svg.TemplateData, error) {
|
||||
data := svg.TemplateData{Id: generateId(), Name: name, TemplateKeys: nil}
|
||||
populateKeys(&data, svgbuf)
|
||||
func Create(svgbufs [][]byte, name string) (svg.TemplateData, error) {
|
||||
id := generateId()
|
||||
|
||||
_, err := svg.Storage.Create(data.Id, bytes.NewReader(svgbuf))
|
||||
if err != nil {
|
||||
return svg.TemplateData{}, err
|
||||
pages := make([]svg.TemplatePage, len(svgbufs))
|
||||
for i, pagebuf := range svgbufs {
|
||||
page, err := AddPage(id, pagebuf)
|
||||
|
||||
if err != nil {
|
||||
return svg.TemplateData{}, err
|
||||
}
|
||||
|
||||
pages[i] = page
|
||||
}
|
||||
|
||||
data := svg.TemplateData{Id: id, Name: name, Pages: pages}
|
||||
|
||||
if err := database.InsertSVG(&data); err != nil {
|
||||
return svg.TemplateData{}, err
|
||||
}
|
||||
@@ -28,19 +33,6 @@ func Create(svgbuf []byte, name string) (svg.TemplateData, error) {
|
||||
return data, nil
|
||||
}
|
||||
|
||||
func populateKeys(data *svg.TemplateData, svgblob []byte) {
|
||||
regex := regexp.MustCompile(svg.KeyRegex)
|
||||
result := regex.FindAllSubmatch(svgblob, -1)
|
||||
templateKeys := make([]string, len(result))
|
||||
|
||||
for i, matches := range result {
|
||||
varname := matches[1] // first capture group
|
||||
templateKeys[i] = string(varname)
|
||||
}
|
||||
data.TemplateKeys = templateKeys
|
||||
log.Println("Found keys:\n", templateKeys)
|
||||
}
|
||||
|
||||
func generateId() string {
|
||||
token := make([]byte, 16)
|
||||
if _, err := rand.Read(token); err != nil {
|
||||
|
||||
Reference in New Issue
Block a user