Deprecate scanner.Block & File

scanner/blocks.go

@@ -7,25 +7,16 @@ package scanner
 import (
 	"bytes"
 	"crypto/sha256"
-	"fmt"
 	"io"
+
+	"github.com/calmh/syncthing/protocol"
 )
 
 const StandardBlockSize = 128 * 1024
 
-type Block struct {
-	Offset int64
-	Size   uint32
-	Hash   []byte
-}
-
-func (b Block) String() string {
-	return fmt.Sprintf("%d/%d/%x", b.Offset, b.Size, b.Hash)
-}
-
 // Blocks returns the blockwise hash of the reader.
-func Blocks(r io.Reader, blocksize int) ([]Block, error) {
-	var blocks []Block
+func Blocks(r io.Reader, blocksize int) ([]protocol.BlockInfo, error) {
+	var blocks []protocol.BlockInfo
 	var offset int64
 	for {
 		lr := &io.LimitedReader{R: r, N: int64(blocksize)}
@@ -39,9 +30,9 @@ func Blocks(r io.Reader, blocksize int) ([]Block, error) {
 			break
 		}
 
-		b := Block{
-			Offset: offset,
+		b := protocol.BlockInfo{
 			Size:   uint32(n),
+			Offset: offset,
 			Hash:   hf.Sum(nil),
 		}
 		blocks = append(blocks, b)
@@ -50,7 +41,7 @@ func Blocks(r io.Reader, blocksize int) ([]Block, error) {
 
 	if len(blocks) == 0 {
 		// Empty file
-		blocks = append(blocks, Block{
+		blocks = append(blocks, protocol.BlockInfo{
 			Offset: 0,
 			Size:   0,
 			Hash:   []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},
@@ -62,11 +53,18 @@ func Blocks(r io.Reader, blocksize int) ([]Block, error) {
 
 // BlockDiff returns lists of common and missing (to transform src into tgt)
 // blocks. Both block lists must have been created with the same block size.
-func BlockDiff(src, tgt []Block) (have, need []Block) {
+func BlockDiff(src, tgt []protocol.BlockInfo) (have, need []protocol.BlockInfo) {
 	if len(tgt) == 0 && len(src) != 0 {
 		return nil, nil
 	}
 
+	// Set the Offset field on each target block
+	var offset int64
+	for i := range tgt {
+		tgt[i].Offset = offset
+		offset += int64(tgt[i].Size)
+	}
+
 	if len(tgt) != 0 && len(src) == 0 {
 		// Copy the entire file
 		return nil, tgt