refactor: Use public API structs in persisters

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
+2 -3
View File
@@ -10,7 +10,6 @@ import (
ftpserver "github.com/fclairamb/ftpserverlib"
"github.com/pojntfx/stfs/internal/check"
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
"github.com/pojntfx/stfs/internal/encryption"
"github.com/pojntfx/stfs/internal/ftp"
"github.com/pojntfx/stfs/internal/keys"
@@ -213,7 +212,7 @@ var serveFTPCmd = &cobra.Command{
},
true, // FTP needs read permission for `STOR` command even if O_WRONLY is set
func(hdr *models.Header) {
func(hdr *config.Header) {
jsonLogger.Trace("Header transform", hdr)
},
jsonLogger,
@@ -252,7 +251,7 @@ var serveFTPCmd = &cobra.Command{
return signature.VerifyHeader(hdr, isRegular, viper.GetString(signatureFlag), signatureRecipient)
},
func(hdr *models.Header) {
func(hdr *config.Header) {
jsonLogger.Debug("Header read", hdr)
},
)
+1 -2
View File
@@ -8,7 +8,6 @@ import (
"time"
"github.com/pojntfx/stfs/internal/check"
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
"github.com/pojntfx/stfs/internal/handlers"
"github.com/pojntfx/stfs/internal/keys"
"github.com/pojntfx/stfs/internal/logging"
@@ -132,7 +131,7 @@ var serveHTTPCmd = &cobra.Command{
nil, // We never write
false, // We never write
func(hdr *models.Header) {
func(hdr *config.Header) {
jsonLogger.Trace("Header transform", hdr)
},
jsonLogger,