From da1d8f4e7c332c7109427915e6459b10209cedce Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sun, 06 Apr 2025 09:26:46 +0800 Subject: [PATCH] Move the Go stuff to ./forged/ --- Makefile | 7 +++---- cmd/forge/main.go => forged/cmd/forge/main.go | 2 +- internal/ansiec/ansiec.go => forged/internal/ansiec/ansiec.go | 0 internal/ansiec/colors.go => forged/internal/ansiec/colors.go | 0 internal/ansiec/reset.go => forged/internal/ansiec/reset.go | 0 internal/ansiec/style.go => forged/internal/ansiec/style.go | 0 internal/database/database.go => forged/internal/database/database.go | 0 internal/embed/.gitignore => forged/internal/embed/.gitignore | 0 internal/embed/embed.go => forged/internal/embed/embed.go | 0 internal/git2c/client.go => forged/internal/git2c/client.go | 0 internal/git2c/cmd_index.go => forged/internal/git2c/cmd_index.go | 0 internal/git2c/cmd_treeraw.go => forged/internal/git2c/cmd_treeraw.go | 0 internal/git2c/git_types.go => forged/internal/git2c/git_types.go | 0 internal/irc/bot.go => forged/internal/irc/bot.go | 2 +- internal/misc/back.go => forged/internal/misc/back.go | 0 internal/misc/deploy.go => forged/internal/misc/deploy.go | 0 internal/misc/iter.go => forged/internal/misc/iter.go | 0 internal/misc/misc.go => forged/internal/misc/misc.go | 0 internal/misc/panic.go => forged/internal/misc/panic.go | 0 internal/misc/trivial.go => forged/internal/misc/trivial.go | 0 internal/misc/unsafe.go => forged/internal/misc/unsafe.go | 0 internal/misc/url.go => forged/internal/misc/url.go | 0 internal/oldgit/fmtpatch.go => forged/internal/oldgit/fmtpatch.go | 0 internal/oldgit/oldgit.go => forged/internal/oldgit/oldgit.go | 0 internal/oldgit/patch.go => forged/internal/oldgit/patch.go | 0 internal/render/chroma.go => forged/internal/render/chroma.go | 0 internal/render/escape.go => forged/internal/render/escape.go | 0 internal/render/readme.go => forged/internal/render/readme.go | 2 +- internal/render/render.go => forged/internal/render/render.go | 0 internal/scfg/.golangci.yaml => forged/internal/scfg/.golangci.yaml | 0 internal/scfg/reader.go => forged/internal/scfg/reader.go | 0 internal/scfg/scfg.go => forged/internal/scfg/scfg.go | 0 internal/scfg/struct.go => forged/internal/scfg/struct.go | 0 internal/scfg/unmarshal.go => forged/internal/scfg/unmarshal.go | 0 internal/scfg/writer.go => forged/internal/scfg/writer.go | 0 internal/unsorted/acl.go => forged/internal/unsorted/acl.go | 0 internal/unsorted/config.go => forged/internal/unsorted/config.go | 6 +++--- internal/unsorted/database.go => forged/internal/unsorted/database.go | 0 internal/unsorted/fedauth.go => forged/internal/unsorted/fedauth.go | 0 internal/unsorted/git_hooks_handle_linux.go => forged/internal/unsorted/git_hooks_handle_linux.go | 4 ++-- internal/unsorted/git_hooks_handle_other.go => forged/internal/unsorted/git_hooks_handle_other.go | 4 ++-- internal/unsorted/git_init.go => forged/internal/unsorted/git_init.go | 0 internal/unsorted/git_misc.go => forged/internal/unsorted/git_misc.go | 0 internal/unsorted/git_plumbing.go => forged/internal/unsorted/git_plumbing.go | 2 +- internal/unsorted/git_ref.go => forged/internal/unsorted/git_ref.go | 0 internal/unsorted/http_auth.go => forged/internal/unsorted/http_auth.go | 0 internal/unsorted/http_handle_branches.go => forged/internal/unsorted/http_handle_branches.go | 2 +- internal/unsorted/http_handle_group_index.go => forged/internal/unsorted/http_handle_group_index.go | 4 ++-- internal/unsorted/http_handle_index.go => forged/internal/unsorted/http_handle_index.go | 2 +- internal/unsorted/http_handle_login.go => forged/internal/unsorted/http_handle_login.go | 2 +- internal/unsorted/http_handle_repo_commit.go => forged/internal/unsorted/http_handle_repo_commit.go | 6 +++--- internal/unsorted/http_handle_repo_contrib_index.go => forged/internal/unsorted/http_handle_repo_contrib_index.go | 2 +- internal/unsorted/http_handle_repo_contrib_one.go => forged/internal/unsorted/http_handle_repo_contrib_one.go | 2 +- internal/unsorted/http_handle_repo_index.go => forged/internal/unsorted/http_handle_repo_index.go | 6 +++--- internal/unsorted/http_handle_repo_info.go => forged/internal/unsorted/http_handle_repo_info.go | 0 internal/unsorted/http_handle_repo_log.go => forged/internal/unsorted/http_handle_repo_log.go | 2 +- internal/unsorted/http_handle_repo_raw.go => forged/internal/unsorted/http_handle_repo_raw.go | 6 +++--- internal/unsorted/http_handle_repo_tree.go => forged/internal/unsorted/http_handle_repo_tree.go | 6 +++--- internal/unsorted/http_handle_repo_upload_pack.go => forged/internal/unsorted/http_handle_repo_upload_pack.go | 0 internal/unsorted/http_handle_users.go => forged/internal/unsorted/http_handle_users.go | 2 +- internal/unsorted/http_server.go => forged/internal/unsorted/http_server.go | 4 ++-- internal/unsorted/http_template.go => forged/internal/unsorted/http_template.go | 0 internal/unsorted/lmtp_handle_patch.go => forged/internal/unsorted/lmtp_handle_patch.go | 2 +- internal/unsorted/lmtp_server.go => forged/internal/unsorted/lmtp_server.go | 2 +- internal/unsorted/remote_url.go => forged/internal/unsorted/remote_url.go | 2 +- internal/unsorted/resources.go => forged/internal/unsorted/resources.go | 4 ++-- internal/unsorted/server.go => forged/internal/unsorted/server.go | 8 ++++---- internal/unsorted/ssh_handle_receive_pack.go => forged/internal/unsorted/ssh_handle_receive_pack.go | 0 internal/unsorted/ssh_handle_upload_pack.go => forged/internal/unsorted/ssh_handle_upload_pack.go | 0 internal/unsorted/ssh_server.go => forged/internal/unsorted/ssh_server.go | 4 ++-- internal/unsorted/ssh_utils.go => forged/internal/unsorted/ssh_utils.go | 4 ++-- internal/unsorted/unsorted.go => forged/internal/unsorted/unsorted.go | 0 internal/unsorted/users.go => forged/internal/unsorted/users.go | 0 internal/unsorted/version.go => forged/internal/unsorted/version.go | 0 internal/web/error_pages.go => forged/internal/web/error_pages.go | 0 internal/web/web.go => forged/internal/web/web.go | 0 diff --git a/Makefile b/Makefile index b74ab1b669e40dd6aabf8dd943670444bbc0e2ac..98a2f140c1a243090ce633892af6371d0ddef3c2 100644 --- a/Makefile +++ b/Makefile @@ -10,15 +10,14 @@ .PHONY: clean CFLAGS = -Wall -Wextra -pedantic -std=c99 -D_GNU_SOURCE -MAN_PAGES = lindenii-forge.5 lindenii-forge-hookc.1 lindenii-forge.1 lindenii-forge-mail.5 VERSION = $(shell git describe --tags --always --dirty) SOURCE_FILES = $(shell git ls-files) EMBED = git2d/git2d hookc/hookc source.tar.gz $(wildcard LICENSE*) $(wildcard static/*) $(wildcard templates/*) -EMBED_ = $(EMBED:%=internal/embed/%) +EMBED_ = $(EMBED:%=forged/internal/embed/%) forge: $(EMBED_) $(SOURCE_FILES) - CGO_ENABLED=0 go build -o forge -ldflags '-extldflags "-f no-PIC -static" -X "go.lindenii.runxiyu.org/forge.version=$(VERSION)"' -tags 'osusergo netgo static_build' ./cmd/forge + CGO_ENABLED=0 go build -o forge -ldflags '-extldflags "-f no-PIC -static" -X "go.lindenii.runxiyu.org/forge.version=$(VERSION)"' -tags 'osusergo netgo static_build' ./forged/cmd/forge utils/colb: @@ -34,6 +33,6 @@ source.tar.gz: $(SOURCE_FILES) rm -f source.tar.gz git ls-files -z | xargs -0 tar -czf source.tar.gz -internal/embed/%: % +forged/internal/embed/%: % @mkdir -p $(shell dirname $@) @cp $^ $@ diff --git a/cmd/forge/main.go b/forged/cmd/forge/main.go rename from cmd/forge/main.go rename to forged/cmd/forge/main.go index 5a2394798fd8e756fa3a010673418560797b5c4d..87857515b008091dc88c2178556ed14f8543d6ba 100644 --- a/cmd/forge/main.go +++ b/forged/cmd/forge/main.go @@ -6,7 +6,7 @@ import ( "flag" - "go.lindenii.runxiyu.org/forge/internal/unsorted" + "go.lindenii.runxiyu.org/forge/forged/internal/unsorted" ) func main() { diff --git a/internal/ansiec/ansiec.go b/forged/internal/ansiec/ansiec.go rename from internal/ansiec/ansiec.go rename to forged/internal/ansiec/ansiec.go diff --git a/internal/ansiec/colors.go b/forged/internal/ansiec/colors.go rename from internal/ansiec/colors.go rename to forged/internal/ansiec/colors.go diff --git a/internal/ansiec/reset.go b/forged/internal/ansiec/reset.go rename from internal/ansiec/reset.go rename to forged/internal/ansiec/reset.go diff --git a/internal/ansiec/style.go b/forged/internal/ansiec/style.go rename from internal/ansiec/style.go rename to forged/internal/ansiec/style.go diff --git a/internal/database/database.go b/forged/internal/database/database.go rename from internal/database/database.go rename to forged/internal/database/database.go diff --git a/internal/embed/.gitignore b/forged/internal/embed/.gitignore rename from internal/embed/.gitignore rename to forged/internal/embed/.gitignore diff --git a/internal/embed/embed.go b/forged/internal/embed/embed.go rename from internal/embed/embed.go rename to forged/internal/embed/embed.go diff --git a/internal/git2c/client.go b/forged/internal/git2c/client.go rename from internal/git2c/client.go rename to forged/internal/git2c/client.go diff --git a/internal/git2c/cmd_index.go b/forged/internal/git2c/cmd_index.go rename from internal/git2c/cmd_index.go rename to forged/internal/git2c/cmd_index.go diff --git a/internal/git2c/cmd_treeraw.go b/forged/internal/git2c/cmd_treeraw.go rename from internal/git2c/cmd_treeraw.go rename to forged/internal/git2c/cmd_treeraw.go diff --git a/internal/git2c/git_types.go b/forged/internal/git2c/git_types.go rename from internal/git2c/git_types.go rename to forged/internal/git2c/git_types.go diff --git a/internal/irc/bot.go b/forged/internal/irc/bot.go rename from internal/irc/bot.go rename to forged/internal/irc/bot.go index dfb2906ab930f818e04d9189be694bf296f55ae2..89de024b0eb7909613512abe5025374afcda5849 100644 --- a/internal/irc/bot.go +++ b/forged/internal/irc/bot.go @@ -9,7 +9,7 @@ "crypto/tls" "log/slog" "net" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" irc "go.lindenii.runxiyu.org/lindenii-irc" ) diff --git a/internal/misc/back.go b/forged/internal/misc/back.go rename from internal/misc/back.go rename to forged/internal/misc/back.go diff --git a/internal/misc/deploy.go b/forged/internal/misc/deploy.go rename from internal/misc/deploy.go rename to forged/internal/misc/deploy.go diff --git a/internal/misc/iter.go b/forged/internal/misc/iter.go rename from internal/misc/iter.go rename to forged/internal/misc/iter.go diff --git a/internal/misc/misc.go b/forged/internal/misc/misc.go rename from internal/misc/misc.go rename to forged/internal/misc/misc.go diff --git a/internal/misc/panic.go b/forged/internal/misc/panic.go rename from internal/misc/panic.go rename to forged/internal/misc/panic.go diff --git a/internal/misc/trivial.go b/forged/internal/misc/trivial.go rename from internal/misc/trivial.go rename to forged/internal/misc/trivial.go diff --git a/internal/misc/unsafe.go b/forged/internal/misc/unsafe.go rename from internal/misc/unsafe.go rename to forged/internal/misc/unsafe.go diff --git a/internal/misc/url.go b/forged/internal/misc/url.go rename from internal/misc/url.go rename to forged/internal/misc/url.go diff --git a/internal/oldgit/fmtpatch.go b/forged/internal/oldgit/fmtpatch.go rename from internal/oldgit/fmtpatch.go rename to forged/internal/oldgit/fmtpatch.go diff --git a/internal/oldgit/oldgit.go b/forged/internal/oldgit/oldgit.go rename from internal/oldgit/oldgit.go rename to forged/internal/oldgit/oldgit.go diff --git a/internal/oldgit/patch.go b/forged/internal/oldgit/patch.go rename from internal/oldgit/patch.go rename to forged/internal/oldgit/patch.go diff --git a/internal/render/chroma.go b/forged/internal/render/chroma.go rename from internal/render/chroma.go rename to forged/internal/render/chroma.go diff --git a/internal/render/escape.go b/forged/internal/render/escape.go rename from internal/render/escape.go rename to forged/internal/render/escape.go diff --git a/internal/render/readme.go b/forged/internal/render/readme.go rename from internal/render/readme.go rename to forged/internal/render/readme.go index ac609813fa799f6d46dc791a4b483be7ecbfee63..195c87f5099a9a499b25fbe723e3a54db3f604f4 100644 --- a/internal/render/readme.go +++ b/forged/internal/render/readme.go @@ -13,7 +13,7 @@ "github.com/microcosm-cc/bluemonday" "github.com/niklasfasching/go-org/org" "github.com/yuin/goldmark" "github.com/yuin/goldmark/extension" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" ) var markdownConverter = goldmark.New(goldmark.WithExtensions(extension.GFM)) //nolint:gochecknoglobals diff --git a/internal/render/render.go b/forged/internal/render/render.go rename from internal/render/render.go rename to forged/internal/render/render.go diff --git a/internal/scfg/.golangci.yaml b/forged/internal/scfg/.golangci.yaml rename from internal/scfg/.golangci.yaml rename to forged/internal/scfg/.golangci.yaml diff --git a/internal/scfg/reader.go b/forged/internal/scfg/reader.go rename from internal/scfg/reader.go rename to forged/internal/scfg/reader.go diff --git a/internal/scfg/scfg.go b/forged/internal/scfg/scfg.go rename from internal/scfg/scfg.go rename to forged/internal/scfg/scfg.go diff --git a/internal/scfg/struct.go b/forged/internal/scfg/struct.go rename from internal/scfg/struct.go rename to forged/internal/scfg/struct.go diff --git a/internal/scfg/unmarshal.go b/forged/internal/scfg/unmarshal.go rename from internal/scfg/unmarshal.go rename to forged/internal/scfg/unmarshal.go diff --git a/internal/scfg/writer.go b/forged/internal/scfg/writer.go rename from internal/scfg/writer.go rename to forged/internal/scfg/writer.go diff --git a/internal/unsorted/acl.go b/forged/internal/unsorted/acl.go rename from internal/unsorted/acl.go rename to forged/internal/unsorted/acl.go diff --git a/internal/unsorted/config.go b/forged/internal/unsorted/config.go rename from internal/unsorted/config.go rename to forged/internal/unsorted/config.go index a2c0eb72796395156a4bde033b95203e4ce74a6e..9eae13b4b169db423c60d1f6c3cb1553039f5503 100644 --- a/internal/unsorted/config.go +++ b/forged/internal/unsorted/config.go @@ -9,9 +9,9 @@ "errors" "log/slog" "os" - "go.lindenii.runxiyu.org/forge/internal/database" - "go.lindenii.runxiyu.org/forge/internal/irc" - "go.lindenii.runxiyu.org/forge/internal/scfg" + "go.lindenii.runxiyu.org/forge/forged/internal/database" + "go.lindenii.runxiyu.org/forge/forged/internal/irc" + "go.lindenii.runxiyu.org/forge/forged/internal/scfg" ) type Config struct { diff --git a/internal/unsorted/database.go b/forged/internal/unsorted/database.go rename from internal/unsorted/database.go rename to forged/internal/unsorted/database.go diff --git a/internal/unsorted/fedauth.go b/forged/internal/unsorted/fedauth.go rename from internal/unsorted/fedauth.go rename to forged/internal/unsorted/fedauth.go diff --git a/internal/unsorted/git_hooks_handle_linux.go b/forged/internal/unsorted/git_hooks_handle_linux.go rename from internal/unsorted/git_hooks_handle_linux.go rename to forged/internal/unsorted/git_hooks_handle_linux.go index de45e03b65e93a82c7143d64e6427d9af122e8fb..f90455071c2ff21935172b5fec3abb09d7d327ec 100644 --- a/internal/unsorted/git_hooks_handle_linux.go +++ b/forged/internal/unsorted/git_hooks_handle_linux.go @@ -22,8 +22,8 @@ "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" "github.com/jackc/pgx/v5" - "go.lindenii.runxiyu.org/forge/internal/ansiec" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/ansiec" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" ) var ( diff --git a/internal/unsorted/git_hooks_handle_other.go b/forged/internal/unsorted/git_hooks_handle_other.go rename from internal/unsorted/git_hooks_handle_other.go rename to forged/internal/unsorted/git_hooks_handle_other.go index dd4662218b0686752df66ae076d82f67333c4537..70b2072fcdb0e0545b0226fd177e4b48e3280a53 100644 --- a/internal/unsorted/git_hooks_handle_other.go +++ b/forged/internal/unsorted/git_hooks_handle_other.go @@ -20,8 +20,8 @@ "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" "github.com/jackc/pgx/v5" - "go.lindenii.runxiyu.org/forge/internal/ansiec" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/ansiec" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" ) // hooksHandler handles a connection from hookc via the diff --git a/internal/unsorted/git_init.go b/forged/internal/unsorted/git_init.go rename from internal/unsorted/git_init.go rename to forged/internal/unsorted/git_init.go diff --git a/internal/unsorted/git_misc.go b/forged/internal/unsorted/git_misc.go rename from internal/unsorted/git_misc.go rename to forged/internal/unsorted/git_misc.go diff --git a/internal/unsorted/git_plumbing.go b/forged/internal/unsorted/git_plumbing.go rename from internal/unsorted/git_plumbing.go rename to forged/internal/unsorted/git_plumbing.go index 5cb30b794935a85b10030b97f75437ba36747788..e7ebe8f839d3f339217f917235ebb5bfd9159fbe 100644 --- a/internal/unsorted/git_plumbing.go +++ b/forged/internal/unsorted/git_plumbing.go @@ -14,7 +14,7 @@ "path" "sort" "strings" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" ) func writeTree(ctx context.Context, repoPath string, entries []treeEntry) (string, error) { diff --git a/internal/unsorted/git_ref.go b/forged/internal/unsorted/git_ref.go rename from internal/unsorted/git_ref.go rename to forged/internal/unsorted/git_ref.go diff --git a/internal/unsorted/http_auth.go b/forged/internal/unsorted/http_auth.go rename from internal/unsorted/http_auth.go rename to forged/internal/unsorted/http_auth.go diff --git a/internal/unsorted/http_handle_branches.go b/forged/internal/unsorted/http_handle_branches.go rename from internal/unsorted/http_handle_branches.go rename to forged/internal/unsorted/http_handle_branches.go index 04a9f316178334a04219c6ca4c592aac01a401c4..704e1d8477b86645bb5d3367c027e5a8d1f43d0d 100644 --- a/internal/unsorted/http_handle_branches.go +++ b/forged/internal/unsorted/http_handle_branches.go @@ -10,7 +10,7 @@ "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/storer" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" ) // httpHandleRepoBranches provides the branches page in repos. diff --git a/internal/unsorted/http_handle_group_index.go b/forged/internal/unsorted/http_handle_group_index.go rename from internal/unsorted/http_handle_group_index.go rename to forged/internal/unsorted/http_handle_group_index.go index 092f06eaf5690b3f6402d291d5827c23c4def2bb..ce28a1c3b81ea6cd5cb7735c9e603f9021b1be21 100644 --- a/internal/unsorted/http_handle_group_index.go +++ b/forged/internal/unsorted/http_handle_group_index.go @@ -11,8 +11,8 @@ "strconv" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgtype" - "go.lindenii.runxiyu.org/forge/internal/misc" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // httpHandleGroupIndex provides index pages for groups, which includes a list diff --git a/internal/unsorted/http_handle_index.go b/forged/internal/unsorted/http_handle_index.go rename from internal/unsorted/http_handle_index.go rename to forged/internal/unsorted/http_handle_index.go index 458fbb4381b78223aaf7a90b4bad813a4dea86da..339344e3c6a237329428980088ae793d8aef53ba 100644 --- a/internal/unsorted/http_handle_index.go +++ b/forged/internal/unsorted/http_handle_index.go @@ -8,7 +8,7 @@ "net/http" "runtime" "github.com/dustin/go-humanize" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // httpHandleIndex provides the main index page which includes a list of groups diff --git a/internal/unsorted/http_handle_login.go b/forged/internal/unsorted/http_handle_login.go rename from internal/unsorted/http_handle_login.go rename to forged/internal/unsorted/http_handle_login.go index 5386e3a50b2bf7a00fa87af764eaa578a0267686..94a30a05bf6fa4a03e4eab144956a35d07e6eb74 100644 --- a/internal/unsorted/http_handle_login.go +++ b/forged/internal/unsorted/http_handle_login.go @@ -13,7 +13,7 @@ "time" "github.com/alexedwards/argon2id" "github.com/jackc/pgx/v5" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // httpHandleLogin provides the login page for local users. diff --git a/internal/unsorted/http_handle_repo_commit.go b/forged/internal/unsorted/http_handle_repo_commit.go rename from internal/unsorted/http_handle_repo_commit.go rename to forged/internal/unsorted/http_handle_repo_commit.go index 44f8f5472230799f5d72323604de56dfb15cbff7..2afdf3abab3ff9377819b34e87582818d71f17d5 100644 --- a/internal/unsorted/http_handle_repo_commit.go +++ b/forged/internal/unsorted/http_handle_repo_commit.go @@ -13,9 +13,9 @@ "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/filemode" "github.com/go-git/go-git/v5/plumbing/format/diff" "github.com/go-git/go-git/v5/plumbing/object" - "go.lindenii.runxiyu.org/forge/internal/misc" - "go.lindenii.runxiyu.org/forge/internal/oldgit" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/oldgit" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // usableFilePatch is a [diff.FilePatch] that is structured in a way more diff --git a/internal/unsorted/http_handle_repo_contrib_index.go b/forged/internal/unsorted/http_handle_repo_contrib_index.go rename from internal/unsorted/http_handle_repo_contrib_index.go rename to forged/internal/unsorted/http_handle_repo_contrib_index.go index 4db3846786fa876429a8ad9324d17991e03417a5..5c68c08bef12b0f54bddfe309857f8cbb667d2a5 100644 --- a/internal/unsorted/http_handle_repo_contrib_index.go +++ b/forged/internal/unsorted/http_handle_repo_contrib_index.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/jackc/pgx/v5" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // idTitleStatus describes properties of a merge request that needs to be diff --git a/internal/unsorted/http_handle_repo_contrib_one.go b/forged/internal/unsorted/http_handle_repo_contrib_one.go rename from internal/unsorted/http_handle_repo_contrib_one.go rename to forged/internal/unsorted/http_handle_repo_contrib_one.go index fb9989b77084866324db856008a80e1367fa4121..1d733b0940b377558e49c84ac9df8ad3b6070cea 100644 --- a/internal/unsorted/http_handle_repo_contrib_one.go +++ b/forged/internal/unsorted/http_handle_repo_contrib_one.go @@ -10,7 +10,7 @@ "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // httpHandleRepoContribOne provides an interface to each merge request of a diff --git a/internal/unsorted/http_handle_repo_index.go b/forged/internal/unsorted/http_handle_repo_index.go rename from internal/unsorted/http_handle_repo_index.go rename to forged/internal/unsorted/http_handle_repo_index.go index 03eed7769ff1f1780848bfe3876b624ceb5bbf34..dd46dfe37ffb695ded6c3efdcbcf58635de48796 100644 --- a/internal/unsorted/http_handle_repo_index.go +++ b/forged/internal/unsorted/http_handle_repo_index.go @@ -6,9 +6,9 @@ import ( "net/http" - "go.lindenii.runxiyu.org/forge/internal/git2c" - "go.lindenii.runxiyu.org/forge/internal/render" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/git2c" + "go.lindenii.runxiyu.org/forge/forged/internal/render" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // httpHandleRepoIndex provides the front page of a repo using git2d. diff --git a/internal/unsorted/http_handle_repo_info.go b/forged/internal/unsorted/http_handle_repo_info.go rename from internal/unsorted/http_handle_repo_info.go rename to forged/internal/unsorted/http_handle_repo_info.go diff --git a/internal/unsorted/http_handle_repo_log.go b/forged/internal/unsorted/http_handle_repo_log.go rename from internal/unsorted/http_handle_repo_log.go rename to forged/internal/unsorted/http_handle_repo_log.go index c25c60b5122a4314407c6eba0820af39a85ebaa4..fa992b3f845a4c97ff93a349d4d788e86d3c15bd 100644 --- a/internal/unsorted/http_handle_repo_log.go +++ b/forged/internal/unsorted/http_handle_repo_log.go @@ -8,7 +8,7 @@ "net/http" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // httpHandleRepoLog provides a page with a complete Git log. diff --git a/internal/unsorted/http_handle_repo_raw.go b/forged/internal/unsorted/http_handle_repo_raw.go rename from internal/unsorted/http_handle_repo_raw.go rename to forged/internal/unsorted/http_handle_repo_raw.go index 3d999e50c087cb8c5f1cc6252405d571a60f8627..1127284e198a14e5fa02d6e3863c4714bfcd5788 100644 --- a/internal/unsorted/http_handle_repo_raw.go +++ b/forged/internal/unsorted/http_handle_repo_raw.go @@ -9,9 +9,9 @@ "html/template" "net/http" "strings" - "go.lindenii.runxiyu.org/forge/internal/git2c" - "go.lindenii.runxiyu.org/forge/internal/misc" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/git2c" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // httpHandleRepoRaw serves raw files, or directory listings that point to raw diff --git a/internal/unsorted/http_handle_repo_tree.go b/forged/internal/unsorted/http_handle_repo_tree.go rename from internal/unsorted/http_handle_repo_tree.go rename to forged/internal/unsorted/http_handle_repo_tree.go index 96920f659a1ec33990869b9fc0d9c396efaf6608..4799ccb5d0542a9f98baa04ef705342abb8cd6ca 100644 --- a/internal/unsorted/http_handle_repo_tree.go +++ b/forged/internal/unsorted/http_handle_repo_tree.go @@ -8,9 +8,9 @@ "html/template" "net/http" "strings" - "go.lindenii.runxiyu.org/forge/internal/git2c" - "go.lindenii.runxiyu.org/forge/internal/render" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/git2c" + "go.lindenii.runxiyu.org/forge/forged/internal/render" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // httpHandleRepoTree provides a friendly, syntax-highlighted view of diff --git a/internal/unsorted/http_handle_repo_upload_pack.go b/forged/internal/unsorted/http_handle_repo_upload_pack.go rename from internal/unsorted/http_handle_repo_upload_pack.go rename to forged/internal/unsorted/http_handle_repo_upload_pack.go diff --git a/internal/unsorted/http_handle_users.go b/forged/internal/unsorted/http_handle_users.go rename from internal/unsorted/http_handle_users.go rename to forged/internal/unsorted/http_handle_users.go index 7b0f6570958c05e2d36186c5fac5c03f02c88d51..b41ee44e859d9120ecc8be4336e69bdb264d6658 100644 --- a/internal/unsorted/http_handle_users.go +++ b/forged/internal/unsorted/http_handle_users.go @@ -6,7 +6,7 @@ import ( "net/http" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // httpHandleUsers is a useless stub. diff --git a/internal/unsorted/http_server.go b/forged/internal/unsorted/http_server.go rename from internal/unsorted/http_server.go rename to forged/internal/unsorted/http_server.go index 6710df35340ae3464619c067bce5e83cfced354d..f6a17941c73055d845715e92768b525339543275 100644 --- a/internal/unsorted/http_server.go +++ b/forged/internal/unsorted/http_server.go @@ -12,8 +12,8 @@ "strconv" "strings" "github.com/jackc/pgx/v5" - "go.lindenii.runxiyu.org/forge/internal/misc" - "go.lindenii.runxiyu.org/forge/internal/web" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/web" ) // ServeHTTP handles all incoming HTTP requests and routes them to the correct diff --git a/internal/unsorted/http_template.go b/forged/internal/unsorted/http_template.go rename from internal/unsorted/http_template.go rename to forged/internal/unsorted/http_template.go diff --git a/internal/unsorted/lmtp_handle_patch.go b/forged/internal/unsorted/lmtp_handle_patch.go rename from internal/unsorted/lmtp_handle_patch.go rename to forged/internal/unsorted/lmtp_handle_patch.go index 1a234229905fa81fb637c569c8db2f98bd669a50..b258bfc20efb6d6745ae48b6ae9467c5730a26a5 100644 --- a/internal/unsorted/lmtp_handle_patch.go +++ b/forged/internal/unsorted/lmtp_handle_patch.go @@ -16,7 +16,7 @@ "time" "github.com/bluekeyes/go-gitdiff/gitdiff" "github.com/go-git/go-git/v5" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" ) func (s *Server) lmtpHandlePatch(session *lmtpSession, groupPath []string, repoName string, mbox io.Reader) (err error) { diff --git a/internal/unsorted/lmtp_server.go b/forged/internal/unsorted/lmtp_server.go rename from internal/unsorted/lmtp_server.go rename to forged/internal/unsorted/lmtp_server.go index 13c74c8ba73c5637ac01ddc927c94735bfc21de9..1e948946ba8514108402f87e969699461f245ecc 100644 --- a/internal/unsorted/lmtp_server.go +++ b/forged/internal/unsorted/lmtp_server.go @@ -17,7 +17,7 @@ "time" "github.com/emersion/go-message" "github.com/emersion/go-smtp" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" ) type lmtpHandler struct{} diff --git a/internal/unsorted/remote_url.go b/forged/internal/unsorted/remote_url.go rename from internal/unsorted/remote_url.go rename to forged/internal/unsorted/remote_url.go index 51740c4d87494484410ad21fa31b96574cb9cfdc..f4d4c58e21b185d855cedd730710641b21edf240 100644 --- a/internal/unsorted/remote_url.go +++ b/forged/internal/unsorted/remote_url.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" ) // We don't use path.Join because it collapses multiple slashes into one. diff --git a/internal/unsorted/resources.go b/forged/internal/unsorted/resources.go rename from internal/unsorted/resources.go rename to forged/internal/unsorted/resources.go index d09ee609588b332d4601f860a110ff331585a1ad..9f3a5d09011280a496a39398d47c3edf2ba8fb27 100644 --- a/internal/unsorted/resources.go +++ b/forged/internal/unsorted/resources.go @@ -9,8 +9,8 @@ "io/fs" "github.com/tdewolff/minify/v2" "github.com/tdewolff/minify/v2/html" - "go.lindenii.runxiyu.org/forge/internal/embed" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/embed" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" ) // loadTemplates minifies and loads HTML templates. diff --git a/internal/unsorted/server.go b/forged/internal/unsorted/server.go rename from internal/unsorted/server.go rename to forged/internal/unsorted/server.go index 29b0fab0693a9e7b4d09358c74bfb06cf853da5b..f8978a5fcea1ffc75d52c10597fca2b060978edc 100644 --- a/internal/unsorted/server.go +++ b/forged/internal/unsorted/server.go @@ -17,10 +17,10 @@ "path/filepath" "syscall" "time" - "go.lindenii.runxiyu.org/forge/internal/database" - "go.lindenii.runxiyu.org/forge/internal/embed" - "go.lindenii.runxiyu.org/forge/internal/irc" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/database" + "go.lindenii.runxiyu.org/forge/forged/internal/embed" + "go.lindenii.runxiyu.org/forge/forged/internal/irc" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" "go.lindenii.runxiyu.org/lindenii-common/cmap" goSSH "golang.org/x/crypto/ssh" ) diff --git a/internal/unsorted/ssh_handle_receive_pack.go b/forged/internal/unsorted/ssh_handle_receive_pack.go rename from internal/unsorted/ssh_handle_receive_pack.go rename to forged/internal/unsorted/ssh_handle_receive_pack.go diff --git a/internal/unsorted/ssh_handle_upload_pack.go b/forged/internal/unsorted/ssh_handle_upload_pack.go rename from internal/unsorted/ssh_handle_upload_pack.go rename to forged/internal/unsorted/ssh_handle_upload_pack.go diff --git a/internal/unsorted/ssh_server.go b/forged/internal/unsorted/ssh_server.go rename from internal/unsorted/ssh_server.go rename to forged/internal/unsorted/ssh_server.go index eb4d09d2f6e838cc037a1bdfd08e76cfd5f8eeb5..43cc0c49d097fcddb76c9dae463fee6e2634736b 100644 --- a/internal/unsorted/ssh_server.go +++ b/forged/internal/unsorted/ssh_server.go @@ -11,8 +11,8 @@ "os" "strings" gliderSSH "github.com/gliderlabs/ssh" - "go.lindenii.runxiyu.org/forge/internal/ansiec" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/ansiec" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" goSSH "golang.org/x/crypto/ssh" ) diff --git a/internal/unsorted/ssh_utils.go b/forged/internal/unsorted/ssh_utils.go rename from internal/unsorted/ssh_utils.go rename to forged/internal/unsorted/ssh_utils.go index d9850d215d5cee3d96bd79ee27535461904e113a..6f50a87df3ecc930d1e2d675170f410ce19db71f 100644 --- a/internal/unsorted/ssh_utils.go +++ b/forged/internal/unsorted/ssh_utils.go @@ -10,8 +10,8 @@ "fmt" "io" "net/url" - "go.lindenii.runxiyu.org/forge/internal/ansiec" - "go.lindenii.runxiyu.org/forge/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/ansiec" + "go.lindenii.runxiyu.org/forge/forged/internal/misc" ) var errIllegalSSHRepoPath = errors.New("illegal SSH repo path") diff --git a/internal/unsorted/unsorted.go b/forged/internal/unsorted/unsorted.go rename from internal/unsorted/unsorted.go rename to forged/internal/unsorted/unsorted.go diff --git a/internal/unsorted/users.go b/forged/internal/unsorted/users.go rename from internal/unsorted/users.go rename to forged/internal/unsorted/users.go diff --git a/internal/unsorted/version.go b/forged/internal/unsorted/version.go rename from internal/unsorted/version.go rename to forged/internal/unsorted/version.go diff --git a/internal/web/error_pages.go b/forged/internal/web/error_pages.go rename from internal/web/error_pages.go rename to forged/internal/web/error_pages.go diff --git a/internal/web/web.go b/forged/internal/web/web.go rename from internal/web/web.go rename to forged/internal/web/web.go -- 2.48.1