perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Refactor out folder and folderscan types, simplify somewhat

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3007
This commit is contained in:
Lars K.W. Gohlke
2016-04-26 14:01:46 +00:00
committed by Jakob Borg
parent 2467678bd4
commit 236f121c4e
7 changed files with 446 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/model/model.go
View File

@@ -172,7 +172,7 @@ func (m *Model) StartFolderRW(folder string) {
if ok {
panic("cannot start already running folder " + folder)
}
p := newRWFolder(m, m.shortID, cfg)
p := newRWFolder(m, cfg)
m.folderRunners[folder] = p
if len(cfg.Versioning.Type) > 0 {
@@ -243,7 +243,7 @@ func (m *Model) StartFolderRO(folder string) {
if ok {
panic("cannot start already running folder " + folder)
}
s := newROFolder(m, folder, time.Duration(cfg.RescanIntervalS)*time.Second)
s := newROFolder(m, cfg)
m.folderRunners[folder] = s
token := m.Add(s)
@@ -1360,7 +1360,7 @@ func (m *Model) ScanFolderSubs(folder string, subs []string) error {
return runner.Scan(subs)
}
func (m *Model) internalScanFolderSubs(folder string, subs []string) error {
func (m *Model) internalScanFolderSubdirs(folder string, subs []string) error {
for i, sub := range subs {
sub = osutil.NativeFilename(sub)
if p := filepath.Clean(filepath.Join(folder, sub)); !strings.HasPrefix(p, folder) {