+
+
diff --git a/storage/database.go b/storage/database.go
index 192f149..5fd6e20 100644
--- a/storage/database.go
+++ b/storage/database.go
@@ -384,9 +384,14 @@ func List(start, limit int) ([]MessageSummary, error) {
// The search is broken up by segments (exact phrases can be quoted), and interprets specific terms such as:
// is:read, is:unread, has:attachment, to:, from: & subject:
// Negative searches also also included by prefixing the search term with a `-` or `!`
-func Search(search string, start, limit int) ([]MessageSummary, error) {
+func Search(search string, start, limit int) ([]MessageSummary, int, error) {
results := []MessageSummary{}
+ allResults := []MessageSummary{}
tsStart := time.Now()
+ nrResults := 0
+ if limit < 0 {
+ limit = 50
+ }
s := strings.ToLower(search)
// add another quote if missing closing quote
@@ -398,11 +403,11 @@ func Search(search string, start, limit int) ([]MessageSummary, error) {
p := shellwords.NewParser()
args, err := p.Parse(s)
if err != nil {
- return results, errors.New("Your search contains invalid characters")
+ return results, nrResults, errors.New("Your search contains invalid characters")
}
// generate the SQL based on arguments
- q := searchParser(args, start, limit)
+ q := searchParser(args)
if err := q.QueryAndClose(nil, db, func(row *sql.Rows) {
var created int64
@@ -440,18 +445,29 @@ func Search(search string, start, limit int) ([]MessageSummary, error) {
em.Attachments = attachments
em.Read = read == 1
- results = append(results, em)
+ allResults = append(allResults, em)
}); err != nil {
- return results, err
+ return results, nrResults, err
+ }
+
+ dbLastAction = time.Now()
+
+ nrResults = len(allResults)
+
+ if nrResults > start {
+ end := nrResults
+ if nrResults >= start+limit {
+ end = start + limit
+ }
+
+ results = allResults[start:end]
}
elapsed := time.Since(tsStart)
logger.Log().Debugf("[db] search for \"%s\" in %s", search, elapsed)
- dbLastAction = time.Now()
-
- return results, err
+ return results, nrResults, err
}
// GetMessage returns a Message generated from the mailbox_data collection.
diff --git a/storage/database_test.go b/storage/database_test.go
index 344bdc1..e9876ee 100644
--- a/storage/database_test.go
+++ b/storage/database_test.go
@@ -168,9 +168,9 @@ func TestSearch(t *testing.T) {
for i := 1; i < 51; i++ {
// search a random something that will return a single result
- searchIndx := rand.Intn(4) + 1
+ searchIdx := rand.Intn(4) + 1
var search string
- switch searchIndx {
+ switch searchIdx {
case 1:
search = fmt.Sprintf("from-%d@example.com", i)
case 2:
@@ -181,7 +181,7 @@ func TestSearch(t *testing.T) {
search = fmt.Sprintf("\"the email body %d jdsauk dwqmdqw\"", i)
}
- summaries, err := Search(search, 0, 100)
+ summaries, _, err := Search(search, 0, 100)
if err != nil {
t.Log("error ", err)
t.Fail()
@@ -196,8 +196,8 @@ func TestSearch(t *testing.T) {
assertEqual(t, summaries[0].Subject, fmt.Sprintf("Subject line %d end", i), "\"Subject\" does not match")
}
- // search something that will return 200 rsults
- summaries, err := Search("This is the email body", 0, testRuns)
+ // search something that will return 200 results
+ summaries, _, err := Search("This is the email body", 0, testRuns)
if err != nil {
t.Log("error ", err)
t.Fail()
diff --git a/storage/search.go b/storage/search.go
index a3824cd..519bd78 100644
--- a/storage/search.go
+++ b/storage/search.go
@@ -8,25 +8,14 @@ import (
)
// SearchParser returns the SQL syntax for the database search based on the search arguments
-func searchParser(args []string, start, limit int) *sqlf.Stmt {
- if limit == 0 {
- limit = 50
- }
-
+func searchParser(args []string) *sqlf.Stmt {
q := sqlf.From("mailbox").
Select(`Created, ID, MessageID, Subject, Metadata, Size, Attachments, Read, Tags,
IFNULL(json_extract(Metadata, '$.To'), '{}') as ToJSON,
IFNULL(json_extract(Metadata, '$.From'), '{}') as FromJSON,
IFNULL(json_extract(Metadata, '$.Cc'), '{}') as CcJSON,
IFNULL(json_extract(Metadata, '$.Bcc'), '{}') as BccJSON
- `).
- OrderBy("Created DESC").
- Limit(limit).
- Offset(start)
-
- if limit > 0 {
- q = q.Limit(limit)
- }
+ `).OrderBy("Created DESC")
for _, w := range args {
if cleanString(w) == "" {