From c9b4eee4c589b8b40c02d0c96f887ec991580a24 Mon Sep 17 00:00:00 2001
From: Runxi Yu <me@runxiyu.org>
Date: Sun, 06 Apr 2025 09:33:11 +0800
Subject: [PATCH] Restructure static/templates into forged

---
 .golangci.yaml => forged/.golangci.yaml                                       | 0 
 Makefile                                                                      | 2 +-
 forged/cmd/forge/main.go                                                      | 1 +
 forged/internal/embed/.gitignore                                              | 1 +
 forged/internal/embed/embed.go                                                | 2 +-
 forged/internal/unsorted/resources.go                                         | 2 +-
 forged/internal/unsorted/server.go                                            | 2 +-
 static/.gitignore => forged/static/.gitignore                                 | 0 
 static/chroma.css => forged/static/chroma.css                                 | 0 
 static/style.css => forged/static/style.css                                   | 0 
 templates/400.tmpl => forged/templates/400.tmpl                               | 0 
 templates/400_colon.tmpl => forged/templates/400_colon.tmpl                   | 0 
 templates/403.tmpl => forged/templates/403.tmpl                               | 0 
 templates/404.tmpl => forged/templates/404.tmpl                               | 0 
 templates/451.tmpl => forged/templates/451.tmpl                               | 0 
 templates/500.tmpl => forged/templates/500.tmpl                               | 0 
 templates/501.tmpl => forged/templates/501.tmpl                               | 0 
 templates/_footer.tmpl => forged/templates/_footer.tmpl                       | 0 
 templates/_group_path.tmpl => forged/templates/_group_path.tmpl               | 0 
 templates/_group_view.tmpl => forged/templates/_group_view.tmpl               | 0 
 templates/_head.tmpl => forged/templates/_head.tmpl                           | 0 
 templates/_header.tmpl => forged/templates/_header.tmpl                       | 0 
 templates/_ref_query.tmpl => forged/templates/_ref_query.tmpl                 | 0 
 templates/group.tmpl => forged/templates/group.tmpl                           | 0 
 templates/index.tmpl => forged/templates/index.tmpl                           | 0 
 templates/login.tmpl => forged/templates/login.tmpl                           | 0 
 templates/repo_branches.tmpl => forged/templates/repo_branches.tmpl           | 0 
 templates/repo_commit.tmpl => forged/templates/repo_commit.tmpl               | 0 
 templates/repo_contrib_index.tmpl => forged/templates/repo_contrib_index.tmpl | 0 
 templates/repo_contrib_one.tmpl => forged/templates/repo_contrib_one.tmpl     | 0 
 templates/repo_index.tmpl => forged/templates/repo_index.tmpl                 | 0 
 templates/repo_log.tmpl => forged/templates/repo_log.tmpl                     | 0 
 templates/repo_raw_dir.tmpl => forged/templates/repo_raw_dir.tmpl             | 0 
 templates/repo_tree_dir.tmpl => forged/templates/repo_tree_dir.tmpl           | 0 
 templates/repo_tree_file.tmpl => forged/templates/repo_tree_file.tmpl         | 0 

