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

Windows nodes should ignore deleted impossible files

Browse Source
This commit is contained in:
Jakob Borg 2014-08-19 15:36:57 +02:00
parent 5538545fb0
commit ee05e12480
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
protocol/nativemodel_windows.go
View File

@ -29,6 +29,11 @@ type nativeModel struct {
func (m nativeModel) Index(nodeID NodeID, repo string, files []FileInfo) { func (m nativeModel) Index(nodeID NodeID, repo string, files []FileInfo) {
for i, f := range files { for i, f := range files {
if strings.ContainsAny(f.Name, disallowedCharacters) { if strings.ContainsAny(f.Name, disallowedCharacters) {
if f.IsDeleted() {
// Don't complain if the file is marked as deleted, since it
// can't possibly exist here anyway.
continue
}
files[i].Flags |= FlagInvalid files[i].Flags |= FlagInvalid
l.Warnf("File name %q contains invalid characters; marked as invalid.", f.Name) l.Warnf("File name %q contains invalid characters; marked as invalid.", f.Name)
} }
@ -40,6 +45,11 @@ func (m nativeModel) Index(nodeID NodeID, repo string, files []FileInfo) {
func (m nativeModel) IndexUpdate(nodeID NodeID, repo string, files []FileInfo) { func (m nativeModel) IndexUpdate(nodeID NodeID, repo string, files []FileInfo) {
for i, f := range files { for i, f := range files {
if strings.ContainsAny(f.Name, disallowedCharacters) { if strings.ContainsAny(f.Name, disallowedCharacters) {
if f.IsDeleted() {
// Don't complain if the file is marked as deleted, since it
// can't possibly exist here anyway.
continue
}
files[i].Flags |= FlagInvalid files[i].Flags |= FlagInvalid
l.Warnf("File name %q contains invalid characters; marked as invalid.", f.Name) l.Warnf("File name %q contains invalid characters; marked as invalid.", f.Name)
} }