Advanced search queries

Author: rubiojr

cmd/hs/search.go

@@ -115,7 +115,7 @@ func searchByExt(c *cli.Context, filename string) error {
 	}
 	defer db.Close()
 
-	r, err := hsdb.Search(db, filename, []string{ext}, limit)
+	r, err := hsdb.Search(db, filename, []string{ext}, []string{}, limit)
 	for _, result := range r {
 		printFileResult(result)
 	}
@@ -125,27 +125,18 @@ func searchByExt(c *cli.Context, filename string) error {
 
 func searchByHost(c *cli.Context, filename string) error {
 	host := c.String("host")
-	limit := c.String("limit")
+	limit := c.Int("limit")
 	db, err := dbConn(c.String("db"))
 	if err != nil {
 		return fmt.Errorf("failed to get database connection: %v", err)
 	}
 	defer db.Close()
 
-	query := `
-		SELECT file_path, file_size, modified_date, host, extension, file_hash
-		FROM file_info
-		WHERE (file_path LIKE ? OR file_hash LIKE ?) AND host = ?
-		LIMIT ?
-	`
-
-	rows, err := db.Query(query, "%"+filename+"%", "%"+filename+"%", host, limit)
-	if err != nil {
-		return fmt.Errorf("failed to query database: %v", err)
+	r, err := hsdb.Search(db, filename, []string{}, []string{host}, limit)
+	for _, result := range r {
+		printFileResult(result)
 	}
-	defer rows.Close()
-
-	return printRows(rows)
+	return nil
 }
 
 func searchFiles(c *cli.Context, filename string) error {
@@ -155,7 +146,7 @@ func searchFiles(c *cli.Context, filename string) error {
 	}
 	defer db.Close()
 
-	r, err := hsdb.Search(db, filename, []string{}, 100)
+	r, err := hsdb.Search(db, filename, []string{}, []string{}, 100)
 	for _, result := range r {
 		printFileResult(result)
 	}

internal/api/api.go

@@ -137,7 +137,19 @@ func searchHandler(dbPath string) http.HandlerFunc {
 			return
 		}
 
-		results, err := hsdb.Search(db, query, []string{}, 100)
+		ext := r.URL.Query().Get("ext")
+		exts := []string{}
+		if ext != "" {
+			exts = append(exts, ext)
+		}
+
+		host := r.URL.Query().Get("host")
+		hosts := []string{}
+		if host != "" {
+			hosts = append(hosts, host)
+		}
+
+		results, err := hsdb.Search(db, query, exts, hosts, 100)
 		if err != nil {
 			statusJSON(http.StatusInternalServerError, err, w, r)
 			return

internal/db/db.go

@@ -51,7 +51,7 @@ func CreateTables(db *sql.DB) error {
 	return err
 }
 
-func Search(db *sql.DB, query string, extensions []string, limit int) ([]*types.FileResult, error) {
+func Search(db *sql.DB, query string, extensions []string, hosts []string, limit int) ([]*types.FileResult, error) {
 	query = strings.Replace(query, " ", "%", -1)
 	sqlQuery := `
 		SELECT file_path, file_size, modified_date, host, extension, file_hash
@@ -64,13 +64,20 @@ func Search(db *sql.DB, query string, extensions []string, limit int) ([]*types.
 
 	if len(extensions) > 0 {
 		placeholders := make([]string, len(extensions))
-		for i := range extensions {
+		for i, ext := range extensions {
 			placeholders[i] = "?"
+			args = append(args, strings.TrimSpace(ext))
 		}
 		sqlQuery += fmt.Sprintf(" AND extension IN (%s)", strings.Join(placeholders, ","))
-		for _, ext := range extensions {
-			args = append(args, strings.TrimSpace(ext))
+	}
+
+	if len(hosts) > 0 {
+		placeholders := make([]string, len(hosts))
+		for i, host := range hosts {
+			placeholders[i] = "?"
+			args = append(args, strings.TrimSpace(host))
 		}
+		sqlQuery += fmt.Sprintf(" AND host IN (%s)", strings.Join(placeholders, ","))
 	}
 
 	sqlQuery += `