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

lib/model: Deduplicate folder loops

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4352
LGTM: AudriusButkevicius, calmh
This commit is contained in:
Simon Frei 2017-09-07 06:17:47 +00:00 committed by Jakob Borg
parent 4d3e0de4ba
commit f7d2c58783
4 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/model/folder.go
View File

@ -71,3 +71,20 @@ func (f *folder) scanSubdirs(subDirs []string) error {
}
return nil
}
func (f *folder) scanTimerFired() {
err := f.scanSubdirs(nil)
select {
case <-f.initialScanFinished:
default:
status := "Completed"
if err != nil {
status = "Failed"
}
l.Infoln(status, "initial scan of", f.Type.String(), "folder", f.Description())
close(f.initialScanFinished)
}
f.scan.Reschedule()
}

4
lib/model/folderscanner.go
View File

@ -57,7 +57,3 @@ func (f *folderScanner) Scan(subdirs []string) error {
func (f *folderScanner) Delay(next time.Duration) {
f.delay <- next
}
func (f *folderScanner) HasNoInterval() bool {
return f.interval == 0
}

19
lib/model/rofolder.go
View File

@ -41,24 +41,7 @@ func (f *sendOnlyFolder) Serve() {
case <-f.scan.timer.C:
l.Debugln(f, "Scanning subdirectories")
err := f.scanSubdirs(nil)
select {
case <-f.initialScanFinished:
default:
status := "Completed"
if err != nil {
status = "Failed"
}
l.Infoln(status, "initial scan (ro) of", f.Description())
close(f.initialScanFinished)
}
if f.scan.HasNoInterval() {
continue
}
f.scan.Reschedule()
f.scanTimerFired()
case req := <-f.scan.now:
req.err <- f.scanSubdirs(req.subdirs)

13
lib/model/rwfolder.go
View File

@ -268,18 +268,7 @@ func (f *sendReceiveFolder) Serve() {
// same time.
case <-f.scan.timer.C:
l.Debugln(f, "Scanning subdirectories")
err := f.scanSubdirs(nil)
f.scan.Reschedule()
select {
case <-f.initialScanFinished:
default:
close(f.initialScanFinished)
status := "Completed"
if err != nil {
status = "Failed"
}
l.Infoln(status, "initial scan (rw) of", f.Description())
}
f.scanTimerFired()
case req := <-f.scan.now:
req.err <- f.scanSubdirs(req.subdirs)