2 Commits
v1.14 ... v1.16

Author SHA1 Message Date
Bel LaPointe
817fc57dd1 dont search attachments or git 2021-02-25 22:23:13 -06:00
Bel LaPointe
095ba7820d jsut in case 2021-02-25 22:17:32 -06:00
2 changed files with 12 additions and 1 deletions

View File

@@ -81,6 +81,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

View File

@@ -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
}