extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-04-11 11:08:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ignore a single dash as a token to improve search behavior for queries like 'ls -' to improve #67

Browse Source
This commit is contained in:
David Dworken 2023-02-18 21:46:51 -08:00
parent 0231203aad
commit f2298def32
No known key found for this signature in database
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/lib/lib.go
View File

@ -1098,6 +1098,11 @@ func MakeWhereQueryFromSearch(ctx *context.Context, db *gorm.DB, query string) (
tx := db.Model(&data.HistoryEntry{}).Where("true") tx := db.Model(&data.HistoryEntry{}).Where("true")
for _, token := range tokens { for _, token := range tokens {
if strings.HasPrefix(token, "-") { if strings.HasPrefix(token, "-") {
if token == "-" {
// The entire token is a -, just ignore this token. Otherwise we end up
// interpreting "-" as exluding literally all results which is pretty useless.
continue
}
if containsUnescaped(token, ":") { if containsUnescaped(token, ":") {
query, v1, v2, err := parseAtomizedToken(ctx, token[1:]) query, v1, v2, err := parseAtomizedToken(ctx, token[1:])
if err != nil { if err != nil {

7
client/lib/lib_test.go
View File

@ -274,6 +274,13 @@ func TestSearch(t *testing.T) {
if len(results) != 1 { if len(results) != 1 {
t.Fatalf("Search() returned %d results, expected 1, results=%#v", len(results), results) t.Fatalf("Search() returned %d results, expected 1, results=%#v", len(results), results)
} }
// A malformed search query, but we should just ignore the dash since this is a common enough thing
results, err = Search(ctx, db, "ls -", 5)
testutils.Check(t, err)
if len(results) != 3 {
t.Fatalf("Search() returned %d results, expected 3, results=%#v", len(results), results)
}
} }
func TestAddToDbIfNew(t *testing.T) { func TestAddToDbIfNew(t *testing.T) {