From 86f9d62c5ef3e61fdac9bda0a9920b8c1d9820fa Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Wed, 12 Feb 2025 11:28:37 +0800 Subject: handle_index: Query group names from database --- handle_index.go | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/handle_index.go b/handle_index.go index 4301eed..c631546 100644 --- a/handle_index.go +++ b/handle_index.go @@ -2,22 +2,33 @@ package main import ( "net/http" - "os" ) func handle_index(w http.ResponseWriter, r *http.Request) { data := make(map[string]any) - entries, err := os.ReadDir(config.Git.Root) + rows, err := database.Query(r.Context(), "SELECT name FROM groups") if err != nil { - _, _ = w.Write([]byte("Error listing groups: " + err.Error())) + _, _ = w.Write([]byte("Error querying groups: " + err.Error())) return } + defer rows.Close() groups := []string{} - for _, entry := range entries { - groups = append(groups, entry.Name()) + for rows.Next() { + var groupName string + if err := rows.Scan(&groupName); err != nil { + _, _ = w.Write([]byte("Error scanning group name: " + err.Error())) + return + } + groups = append(groups, groupName) } + + if err := rows.Err(); err != nil { + _, _ = w.Write([]byte("Error iterating over rows: " + err.Error())) + return + } + data["groups"] = groups err = templates.ExecuteTemplate(w, "index", data) -- cgit v1.2.3