diff --git a/cmd/server/main.go b/cmd/server/main.go index c17d08b..c187d24 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -4,12 +4,14 @@ import ( "fmt" "log" "net/http" + "os" - "gitea.gwairfelin.com/max/gonotes/internal/conf" - "gitea.gwairfelin.com/max/gonotes/internal/notes/views" + "forgejo.gwairfelin.com/max/gonotes/internal/conf" + "forgejo.gwairfelin.com/max/gonotes/internal/notes/views" ) func main() { + os.Mkdir("./foobardir", os.ModeDir|os.ModePerm) conf.LoadConfig("./conf.toml") router := http.NewServeMux() diff --git a/go.mod b/go.mod index 4317ecf..3993305 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module gitea.gwairfelin.com/max/gonotes +module forgejo.gwairfelin.com/max/gonotes go 1.23.5 require github.com/yuin/goldmark v1.7.8 require ( - gitea.gwairfelin.com/max/gispatcho v0.1.1 + forgejo.gwairfelin.com/max/gispatcho v0.1.2 github.com/pelletier/go-toml/v2 v2.2.3 ) diff --git a/go.sum b/go.sum index acf21a6..ea380da 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -gitea.gwairfelin.com/max/gispatcho v0.1.1 h1:8Zv6UH046mSSLdf0PqpNRK6DACuWJfgBSUiWhMW0sMY= -gitea.gwairfelin.com/max/gispatcho v0.1.1/go.mod h1:TRhxU+uNv+nIcFIxy2jl30DPbcM5Yib0S/cpLXws5iM= +forgejo.gwairfelin.com/max/gispatcho v0.1.2 h1:z6H3Fe3L/c+TxVzIc2xQd96zmSh7b1Mkmeh+6OKZLGk= +forgejo.gwairfelin.com/max/gispatcho v0.1.2/go.mod h1:yt8U7rLn1yUCApGiJ3YKLN5VSpsttJs68BQBT7caTcM= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= diff --git a/internal/conf/conf.go b/internal/conf/conf.go index 0fb8c60..e34c911 100644 --- a/internal/conf/conf.go +++ b/internal/conf/conf.go @@ -6,6 +6,7 @@ import ( "log" "net/http" "os" + "path" "path/filepath" "github.com/pelletier/go-toml/v2" @@ -19,6 +20,12 @@ type Asset struct { func (asset *Asset) FetchIfNotExists(staticPath string) { destPath := filepath.Join(staticPath, asset.Path) + err := os.MkdirAll(path.Dir(destPath), os.ModeDir|0777) + if err != nil { + log.Printf("Couldn't create parent dirs of %s\n", destPath) + panic(err) + } + out, err := os.OpenFile( destPath, os.O_WRONLY|os.O_CREATE|os.O_EXCL, @@ -75,6 +82,8 @@ func LoadConfig(path string) { log.Fatal(err) } + os.Mkdir(Conf.Static.Dir, os.FileMode(750)) + for _, asset := range Conf.Static.Assets { asset.FetchIfNotExists(Conf.Static.Dir) } diff --git a/internal/notes/notes.go b/internal/notes/notes.go index 3507779..d5512de 100644 --- a/internal/notes/notes.go +++ b/internal/notes/notes.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "gitea.gwairfelin.com/max/gonotes/internal/conf" + "forgejo.gwairfelin.com/max/gonotes/internal/conf" "github.com/yuin/goldmark" "github.com/yuin/goldmark/extension" ) diff --git a/internal/notes/views/views.go b/internal/notes/views/views.go index c76c731..de23b90 100644 --- a/internal/notes/views/views.go +++ b/internal/notes/views/views.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" - urls "gitea.gwairfelin.com/max/gispatcho" - "gitea.gwairfelin.com/max/gonotes/internal/conf" - "gitea.gwairfelin.com/max/gonotes/internal/notes" - "gitea.gwairfelin.com/max/gonotes/internal/templ" + urls "forgejo.gwairfelin.com/max/gispatcho" + "forgejo.gwairfelin.com/max/gonotes/internal/conf" + "forgejo.gwairfelin.com/max/gonotes/internal/notes" + "forgejo.gwairfelin.com/max/gonotes/internal/templ" ) var myurls urls.URLs @@ -55,7 +55,7 @@ func edit(w http.ResponseWriter, r *http.Request) { } urlSave := myurls.Reverse("save", urls.Repl{"note": title}) - context := templ.Ctx{"note": note, "urlSave": urlSave} + context := templ.Ctx{"note": note, "urlSave": urlSave, "text": string(note.Body)} err = templ.RenderTemplate(w, "edit.tmpl.html", context) if err != nil { log.Print(err.Error()) diff --git a/internal/templ/templ.go b/internal/templ/templ.go index 7a5ca44..d794ede 100644 --- a/internal/templ/templ.go +++ b/internal/templ/templ.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "gitea.gwairfelin.com/max/gonotes/internal/conf" + "forgejo.gwairfelin.com/max/gonotes/internal/conf" ) type Ctx map[string]any diff --git a/templates/edit.tmpl.html b/templates/edit.tmpl.html index ae5033b..bc2b010 100644 --- a/templates/edit.tmpl.html +++ b/templates/edit.tmpl.html @@ -6,7 +6,7 @@
- +
Enter your note content in markdown