CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-08-04 14:46:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use the append paradigm for the delta iterator as well

Browse source
This commit is contained in:
Kovid Goyal 2023-07-06 09:19:08 +05:30
parent 579ab8551e
commit c2ad662bed
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
3 changed files with 46 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

29
tools/rsync/api.go
View file

@ -178,12 +178,12 @@ func write_block_hash(output []byte, bl BlockHash) []byte {
return output
}
// Append the next signature to the provided slice and return the resulting slice. Data is written to the slice iff err == nil.
// When no more signature data is available, err = io.EOF and the unmodified slice is returned.
type SignatureIterator = func([]byte) ([]byte, error)
// Append the next item to the provided slice and return the resulting slice. Data is written to the slice iff err == nil.
// When no more data is available, err = io.EOF and the unmodified slice is returned.
type OutputIterator = func([]byte) ([]byte, error)
// Create a signature for the data source in src.
func (self *Patcher) CreateSignatureIterator(src io.Reader) SignatureIterator {
func (self *Patcher) CreateSignatureIterator(src io.Reader) OutputIterator {
var it func() (BlockHash, error)
finished := false
return func(output []byte) ([]byte, error) {
@ -212,24 +212,29 @@ func (self *Patcher) CreateSignatureIterator(src io.Reader) SignatureIterator {
}
}
type DeltaIterator = func() ([]byte, error)
// Create a serialized delta based on the previously loaded signature
func (self *Differ) CreateDelta(src io.Reader) DeltaIterator {
func (self *Differ) CreateDelta(src io.Reader) OutputIterator {
if err := self.finish_signature_data(); err != nil {
return func() ([]byte, error) { return nil, err }
return func([]byte) ([]byte, error) { return nil, err }
}
if self.signature == nil {
return func() ([]byte, error) { return nil, fmt.Errorf("Cannot call CreateDelta() before loading a signature") }
return func([]byte) ([]byte, error) {
return nil, fmt.Errorf("Cannot call CreateDelta() before loading a signature")
}
}
it := self.rsync.CreateDiff(src, self.signature)
return func() ([]byte, error) {
return func(output []byte) ([]byte, error) {
for {
op, err := it()
if op == nil {
return nil, err
if err == nil {
err = io.EOF
}
return output, err
}
return op.Serialize(), nil
output, p := ensure_size(output, op.SerializeSize())
op.Serialize(p)
return output, nil
}
}
}