Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a16beb676 | ||
|
|
817fc57dd1 |
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user