felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

all: Refactor the protocol/model interface a bit (ref #8981) (#9007)

Browse Source
This commit is contained in:
Jakob Borg
2023-07-29 10:24:44 +02:00
committed by GitHub
parent b806026990
commit 9d21b91124
21 changed files with 431 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/protocol/nativemodel_windows.go
+8 -8
View File
@@ -13,30 +13,30 @@ import (
"strings"
)
func makeNative(m Model) Model { return nativeModel{m} }
func makeNative(m contextLessModel) contextLessModel { return nativeModel{m} }
type nativeModel struct {
Model
contextLessModel
}
func (m nativeModel) Index(deviceID DeviceID, folder string, files []FileInfo) error {
func (m nativeModel) Index(folder string, files []FileInfo) error {
files = fixupFiles(files)
return m.Model.Index(deviceID, folder, files)
return m.contextLessModel.Index(folder, files)
}
func (m nativeModel) IndexUpdate(deviceID DeviceID, folder string, files []FileInfo) error {
func (m nativeModel) IndexUpdate(folder string, files []FileInfo) error {
files = fixupFiles(files)
return m.Model.IndexUpdate(deviceID, folder, files)
return m.contextLessModel.IndexUpdate(folder, files)
}
func (m nativeModel) Request(deviceID DeviceID, folder, name string, blockNo, size int32, offset int64, hash []byte, weakHash uint32, fromTemporary bool) (RequestResponse, error) {
func (m nativeModel) Request(folder, name string, blockNo, size int32, offset int64, hash []byte, weakHash uint32, fromTemporary bool) (RequestResponse, error) {
if strings.Contains(name, `\`) {
l.Warnf("Dropping request for %s, contains invalid path separator", name)
return nil, ErrNoSuchFile
}
name = filepath.FromSlash(name)
return m.Model.Request(deviceID, folder, name, blockNo, size, offset, hash, weakHash, fromTemporary)
return m.contextLessModel.Request(folder, name, blockNo, size, offset, hash, weakHash, fromTemporary)
}
func fixupFiles(files []FileInfo) []FileInfo {