From cdb75d3fcbc9339b897f8c6ff4d69a577f017393 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Tue, 8 Jul 2025 23:26:05 +0100 Subject: Rewrite in Go --- web/command/handler/create.go | 53 +++++++++++++++++++++++++++++++++++++++++++ web/command/handler/home.go | 17 ++++++++++++++ web/command/handler/site.go | 27 ++++++++++++++++++++++ web/command/handler/upload.go | 49 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 146 insertions(+) create mode 100644 web/command/handler/create.go create mode 100644 web/command/handler/home.go create mode 100644 web/command/handler/site.go create mode 100644 web/command/handler/upload.go (limited to 'web/command/handler') diff --git a/web/command/handler/create.go b/web/command/handler/create.go new file mode 100644 index 0000000..21c6b1a --- /dev/null +++ b/web/command/handler/create.go @@ -0,0 +1,53 @@ +package handler + +import ( + "fmt" + "net/http" + "path" + + "github.com/LMBishop/scrapbook/pkg/config" + "github.com/LMBishop/scrapbook/pkg/constants" + "github.com/LMBishop/scrapbook/pkg/index" + "github.com/LMBishop/scrapbook/pkg/site" + "github.com/LMBishop/scrapbook/web/command/html" + . "maragu.dev/gomponents" + ghttp "maragu.dev/gomponents/http" +) + +func GetCreate() func(http.ResponseWriter, *http.Request) { + return ghttp.Adapt(func(w http.ResponseWriter, r *http.Request) (Node, error) { + return html.CreatePage("", "", html.CreatePageForm{}), nil + }) +} + +func PostCreate(mainConfig *config.MainConfig, index *index.SiteIndex) func(http.ResponseWriter, *http.Request) { + return ghttp.Adapt(func(w http.ResponseWriter, r *http.Request) (Node, error) { + err := r.ParseForm() + if err != nil { + return html.CreatePage("", err.Error(), html.CreatePageForm{}), nil + } + + name := r.Form.Get("name") + host := r.Form.Get("host") + + formValues := html.CreatePageForm{Name: name, Host: host} + + if name == "" { + return html.CreatePage("", "A name must be specified", formValues), nil + } + + if host == "" { + return html.CreatePage("", "A host must be specified", formValues), nil + } + + site, err := site.CreateNewSite(name, path.Join(constants.SysDataDir, "sites"), host) + + if err != nil { + return html.CreatePage("", fmt.Errorf("Unexpected error: %w", err).Error(), formValues), nil + } + + index.AddSite(site) + + return html.CreatePage("Successfully created new site", "", formValues), nil + }) +} diff --git a/web/command/handler/home.go b/web/command/handler/home.go new file mode 100644 index 0000000..a46d5ed --- /dev/null +++ b/web/command/handler/home.go @@ -0,0 +1,17 @@ +package handler + +import ( + "net/http" + + "github.com/LMBishop/scrapbook/pkg/config" + "github.com/LMBishop/scrapbook/pkg/index" + "github.com/LMBishop/scrapbook/web/command/html" + . "maragu.dev/gomponents" + ghttp "maragu.dev/gomponents/http" +) + +func GetHome(mainConfig *config.MainConfig, index *index.SiteIndex) func(http.ResponseWriter, *http.Request) { + return ghttp.Adapt(func(w http.ResponseWriter, r *http.Request) (Node, error) { + return html.HomePage(index), nil + }) +} diff --git a/web/command/handler/site.go b/web/command/handler/site.go new file mode 100644 index 0000000..73ea1a0 --- /dev/null +++ b/web/command/handler/site.go @@ -0,0 +1,27 @@ +package handler + +import ( + "fmt" + "net/http" + + "github.com/LMBishop/scrapbook/pkg/config" + "github.com/LMBishop/scrapbook/pkg/index" + "github.com/LMBishop/scrapbook/web/command/html" + . "maragu.dev/gomponents" + ghttp "maragu.dev/gomponents/http" +) + +func GetSite(mainConfig *config.MainConfig, index *index.SiteIndex) func(http.ResponseWriter, *http.Request) { + return ghttp.Adapt(func(w http.ResponseWriter, r *http.Request) (Node, error) { + siteName := r.PathValue("site") + if siteName == "" { + return nil, fmt.Errorf("unknown site") + } + site := index.GetSite(siteName) + if site == nil { + return nil, fmt.Errorf("unknown site") + } + + return html.SitePage(mainConfig, site), nil + }) +} diff --git a/web/command/handler/upload.go b/web/command/handler/upload.go new file mode 100644 index 0000000..0e4928c --- /dev/null +++ b/web/command/handler/upload.go @@ -0,0 +1,49 @@ +package handler + +import ( + "fmt" + "net/http" + + "github.com/LMBishop/scrapbook/pkg/config" + "github.com/LMBishop/scrapbook/pkg/index" + "github.com/LMBishop/scrapbook/pkg/upload" + "github.com/LMBishop/scrapbook/web/command/html" + . "maragu.dev/gomponents" + ghttp "maragu.dev/gomponents/http" +) + +func GetUpload(index *index.SiteIndex) func(http.ResponseWriter, *http.Request) { + return ghttp.Adapt(func(w http.ResponseWriter, r *http.Request) (Node, error) { + siteName := r.PathValue("site") + if siteName == "" { + return nil, fmt.Errorf("unknown site") + } + site := index.GetSite(siteName) + if site == nil { + return nil, fmt.Errorf("unknown site") + } + + return html.UploadPage("", "", siteName), nil + }) +} + +func PostUpload(mainConfig *config.MainConfig, index *index.SiteIndex) func(http.ResponseWriter, *http.Request) { + return ghttp.Adapt(func(w http.ResponseWriter, r *http.Request) (Node, error) { + siteName := r.PathValue("site") + if siteName == "" { + return nil, fmt.Errorf("unknown site") + } + + reader, err := r.MultipartReader() + if err != nil { + return html.UploadPage("", fmt.Errorf("Unexpected error: could not read stream: %w", err).Error(), siteName), nil + } + + version, err := upload.HandleUpload(siteName, reader, index) + if err != nil { + return html.UploadPage("", fmt.Errorf("Unexpected error: %w", err).Error(), siteName), nil + } + + return html.UploadPage(fmt.Sprintf("Version %s created successfully", version), "", siteName), nil + }) +} -- cgit v1.2.3-70-g09d2