octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 19:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1424 from AudriusButkevicius/scanner

Browse Source 
Make sure we start scanning at an indexed location (fixes #1399)
This commit is contained in:
Audrius Butkevicius 2015-03-08 19:46:21 +00:00
commit 575b62d77b
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/model/model.go
View File

@ -1146,6 +1146,7 @@ func (m *Model) ScanFolder(folder string) error {
}
func (m *Model) ScanFolderSub(folder, sub string) error {
sub = osutil.NativeFilename(sub)
if p := filepath.Clean(filepath.Join(folder, sub)); !strings.HasPrefix(p, folder) {
return errors.New("invalid subpath")
}
@ -1162,6 +1163,18 @@ func (m *Model) ScanFolderSub(folder, sub string) error {
_ = ignores.Load(filepath.Join(folderCfg.Path, ".stignore")) // Ignore error, there might not be an .stignore
// Required to make sure that we start indexing at a directory we're already
// aware off.
for sub != "" {
if _, ok = fs.Get(protocol.LocalDeviceID, sub); ok {
break
}
sub = filepath.Dir(sub)
if sub == "." || sub == string(filepath.Separator) {
sub = ""
}
}
w := &scanner.Walker{
Dir: folderCfg.Path,
Sub: sub,