octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 03:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have only one block size

Browse Source
This commit is contained in:
Audrius Butkevicius 2014-09-29 23:01:17 +01:00
parent 493dc8fcd5
commit 41b8dd2863
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/model/model.go
View File

@ -1001,7 +1001,7 @@ func (m *Model) ScanFolderSub(folder, sub string) error {
Dir: dir, Dir: dir,
Sub: sub, Sub: sub,
Ignores: ignores, Ignores: ignores,
BlockSize: scanner.StandardBlockSize, BlockSize: protocol.BlockSize,
TempNamer: defTempNamer, TempNamer: defTempNamer,
CurrentFiler: cFiler{m, folder}, CurrentFiler: cFiler{m, folder},
IgnorePerms: m.folderCfgs[folder].IgnorePerms, IgnorePerms: m.folderCfgs[folder].IgnorePerms,

4
internal/model/puller.go
View File

@ -469,7 +469,7 @@ func (p *Puller) shortcutFile(file protocol.FileInfo) {
// copierRoutine reads pullerStates until the in channel closes and performs // copierRoutine reads pullerStates until the in channel closes and performs
// the relevant copy. // the relevant copy.
func (p *Puller) copierRoutine(in <-chan copyBlocksState, out chan<- *sharedPullerState) { func (p *Puller) copierRoutine(in <-chan copyBlocksState, out chan<- *sharedPullerState) {
buf := make([]byte, scanner.StandardBlockSize) buf := make([]byte, protocol.BlockSize)
nextFile: nextFile:
for state := range in { for state := range in {
@ -575,7 +575,7 @@ func (p *Puller) finisherRoutine(in <-chan *sharedPullerState) {
l.Warnln("puller: final:", err) l.Warnln("puller: final:", err)
continue continue
} }
err = scanner.Verify(fd, scanner.StandardBlockSize, state.file.Blocks) err = scanner.Verify(fd, protocol.BlockSize, state.file.Blocks)
fd.Close() fd.Close()
if err != nil { if err != nil {
os.Remove(state.tempName) os.Remove(state.tempName)

2
internal/scanner/blocks.go
View File

@ -24,8 +24,6 @@ import (
"github.com/syncthing/syncthing/internal/protocol" "github.com/syncthing/syncthing/internal/protocol"
) )
const StandardBlockSize = 128 * 1024
var sha256OfNothing = []uint8{0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55} var sha256OfNothing = []uint8{0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55}
// Blocks returns the blockwise hash of the reader. // Blocks returns the blockwise hash of the reader.