Use positional arguments for source and target in beam commands

cmd/beam.go

@@ -37,11 +37,7 @@ func init() {
 
 	// Cobra supports Persistent Flags which will work for this command
 	// and all subcommands, e.g.:
-	beamCmd.PersistentFlags().StringP("from", "f", "", "Source service configuration (required)")
+	// beamCmd.PersistentFlags().String("foo", "", "A help for foo")
-	beamCmd.MarkPersistentFlagRequired("from")
-	beamCmd.PersistentFlags().StringP("to", "t", "", "Target service configuration (required)")
-	beamCmd.MarkPersistentFlagRequired("to")
-	beamCmd.PersistentFlags().Int64P("timestamp", "s", 0, "Only import data newer then given Unix timestamp")
 
 	// Cobra supports local flags which will only run when this command
 	// is called directly, e.g.:

cmd/beam_listens.go

@@ -26,9 +26,11 @@ import (
 )
 
 var beamListensCmd = &cobra.Command{
-	Use:   "listens",
+	Use:        "listens SOURCE TARGET",
-	Short: "Transfer listens between two services",
+	Short:      "Transfer listens between two services",
-	Long:  `Transfers listens between two configured services.`,
+	Long:       `Transfers listens between two configured services.`,
+	Args:       cobra.ExactArgs(2),
+	ArgAliases: []string{"source", "target"},
 	Run: func(cmd *cobra.Command, args []string) {
 		db, err := storage.New(config.DatabasePath())
 		cobra.CheckErr(err)
@@ -36,7 +38,7 @@ var beamListensCmd = &cobra.Command{
 			models.ListensExport,
 			models.ListensImport,
 			models.ListensResult,
-		](cmd, &db, "listens")
+		](cmd, &db, "listens", args[0], args[1])
 		cobra.CheckErr(err)
 		exp := backends.ListensExportProcessor{Backend: c.ExpBackend}
 		imp := backends.ListensImportProcessor{Backend: c.ImpBackend}
@@ -56,4 +58,5 @@ func init() {
 	// Cobra supports local flags which will only run when this command
 	// is called directly, e.g.:
 	// beamListensCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	beamListensCmd.Flags().Int64P("timestamp", "t", 0, "Only import listens newer then given Unix timestamp")
 }

cmd/beam_loves.go

@@ -26,9 +26,10 @@ import (
 )
 
 var beamLovesCmd = &cobra.Command{
-	Use:   "loves",
+	Use:   "loves SOURCE TARGET",
 	Short: "Transfer loves between two services",
 	Long:  `Transfers loves between two configured services.`,
+	Args:  cobra.ExactArgs(2),
 	Run: func(cmd *cobra.Command, args []string) {
 		db, err := storage.New(config.DatabasePath())
 		cobra.CheckErr(err)
@@ -36,7 +37,7 @@ var beamLovesCmd = &cobra.Command{
 			models.LovesExport,
 			models.LovesImport,
 			models.LovesResult,
-		](cmd, &db, "loves")
+		](cmd, &db, "loves", args[0], args[1])
 		cobra.CheckErr(err)
 		exp := backends.LovesExportProcessor{Backend: c.ExpBackend}
 		imp := backends.LovesImportProcessor{Backend: c.ImpBackend}
@@ -57,4 +58,5 @@ func init() {
 	// Cobra supports local flags which will only run when this command
 	// is called directly, e.g.:
 	// beamLovesCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	beamLovesCmd.Flags().Int64P("timestamp", "t", 0, "Only import loves newer then given Unix timestamp")
 }

internal/cli/transfer.go

@@ -16,7 +16,6 @@ Scotty. If not, see <https://www.gnu.org/licenses/>.
 package cli
 
 import (
-	"errors"
 	"fmt"
 	"sync"
 	"time"
@@ -24,6 +23,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"go.uploadedlobster.com/scotty/internal/backends"
+	"go.uploadedlobster.com/scotty/internal/config"
 	"go.uploadedlobster.com/scotty/internal/models"
 	"go.uploadedlobster.com/scotty/internal/storage"
 )
@@ -36,13 +36,15 @@ func NewTransferCmd[
 	cmd *cobra.Command,
 	db *storage.Database,
 	entity string,
+	source string,
+	target string,
 ) (TransferCmd[E, I, R], error) {
 	c := TransferCmd[E, I, R]{
 		cmd:    cmd,
 		db:     db,
 		entity: entity,
 	}
-	err := c.resolveBackends()
+	err := c.resolveBackends(source, target)
 	if err != nil {
 		return c, err
 	}
@@ -59,15 +61,10 @@ type TransferCmd[E models.Backend, I models.ImportBackend, R models.ListensResul
 	ImpBackend I
 }
 
-func (c *TransferCmd[E, I, R]) resolveBackends() error {
+func (c *TransferCmd[E, I, R]) resolveBackends(source string, target string) error {
-	sourceConfig := GetServiceConfigFromFlag(c.cmd, "from")
+	sourceConfig, err := config.GetService(source)
-	if sourceConfig == nil {
+	cobra.CheckErr(err)
-		cobra.CheckErr(errors.New("failed loading service configuration"))
+	targetConfig, err := config.GetService(target)
-	}
-	targetConfig := GetServiceConfigFromFlag(c.cmd, "to")
-	if targetConfig == nil {
-		cobra.CheckErr(errors.New("failed loading service configuration"))
-	}
 
 	// Initialize backends
 	expBackend, err := backends.ResolveBackend[E](sourceConfig)