feat(template): add Fileserver for download

cmd/svg-templater/main.go

@@ -5,9 +5,13 @@ import (
 
 	"tomatentum.net/svg-templater/internal/command"
 	"tomatentum.net/svg-templater/internal/database"
+	"tomatentum.net/svg-templater/pkg/format"
 )
 
 func main() {
+	if !format.CheckInkscape() {
+		panic("Inkscape not found")
+	}
 	if err := database.OpenSQLite(); err != nil {
 		log.Fatal("Failed opening DB:\n", err)
 		return

go.mod

@@ -4,13 +4,11 @@ go 1.24.9
 
 require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/glebarez/go-sqlite v1.22.0
+	github.com/glebarez/go-sqlite v1.22.0 // indirect
 	github.com/google/uuid v1.5.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	golang.org/x/image v0.36.0
 	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/text v0.34.0 // indirect
 	modernc.org/libc v1.37.6 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.7.2 // indirect

go.sum

@@ -8,13 +8,9 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-golang.org/x/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc=
-golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
-golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
 modernc.org/libc v1.37.6 h1:orZH3c5wmhIQFTXF+Nt+eeauyd+ZIt2BX6ARe+kD+aw=
 modernc.org/libc v1.37.6/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=

internal/command/commandline.go

@@ -30,7 +30,7 @@ func HandleCommandline() {
 	} else if help {
 		flag.PrintDefaults()
 	} else {
-		svg.Storage = svg.NewFileStorage(datapath, "fonts")
+		svg.Storage = svg.NewFileStorage(datapath, "public")
 		server.PrepareHTTP()
 		server.Start()
 	}

internal/routes/font.go

@@ -1,45 +0,0 @@
-package routes
-
-import (
-	"encoding/json"
-	"log"
-	"net/http"
-	"strings"
-
-	"tomatentum.net/svg-templater/pkg/svg"
-)
-
-func AddFont(w http.ResponseWriter, r *http.Request) {
-	contentType := r.Header.Get("Content-Type")
-	if contentType != "font/ttf" && contentType != "font/otf" {
-		http.Error(w, "", http.StatusUnsupportedMediaType)
-		return
-	}
-	log.Println("Received font add request")
-	format := strings.TrimPrefix(contentType, "font/")
-
-	if err := svg.Storage.AddFont(r.Body, format); err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		log.Println(err)
-		return
-	}
-}
-
-func GetFonts(w http.ResponseWriter, r *http.Request) {
-	log.Println("Serving all available fonts")
-	fonts, err := svg.Storage.GetFonts()
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		log.Println(err)
-		return
-	}
-
-	json, err := json.Marshal(fonts)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		log.Println(err)
-		return
-	}
-	w.Header().Add("Content-Type", "application/json")
-	w.Write(json)
-}

internal/server/http.go

@@ -4,30 +4,26 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"path/filepath"
 
 	"tomatentum.net/svg-templater/internal/routes"
 	"tomatentum.net/svg-templater/pkg/auth"
