refactor: Drop offset in favor of ignoring the first index

This commit is contained in:
Felicitas Pojtinger
2021-12-06 23:31:55 +01:00
parent df9cecd97e
commit ee5d3c72d9
5 changed files with 22 additions and 26 deletions

View File

@@ -173,7 +173,6 @@ var archiveCmd = &cobra.Command{
int(lastIndexedBlock),
viper.GetBool(overwriteFlag),
0,
func(hdr *tar.Header, i int) error {
if len(hdrs) <= i {
return errMissingTarHeader

View File

@@ -77,7 +77,6 @@ var recoveryIndexCmd = &cobra.Command{
viper.GetInt(blockFlag),
viper.GetBool(overwriteFlag),
0,
func(hdr *tar.Header, i int) error {
return encryption.DecryptHeader(hdr, viper.GetString(encryptionFlag), identity)
},

View File

@@ -119,13 +119,16 @@ var updateCmd = &cobra.Command{
int(lastIndexedBlock),
false,
1,
func(hdr *tar.Header, i int) error {
if len(hdrs) <= i {
if i == 0 {
return nil
}
if len(hdrs) <= i-1 {
return errMissingTarHeader
}
*hdr = *hdrs[i]
*hdr = *hdrs[i-1]
return nil
},

View File

@@ -32,7 +32,6 @@ func Index(
block int,
overwrite bool,
offset int,
decryptHeader func(
hdr *tar.Header,
i int,
@@ -129,18 +128,16 @@ func Index(
break
}
if i >= offset {
if err := decryptHeader(hdr, i-offset); err != nil {
return err
}
if err := decryptHeader(hdr, i); err != nil {
return err
}
if err := verifyHeader(hdr, isRegular); err != nil {
return err
}
if err := verifyHeader(hdr, isRegular); err != nil {
return err
}
if err := indexHeader(record, block, hdr, metadataPersister, pipes.Compression, pipes.Encryption); err != nil {
return nil
}
if err := indexHeader(record, block, hdr, metadataPersister, pipes.Compression, pipes.Encryption); err != nil {
return nil
}
curr, err := f.Seek(0, io.SeekCurrent)
@@ -215,18 +212,16 @@ func Index(
}
}
if i >= offset {
if err := decryptHeader(hdr, i-offset); err != nil {
return err
}
if err := decryptHeader(hdr, i); err != nil {
return err
}
if err := verifyHeader(hdr, isRegular); err != nil {
return err
}
if err := verifyHeader(hdr, isRegular); err != nil {
return err
}
if err := indexHeader(record, block, hdr, metadataPersister, pipes.Compression, pipes.Encryption); err != nil {
return nil
}
if err := indexHeader(record, block, hdr, metadataPersister, pipes.Compression, pipes.Encryption); err != nil {
return nil
}
curr = int64(counter.BytesRead)