mirrors/stfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Decompose all redudant parameters into Operations struct

Browse Source
This commit is contained in:
Felicitas Pojtinger
2021-12-15 01:18:12 +01:00
parent 71d28c8184
commit 1ea34eb02a
11 changed files with 115 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/operations/move.go
View File

@@ -15,16 +15,7 @@ import (
"github.com/pojntfx/stfs/pkg/recovery"
)
func (o *Operations) Move(
pipes config.PipeConfig,
crypto config.CryptoConfig,
recordSize int,
from string,
to string,
onHeader func(hdr *models.Header),
) error {
func (o *Operations) Move(from string, to string) error {
o.diskOperationLock.Lock()
defer o.diskOperationLock.Unlock()
@@ -34,12 +25,12 @@ func (o *Operations) Move(
}
dirty := false
tw, cleanup, err := tarext.NewTapeWriter(writer.Drive, writer.DriveIsRegular, recordSize)
tw, cleanup, err := tarext.NewTapeWriter(writer.Drive, writer.DriveIsRegular, o.recordSize)
if err != nil {
return err
}
lastIndexedRecord, lastIndexedBlock, err := o.metadataPersister.GetLastIndexedRecordAndBlock(context.Background(), recordSize)
lastIndexedRecord, lastIndexedBlock, err := o.metadataPersister.GetLastIndexedRecordAndBlock(context.Background(), o.recordSize)
if err != nil {
return err
}
@@ -77,20 +68,20 @@ func (o *Operations) Move(
hdrs = append(hdrs, *hdr)
if onHeader != nil {
if o.onHeader != nil {
dbhdr, err := converters.TarHeaderToDBHeader(-1, -1, -1, -1, hdr)
if err != nil {
return err
}
onHeader(dbhdr)
o.onHeader(dbhdr)
}
if err := signature.SignHeader(hdr, writer.DriveIsRegular, pipes.Signature, crypto.Identity); err != nil {
if err := signature.SignHeader(hdr, writer.DriveIsRegular, o.pipes.Signature, o.crypto.Identity); err != nil {
return err
}
if err := encryption.EncryptHeader(hdr, pipes.Encryption, crypto.Recipient); err != nil {
if err := encryption.EncryptHeader(hdr, o.pipes.Encryption, o.crypto.Recipient); err != nil {
return err
}
@@ -127,10 +118,10 @@ func (o *Operations) Move(
config.MetadataConfig{
Metadata: o.metadataPersister,
},
pipes,
crypto,
o.pipes,
o.crypto,
recordSize,
o.recordSize,
int(lastIndexedRecord),
int(lastIndexedBlock),
false,
@@ -149,6 +140,6 @@ func (o *Operations) Move(
return nil // We sign above, no need to verify
},
onHeader,
o.onHeader,
)
}