balki/collage-maker
1
0
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

Add anyhttp support #17

Merged
balki merged 4 commits from anyhttp into main 2023-09-11 21:16:11 -04:00
Conversation 0 Commits 4 Files Changed 3 +7 -4
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6f342c8888 - Show all commits

2
go.mod
View File

@@ -3,7 +3,7 @@ module go.balki.me/collage-maker
go 1.21 go 1.21
require ( require (
github.com/oliamb/cutter v0.2.2 go.balki.me/anyhttp v0.2.0
go.oneofone.dev/resize v1.0.1 go.oneofone.dev/resize v1.0.1
) )

4
go.sum
View File

@@ -1,6 +1,6 @@
github.com/oliamb/cutter v0.2.2 h1:Lfwkya0HHNU1YLnGv2hTkzHfasrSMkgv4Dn+5rmlk3k=
github.com/oliamb/cutter v0.2.2/go.mod h1:4BenG2/4GuRBDbVm/OPahDVqbrOemzpPiG5mi1iryBU=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
go.balki.me/anyhttp v0.2.0 h1:W6aGcmjF5CMJvJYtbYCywxnYoErFhFc76vwaqUG5FAQ=
go.balki.me/anyhttp v0.2.0/go.mod h1:JhfekOIjgVODoVqUCficjpIgmB3wwlB7jhN0eN2EZ/s=
go.oneofone.dev/resize v1.0.1 h1:HjpVar/4pxMGrjO44ThaMX1Q5UOBw0KxzbxxRDZPQuA= go.oneofone.dev/resize v1.0.1 h1:HjpVar/4pxMGrjO44ThaMX1Q5UOBw0KxzbxxRDZPQuA=
go.oneofone.dev/resize v1.0.1/go.mod h1:zGFmn7q4EUZVlnDmxqf+b0mWpxsTt0MH2yx6ng8tpq0= go.oneofone.dev/resize v1.0.1/go.mod h1:zGFmn7q4EUZVlnDmxqf+b0mWpxsTt0MH2yx6ng8tpq0=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

5
main.go
View File

@@ -16,6 +16,7 @@ import (
"log/slog" "log/slog"
"go.balki.me/anyhttp"
"go.balki.me/collage-maker/collage" "go.balki.me/collage-maker/collage"
) )
@@ -25,6 +26,7 @@ var (
localAssets bool localAssets bool
collageNameGen *nameGen collageNameGen *nameGen
imagesDirFs fs.FS imagesDirFs fs.FS
listenAddr string
// go:embed web/* // go:embed web/*
webFS embed.FS webFS embed.FS
@@ -34,6 +36,7 @@ func main() {
flag.StringVar(&imagesDir, "images-dir", "images", "Sets the images dir") flag.StringVar(&imagesDir, "images-dir", "images", "Sets the images dir")
flag.StringVar(&collageDir, "collages-dir", "collages", "Sets the collages dir") flag.StringVar(&collageDir, "collages-dir", "collages", "Sets the collages dir")
flag.BoolVar(&localAssets, "local-assets", false, "Serve local assets for testing") flag.BoolVar(&localAssets, "local-assets", false, "Serve local assets for testing")
flag.StringVar(&listenAddr, "addr", "127.0.0.1:8767", "Sets the collages dir")
flag.Parse() flag.Parse()
@@ -89,7 +92,7 @@ func main() {
} }
w.Write([]byte(collageFile)) w.Write([]byte(collageFile))
}) })
if err := http.ListenAndServe(":8767", nil); err != nil { if err := anyhttp.ListenAndServe(listenAddr, nil); err != nil {
slog.Error("http ListenAndServe failed", "error", err) slog.Error("http ListenAndServe failed", "error", err)
} }
} }