refactor: Decompose list func

This commit is contained in:
Felicitas Pojtinger
2021-12-06 22:48:23 +01:00
parent 8d991a8237
commit a0f1bdfea7
5 changed files with 72 additions and 48 deletions

View File

@@ -1,11 +1,7 @@
package cmd
import (
"context"
"github.com/pojntfx/stfs/internal/converters"
"github.com/pojntfx/stfs/internal/formatting"
"github.com/pojntfx/stfs/internal/persisters"
"github.com/pojntfx/stfs/pkg/inventory"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/volatiletech/sqlboiler/v4/boil"
@@ -24,33 +20,16 @@ var listCmd = &cobra.Command{
boil.DebugMode = true
}
metadataPersister := persisters.NewMetadataPersister(viper.GetString(metadataFlag))
if err := metadataPersister.Open(); err != nil {
if _, err := inventory.List(
inventory.MetadataConfig{
Metadata: viper.GetString(metadataFlag),
},
viper.GetString(nameFlag),
); err != nil {
return err
}
headers, err := metadataPersister.GetHeaderDirectChildren(context.Background(), viper.GetString(nameFlag))
if err != nil {
return err
}
for i, dbhdr := range headers {
if i == 0 {
if err := formatting.PrintCSV(formatting.TARHeaderCSV); err != nil {
return err
}
}
hdr, err := converters.DBHeaderToTarHeader(dbhdr)
if err != nil {
return err
}
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(dbhdr.Record, dbhdr.Block, hdr)); err != nil {
return err
}
}
return nil
},
}

5
pkg/inventory/config.go Normal file
View File

@@ -0,0 +1,5 @@
package inventory
type MetadataConfig struct {
Metadata string
}

11
pkg/inventory/find.go Normal file
View File

@@ -0,0 +1,11 @@
package inventory
import "archive/tar"
func Find(
state MetadataConfig,
expression string,
) ([]*tar.Header, error) {
return nil, nil
}

View File

@@ -1,19 +0,0 @@
package inventory
import "archive/tar"
type MetadataConfig struct {
Metadata string
}
func Find(
state MetadataConfig,
expression string,
) ([]*tar.Header, error)
func List(
state MetadataConfig,
name string,
) ([]*tar.Header, error)

48
pkg/inventory/list.go Normal file
View File

@@ -0,0 +1,48 @@
package inventory
import (
"archive/tar"
"context"
"github.com/pojntfx/stfs/internal/converters"
"github.com/pojntfx/stfs/internal/formatting"
"github.com/pojntfx/stfs/internal/persisters"
)
func List(
state MetadataConfig,
name string,
) ([]*tar.Header, error) {
metadataPersister := persisters.NewMetadataPersister(state.Metadata)
if err := metadataPersister.Open(); err != nil {
return []*tar.Header{}, err
}
dbHdrs, err := metadataPersister.GetHeaderDirectChildren(context.Background(), name)
if err != nil {
return []*tar.Header{}, err
}
headers := []*tar.Header{}
for i, dbhdr := range dbHdrs {
if i == 0 {
if err := formatting.PrintCSV(formatting.TARHeaderCSV); err != nil {
return []*tar.Header{}, err
}
}
hdr, err := converters.DBHeaderToTarHeader(dbhdr)
if err != nil {
return []*tar.Header{}, err
}
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(dbhdr.Record, dbhdr.Block, hdr)); err != nil {
return []*tar.Header{}, err
}
headers = append(headers, hdr)
}
return headers, nil
}