Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: GetIgnores: Don't return error for no .stignore file 

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4311
This commit is contained in:
Simon Frei 2017-08-22 06:48:25 +00:00 committed by Jakob Borg
parent 0a96a1150b
commit 0ca0e3e9bd
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/model/model.go
View File

@ -1250,25 +1250,28 @@ func (m *Model) GetIgnores(folder string) ([]string, []string, error) {
defer m.fmut.RUnlock()
cfg, ok := m.folderCfgs[folder]
if ok {
if !cfg.HasMarker() {
return nil, nil, fmt.Errorf("Folder %s stopped", folder)
if !ok {
cfg, ok = m.cfg.Folders()[folder]
if !ok {
return nil, nil, fmt.Errorf("Folder %s does not exist", folder)
}
}
ignores := m.folderIgnores[folder]
if err := m.checkFolderPath(cfg); err != nil {
return nil, nil, err
}
ignores, ok := m.folderIgnores[folder]
if ok {
return ignores.Lines(), ignores.Patterns(), nil
}
if cfg, ok := m.cfg.Folders()[folder]; ok {
matcher := ignore.New(cfg.Filesystem())
if err := matcher.Load(".stignore"); err != nil {
return nil, nil, err
}
return matcher.Lines(), matcher.Patterns(), nil
ignores = ignore.New(fs.NewFilesystem(cfg.FilesystemType, cfg.Path))
if err := ignores.Load(".stignore"); err != nil && !fs.IsNotExist(err) {
return nil, nil, err
}
return nil, nil, fmt.Errorf("Folder %s does not exist", folder)
return ignores.Lines(), ignores.Patterns(), nil
}
func (m *Model) SetIgnores(folder string, content []string) error {

5
lib/model/model_test.go
View File

@ -1083,6 +1083,11 @@ func TestIgnores(t *testing.T) {
// added to the model and thus there is no initial scan happening.
changeIgnores(t, m, expected)
// Make sure no .stignore file is considered valid
os.Rename("testdata/.stignore", "testdata/.stignore.bak")
changeIgnores(t, m, []string{})
os.Rename("testdata/.stignore.bak", "testdata/.stignore")
}
func TestROScanRecovery(t *testing.T) {