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

Delete files and directories after pulling

Browse Source
This commit is contained in:
Audrius Butkevicius 2014-10-12 22:01:57 +01:00 committed by Jakob Borg
parent e62b9c6009
commit dedf835aa6
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
internal/model/puller.go
View File

@ -281,6 +281,9 @@ func (p *Puller) pullerIteration(ncopiers, npullers, nfinishers int) int {
// !!! // !!!
changed := 0 changed := 0
var deletions []protocol.FileInfo
files.WithNeed(protocol.LocalDeviceID, func(intf protocol.FileIntf) bool { files.WithNeed(protocol.LocalDeviceID, func(intf protocol.FileIntf) bool {
// Needed items are delivered sorted lexicographically. This isn't // Needed items are delivered sorted lexicographically. This isn't
@ -302,15 +305,12 @@ func (p *Puller) pullerIteration(ncopiers, npullers, nfinishers int) int {
} }
switch { switch {
case protocol.IsDirectory(file.Flags) && protocol.IsDeleted(file.Flags): case protocol.IsDeleted(file.Flags):
// A deleted directory // A deleted file or directory
p.deleteDir(file) deletions = append(deletions, file)
case protocol.IsDirectory(file.Flags): case protocol.IsDirectory(file.Flags):
// A new or changed directory // A new or changed directory
p.handleDir(file) p.handleDir(file)
case protocol.IsDeleted(file.Flags):
// A deleted file
p.deleteFile(file)
default: default:
// A new or changed file. This is the only case where we do stuff // A new or changed file. This is the only case where we do stuff
// in the background; the other three are done synchronously. // in the background; the other three are done synchronously.
@ -334,6 +334,15 @@ func (p *Puller) pullerIteration(ncopiers, npullers, nfinishers int) int {
// Wait for the finisherChan to finish. // Wait for the finisherChan to finish.
doneWg.Wait() doneWg.Wait()
for i := range deletions {
deletion := deletions[len(deletions)-i-1]
if deletion.IsDirectory() {
p.deleteDir(deletion)
} else {
p.deleteFile(deletion)
}
}
return changed return changed
} }