search file names first

notes/comment_test.go

@@ -42,7 +42,7 @@ func TestComment(t *testing.T) {
 		t.Error(err)
 	}
 
-	if err := n.Comment(fpath, 10000, "big line no"); err == nil {
+	if err := n.Comment(fpath, 10000, "big line no"); err != nil {
 		t.Error(err)
 	}
 

notes/delete.go

@@ -1,11 +1,16 @@
 package notes
 
 import (
+	"fmt"
 	"local/notes-server/filetree"
 	"os"
 )
 
 func (n *Notes) Delete(urlPath string) error {
 	p := filetree.NewPathFromURL(urlPath)
-	return os.Remove(p.Local)
+	err := os.Remove(p.Local)
+	if err != nil {
+		err = fmt.Errorf("failed to delete %q => %q: %v", urlPath, p.Local, err)
+	}
+	return err
 }

notes/delete_test.go

@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"local/notes-server/config"
 	"os"
+	"path"
 	"testing"
 )
 
@@ -11,33 +12,43 @@ func TestDelete(t *testing.T) {
 	config.Root = "/tmp"
 	ioutil.WriteFile("/tmp/a", []byte("hi"), os.ModePerm)
 	n := &Notes{}
-	if err := n.Delete("/notes/a"); err != nil {
-		t.Error(err)
-	}
-	if _, err := os.Stat("/tmp/a"); err == nil {
-		t.Error(err)
-	}
 
-	d, err := ioutil.TempDir(os.TempDir(), "trydel*")
+	t.Run("delete 404", func(t *testing.T) {
-	if err != nil {
+		if err := n.Delete("/notes/a"); err != nil {
-		t.Fatal(err)
+			t.Error(err)
-	}
+		}
-	for i := 0; i < 3; i++ {
+		if _, err := os.Stat("/tmp/a"); err == nil {
-		f, err := ioutil.TempFile(d, "file*")
+			t.Error(err)
+		}
+	})
+
+	t.Run("delete w. content", func(t *testing.T) {
+		d, err := ioutil.TempDir(os.TempDir(), "trydel*")
 		if err != nil {
 			t.Fatal(err)
 		}
-		f.Close()
+		config.Root = path.Dir(d)
-	}
+		for i := 0; i < 3; i++ {
-	if err := n.Delete(d); err == nil {
+			f, err := ioutil.TempFile(d, "file*")
-		t.Error(err)
+			if err != nil {
-	}
+				t.Fatal(err)
+			}
+			f.Close()
+		}
+		if err := n.Delete("/abc/" + path.Base(d)); err == nil {
+			t.Error(err)
+		}
+	})
 
-	e, err := ioutil.TempDir(os.TempDir(), "trydel*")
+	t.Run("delete empty dir", func(t *testing.T) {
-	if err != nil {
+		d2p := os.TempDir()
-		t.Fatal(err)
+		d2, err := ioutil.TempDir(d2p, "trydel*")
-	}
+		config.Root = path.Dir(d2p)
-	if err := n.Delete(e); err != nil {
+		if err != nil {
-		t.Error(err)
+			t.Fatal(err)
-	}
+		}
+		if err := n.Delete("/abc/" + path.Base(d2)); err != nil {
+			t.Errorf("failed to del empty dir %s in %s: %v", d2, d2p, err)
+		}
+	})
 }

notes/search.go

@@ -3,6 +3,7 @@ package notes
 import (
 	"bufio"
 	"errors"
+	"io"
 	"local/notes-server/filetree"
 	"log"
 	"os"
@@ -51,6 +52,7 @@ func (n *Notes) Search(phrase string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	perffiles := filetree.NewFiles()
 	files := filetree.NewFiles()
 	err = filepath.Walk(n.root,
 		func(walked string, info os.FileInfo, err error) error {
@@ -60,26 +62,33 @@ func (n *Notes) Search(phrase string) (string, error) {
 			if !info.Mode().IsRegular() {
 				return nil
 			}
+			p := filetree.NewPathFromLocal(path.Dir(walked))
+			if ok, _ := searcher.stream(strings.NewReader(info.Name())); ok {
+				perffiles.Push(p, info)
+				return nil
+			}
 			if size := info.Size(); size < 1 || size > (5*1024*1024) {
 				return nil
 			}
-			ok, err := grepFile(walked, searcher)
+			ok, err := searcher.file(walked)
 			if err != nil && err.Error() == "bufio.Scanner: token too long" {
 				err = nil
 			}
 			if err != nil {
 				log.Printf("failed to scan %v: %v", walked, err)
 			} else if ok {
-				p := filetree.NewPathFromLocal(path.Dir(walked))
 				files.Push(p, info)
 			}
 			return err
 		},
 	)
-	return filetree.Paths(*files).List(true), err
+	for _, file := range *files {
+		*perffiles = append(*perffiles, file)
+	}
+	return filetree.Paths(*perffiles).List(true), err
 }
 
-func grepFile(file string, searcher *searcher) (bool, error) {
+func (searcher *searcher) file(file string) (bool, error) {
 	if d := path.Base(path.Dir(file)); strings.HasPrefix(d, ".") && strings.HasSuffix(d, ".attachments") {
 		return false, nil
 	}
@@ -91,7 +100,11 @@ func grepFile(file string, searcher *searcher) (bool, error) {
 		return false, err
 	}
 	defer f.Close()
-	scanner := bufio.NewScanner(f)
+	return searcher.stream(f)
+}
+
+func (searcher *searcher) stream(r io.Reader) (bool, error) {
+	scanner := bufio.NewScanner(r)
 	for scanner.Scan() {
 		if searcher.matches(scanner.Bytes()) {
 			return true, scanner.Err()

notes/search_test.go

@@ -34,7 +34,7 @@ func TestSearch(t *testing.T) {
 		t.Fatal(v, result)
 	}
 
-	result, err = n.Search("4")
+	result, err = n.Search("number.4")
 	if err != nil {
 		t.Fatal(err)
 	}