fSD/fes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restructure Start

Browse Source
This commit is contained in:
vx-clutch
2025-12-14 11:54:50 -05:00
parent f0e1f52ae2
commit 2ff43cb8df
2 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/server/server.go
View File

@@ -136,7 +136,7 @@ func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
return app 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() L := lua.NewState()
defer L.Close() 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 { if err := L.DoFile(entry); err != nil {
return "", err return []byte(""), err
} }
if L.GetTop() == 0 { if L.GetTop() == 0 {
return "", nil return []byte(""), nil
} }
L.SetGlobal("__fes_result", L.Get(-1)) L.SetGlobal("__fes_result", L.Get(-1))
if err := L.DoString("return tostring(__fes_result)"); err != nil { if err := L.DoString("return tostring(__fes_result)"); err != nil {
L.GetGlobal("__fes_result") L.GetGlobal("__fes_result")
if s := L.ToString(-1); s != "" { if s := L.ToString(-1); s != "" {
return s, nil return []byte(s), nil
} }
return "", nil return []byte(""), nil
} }
if s := L.ToString(-1); s != "" { 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) { func generateArchiveIndex(fsPath string, urlPath string) (string, error) {
@@ -370,7 +370,7 @@ func Start(dir string) error {
cfg.App.Version = "unknown" cfg.App.Version = "unknown"
} }
notFoundData := ` notFoundData := []byte(`
<html> <html>
<head><title>404 Not Found</title></head> <head><title>404 Not Found</title></head>
<body> <body>
@@ -378,14 +378,14 @@ func Start(dir string) error {
<hr><center>fes</center> <hr><center>fes</center>
</body> </body>
</html> </html>
` `)
if _, err := os.Stat(filepath.Join("www", "404.lua")); err == nil { if _, err := os.Stat(filepath.Join("www", "404.lua")); err == nil {
if nf, err := loadLua(dir, "www/404.lua", &cfg, reqData{}); err == nil { if nf, err := loadLua(dir, "www/404.lua", &cfg, reqData{}); err == nil {
notFoundData = nf notFoundData = nf
} }
} else if _, err := os.Stat("www/404.html"); err == nil { } else if _, err := os.Stat("www/404.html"); err == nil {
if buf, err := os.ReadFile("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) { http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
path := r.URL.Path route, ok := routes[r.URL.Path]
route, ok := routes[path]
var status error = nil
route = basePath(route) var err error = nil
defer func() {
ui.Path(route, err)
}()
if !ok && strings.HasPrefix(path, "/archive") { if !ok {
fsPath := "." + path err = config.ErrRouteMiss
info, err := os.Stat(fsPath) route = r.URL.Path
if err == nil && info.IsDir() {
if htmlStr, err := generateArchiveIndex(fsPath, path); err == nil { if strings.HasPrefix(route, "/archive") {
w.Write([]byte(htmlStr)) 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 return
} }
} }
} else if !ok { } else {
w.WriteHeader(http.StatusNotFound) w.WriteHeader(http.StatusNotFound)
w.Write([]byte(notFoundData)) w.Write([]byte(notFoundData))
ui.Path(path, config.ErrRouteMiss)
return return
} }
}
params := make(map[string]string) params := make(map[string]string)
for k, val := range r.URL.Query() { for k, v := range r.URL.Query() {
if len(val) > 0 { if len(v) > 0 {
params[k] = val[0] params[k] = v[0]
} }
} }
req := reqData{
path: path,
params: params,
}
var data []byte var data []byte
if strings.HasSuffix(route, ".lua") { if strings.HasSuffix(route, ".lua") {
var b string data, err = loadLua(dir, route, &cfg, reqData{path: r.URL.Path, params: params})
b, err = loadLua(dir, route, &cfg, req)
data = []byte(b)
} else if strings.HasSuffix(route, ".md") { } else if strings.HasSuffix(route, ".md") {
data, err = os.ReadFile(route) data, err = os.ReadFile(route)
data = []byte(markdownToHTML(string(data))) data = []byte(markdownToHTML(string(data)))
@@ -459,12 +454,9 @@ func Start(dir string) error {
if err != nil { if err != nil {
http.Error(w, fmt.Sprintf("Error loading page: %v", err), http.StatusInternalServerError) http.Error(w, fmt.Sprintf("Error loading page: %v", err), http.StatusInternalServerError)
status = err
return
} }
w.Write(data) w.Write(data)
ui.Path(path, status)
}) })
fmt.Printf("Server is running on http://localhost:%d\n", *config.Port) fmt.Printf("Server is running on http://localhost:%d\n", *config.Port)

4
src/ui/ui.go
View File

@@ -13,10 +13,10 @@ func Path(path string, err error) {
path = strings.TrimPrefix(path, "/") path = strings.TrimPrefix(path, "/")
if path == "" { if path == "" {
path = "/" path = "(null)"
} }
fmt.Printf("> %s ", path) fmt.Printf(" > %s ", path)
if err == nil { if err == nil {
OK("ok") OK("ok")
return return