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

Various output tweaks

Browse source
This commit is contained in:
Philipp Wolfer 2023-11-09 17:31:42 +01:00
parent e9b7aabc0a
commit 49d06b7f52
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backends/base.go
View file

@ -49,7 +49,7 @@ type ImportResult struct {
func resolveBackend(config *viper.Viper) (string, Backend, error) { func resolveBackend(config *viper.Viper) (string, Backend, error) {
backendName := config.GetString("backend") backendName := config.GetString("backend")
fmt.Printf("requested backend %s\n", backendName) // fmt.Printf("requested backend %s\n", backendName)
backendType := knownBackends[backendName] backendType := knownBackends[backendName]
if backendType == nil { if backendType == nil {
return backendName, nil, errors.New(fmt.Sprintf("Unknown backend %s", backendName)) return backendName, nil, errors.New(fmt.Sprintf("Unknown backend %s", backendName))

6
backends/dump.go
View file

@ -39,10 +39,10 @@ func (b DumpBackend) ImportListens(listens []Listen, oldestTimestamp time.Time)
Count: len(listens), Count: len(listens),
LastTimestamp: oldestTimestamp, LastTimestamp: oldestTimestamp,
} }
if result.Count > 0 {
result.LastTimestamp = listens[len(listens)-1].ListenedAt
}
for _, listen := range listens { 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()) fmt.Printf("Listen: \"%s\" by %s\n", listen.TrackName, listen.ArtistName())
} }
return result, nil return result, nil

10
cmd/listens.go
View file

@ -36,9 +36,9 @@ var listensCmd = &cobra.Command{
Short: "Transfer listens between two backends", Short: "Transfer listens between two backends",
Long: `Transfers listens between two configured backends.`, Long: `Transfers listens between two configured backends.`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
fmt.Println("listens called") sourceName, sourceConfig := getConfigFromFlag(cmd, "from")
sourceConfig := getConfigFromFlag(cmd, "from") targetName, targetConfig := getConfigFromFlag(cmd, "to")
targetConfig := getConfigFromFlag(cmd, "to") fmt.Printf("Transfering listens from %s to %s...\n", sourceName, targetName)
exportBackend, err := backends.ResolveBackend[backends.ListenExport](sourceConfig) exportBackend, err := backends.ResolveBackend[backends.ListenExport](sourceConfig)
cobra.CheckErr(err) cobra.CheckErr(err)
importBackend, err := backends.ResolveBackend[backends.ListenImport](targetConfig) 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() configName := cmd.Flag(flagName).Value.String()
config := viper.Sub(configName) config := viper.Sub(configName)
if config == nil { if config == nil {
cobra.CheckErr(fmt.Sprintf("Invalid source configuration \"%s\"", configName)) cobra.CheckErr(fmt.Sprintf("Invalid source configuration \"%s\"", configName))
} }
return config return configName, config
} }
func init() { func init() {