+	"tomatentum.net/svg-templater/pkg/svg"
 )
 
 func PrepareHTTP() {
-	registerAuthorized("/", func(w http.ResponseWriter, r *http.Request) {
+	registerAuthorizedFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintln(w, "You are authorized!")
 	})
-	registerAuthorized("/svg/", func(w http.ResponseWriter, r *http.Request) {
+	registerAuthorizedFunc("/svg/", func(w http.ResponseWriter, r *http.Request) {
 		if r.Method != "POST" {
 			http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
 			return
 		}
 		routes.CreateSVG(w, *r)
 	})
-	registerAuthorized("/font/", func(w http.ResponseWriter, r *http.Request) {
+
-		switch r.Method {
+	registerAuthorized("/public/", http.StripPrefix("/public/", http.FileServer(svg.Storage.GetPublicDir())))
-		case "GET":
-			routes.GetFonts(w, r)
-		case "POST":
-			routes.AddFont(w, r)
-		}
-	})
 }
 
 func Start() {
@@ -37,7 +33,15 @@ func Start() {
 	}
 }
 
-func registerAuthorized(path string, f func(w http.ResponseWriter, r *http.Request)) {
+func registerAuthorized(path string, handler http.Handler) {
-	http.HandleFunc(path, auth.AuthMiddleware(http.HandlerFunc(f)))
+	http.HandleFunc(path, auth.AuthMiddleware(handler))
 	log.Println("Registered authorized handler for", path)
 }
+
+func registerAuthorizedFunc(path string, f func(w http.ResponseWriter, r *http.Request)) {
+	registerAuthorized(path, http.HandlerFunc(f))
+}
+
+func GetPublicPath(path string) string {
+	return filepath.Join("public", path)
+}

pkg/format/formatconverter.go

@@ -0,0 +1,97 @@
+package format
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"tomatentum.net/svg-templater/pkg/svg"
+)
+
+type ConversionParameters struct {
+	Format        string
+	Width, Height int
+}
+
+func ConvertByte(svgblob []byte, param ConversionParameters) ([]byte, error) {
+	reader, err := ConvertReader(svgblob, param)
+	if err != nil {
+		return nil, err
+	}
+	defer reader.Close()
+
+	result, err := io.ReadAll(reader)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+func ConvertReader(svgblob []byte, param ConversionParameters) (io.ReadCloser, error) {
+	if param.Format == "svg" {
+		return io.NopCloser(bytes.NewReader(svgblob)), nil
+	}
+	file, err := svg.CreateTemp(bytes.NewReader(svgblob), "svg")
+	if err != nil {
+		return nil, err
+	}
+	defer os.Remove(file)
+
+	return runCommand(file, param)
+}
+
+func runCommand(input string, param ConversionParameters) (io.ReadCloser, error) {
+	var args []string
+
+	var outExt string
+	switch param.Format {
+	case "png":
+		args = append(args, "--export-type=png")
+		outExt = ".png"
+	case "jpg":
+		args = append(args, "--export-type=png") // inkscape doesn't export jpg directly
+		outExt = ".png"
+	case "pdf":
+		args = append(args, "--export-type=pdf")
+		outExt = ".pdf"
+	default:
+		return nil, fmt.Errorf("format not supported: %s", param.Format)
+	}
+
+	if param.Width > 0 {
+		args = append(args, "-w", strconv.Itoa(param.Width))
+	}
+	if param.Height > 0 {
+		args = append(args, "-h", strconv.Itoa(param.Height))
+	}
+
+	outFile := strings.TrimSuffix(input, filepath.Ext(input)) + outExt
+	args = append(args, "-o", outFile)
+	args = append(args, input)
+
+	cmd := exec.Command("/opt/homebrew/bin/inkscape", args...)
+	cmd.Dir = svg.TempDir
+
+	out, err := cmd.CombinedOutput()
+
+	if err != nil {
+		return nil, fmt.Errorf("inkscape failed: %w: %s", err, string(out))
+	}
+
+	file, err := os.Open(outFile)
+	if err != nil {
+		return nil, err
+	}
+
+	return file, nil
+}
+
+func CheckInkscape() bool {
+	_, err := exec.LookPath("inkscape")
+	return err == nil
+}

pkg/svg/storage.go

@@ -1,40 +1,35 @@
 package svg
 
 import (
-	"errors"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"path/filepath"
-	"strings"
-
-	"golang.org/x/image/font/sfnt"
 )
 
 type SvgStorage interface {
 	Create(id string, svg io.Reader) (string, error)
-	Get(id string) (io.Reader, error)
+	Get(id string) (io.ReadCloser, error)
-	AddFont(reader io.Reader, format string) error
+	CreatePublic(data io.Reader, filetype string) (string, error)
-	GetFonts() ([]string, error)
+	GetPublic(path string) (io.ReadCloser, error)
-	GetFontsDir() (string, error)
+	GetPublicDir() http.Dir
 }
 
+var _ SvgStorage = FileSvgStorage{}
+var TempDir string = ""
+
 type FileSvgStorage struct {
-	basepath     string
+	basepath, publicSubPath string
-	fontssubpath string
 }
 
-func NewFileStorage(path string, fontssubpath string) *FileSvgStorage {
+func NewFileStorage(path, publicSubPath string) *FileSvgStorage {
 	err := os.MkdirAll(path, 0755)
 	if err != nil {
 		panic(err)
 	}
-	err = os.MkdirAll(filepath.Join(path, fontssubpath), 0755)
-	if err != nil {
-		panic(err)
-	}
 	log.Println("Initialized file storage handler")
-	return &FileSvgStorage{path, fontssubpath}
+	return &FileSvgStorage{path, publicSubPath}
 }
 
 func (f FileSvgStorage) Create(id string, svg io.Reader) (string, error) {
@@ -54,70 +49,51 @@ func (f FileSvgStorage) Create(id string, svg io.Reader) (string, error) {
 	return file.Name(), nil
 }
 
-func (f FileSvgStorage) Get(id string) (io.Reader, error) {
+func (f FileSvgStorage) Get(id string) (io.ReadCloser, error) {
-	file, err := os.Open(filepath.Join(f.basepath, "svg", id+".svg"))
+	file, err := os.Open(filepath.Join(f.basepath, id+".svg"))
 	if err != nil {
 		return nil, err
 	}
 	return file, nil
 }
 
-func (f FileSvgStorage) AddFont(fontreader io.Reader, format string) error {
+func (f FileSvgStorage) CreatePublic(data io.Reader, filetype string) (string, error) {
-	if format != "ttf" && format != "otf" {
+	path := filepath.Join(f.basepath, f.publicSubPath)
-		return errors.New("Format not supported")
+	if err := os.Mkdir(path, 0755); err != nil {
+		return "", err
 	}
-	file, err := os.CreateTemp(filepath.Join(f.basepath, f.fontssubpath), "*."+format)
+
+	file, err := os.CreateTemp(path, "*."+filetype)
 	if err != nil {
-		return err
+		return "", err
 	}
 	defer file.Close()
-	log.Printf("Writing %s font to %s\n", format, file.Name())
+
-	_, err = io.Copy(file, fontreader)
+	return file.Name(), nil
-	if err != nil {
-		return err
-	}
-	return nil
 }
 
-func (f FileSvgStorage) GetFonts() ([]string, error) {
+func (f FileSvgStorage) GetPublic(path string) (io.ReadCloser, error) {
-	path := filepath.Join(f.basepath, f.fontssubpath)
+	file, err := os.Open(filepath.Join(f.basepath, f.publicSubPath, path))
-	entries, err := os.ReadDir(path)
 	if err != nil {
 		return nil, err
 	}
-	fonts := make([]string, len(entries))
+	return file, nil
-	for i, entry := range entries {
-		if entry.IsDir() {
-			continue
-		}
-		if strings.HasSuffix(entry.Name(), ".ttf") || strings.HasSuffix(entry.Name(), ".otf") {
-			fontblob, err := os.ReadFile(filepath.Join(path, entry.Name()))
-			if err != nil {
-				return nil, err
-			}
-			fontname, err := getFontName(fontblob)
-			if err != nil {
-				return nil, err
-			}
-			fonts[i] = fontname
-		}
-	}
-	log.Printf("Got fonts \n%s\n", strings.Join(fonts, "\n"))
-	return fonts, nil
 }
 
-func (f FileSvgStorage) GetFontsDir() (string, error) {
+func (f FileSvgStorage) GetPublicDir() http.Dir {
-	return filepath.Join(f.basepath, f.fontssubpath), nil
+	return http.Dir(filepath.Join(f.basepath, f.publicSubPath))
 }
 
-func getFontName(svgblob []byte) (string, error) {
+func CreateTemp(data io.Reader, filetype string) (string, error) {
-	font, err := sfnt.Parse(svgblob)
+	file, err := os.CreateTemp(TempDir, "*."+filetype)
 	if err != nil {
 		return "", err
 	}
-	name, err := font.Name(nil, sfnt.NameIDFull)
+	defer file.Close()
+	_, err = io.Copy(file, data)
 	if err != nil {
 		return "", err
 	}
-	return name, nil
+
+	return file.Name(), nil
 }