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

refactor: Use public API structs in persisters

Browse Source
This commit is contained in:
Felix Pojtinger
2022-01-02 00:03:01 +01:00
parent f2b7b1ed60
commit 3b17287d16
20 changed files with 158 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operations/archive.go
+2 -3
View File
@@ -10,7 +10,6 @@ import (
"github.com/pojntfx/stfs/internal/compression"
"github.com/pojntfx/stfs/internal/converters"
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
"github.com/pojntfx/stfs/internal/encryption"
"github.com/pojntfx/stfs/internal/ioext"
"github.com/pojntfx/stfs/internal/mtio"
@@ -163,7 +162,7 @@ func (o *Operations) Archive(
o.onHeader(&config.HeaderEvent{
Type: config.HeaderEventTypeArchive,
Indexed: false,
Header: dbhdr,
Header: converters.DBHeaderToConfigHeader(dbhdr),
})
}
@@ -294,7 +293,7 @@ func (o *Operations) Archive(
return nil // We sign above, no need to verify
},
func(hdr *models.Header) {
func(hdr *config.Header) {
o.onHeader(&config.HeaderEvent{
Type: config.HeaderEventTypeArchive,
Indexed: true,
pkg/operations/delete.go
+4 -5
View File
@@ -6,7 +6,6 @@ import (
"path/filepath"
"github.com/pojntfx/stfs/internal/converters"
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
"github.com/pojntfx/stfs/internal/encryption"
"github.com/pojntfx/stfs/internal/records"
"github.com/pojntfx/stfs/internal/signature"
@@ -37,7 +36,7 @@ func (o *Operations) Delete(name string) error {
return err
}
headersToDelete := []*models.Header{}
headersToDelete := []*config.Header{}
dbhdr, err := o.metadata.Metadata.GetHeader(context.Background(), name)
if err != nil {
return err
@@ -57,7 +56,7 @@ func (o *Operations) Delete(name string) error {
// Append deletion hdrs to the tape or tar file
hdrs := []tar.Header{}
for _, dbhdr := range headersToDelete {
hdr, err := converters.DBHeaderToTarHeader(dbhdr)
hdr, err := converters.DBHeaderToTarHeader(converters.ConfigHeaderToDBHeader(dbhdr))
if err != nil {
return err
}
@@ -77,7 +76,7 @@ func (o *Operations) Delete(name string) error {
o.onHeader(&config.HeaderEvent{
Type: config.HeaderEventTypeDelete,
Indexed: false,
Header: dbhdr,
Header: converters.DBHeaderToConfigHeader(dbhdr),
})
}
@@ -142,7 +141,7 @@ func (o *Operations) Delete(name string) error {
return nil // We sign above, no need to verify
},
func(hdr *models.Header) {
func(hdr *config.Header) {
o.onHeader(&config.HeaderEvent{
Type: config.HeaderEventTypeDelete,
Indexed: true,
pkg/operations/move.go
+4 -5
View File
@@ -8,7 +8,6 @@ import (
"strings"
"github.com/pojntfx/stfs/internal/converters"
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
"github.com/pojntfx/stfs/internal/encryption"
"github.com/pojntfx/stfs/internal/records"
"github.com/pojntfx/stfs/internal/signature"
@@ -44,7 +43,7 @@ func (o *Operations) Move(from string, to string) error {
return err
}
headersToMove := []*models.Header{}
headersToMove := []*config.Header{}
dbhdr, err := o.metadata.Metadata.GetHeader(context.Background(), from)
if err != nil {
return err
@@ -74,7 +73,7 @@ func (o *Operations) Move(from string, to string) error {
// Append move headers to the tape or tar file
hdrs := []tar.Header{}
for _, dbhdr := range headersToMove {
hdr, err := converters.DBHeaderToTarHeader(dbhdr)
hdr, err := converters.DBHeaderToTarHeader(converters.ConfigHeaderToDBHeader(dbhdr))
if err != nil {
return err
}
@@ -96,7 +95,7 @@ func (o *Operations) Move(from string, to string) error {
o.onHeader(&config.HeaderEvent{
Type: config.HeaderEventTypeMove,
Indexed: false,
Header: dbhdr,
Header: converters.DBHeaderToConfigHeader(dbhdr),
})
}
@@ -161,7 +160,7 @@ func (o *Operations) Move(from string, to string) error {
return nil // We sign above, no need to verify
},
func(hdr *models.Header) {
func(hdr *config.Header) {
o.onHeader(&config.HeaderEvent{
Type: config.HeaderEventTypeMove,
Indexed: true,
pkg/operations/restore.go
+1 -2
View File
@@ -10,7 +10,6 @@ import (
"path/filepath"
"strings"
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
"github.com/pojntfx/stfs/pkg/config"
"github.com/pojntfx/stfs/pkg/recovery"
)
@@ -28,7 +27,7 @@ func (o *Operations) Restore(
o.diskOperationLock.Lock()
defer o.diskOperationLock.Unlock()
headersToRestore := []*models.Header{}
headersToRestore := []*config.Header{}
src := strings.TrimSuffix(from, "/")
dbhdr, err := o.metadata.Metadata.GetHeader(context.Background(), src)
if err != nil {
pkg/operations/update.go
+3 -4
View File
@@ -9,7 +9,6 @@ import (
"github.com/pojntfx/stfs/internal/compression"
"github.com/pojntfx/stfs/internal/converters"
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
"github.com/pojntfx/stfs/internal/encryption"
"github.com/pojntfx/stfs/internal/ioext"
"github.com/pojntfx/stfs/internal/mtio"
@@ -163,7 +162,7 @@ func (o *Operations) Update(
o.onHeader(&config.HeaderEvent{
Type: config.HeaderEventTypeUpdate,
Indexed: false,
Header: dbhdr,
Header: converters.DBHeaderToConfigHeader(dbhdr),
})
}
@@ -253,7 +252,7 @@ func (o *Operations) Update(
o.onHeader(&config.HeaderEvent{
Type: config.HeaderEventTypeUpdate,
Indexed: false,
Header: dbhdr,
Header: converters.DBHeaderToConfigHeader(dbhdr),
})
}
@@ -322,7 +321,7 @@ func (o *Operations) Update(
return nil // We sign above, no need to verify
},
func(hdr *models.Header) {
func(hdr *config.Header) {
o.onHeader(&config.HeaderEvent{
Type: config.HeaderEventTypeUpdate,
Indexed: true,