octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-08 14:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup temporary files during directory removal (fixes #919)

Browse Source
This commit is contained in:
Audrius Butkevicius 2014-10-29 11:19:48 +00:00
parent 2ba4b235fc
commit d305752749
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/model/puller.go
View File

@ -412,6 +412,16 @@ func (p *Puller) handleDir(file protocol.FileInfo) {
// deleteDir attempts to delete the given directory // deleteDir attempts to delete the given directory
func (p *Puller) deleteDir(file protocol.FileInfo) { func (p *Puller) deleteDir(file protocol.FileInfo) {
realName := filepath.Join(p.dir, file.Name) realName := filepath.Join(p.dir, file.Name)
// Delete any temporary files lying around in the directory
dir, _ := os.Open(realName)
if dir != nil {
files, _ := dir.Readdirnames(-1)
for _, file := range files {
if defTempNamer.IsTemporary(file) {
osutil.InWritableDir(os.Remove, filepath.Join(realName, file))
}
}
}
err := osutil.InWritableDir(os.Remove, realName) err := osutil.InWritableDir(os.Remove, realName)
if err == nil || os.IsNotExist(err) { if err == nil || os.IsNotExist(err) {
p.model.updateLocal(p.folder, file) p.model.updateLocal(p.folder, file)