add cobra cmd

cmd/franklin.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"strconv"
@@ -9,8 +9,20 @@ import (
 
 	"github.com/go-errors/errors"
 	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 )
 
+func init() {
+	var franklinCmd = &cobra.Command{
+		Use:   "franklin",
+		Short: "Test availability of homepage content",
+		Run: func(cmd *cobra.Command, args []string) {
+			franklin()
+		},
+	}
+	RootCmd.AddCommand(franklinCmd)
+}
+
 const (
 	maxPrice         = float64(999)
 	waitForStart     = 5 * time.Second

cmd/root.go

@@ -0,0 +1,66 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	homedir "github.com/mitchellh/go-homedir"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+var cfgFile string
+
+// RootCmd represents the base command when called without any subcommands
+var RootCmd = &cobra.Command{
+	Use:   "lbry",
+	Short: "A command-line swiss army knife for LBRY",
+	// Uncomment the following line if your bare application
+	// has an action associated with it:
+	//	Run: func(cmd *cobra.Command, args []string) { },
+}
+
+// Execute adds all child commands to the root command and sets flags appropriately.
+// This is called by main.main(). It only needs to happen once to the rootCmd.
+func Execute() {
+	if err := RootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
+
+func init() {
+	// connect viper config
+	//cobra.OnInitialize(initConfig)
+
+	// Here you will define your flags and configuration settings.
+	// Cobra supports persistent flags, which, if defined here,
+	// will be global for your application.
+	//RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.lbry.yaml)")
+}
+
+// initConfig reads in config file and ENV variables if set.
+func initConfig() {
+	if cfgFile != "" {
+		// Use config file from the flag.
+		viper.SetConfigFile(cfgFile)
+	} else {
+		// Find home directory.
+		home, err := homedir.Dir()
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+
+		// Search config in home directory with name ".cmd" (without extension).
+		viper.AddConfigPath(home)
+		viper.SetConfigName(".lbry")
+	}
+
+	viper.AutomaticEnv() // read in environment variables that match
+
+	// If a config file is found, read it in.
+	if err := viper.ReadInConfig(); err == nil {
+		fmt.Println("Using config file:", viper.ConfigFileUsed())
+	}
+}

cmd/ytsync.go

@@ -1,9 +1,8 @@
-package main
+package cmd
 
 import (
 	"bytes"
 	"encoding/json"
-	"flag"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -20,10 +19,21 @@ import (
 	"github.com/garyburd/redigo/redis"
 	ytdl "github.com/kkdai/youtube"
 	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 	"google.golang.org/api/googleapi/transport"
 	"google.golang.org/api/youtube/v3"
 )
 
+func init() {
+	var ytSyncCmd = &cobra.Command{
+		Use:   "ytsync <youtube_api_key> <youtube_channel_id> [<lbry_channel_name>]",
+		Args:  cobra.RangeArgs(2, 3),
+		Short: "Publish youtube channel into LBRY network.",
+		Run:   ytsync,
+	}
+	RootCmd.AddCommand(ytSyncCmd)
+}
+
 const (
 	concurrentVideos = 1
 	redisHashKey     = "ytsync"
@@ -58,27 +68,23 @@ func (a byPlaylistPosition) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 func (a byPlaylistPosition) Less(i, j int) bool { return a[i].playlistPosition < a[j].playlistPosition }
 
 var (
-	daemon          *jsonrpc.Client
+	ytAPIKey        string
 	channelID       string
 	lbryChannelName string
-	claimAddress    string
+
-	videoDirectory  string
+	daemon         *jsonrpc.Client
-	ytAPIKey        string
+	claimAddress   string
-	redisPool       *redis.Pool
+	videoDirectory string
+	redisPool      *redis.Pool
 )
 
-func ytsync() {
+func ytsync(cmd *cobra.Command, args []string) {
 	var err error
 
-	flagSet := flag.NewFlagSet("", flag.ExitOnError)
+	ytAPIKey = args[0]
-	flagSet.StringVar(&ytAPIKey, "ytApiKey", "", "Youtube API key (required)")
+	channelID = args[1]
-	flagSet.StringVar(&channelID, "channelID", "", "ID of the youtube channel to sync (required)")
+	if len(args) > 2 {
-	flagSet.StringVar(&lbryChannelName, "lbryChannel", "", "Publish videos into this channel")
+		lbryChannelName = args[2]
-	flagSet.Parse(os.Args[2:])
-
-	if channelID == "" || ytAPIKey == "" {
-		flag.Usage()
-		return
 	}
 
 	redisPool = &redis.Pool{

main.go

@@ -1,24 +1,12 @@
 package main
 
 import (
-	"os"
+	"github.com/lbryio/lbry.go/cmd"
 
 	log "github.com/sirupsen/logrus"
 )
 
 func main() {
 	log.SetLevel(log.DebugLevel)
-
+	cmd.Execute()
-	if len(os.Args) < 2 {
-		log.Errorln("Usage: " + os.Args[0] + " COMMAND [options]")
-	}
-
-	switch os.Args[1] {
-	case "ytsync":
-		ytsync()
-	case "franklin":
-		franklin()
-	default:
-		log.Errorln("Unknown command: " + os.Args[1])
-	}
 }