From 3b7d89ab5e022b310303b29efc976ded75851f34 Mon Sep 17 00:00:00 2001 From: cblgh Date: Thu, 4 Feb 2021 17:44:58 +0100 Subject: [PATCH] go fmt --- database/database.go | 22 +++++++++++----------- server/server.go | 29 ++++++++++++++--------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/database/database.go b/database/database.go index ee467a7..a76c50b 100644 --- a/database/database.go +++ b/database/database.go @@ -111,22 +111,22 @@ func GetWordCount(db *sql.DB) int { } func GetRandomPage(db *sql.DB) string { - rows, err := db.Query("SELECT url FROM pages ORDER BY RANDOM() LIMIT 1;") - util.Check(err) - defer rows.Close() + rows, err := db.Query("SELECT url FROM pages ORDER BY RANDOM() LIMIT 1;") + util.Check(err) + defer rows.Close() - var link string - for rows.Next() { - err = rows.Scan(&link) - util.Check(err) - } - return link + var link string + for rows.Next() { + err = rows.Scan(&link) + util.Check(err) + } + return link } func countQuery(db *sql.DB, table string) int { rows, err := db.Query(fmt.Sprintf("SELECT COUNT(*) FROM %s;", table)) util.Check(err) - defer rows.Close() + defer rows.Close() var count int for rows.Next() { @@ -165,7 +165,7 @@ func searchWords(db *sql.DB, words []string, searchByScore bool) []types.PageDat rows, err := stmt.Query(args...) util.Check(err) - defer rows.Close() + defer rows.Close() var pageData types.PageData var pages []types.PageData diff --git a/server/server.go b/server/server.go index c5e9971..34c9be5 100644 --- a/server/server.go +++ b/server/server.go @@ -1,18 +1,17 @@ package server import ( + "database/sql" "fmt" "net/http" "net/url" "strings" - "database/sql" + "html/template" "lieu/database" "lieu/types" "lieu/util" - "html/template" - - // "github.com/shurcooL/vfsgen" + // "github.com/shurcooL/vfsgen" ) type SearchData struct { @@ -40,8 +39,8 @@ func searchRoute(res http.ResponseWriter, req *http.Request, config types.Config if !exists || words[0] == "" { view := template.Must(template.ParseFiles("html/index-template.html")) var empty interface{} - err := view.Execute(res, empty) - util.Check(err) + err := view.Execute(res, empty) + util.Check(err) return } query = words[0] @@ -49,7 +48,7 @@ func searchRoute(res http.ResponseWriter, req *http.Request, config types.Config view := template.Must(template.ParseFiles("html/index-template.html")) var empty interface{} err := view.Execute(res, empty) - util.Check(err) + util.Check(err) return } @@ -70,7 +69,7 @@ func searchRoute(res http.ResponseWriter, req *http.Request, config types.Config Pages: pages, } err := view.Execute(res, data) - util.Check(err) + util.Check(err) } func aboutRoute(res http.ResponseWriter, req *http.Request, config types.Config, db *sql.DB) { @@ -88,7 +87,7 @@ func aboutRoute(res http.ResponseWriter, req *http.Request, config types.Config, RingLink: config.General.URL, } err := view.Execute(res, data) - util.Check(err) + util.Check(err) } type ListData struct { @@ -113,12 +112,12 @@ func filteredRoute(res http.ResponseWriter, req *http.Request, config types.Conf URLs: URLs, } err := view.Execute(res, data) - util.Check(err) + util.Check(err) } func randomRoute(res http.ResponseWriter, req *http.Request, config types.Config, db *sql.DB) { - link := database.GetRandomPage(db) - http.Redirect(res, req, link, http.StatusSeeOther) + link := database.GetRandomPage(db) + http.Redirect(res, req, link, http.StatusSeeOther) } func Serve(config types.Config) { @@ -131,9 +130,9 @@ func Serve(config types.Config) { searchRoute(res, req, config, db) }) - http.HandleFunc("/random", func(res http.ResponseWriter, req *http.Request) { - randomRoute(res, req, config, db) - }) + http.HandleFunc("/random", func(res http.ResponseWriter, req *http.Request) { + randomRoute(res, req, config, db) + }) http.HandleFunc("/filtered", func(res http.ResponseWriter, req *http.Request) { filteredRoute(res, req, config, db)