move import to subcommand

cmd/import.go

@@ -0,0 +1,50 @@
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"github.com/pilosa/pilosa/ctl"
+)
+
+var importer = ctl.NewImportCommand(os.Stdin, os.Stdout, os.Stderr)
+
+var importCmd = &cobra.Command{
+	Use:   "import",
+	Short: "import - import data to pilosa",
+	Long: `Bulk imports one or more CSV files to a host's database and frame. The bits
+of the CSV file are grouped by slice for the most efficient import.
+
+The format of the CSV file is:
+
+	BITMAPID,PROFILEID,[TIME]
+
+The file should contain no headers. The TIME column is optional and can be
+omitted. If it is present then its format should be YYYY-MM-DDTHH:MM.
+`,
+	Run: func(cmd *cobra.Command, args []string) {
+		importer.Paths = args
+		if err := importer.Run(context.Background()); err != nil {
+			fmt.Println(err)
+		}
+	},
+}
+
+func init() {
+	importCmd.Flags().StringVarP(&importer.Host, "host", "", "localhost:15000", "host:port of Pilosa.")
+	importCmd.Flags().StringVarP(&importer.Database, "database", "d", "", "Pilosa database to import into.")
+	importCmd.Flags().StringVarP(&importer.Frame, "frame", "f", "", "Frame to import into.")
+	importCmd.Flags().IntVarP(&importer.BufferSize, "buffer-size", "s", 10000000, "Number of bits to buffer/sort before importing.")
+
+	err := viper.BindPFlags(importCmd.Flags())
+	if err != nil {
+		log.Fatalf("Error binding import flags: %v", err)
+	}
+
+	RootCmd.AddCommand(importCmd)
+}

cmd/pilosactl/main.go

@@ -22,7 +22,6 @@ import (
 	"unsafe"
 
 	"github.com/pilosa/pilosa"
-	"github.com/pilosa/pilosa/pilosactl"
 	"github.com/pilosa/pilosa/roaring"
 )
 
@@ -125,8 +124,6 @@ func (m *Main) ParseFlags(args []string) error {
 		fmt.Fprintln(m.Stderr, m.Usage())
 		fmt.Fprintln(m.Stderr, "")
 		return flag.ErrHelp
-	case "import":
-		m.Cmd = pilosactl.NewImportCommand(m.Stdin, m.Stdout, m.Stderr)
 	case "export":
 		m.Cmd = NewExportCommand(m.Stdin, m.Stdout, m.Stderr)
 	case "sort":

ctl/import.go

@@ -1,17 +1,14 @@
-package pilosactl
+package ctl
 
 import (
 	"context"
 	"encoding/csv"
 	"errors"
-	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/pilosa/pilosa"
@@ -56,41 +53,6 @@ func (cmd *ImportCommand) String() string {
 	return fmt.Sprint(*cmd)
 }
 
-// ParseFlags parses command line flags from args.
-func (cmd *ImportCommand) ParseFlags(args []string) error {
-	fs := flag.NewFlagSet("pilosactl", flag.ContinueOnError)
-	fs.SetOutput(ioutil.Discard)
-	fs.StringVar(&cmd.Host, "host", "localhost:15000", "host:port")
-	fs.StringVar(&cmd.Database, "d", "", "database")
-	fs.StringVar(&cmd.Frame, "f", "", "frame")
-	fs.IntVar(&cmd.BufferSize, "buffer-size", cmd.BufferSize, "buffer size")
-	if err := fs.Parse(args); err != nil {
-		return err
-	}
-
-	// Extract the import paths.
-	cmd.Paths = fs.Args()
-
-	return nil
-}
-
-// Usage returns the usage message to be printed.
-func (cmd *ImportCommand) Usage() string {
-	return strings.TrimSpace(`
-usage: pilosactl import -host HOST -d database -f frame paths
-
-Bulk imports one or more CSV files to a host's database and frame. The bits
-of the CSV file are grouped by slice for the most efficient import.
-
-The format of the CSV file is:
-
-	BITMAPID,PROFILEID,[TIME]
-
-The file should contain no headers. The TIME column is optional and can be
-omitted. If it is present then its format should be YYYY-MM-DDTHH:MM.
-`)
-}
-
 // Run executes the main program execution.
 func (cmd *ImportCommand) Run(ctx context.Context) error {
 	logger := log.New(cmd.Stderr, "", log.LstdFlags)