mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-09 14:50:56 +00:00
be0508cf26
This adds error returns to model methods called by the protocol layer. Returning an error will cause the connection to be torn down as the message couldn't be handled. Using this to signal that a folder isn't currently available will then cause a reconnection a few moments later, when it'll hopefully work better. Tested manually by running with STRECHECKDBEVERY=0 on a nontrivially sized setup. This panics reliably before this patch, but just causes a disconnect/reconnect now.
33 lines
927 B
Go
33 lines
927 B
Go
// Copyright (C) 2014 The Protocol Authors.
|
|
|
|
// +build darwin
|
|
|
|
package protocol
|
|
|
|
// Darwin uses NFD normalization
|
|
|
|
import "golang.org/x/text/unicode/norm"
|
|
|
|
type nativeModel struct {
|
|
Model
|
|
}
|
|
|
|
func (m nativeModel) Index(deviceID DeviceID, folder string, files []FileInfo) error {
|
|
for i := range files {
|
|
files[i].Name = norm.NFD.String(files[i].Name)
|
|
}
|
|
return m.Model.Index(deviceID, folder, files)
|
|
}
|
|
|
|
func (m nativeModel) IndexUpdate(deviceID DeviceID, folder string, files []FileInfo) error {
|
|
for i := range files {
|
|
files[i].Name = norm.NFD.String(files[i].Name)
|
|
}
|
|
return m.Model.IndexUpdate(deviceID, folder, files)
|
|
}
|
|
|
|
func (m nativeModel) Request(deviceID DeviceID, folder, name string, size int32, offset int64, hash []byte, weakHash uint32, fromTemporary bool) (RequestResponse, error) {
|
|
name = norm.NFD.String(name)
|
|
return m.Model.Request(deviceID, folder, name, size, offset, hash, weakHash, fromTemporary)
|
|
}
|