diff --git a/.golangci.yaml b/forged/.golangci.yaml
rename from .golangci.yaml
rename to forged/.golangci.yaml
diff --git a/Makefile b/Makefile
index 98a2f140c1a243090ce633892af6371d0ddef3c2..990c1ceb7d25fa94845eca4db6803a5d025fc09c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ CFLAGS = -Wall -Wextra -pedantic -std=c99 -D_GNU_SOURCE
 
 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 = git2d/git2d hookc/hookc source.tar.gz $(wildcard LICENSE*) $(wildcard forged/static/*) $(wildcard forged/templates/*)
 EMBED_ = $(EMBED:%=forged/internal/embed/%)
 
 forge: $(EMBED_) $(SOURCE_FILES)
diff --git a/forged/cmd/forge/main.go b/forged/cmd/forge/main.go
index 87857515b008091dc88c2178556ed14f8543d6ba..fde15d1080ef453980a16373e2065cadc6454dd3 100644
--- a/forged/cmd/forge/main.go
+++ b/forged/cmd/forge/main.go
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 // SPDX-FileCopyrightText: Copyright (c) 2025 Runxi Yu <https://runxiyu.org>
 
+// The main entry point to the Lindenii Forge daemon.
 package main
 
 import (
diff --git a/forged/internal/embed/.gitignore b/forged/internal/embed/.gitignore
index b4db1113e63e06aa914f27deed24e3d719f1b258..e8708b16fc3ace99b1af7fb1669a2620979be4dd 100644
--- a/forged/internal/embed/.gitignore
+++ b/forged/internal/embed/.gitignore
@@ -4,3 +4,4 @@ /git2d/git2d
 /static
 /templates
 /LICENSE*
+/forged
diff --git a/forged/internal/embed/embed.go b/forged/internal/embed/embed.go
index 68af51d69e4be80c1fc0fa89a20da51b0ce4f0bc..c9eeeb3899772f32805304dc41243f5423f998e0 100644
--- a/forged/internal/embed/embed.go
+++ b/forged/internal/embed/embed.go
@@ -9,6 +9,6 @@
 //go:embed LICENSE* source.tar.gz
 var Source embed.FS
 
-//go:embed templates/* static/*
+//go:embed forged/templates/* forged/static/*
 //go:embed hookc/hookc git2d/git2d
 var Resources embed.FS
diff --git a/forged/internal/unsorted/resources.go b/forged/internal/unsorted/resources.go
index 9f3a5d09011280a496a39398d47c3edf2ba8fb27..692b454c109e6f8dbd2832a68426c8dddf418c4b 100644
--- a/forged/internal/unsorted/resources.go
+++ b/forged/internal/unsorted/resources.go
@@ -30,7 +30,7 @@ 		"dereference_error": misc.DereferenceOrZero[error],
 		"minus":             misc.Minus,
 	})
 
-	err = fs.WalkDir(embed.Resources, "templates", func(path string, d fs.DirEntry, err error) error {
+	err = fs.WalkDir(embed.Resources, "forged/templates", func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
diff --git a/forged/internal/unsorted/server.go b/forged/internal/unsorted/server.go
index f8978a5fcea1ffc75d52c10597fca2b060978edc..c7caa7674bba2f72373cd1971fab8747e7cfe823 100644
--- a/forged/internal/unsorted/server.go
+++ b/forged/internal/unsorted/server.go
@@ -63,7 +63,7 @@ 	s.sourceHandler = http.StripPrefix(
 		"/-/source/",
 		http.FileServer(http.FS(embed.Source)),
 	)
-	staticFS, err := fs.Sub(embed.Resources, "static")
+	staticFS, err := fs.Sub(embed.Resources, "forged/static")
 	if err != nil {
 		return s, err
 	}
diff --git a/static/.gitignore b/forged/static/.gitignore
rename from static/.gitignore
rename to forged/static/.gitignore
diff --git a/static/chroma.css b/forged/static/chroma.css
rename from static/chroma.css
rename to forged/static/chroma.css
diff --git a/static/style.css b/forged/static/style.css
rename from static/style.css
rename to forged/static/style.css
diff --git a/templates/400.tmpl b/forged/templates/400.tmpl
rename from templates/400.tmpl
rename to forged/templates/400.tmpl
diff --git a/templates/400_colon.tmpl b/forged/templates/400_colon.tmpl
rename from templates/400_colon.tmpl
rename to forged/templates/400_colon.tmpl
diff --git a/templates/403.tmpl b/forged/templates/403.tmpl
rename from templates/403.tmpl
rename to forged/templates/403.tmpl
diff --git a/templates/404.tmpl b/forged/templates/404.tmpl
rename from templates/404.tmpl
rename to forged/templates/404.tmpl
diff --git a/templates/451.tmpl b/forged/templates/451.tmpl
rename from templates/451.tmpl
rename to forged/templates/451.tmpl
diff --git a/templates/500.tmpl b/forged/templates/500.tmpl
rename from templates/500.tmpl
rename to forged/templates/500.tmpl
diff --git a/templates/501.tmpl b/forged/templates/501.tmpl
rename from templates/501.tmpl
rename to forged/templates/501.tmpl
diff --git a/templates/_footer.tmpl b/forged/templates/_footer.tmpl
rename from templates/_footer.tmpl
rename to forged/templates/_footer.tmpl
diff --git a/templates/_group_path.tmpl b/forged/templates/_group_path.tmpl
rename from templates/_group_path.tmpl
rename to forged/templates/_group_path.tmpl
diff --git a/templates/_group_view.tmpl b/forged/templates/_group_view.tmpl
rename from templates/_group_view.tmpl
rename to forged/templates/_group_view.tmpl
diff --git a/templates/_head.tmpl b/forged/templates/_head.tmpl
rename from templates/_head.tmpl
rename to forged/templates/_head.tmpl
diff --git a/templates/_header.tmpl b/forged/templates/_header.tmpl
rename from templates/_header.tmpl
rename to forged/templates/_header.tmpl
diff --git a/templates/_ref_query.tmpl b/forged/templates/_ref_query.tmpl
rename from templates/_ref_query.tmpl
rename to forged/templates/_ref_query.tmpl
diff --git a/templates/group.tmpl b/forged/templates/group.tmpl
rename from templates/group.tmpl
rename to forged/templates/group.tmpl
diff --git a/templates/index.tmpl b/forged/templates/index.tmpl
rename from templates/index.tmpl
rename to forged/templates/index.tmpl
diff --git a/templates/login.tmpl b/forged/templates/login.tmpl
rename from templates/login.tmpl
rename to forged/templates/login.tmpl
diff --git a/templates/repo_branches.tmpl b/forged/templates/repo_branches.tmpl
rename from templates/repo_branches.tmpl
rename to forged/templates/repo_branches.tmpl
diff --git a/templates/repo_commit.tmpl b/forged/templates/repo_commit.tmpl
rename from templates/repo_commit.tmpl
rename to forged/templates/repo_commit.tmpl
diff --git a/templates/repo_contrib_index.tmpl b/forged/templates/repo_contrib_index.tmpl
rename from templates/repo_contrib_index.tmpl
rename to forged/templates/repo_contrib_index.tmpl
diff --git a/templates/repo_contrib_one.tmpl b/forged/templates/repo_contrib_one.tmpl
rename from templates/repo_contrib_one.tmpl
rename to forged/templates/repo_contrib_one.tmpl
diff --git a/templates/repo_index.tmpl b/forged/templates/repo_index.tmpl
rename from templates/repo_index.tmpl
rename to forged/templates/repo_index.tmpl
diff --git a/templates/repo_log.tmpl b/forged/templates/repo_log.tmpl
rename from templates/repo_log.tmpl
rename to forged/templates/repo_log.tmpl
diff --git a/templates/repo_raw_dir.tmpl b/forged/templates/repo_raw_dir.tmpl
rename from templates/repo_raw_dir.tmpl
rename to forged/templates/repo_raw_dir.tmpl
diff --git a/templates/repo_tree_dir.tmpl b/forged/templates/repo_tree_dir.tmpl
rename from templates/repo_tree_dir.tmpl
rename to forged/templates/repo_tree_dir.tmpl
diff --git a/templates/repo_tree_file.tmpl b/forged/templates/repo_tree_file.tmpl
rename from templates/repo_tree_file.tmpl
rename to forged/templates/repo_tree_file.tmpl

-- 
2.48.1