Advanced search fixes

Author: rubiojr

cmd/hs/search.go

@@ -57,14 +57,15 @@ func commandSearch() *cli.Command {
 			hostFilter := c.String("host")
 			extFilter := c.String("extension")
 			serverURL := c.String("server-url")
+			limit := c.Int("limit")
 
 			filename := c.Args().Get(0)
 			if c.NArg() == 0 {
 				return fmt.Errorf("filename argument is required")
 			}
 
 			if serverURL != "" {
-				return searchServer(serverURL, filename)
+				return searchServer(serverURL, filename, extFilter, hostFilter, limit)
 			}
 
 			if c.String("tag") != "" {
@@ -182,9 +183,9 @@ func printRows(rows *sql.Rows) error {
 	return nil
 }
 
-func searchServer(serverURL string, filename string) error {
+func searchServer(serverURL string, filename string, extFilter string, hostFilter string, limit int) error {
 	client := api.NewClient(serverURL)
-	r, err := client.Search(filename)
+	r, err := client.Search(filename, []string{extFilter}, []string{hostFilter}, limit)
 	if err != nil {
 		return fmt.Errorf("failed to search server: %v", err)
 	}

internal/api/api.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/go-chi/chi/v5"
@@ -60,9 +61,13 @@ func NewClient(serverURL string) *Client {
 	return &Client{client: client, serverURL: serverURL}
 }
 
-func (c *Client) Search(query string) ([]*types.FileResult, error) {
+func (c *Client) Search(query string, exts []string, hosts []string, limit int) ([]*types.FileResult, error) {
 	// Build the URL with query parameters
-	urlStr := fmt.Sprintf("%s/search?q=%s", c.serverURL, url.QueryEscape(query))
+	params := url.Values{}
+	params.Set("ext", strings.Join(exts, ","))
+	params.Set("host", strings.Join(hosts, ","))
+	params.Set("limit", strconv.Itoa(limit))
+	urlStr := fmt.Sprintf("%s/search?q=%s&%s", c.serverURL, url.QueryEscape(query), params.Encode())
 
 	// Create request
 	req, err := http.NewRequest("GET", urlStr, nil)
@@ -149,7 +154,18 @@ func searchHandler(dbPath string) http.HandlerFunc {
 			hosts = append(hosts, host)
 		}
 
-		results, err := hsdb.Search(db, query, exts, hosts, 100)
+		limit := r.URL.Query().Get("limit")
+		if limit == "" {
+			limit = "100"
+		}
+
+		ilimit, err := strconv.Atoi(limit)
+		if err != nil {
+			statusJSON(http.StatusBadRequest, errors.New("invalid limit parameter"), w, r)
+			return
+		}
+
+		results, err := hsdb.Search(db, query, exts, hosts, ilimit)
 		if err != nil {
 			statusJSON(http.StatusInternalServerError, err, w, r)
 			return