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

refactor: Use explicit reader/writer instead of filepath for drive

Browse Source
This commit is contained in:
Felicitas Pojtinger
2021-12-13 00:26:30 +01:00
parent 8ef3530b20
commit 6bd31d356c
34 changed files with 506 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
pkg/operations/archive.go
View File

@@ -20,7 +20,7 @@ import (
"github.com/pojntfx/stfs/internal/signature"
"github.com/pojntfx/stfs/internal/statext"
"github.com/pojntfx/stfs/internal/suffix"
"github.com/pojntfx/stfs/internal/tape"
"github.com/pojntfx/stfs/internal/tarext"
"github.com/pojntfx/stfs/pkg/config"
)
@@ -29,73 +29,21 @@ var (
)
func Archive(
state config.StateConfig,
writer config.DriveWriterConfig,
pipes config.PipeConfig,
crypto config.CryptoConfig,
recordSize int,
from string,
overwrite bool,
compressionLevel string,
onHeader func(hdr *models.Header),
) ([]*tar.Header, error) {
dirty := false
tw, isRegular, cleanup, err := tape.OpenTapeWriteOnly(state.Drive, recordSize, overwrite)
tw, cleanup, err := tarext.NewTapeWriter(writer.Drive, writer.DriveIsRegular, recordSize)
if err != nil {
return []*tar.Header{}, err
}
if overwrite {
if isRegular {
if err := cleanup(&dirty); err != nil { // dirty will always be false here
return []*tar.Header{}, err
}
f, err := os.OpenFile(state.Drive, os.O_WRONLY|os.O_CREATE, 0600)
if err != nil {
return []*tar.Header{}, err
}
// Clear the file's content
if err := f.Truncate(0); err != nil {
return []*tar.Header{}, err
}
if err := f.Close(); err != nil {
return []*tar.Header{}, err
}
tw, isRegular, cleanup, err = tape.OpenTapeWriteOnly(state.Drive, recordSize, overwrite)
if err != nil {
return []*tar.Header{}, err
}
} else {
if err := cleanup(&dirty); err != nil { // dirty will always be false here
return []*tar.Header{}, err
}
f, err := os.OpenFile(state.Drive, os.O_WRONLY, os.ModeCharDevice)
if err != nil {
return []*tar.Header{}, err
}
// Seek to the start of the tape
if err := mtio.SeekToRecordOnTape(f, 0); err != nil {
return []*tar.Header{}, err
}
if err := f.Close(); err != nil {
return []*tar.Header{}, err
}
tw, isRegular, cleanup, err = tape.OpenTapeWriteOnly(state.Drive, recordSize, overwrite)
if err != nil {
return []*tar.Header{}, err
}
}
}
defer cleanup(&dirty)
headers := []*tar.Header{}
@@ -143,7 +91,7 @@ func Archive(
encryptor,
pipes.Compression,
compressionLevel,
isRegular,
writer.DriveIsRegular,
recordSize,
)
if err != nil {
@@ -155,12 +103,12 @@ func Archive(
return err
}
signer, sign, err := signature.Sign(file, isRegular, pipes.Signature, crypto.Identity)
signer, sign, err := signature.Sign(file, writer.DriveIsRegular, pipes.Signature, crypto.Identity)
if err != nil {
return err
}
if isRegular {
if writer.DriveIsRegular {
if _, err := io.Copy(compressor, signer); err != nil {
return err
}
@@ -219,7 +167,7 @@ func Archive(
hdrToAppend := *hdr
headers = append(headers, &hdrToAppend)
if err := signature.SignHeader(hdr, isRegular, pipes.Signature, crypto.Identity); err != nil {
if err := signature.SignHeader(hdr, writer.DriveIsRegular, pipes.Signature, crypto.Identity); err != nil {
return err
}
@@ -247,7 +195,7 @@ func Archive(
encryptor,
pipes.Compression,
compressionLevel,
isRegular,
writer.DriveIsRegular,
recordSize,
)
if err != nil {
@@ -259,7 +207,7 @@ func Archive(
return err
}
if isRegular {
if writer.DriveIsRegular {
if _, err := io.Copy(compressor, file); err != nil {
return err
}

43
pkg/operations/delete.go
View File

@@ -10,13 +10,16 @@ import (
"github.com/pojntfx/stfs/internal/persisters"
"github.com/pojntfx/stfs/internal/records"
"github.com/pojntfx/stfs/internal/signature"
"github.com/pojntfx/stfs/internal/tape"
"github.com/pojntfx/stfs/internal/tarext"
"github.com/pojntfx/stfs/pkg/config"
"github.com/pojntfx/stfs/pkg/recovery"
)
func Delete(
state config.StateConfig,
writer config.DriveWriterConfig,
reader config.DriveReaderConfig,
drive config.DriveConfig,
metadata config.MetadataConfig,
pipes config.PipeConfig,
crypto config.CryptoConfig,
@@ -26,13 +29,13 @@ func Delete(
onHeader func(hdr *models.Header),
) error {
dirty := false
tw, isRegular, cleanup, err := tape.OpenTapeWriteOnly(state.Drive, recordSize, false)
tw, cleanup, err := tarext.NewTapeWriter(writer.Drive, writer.DriveIsRegular, recordSize)
if err != nil {
return err
}
defer cleanup(&dirty)
metadataPersister := persisters.NewMetadataPersister(state.Metadata)
metadataPersister := persisters.NewMetadataPersister(metadata.Metadata)
if err := metadataPersister.Open(); err != nil {
return err
}
@@ -60,7 +63,7 @@ func Delete(
}
// Append deletion hdrs to the tape or tar file
hdrs := []*tar.Header{}
hdrs := []tar.Header{}
for _, dbhdr := range headersToDelete {
hdr, err := converters.DBHeaderToTarHeader(dbhdr)
if err != nil {
@@ -71,7 +74,18 @@ func Delete(
hdr.PAXRecords[records.STFSRecordVersion] = records.STFSRecordVersion1
hdr.PAXRecords[records.STFSRecordAction] = records.STFSRecordActionDelete
if err := signature.SignHeader(hdr, isRegular, pipes.Signature, crypto.Identity); err != nil {
hdrs = append(hdrs, *hdr)
if onHeader != nil {
dbhdr, err := converters.TarHeaderToDBHeader(-1, -1, -1, -1, hdr)
if err != nil {
return err
}
onHeader(dbhdr)
}
if err := signature.SignHeader(hdr, writer.DriveIsRegular, pipes.Signature, crypto.Identity); err != nil {
return err
}
@@ -84,21 +98,12 @@ func Delete(
}
dirty = true
if onHeader != nil {
dbhdr, err := converters.TarHeaderToDBHeader(-1, -1, -1, -1, hdr)
if err != nil {
return err
}
onHeader(dbhdr)
}
hdrs = append(hdrs, hdr)
}
return recovery.Index(
state,
reader,
drive,
metadata,
pipes,
crypto,
@@ -113,7 +118,7 @@ func Delete(
return config.ErrTarHeaderMissing
}
*hdr = *hdrs[i]
*hdr = hdrs[i]
return nil
},

43
pkg/operations/move.go
View File

@@ -11,13 +11,16 @@ import (
"github.com/pojntfx/stfs/internal/persisters"
"github.com/pojntfx/stfs/internal/records"
"github.com/pojntfx/stfs/internal/signature"
"github.com/pojntfx/stfs/internal/tape"
"github.com/pojntfx/stfs/internal/tarext"
"github.com/pojntfx/stfs/pkg/config"
"github.com/pojntfx/stfs/pkg/recovery"
)
func Move(
state config.StateConfig,
writer config.DriveWriterConfig,
drive config.DriveConfig,
reader config.DriveReaderConfig,
metadata config.MetadataConfig,
pipes config.PipeConfig,
crypto config.CryptoConfig,
@@ -28,13 +31,13 @@ func Move(
onHeader func(hdr *models.Header),
) error {
dirty := false
tw, isRegular, cleanup, err := tape.OpenTapeWriteOnly(state.Drive, recordSize, false)
tw, cleanup, err := tarext.NewTapeWriter(writer.Drive, writer.DriveIsRegular, recordSize)
if err != nil {
return err
}
defer cleanup(&dirty)
metadataPersister := persisters.NewMetadataPersister(state.Metadata)
metadataPersister := persisters.NewMetadataPersister(metadata.Metadata)
if err := metadataPersister.Open(); err != nil {
return err
}
@@ -62,7 +65,7 @@ func Move(
}
// Append move headers to the tape or tar file
hdrs := []*tar.Header{}
hdrs := []tar.Header{}
for _, dbhdr := range headersToMove {
hdr, err := converters.DBHeaderToTarHeader(dbhdr)
if err != nil {
@@ -75,7 +78,18 @@ func Move(
hdr.PAXRecords[records.STFSRecordAction] = records.STFSRecordActionUpdate
hdr.PAXRecords[records.STFSRecordReplacesName] = dbhdr.Name
if err := signature.SignHeader(hdr, isRegular, pipes.Signature, crypto.Identity); err != nil {
hdrs = append(hdrs, *hdr)
if onHeader != nil {
dbhdr, err := converters.TarHeaderToDBHeader(-1, -1, -1, -1, hdr)
if err != nil {
return err
}
onHeader(dbhdr)
}
if err := signature.SignHeader(hdr, writer.DriveIsRegular, pipes.Signature, crypto.Identity); err != nil {
return err
}
@@ -88,21 +102,12 @@ func Move(
}
dirty = true
if onHeader != nil {
dbhdr, err := converters.TarHeaderToDBHeader(-1, -1, -1, -1, hdr)
if err != nil {
return err
}
onHeader(dbhdr)
}
hdrs = append(hdrs, hdr)
}
return recovery.Index(
state,
reader,
drive,
metadata,
pipes,
crypto,
@@ -117,7 +122,7 @@ func Move(
return config.ErrTarHeaderMissing
}
*hdr = *hdrs[i]
*hdr = hdrs[i]
return nil
},

12
pkg/operations/restore.go
View File

@@ -11,12 +11,13 @@ import (
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
"github.com/pojntfx/stfs/internal/persisters"
"github.com/pojntfx/stfs/pkg/config"
"github.com/pojntfx/stfs/pkg/hardware"
"github.com/pojntfx/stfs/pkg/recovery"
)
func Restore(
state config.StateConfig,
reader config.DriveReaderConfig,
drive config.DriveConfig,
metadata config.MetadataConfig,
pipes config.PipeConfig,
crypto config.CryptoConfig,
@@ -27,7 +28,7 @@ func Restore(
onHeader func(hdr *models.Header),
) error {
metadataPersister := persisters.NewMetadataPersister(state.Metadata)
metadataPersister := persisters.NewMetadataPersister(metadata.Metadata)
if err := metadataPersister.Open(); err != nil {
return err
}
@@ -78,9 +79,8 @@ func Restore(
}
if err := recovery.Fetch(
hardware.DriveConfig{
Drive: state.Drive,
},
reader,
drive,
pipes,
crypto,

20
pkg/operations/update.go
View File

@@ -18,12 +18,12 @@ import (
"github.com/pojntfx/stfs/internal/signature"
"github.com/pojntfx/stfs/internal/statext"
"github.com/pojntfx/stfs/internal/suffix"
"github.com/pojntfx/stfs/internal/tape"
"github.com/pojntfx/stfs/internal/tarext"
"github.com/pojntfx/stfs/pkg/config"
)
func Update(
state config.StateConfig,
writer config.DriveWriterConfig,
pipes config.PipeConfig,
crypto config.CryptoConfig,
@@ -35,7 +35,7 @@ func Update(
onHeader func(hdr *models.Header),
) ([]*tar.Header, error) {
dirty := false
tw, isRegular, cleanup, err := tape.OpenTapeWriteOnly(state.Drive, recordSize, false)
tw, cleanup, err := tarext.NewTapeWriter(writer.Drive, writer.DriveIsRegular, recordSize)
if err != nil {
return []*tar.Header{}, err
}
@@ -86,7 +86,7 @@ func Update(
encryptor,
pipes.Compression,
compressionLevel,
isRegular,
writer.DriveIsRegular,
recordSize,
)
if err != nil {
@@ -98,12 +98,12 @@ func Update(
return err
}
signer, sign, err := signature.Sign(file, isRegular, pipes.Signature, crypto.Identity)
signer, sign, err := signature.Sign(file, writer.DriveIsRegular, pipes.Signature, crypto.Identity)
if err != nil {
return err
}
if isRegular {
if writer.DriveIsRegular {
if _, err := io.Copy(compressor, signer); err != nil {
return err
}
@@ -165,7 +165,7 @@ func Update(
hdrToAppend := *hdr
headers = append(headers, &hdrToAppend)
if err := signature.SignHeader(hdr, isRegular, pipes.Signature, crypto.Identity); err != nil {
if err := signature.SignHeader(hdr, writer.DriveIsRegular, pipes.Signature, crypto.Identity); err != nil {
return err
}
@@ -191,7 +191,7 @@ func Update(
encryptor,
pipes.Compression,
compressionLevel,
isRegular,
writer.DriveIsRegular,
recordSize,
)
if err != nil {
@@ -203,7 +203,7 @@ func Update(
return err
}
if isRegular {
if writer.DriveIsRegular {
if _, err := io.Copy(compressor, file); err != nil {
return err
}
@@ -244,7 +244,7 @@ func Update(
hdrToAppend := *hdr
headers = append(headers, &hdrToAppend)
if err := signature.SignHeader(hdr, isRegular, pipes.Signature, crypto.Identity); err != nil {
if err := signature.SignHeader(hdr, writer.DriveIsRegular, pipes.Signature, crypto.Identity); err != nil {
return err
}