octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-14 01:04:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Check availability later to catch renames (#5097)

Browse Source
This commit is contained in:
Simon Frei 2018-08-19 20:03:20 +02:00 committed by Audrius Butkevicius
parent 9028969617
commit ff3cbdc90d
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/config/folderconfiguration.go
View File

@ -282,7 +282,7 @@ func (l FolderDeviceConfigurationList) Len() int {
return len(l) return len(l)
} }
func (f *FolderConfiguration) CheckFreeSpace() (err error) { func (f *FolderConfiguration) CheckFreeSpace() error {
return checkFreeSpace(f.MinDiskFree, f.Filesystem()) return checkFreeSpace(f.MinDiskFree, f.Filesystem())
} }

20
lib/model/folder_sendrecv.go
View File

@ -349,18 +349,8 @@ func (f *sendReceiveFolder) processNeeded(ignores *ignore.Matcher, folderFiles *
changed++ changed++
case file.Type == protocol.FileInfoTypeFile: case file.Type == protocol.FileInfoTypeFile:
// Queue files for processing after directories and symlinks, if // Queue files for processing after directories and symlinks.
// it has availability.
devices := folderFiles.Availability(file.Name)
for _, dev := range devices {
if _, ok := f.model.Connection(dev); ok {
f.queue.Push(file.Name, file.Size, file.ModTime()) f.queue.Push(file.Name, file.Size, file.ModTime())
changed++
return true
}
}
f.newError("pull", file.Name, errNotAvailable)
case runtime.GOOS == "windows" && file.IsSymlink(): case runtime.GOOS == "windows" && file.IsSymlink():
file.SetUnsupported(f.shortID) file.SetUnsupported(f.shortID)
@ -492,8 +482,16 @@ nextFile:
} }
} }
devices := folderFiles.Availability(fileName)
for _, dev := range devices {
if _, ok := f.model.Connection(dev); ok {
changed++
// Handle the file normally, by coping and pulling, etc. // Handle the file normally, by coping and pulling, etc.
f.handleFile(fi, copyChan, finisherChan, dbUpdateChan) f.handleFile(fi, copyChan, finisherChan, dbUpdateChan)
continue nextFile
}
}
f.newError("pull", fileName, errNotAvailable)
} }
return changed, fileDeletions, dirDeletions, nil return changed, fileDeletions, dirDeletions, nil