From 4479525731ef41bd5e2a91b949142a2097e0e701 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sun, 17 Aug 2025 18:14:35 +0800 Subject: [PATCH] Move more stub handlers to handlers/ --- forged/internal/incoming/web/handler.go | 34 ++++++++++++++++++---------------- forged/internal/incoming/web/handlers/group.go | 17 +++++++++++++++++ forged/internal/incoming/web/handlers/index.go | 2 +- forged/internal/incoming/web/handlers/not_implemented.go | 15 +++++++++++++++ forged/internal/incoming/web/handlers/repo/raw.go | 19 +++++++++++++++++++ forged/internal/incoming/web/handlers/repo/tree.go | 19 +++++++++++++++++++ forged/internal/incoming/web/stub.go | 38 -------------------------------------- diff --git a/forged/internal/incoming/web/handler.go b/forged/internal/incoming/web/handler.go index 6341a9382507cc3c4af6cc943e508a2ac3c2b2a4..10f85d603db4b7c78cd2dcaa3cf84ec4ca89b09f 100644 --- a/forged/internal/incoming/web/handler.go +++ b/forged/internal/incoming/web/handler.go @@ -25,33 +25,35 @@ ) // Feature handler instances indexHTTP := handlers.NewIndexHTTP() + groupHTTP := handlers.NewGroupHTTP() repoHTTP := repoHandlers.NewHTTP() + notImpl := handlers.NewNotImplementedHTTP() // Index h.r.GET("/", indexHTTP.Index) // Top-level utilities - h.r.ANY("-/login", h.notImplemented) - h.r.ANY("-/users", h.notImplemented) + h.r.ANY("-/login", notImpl.Handle) + h.r.ANY("-/users", notImpl.Handle) - // Group index (kept local for now; migrate later) - h.r.GET("@group/", h.groupIndex) + // Group index + h.r.GET("@group/", groupHTTP.Index) - // Repo index (handled by repoHTTP) + // Repo index h.r.GET("@group/-/repos/:repo/", repoHTTP.Index) - // Repo (kept local for now) - h.r.ANY("@group/-/repos/:repo/info", h.notImplemented) - h.r.ANY("@group/-/repos/:repo/git-upload-pack", h.notImplemented) + // Repo (not implemented yet) + h.r.ANY("@group/-/repos/:repo/info", notImpl.Handle) + h.r.ANY("@group/-/repos/:repo/git-upload-pack", notImpl.Handle) - // Repo features (kept local for now) - h.r.GET("@group/-/repos/:repo/branches/", h.notImplemented) - h.r.GET("@group/-/repos/:repo/log/", h.notImplemented) - h.r.GET("@group/-/repos/:repo/commit/:commit", h.notImplemented) - h.r.GET("@group/-/repos/:repo/tree/*rest", h.repoTree, WithDirIfEmpty("rest")) - h.r.GET("@group/-/repos/:repo/raw/*rest", h.repoRaw, WithDirIfEmpty("rest")) - h.r.GET("@group/-/repos/:repo/contrib/", h.notImplemented) - h.r.GET("@group/-/repos/:repo/contrib/:mr", h.notImplemented) + // Repo features + h.r.GET("@group/-/repos/:repo/branches/", notImpl.Handle) + h.r.GET("@group/-/repos/:repo/log/", notImpl.Handle) + h.r.GET("@group/-/repos/:repo/commit/:commit", notImpl.Handle) + h.r.GET("@group/-/repos/:repo/tree/*rest", repoHTTP.Tree, WithDirIfEmpty("rest")) + h.r.GET("@group/-/repos/:repo/raw/*rest", repoHTTP.Raw, WithDirIfEmpty("rest")) + h.r.GET("@group/-/repos/:repo/contrib/", notImpl.Handle) + h.r.GET("@group/-/repos/:repo/contrib/:mr", notImpl.Handle) return h } diff --git a/forged/internal/incoming/web/handlers/group.go b/forged/internal/incoming/web/handlers/group.go new file mode 100644 index 0000000000000000000000000000000000000000..1a1cb1d35a5f4eaca0747ad2f78cef19c3cd3f78 --- /dev/null +++ b/forged/internal/incoming/web/handlers/group.go @@ -0,0 +1,17 @@ +package handlers + +import ( + "net/http" + "strings" + + wtypes "go.lindenii.runxiyu.org/forge/forged/internal/incoming/web/types" +) + +type GroupHTTP struct{} + +func NewGroupHTTP() *GroupHTTP { return &GroupHTTP{} } + +func (h *GroupHTTP) Index(w http.ResponseWriter, r *http.Request, _ wtypes.Vars) { + base := wtypes.Base(r) + _, _ = w.Write([]byte("group index for: /" + strings.Join(base.GroupPath, "/") + "/")) +} diff --git a/forged/internal/incoming/web/handlers/index.go b/forged/internal/incoming/web/handlers/index.go index 773a0c64eac0c4c47812b7b79278330fe9271d45..1fd295446de0b5434a4e47dcd7f32cdab9f22f03 100644 --- a/forged/internal/incoming/web/handlers/index.go +++ b/forged/internal/incoming/web/handlers/index.go @@ -10,6 +10,6 @@ type IndexHTTP struct{} func NewIndexHTTP() *IndexHTTP { return &IndexHTTP{} } -func (h *IndexHTTP) Index(w http.ResponseWriter, r *http.Request, _ wtypes.Vars) { +func (h *IndexHTTP) Index(w http.ResponseWriter, _ *http.Request, _ wtypes.Vars) { _, _ = w.Write([]byte("index: replace with template render")) } diff --git a/forged/internal/incoming/web/handlers/not_implemented.go b/forged/internal/incoming/web/handlers/not_implemented.go new file mode 100644 index 0000000000000000000000000000000000000000..472f73bdac4d13f2da896a09e0f578582208c6b1 --- /dev/null +++ b/forged/internal/incoming/web/handlers/not_implemented.go @@ -0,0 +1,15 @@ +package handlers + +import ( + "net/http" + + wtypes "go.lindenii.runxiyu.org/forge/forged/internal/incoming/web/types" +) + +type NotImplementedHTTP struct{} + +func NewNotImplementedHTTP() *NotImplementedHTTP { return &NotImplementedHTTP{} } + +func (h *NotImplementedHTTP) Handle(w http.ResponseWriter, _ *http.Request, _ wtypes.Vars) { + http.Error(w, "not implemented", http.StatusNotImplemented) +} diff --git a/forged/internal/incoming/web/handlers/repo/raw.go b/forged/internal/incoming/web/handlers/repo/raw.go new file mode 100644 index 0000000000000000000000000000000000000000..e421f45c0a1c4a3603478d51b87e07ad7d51edad --- /dev/null +++ b/forged/internal/incoming/web/handlers/repo/raw.go @@ -0,0 +1,19 @@ +package repo + +import ( + "fmt" + "net/http" + "strings" + + wtypes "go.lindenii.runxiyu.org/forge/forged/internal/incoming/web/types" +) + +func (h *HTTP) Raw(w http.ResponseWriter, r *http.Request, v wtypes.Vars) { + base := wtypes.Base(r) + repo := v["repo"] + rest := v["rest"] + if base.DirMode && rest != "" && !strings.HasSuffix(rest, "/") { + rest += "/" + } + _, _ = w.Write([]byte(fmt.Sprintf("raw: repo=%q path=%q", repo, rest))) +} diff --git a/forged/internal/incoming/web/handlers/repo/tree.go b/forged/internal/incoming/web/handlers/repo/tree.go new file mode 100644 index 0000000000000000000000000000000000000000..3432244a51d2abd405568831ebfed9f30b111410 --- /dev/null +++ b/forged/internal/incoming/web/handlers/repo/tree.go @@ -0,0 +1,19 @@ +package repo + +import ( + "fmt" + "net/http" + "strings" + + wtypes "go.lindenii.runxiyu.org/forge/forged/internal/incoming/web/types" +) + +func (h *HTTP) Tree(w http.ResponseWriter, r *http.Request, v wtypes.Vars) { + base := wtypes.Base(r) + repo := v["repo"] + rest := v["rest"] // may be "" + if base.DirMode && rest != "" && !strings.HasSuffix(rest, "/") { + rest += "/" + } + _, _ = w.Write([]byte(fmt.Sprintf("tree: repo=%q path=%q", repo, rest))) +} diff --git a/forged/internal/incoming/web/stub.go b/forged/internal/incoming/web/stub.go deleted file mode 100644 index 4fffd7395432a140e19d648edd7d22f8318601aa..0000000000000000000000000000000000000000 --- a/forged/internal/incoming/web/stub.go +++ /dev/null @@ -1,38 +0,0 @@ -package web - -import ( - "fmt" - "net/http" - "strings" - - wtypes "go.lindenii.runxiyu.org/forge/forged/internal/incoming/web/types" -) - -func (h *handler) groupIndex(w http.ResponseWriter, r *http.Request, _ wtypes.Vars) { - base := wtypes.Base(r) - _, _ = w.Write([]byte("group index for: /" + strings.Join(base.GroupPath, "/") + "/")) -} - -func (h *handler) repoTree(w http.ResponseWriter, r *http.Request, v wtypes.Vars) { - base := wtypes.Base(r) - repo := v["repo"] - rest := v["rest"] // may be "" - if base.DirMode && rest != "" && !strings.HasSuffix(rest, "/") { - rest += "/" - } - _, _ = w.Write([]byte(fmt.Sprintf("tree: repo=%q path=%q", repo, rest))) -} - -func (h *handler) repoRaw(w http.ResponseWriter, r *http.Request, v wtypes.Vars) { - base := wtypes.Base(r) - repo := v["repo"] - rest := v["rest"] - if base.DirMode && rest != "" && !strings.HasSuffix(rest, "/") { - rest += "/" - } - _, _ = w.Write([]byte(fmt.Sprintf("raw: repo=%q path=%q", repo, rest))) -} - -func (h *handler) notImplemented(w http.ResponseWriter, _ *http.Request, _ wtypes.Vars) { - http.Error(w, "not implemented", http.StatusNotImplemented) -} -- 2.48.1