iss #69: [wip] display search results

cmd/ponylib/cmd/web_ui.go

@@ -45,7 +45,7 @@ var webUiCmd = &cobra.Command{
 		engine := gin.Default()
 		web.SetupMiddlewares(engine)
 		web.SetupTemplates(engine, devMode)
-		web.AppendRouters(engine)
+		web.AppendRouters(engine, conn)
 
 		addr := fmt.Sprintf("%s:%d", bindHost, bindPort)
 		fmt.Printf("launching web app at: http://%s\n", addr)

fb2_parser/fb2_metadata.go

@@ -22,6 +22,18 @@ func (b *Book) String() string {
 	return b.Title
 }
 
+func (b *Book) WrittenAt() string {
+	if b.Date != nil {
+		if b.Date.Month() == time.January && b.Date.Day() == 1 {
+			return b.Date.Format("2006")
+		}
+		return b.Date.Format("2006-01-02")
+	} else if b.FormattedDate != nil {
+		return *b.FormattedDate
+	}
+	return ""
+}
+
 func (b *Book) AdditionalInfoString() *string {
 	if b.Date != nil || b.FormattedDate != nil || b.Lang != nil {
 		var sb strings.Builder
@@ -34,11 +46,7 @@ func (b *Book) AdditionalInfoString() *string {
 				sb.WriteString(", ")
 			}
 			sb.WriteString("Written at: ")
-			if b.Date != nil {
-				sb.WriteString(b.Date.Format("2006-01-02"))
-			} else {
-				sb.WriteString(*b.FormattedDate)
-			}
+			sb.WriteString(b.WrittenAt())
 		}
 		return u.StrPtr(sb.String())
 	}

ponylib_app/web/books.go

@@ -0,0 +1,58 @@
+package web
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/jackc/pgx/v4/pgxpool"
+
+	"dev.maizy.ru/ponylib/ponylib_app/search"
+)
+
+func BuildBooksHandler(conn *pgxpool.Pool) func(c *gin.Context) {
+
+	return func(c *gin.Context) {
+		query := c.Query("query")
+
+		var results *search.BookSearchResult
+		var totalFound int
+
+		if query != "" {
+			offset := 0
+			limit := 40
+
+			queryStruct := search.BookSearchQuery{TextMatch: query}
+
+			if found, err := search.CountBooks(conn, &queryStruct); err != nil {
+				c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("unable to count matched books: %w", err))
+				return
+			} else {
+				totalFound = found
+			}
+
+			if totalFound > 0 {
+				if res, err := search.SearchBooks(conn, &queryStruct, offset, limit); err != nil {
+					c.AbortWithError(
+						http.StatusInternalServerError,
+						fmt.Errorf("unable to count matched books: %w", err),
+					)
+					return
+				} else {
+					results = res
+				}
+			}
+		}
+
+		titleQuery := query
+		if len(titleQuery) >= 32 {
+			titleQuery = query[:30] + "…"
+		}
+		c.HTML(http.StatusOK, "search.tmpl", WithCommonVars(c, gin.H{
+			"subtitle":   "Books · " + query,
+			"query":      query,
+			"totalFound": totalFound,
+			"results":    results,
+		}))
+	}
+}

ponylib_app/web/router.go

@@ -6,56 +6,15 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-
-	"dev.maizy.ru/ponylib/ponylib_app"
+	"github.com/jackc/pgx/v4/pgxpool"
 )
 
-func AppendWebUiRouters(engine *gin.Engine) {
-	engine.GET("/", func(c *gin.Context) {
-		c.HTML(http.StatusOK, "index.tmpl", gin.H{
-			"lang":          "en",
-			"version":       ponylib_app.GetVersion(),
-			"show_examples": true,
-		})
-	})
-
-	engine.GET("/auth", func(c *gin.Context) {
-		c.HTML(http.StatusOK, "auth.tmpl", gin.H{
-			"lang":    "en",
-			"version": ponylib_app.GetVersion(),
-		})
-	})
-
-	engine.POST("/unlock", func(c *gin.Context) {
-		c.Redirect(http.StatusFound, "/")
-	})
-
-	engine.GET("/books", func(c *gin.Context) {
-		query := c.Query("query")
-		titleQuery := query
-		if len(titleQuery) >= 32 {
-			titleQuery = query[:30] + "…"
-		}
-		c.HTML(http.StatusOK, "search.tmpl", gin.H{
-			"lang":     "en",
-			"subtitle": "Books · " + query,
-			"query":    query,
-			"version":  ponylib_app.GetVersion(),
-		})
-	})
-}
-
-func AppendApiRouters(engine *gin.Engine) {
-	apiGroup := engine.Group("/api/v1")
-	apiGroup.GET("/version", BuildVersionHandler())
-}
-
 const staticPrefix = "/static/"
 
 //go:embed static/*
 var staticFS embed.FS
 
-func AppendRouters(engine *gin.Engine) {
+func AppendRouters(engine *gin.Engine, conn *pgxpool.Pool) {
 
 	engine.GET(staticPrefix+"*filepath", func(c *gin.Context) {
 		path := c.Request.URL.Path
@@ -66,6 +25,21 @@ func AppendRouters(engine *gin.Engine) {
 		}
 	})
 
-	AppendApiRouters(engine)
-	AppendWebUiRouters(engine)
+	engine.GET("/", func(c *gin.Context) {
+		c.HTML(http.StatusOK, "index.tmpl", WithCommonVars(c, gin.H{
+			"show_examples": true,
+		}))
+	})
+
+	engine.GET("/auth", func(c *gin.Context) {
+		c.HTML(http.StatusOK, "auth.tmpl", WithCommonVars(c, gin.H{}))
+	})
+
+	engine.POST("/unlock", func(c *gin.Context) {
+		c.Redirect(http.StatusFound, "/")
+	})
+
+	engine.GET("/version", BuildVersionHandler())
+
+	engine.GET("/books", BuildBooksHandler(conn))
 }