symlinks ok

notes/search.go

@@ -57,7 +57,7 @@ func (n *Notes) Search(phrase string) (string, error) {
 			if err != nil {
 				return err
 			}
-			if info.IsDir() {
+			if !info.Mode().IsRegular() {
 				return nil
 			}
 			if size := info.Size(); size < 1 || size > (5*1024*1024) {
@@ -67,12 +67,11 @@ func (n *Notes) Search(phrase string) (string, error) {
 			if err != nil && err.Error() == "bufio.Scanner: token too long" {
 				err = nil
 			}
-			if err == nil && ok {
-				p := filetree.NewPathFromLocal(path.Dir(walked))
-				files.Push(p, info)
-			}
 			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
 		},
@@ -81,6 +80,12 @@ func (n *Notes) Search(phrase string) (string, error) {
 }
 
 func grepFile(file string, searcher *searcher) (bool, error) {
+	if d := path.Base(path.Dir(file)); strings.HasPrefix(d, ".") && strings.HasSuffix(d, ".attachments") {
+		return false, nil
+	}
+	if strings.Contains(file, "/.git/") {
+		return false, nil
+	}
 	f, err := os.Open(file)
 	if err != nil {
 		return false, err

versions/versions.go

@@ -4,9 +4,11 @@ import (
 	"fmt"
 	"io/ioutil"
 	"local/notes-server/config"
+	"log"
 	"os"
 	"os/exec"
 	"path"
+	"strings"
 	"time"
 )
 
@@ -44,6 +46,9 @@ func (v *Versions) Commit() error {
 func (v *Versions) cmd(cmd string, args ...string) error {
 	command := exec.Command(cmd, args...)
 	command.Dir = config.Root
-	_, err := command.CombinedOutput()
+	out, err := command.CombinedOutput()
+	if err != nil {
+		log.Println(cmd, args, ":", strings.TrimSpace(string(out)))
+	}
 	return err
 }