octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 03:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore all paths within .stversions folder

Browse Source
This commit is contained in:
Lode Hoste 2014-10-23 22:47:07 +02:00 committed by Jakob Borg
parent d4199c2d08
commit 33267f2178
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
internal/model/testdata/.syncthing.file vendored
View File

Binary file not shown.

5
internal/scanner/walk.go
View File

@ -20,6 +20,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strings"
"code.google.com/p/go.text/unicode/norm" "code.google.com/p/go.text/unicode/norm"
@ -113,8 +114,8 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo) filepath.WalkFun
return nil return nil
} }
if sn := filepath.Base(rn); sn == ".stignore" || sn == ".stversions" || if sn := filepath.Base(rn); sn == ".stignore" || sn == ".stfolder" ||
sn == ".stfolder" || (w.Matcher != nil && w.Matcher.Match(rn)) { strings.HasPrefix(rn, ".stversions") || (w.Matcher != nil && w.Matcher.Match(rn)) {
// An ignored file // An ignored file
if debug { if debug {
l.Debugln("ignored:", rn) l.Debugln("ignored:", rn)