commit 2ff43cb8dfdc64128db0a6ea8429d8b24d9d3c46
parent f0e1f52ae24012cec7430a4d7104b91930206447
Author: vx-clutch <[email protected]>
Date: Sun, 14 Dec 2025 11:54:50 -0500
restructure Start
Diffstat:
2 files changed, 38 insertions(+), 46 deletions(-)
diff --git a/src/server/server.go b/src/server/server.go
@@ -136,7 +136,7 @@ func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
return app
}
-func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqData) (string, error) {
+func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqData) ([]byte, error) {
L := lua.NewState()
defer L.Close()
@@ -239,26 +239,26 @@ func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqD
})
if err := L.DoFile(entry); err != nil {
- return "", err
+ return []byte(""), err
}
if L.GetTop() == 0 {
- return "", nil
+ return []byte(""), nil
}
L.SetGlobal("__fes_result", L.Get(-1))
if err := L.DoString("return tostring(__fes_result)"); err != nil {
L.GetGlobal("__fes_result")
if s := L.ToString(-1); s != "" {
- return s, nil
+ return []byte(s), nil
}
- return "", nil
+ return []byte(""), nil
}
if s := L.ToString(-1); s != "" {
- return s, nil
+ return []byte(s), nil
}
- return "", nil
+ return []byte(""), nil
}
func generateArchiveIndex(fsPath string, urlPath string) (string, error) {
@@ -370,7 +370,7 @@ func Start(dir string) error {
cfg.App.Version = "unknown"
}
- notFoundData := `
+ notFoundData := []byte(`
<html>
<head><title>404 Not Found</title></head>
<body>
@@ -378,14 +378,14 @@ func Start(dir string) error {
<hr><center>fes</center>
</body>
</html>
-`
+`)
if _, err := os.Stat(filepath.Join("www", "404.lua")); err == nil {
if nf, err := loadLua(dir, "www/404.lua", &cfg, reqData{}); err == nil {
notFoundData = nf
}
} else if _, err := os.Stat("www/404.html"); err == nil {
if buf, err := os.ReadFile("www/404.html"); err == nil {
- notFoundData = string(buf)
+ notFoundData = buf
}
}
@@ -409,47 +409,42 @@ func Start(dir string) error {
}
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
- path := r.URL.Path
- route, ok := routes[path]
- var status error = nil
-
- route = basePath(route)
-
- if !ok && strings.HasPrefix(path, "/archive") {
- fsPath := "." + path
- info, err := os.Stat(fsPath)
- if err == nil && info.IsDir() {
- if htmlStr, err := generateArchiveIndex(fsPath, path); err == nil {
- w.Write([]byte(htmlStr))
- return
+ route, ok := routes[r.URL.Path]
+
+ var err error = nil
+ defer func() {
+ ui.Path(route, err)
+ }()
+
+ if !ok {
+ err = config.ErrRouteMiss
+ route = r.URL.Path
+
+ if strings.HasPrefix(route, "/archive") {
+ fsPath := "." + route
+ if info, err := os.Stat(fsPath); err == nil && info.IsDir() {
+ if page, err := generateArchiveIndex(fsPath, route); err == nil {
+ w.Write([]byte(page))
+ return
+ }
}
+ } else {
+ w.WriteHeader(http.StatusNotFound)
+ w.Write([]byte(notFoundData))
+ return
}
- } else if !ok {
- w.WriteHeader(http.StatusNotFound)
- w.Write([]byte(notFoundData))
-
- ui.Path(path, config.ErrRouteMiss)
- return
}
params := make(map[string]string)
- for k, val := range r.URL.Query() {
- if len(val) > 0 {
- params[k] = val[0]
+ for k, v := range r.URL.Query() {
+ if len(v) > 0 {
+ params[k] = v[0]
}
}
- req := reqData{
- path: path,
- params: params,
- }
-
var data []byte
-
if strings.HasSuffix(route, ".lua") {
- var b string
- b, err = loadLua(dir, route, &cfg, req)
- data = []byte(b)
+ data, err = loadLua(dir, route, &cfg, reqData{path: r.URL.Path, params: params})
} else if strings.HasSuffix(route, ".md") {
data, err = os.ReadFile(route)
data = []byte(markdownToHTML(string(data)))
@@ -459,12 +454,9 @@ func Start(dir string) error {
if err != nil {
http.Error(w, fmt.Sprintf("Error loading page: %v", err), http.StatusInternalServerError)
- status = err
- return
}
w.Write(data)
- ui.Path(path, status)
})
fmt.Printf("Server is running on http://localhost:%d\n", *config.Port)
diff --git a/src/ui/ui.go b/src/ui/ui.go
@@ -13,10 +13,10 @@ func Path(path string, err error) {
path = strings.TrimPrefix(path, "/")
if path == "" {
- path = "/"
+ path = "(null)"
}
- fmt.Printf("> %s ", path)
+ fmt.Printf(" > %s ", path)
if err == nil {
OK("ok")
return
