marc/scotty
1
0
Fork 0
mirror of https://git.sr.ht/~phw/scotty synced 2025-04-16 10:09:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed interfaces ListenImport|Export to ListensImport|Export

Browse source
This commit is contained in:
Philipp Wolfer 2023-11-12 18:33:44 +01:00
parent baed52dacc
commit 516de905bd
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backends/backends.go
View file

@ -104,7 +104,7 @@ func getExportCapabilities(backend models.Backend) []string {
caps := make([]Capability, 0) caps := make([]Capability, 0)
var name string var name string
var found bool var found bool
name, found = checkCapability[models.ListenExport](backend, "export") name, found = checkCapability[models.ListensExport](backend, "export")
if found { if found {
caps = append(caps, name) caps = append(caps, name)
} }
@ -119,7 +119,7 @@ func getImportCapabilities(backend models.Backend) []Capability {
caps := make([]Capability, 0) caps := make([]Capability, 0)
var name string var name string
var found bool var found bool
name, found = checkCapability[models.ListenImport](backend, "import") name, found = checkCapability[models.ListensImport](backend, "import")
if found { if found {
caps = append(caps, name) caps = append(caps, name)
} }

10
backends/backends_test.go
View file

@ -35,7 +35,7 @@ import (
func TestResolveBackend(t *testing.T) { func TestResolveBackend(t *testing.T) {
config := viper.New() config := viper.New()
config.Set("backend", "dump") config.Set("backend", "dump")
backend, err := backends.ResolveBackend[models.ListenImport](config) backend, err := backends.ResolveBackend[models.ListensImport](config)
assert.NoError(t, err) assert.NoError(t, err)
assert.IsType(t, dump.DumpBackend{}, backend) assert.IsType(t, dump.DumpBackend{}, backend)
} }
@ -43,22 +43,22 @@ func TestResolveBackend(t *testing.T) {
func TestResolveBackendUnknown(t *testing.T) { func TestResolveBackendUnknown(t *testing.T) {
config := viper.New() config := viper.New()
config.Set("backend", "foo") config.Set("backend", "foo")
_, err := backends.ResolveBackend[models.ListenImport](config) _, err := backends.ResolveBackend[models.ListensImport](config)
assert.EqualError(t, err, "Unknown backend foo") assert.EqualError(t, err, "Unknown backend foo")
} }
func TestResolveBackendInvalidInterface(t *testing.T) { func TestResolveBackendInvalidInterface(t *testing.T) {
config := viper.New() config := viper.New()
config.Set("backend", "dump") config.Set("backend", "dump")
_, err := backends.ResolveBackend[models.ListenExport](config) _, err := backends.ResolveBackend[models.ListensExport](config)
assert.EqualError(t, err, "Backend dump does not implement ListenExport") assert.EqualError(t, err, "Backend dump does not implement ListensExport")
} }
func TestGetBackends(t *testing.T) { func TestGetBackends(t *testing.T) {
backends := backends.GetBackends() backends := backends.GetBackends()
for _, info := range backends { for _, info := range backends {
if info.Name == "dump" { if info.Name == "dump" {
assert.Containsf(t, info.ImportCapabilities, "listen", assert.Containsf(t, info.ImportCapabilities, "listens",
"ImportCapabilities for \"dump\" expected to contain \"listens\"") "ImportCapabilities for \"dump\" expected to contain \"listens\"")
assert.Emptyf(t, info.ExportCapabilities, assert.Emptyf(t, info.ExportCapabilities,
"ExportCapabilities for \"dump\" expected to be empty") "ExportCapabilities for \"dump\" expected to be empty")

4
cmd/listens.go
View file

@ -39,9 +39,9 @@ var listensCmd = &cobra.Command{
sourceName, sourceConfig := getConfigFromFlag(cmd, "from") sourceName, sourceConfig := getConfigFromFlag(cmd, "from")
targetName, targetConfig := getConfigFromFlag(cmd, "to") targetName, targetConfig := getConfigFromFlag(cmd, "to")
fmt.Printf("Transferring listens from %s to %s...\n", sourceName, targetName) fmt.Printf("Transferring listens from %s to %s...\n", sourceName, targetName)
exportBackend, err := backends.ResolveBackend[models.ListenExport](sourceConfig) exportBackend, err := backends.ResolveBackend[models.ListensExport](sourceConfig)
cobra.CheckErr(err) cobra.CheckErr(err)
importBackend, err := backends.ResolveBackend[models.ListenImport](targetConfig) importBackend, err := backends.ResolveBackend[models.ListensImport](targetConfig)
cobra.CheckErr(err) cobra.CheckErr(err)
timestamp := time.Unix(0, 0) timestamp := time.Unix(0, 0)
listens, err := exportBackend.ExportListens(timestamp) listens, err := exportBackend.ExportListens(timestamp)

4
models/interfaces.go
View file

@ -31,11 +31,11 @@ type Backend interface {
FromConfig(config *viper.Viper) Backend FromConfig(config *viper.Viper) Backend
} }
type ListenExport interface { type ListensExport interface {
ExportListens(oldestTimestamp time.Time) ([]Listen, error) ExportListens(oldestTimestamp time.Time) ([]Listen, error)
} }
type ListenImport interface { type ListensImport interface {
ImportListens(listens []Listen, oldestTimestamp time.Time) (ImportResult, error) ImportListens(listens []Listen, oldestTimestamp time.Time) (ImportResult, error)
} }