From 49d06b7f528b33d541cd156a07b413273d678d22 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Thu, 9 Nov 2023 17:31:42 +0100 Subject: [PATCH] Various output tweaks --- backends/base.go | 2 +- backends/dump.go | 6 +++--- cmd/listens.go | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backends/base.go b/backends/base.go index 3776edc..8fc3bfd 100644 --- a/backends/base.go +++ b/backends/base.go @@ -49,7 +49,7 @@ type ImportResult struct { func resolveBackend(config *viper.Viper) (string, Backend, error) { backendName := config.GetString("backend") - fmt.Printf("requested backend %s\n", backendName) + // fmt.Printf("requested backend %s\n", backendName) backendType := knownBackends[backendName] if backendType == nil { return backendName, nil, errors.New(fmt.Sprintf("Unknown backend %s", backendName)) diff --git a/backends/dump.go b/backends/dump.go index 6649db4..8c2a0ea 100644 --- a/backends/dump.go +++ b/backends/dump.go @@ -39,10 +39,10 @@ func (b DumpBackend) ImportListens(listens []Listen, oldestTimestamp time.Time) Count: len(listens), LastTimestamp: oldestTimestamp, } - if result.Count > 0 { - result.LastTimestamp = listens[len(listens)-1].ListenedAt - } for _, listen := range listens { + if listen.ListenedAt.Unix() > result.LastTimestamp.Unix() { + result.LastTimestamp = listen.ListenedAt + } fmt.Printf("Listen: \"%s\" by %s\n", listen.TrackName, listen.ArtistName()) } return result, nil diff --git a/cmd/listens.go b/cmd/listens.go index 02b51d2..dd89fb4 100644 --- a/cmd/listens.go +++ b/cmd/listens.go @@ -36,9 +36,9 @@ var listensCmd = &cobra.Command{ Short: "Transfer listens between two backends", Long: `Transfers listens between two configured backends.`, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("listens called") - sourceConfig := getConfigFromFlag(cmd, "from") - targetConfig := getConfigFromFlag(cmd, "to") + sourceName, sourceConfig := getConfigFromFlag(cmd, "from") + targetName, targetConfig := getConfigFromFlag(cmd, "to") + fmt.Printf("Transfering listens from %s to %s...\n", sourceName, targetName) exportBackend, err := backends.ResolveBackend[backends.ListenExport](sourceConfig) cobra.CheckErr(err) importBackend, err := backends.ResolveBackend[backends.ListenImport](targetConfig) @@ -52,13 +52,13 @@ var listensCmd = &cobra.Command{ }, } -func getConfigFromFlag(cmd *cobra.Command, flagName string) *viper.Viper { +func getConfigFromFlag(cmd *cobra.Command, flagName string) (string, *viper.Viper) { configName := cmd.Flag(flagName).Value.String() config := viper.Sub(configName) if config == nil { cobra.CheckErr(fmt.Sprintf("Invalid source configuration \"%s\"", configName)) } - return config + return configName, config } func init() {