Moved dgraph-converter binary to dgraph subcommand.

dgraph/cmd/cert/run.go

@@ -37,8 +37,6 @@ func init() {
 		},
 	}
 
-	Cert.Cmd.AddCommand()
-
 	flag := Cert.Cmd.Flags()
 	flag.StringP("dir", "d", defaultDir, "directory containing TLS certs and keys")
 	flag.StringP("ca-key", "k", defaultCAKey, "path to the CA private key")

dgraph/cmd/dgraph-converter/main.go → dgraph/cmd/conv/conv.go

@@ -5,13 +5,12 @@
  * with the Commons Clause restriction.
  */
 
-package main
+package conv
 
 import (
 	"bufio"
 	"compress/gzip"
 	"encoding/json"
-	"flag"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -23,13 +22,6 @@ import (
 	"github.com/paulmach/go.geojson"
 )
 
-var (
-	// TODO - Take a directory here and convert all the files in the directory.
-	geoFile    = flag.String("geo", "", "Location of geo file to convert")
-	outputFile = flag.String("out", "output.rdf.gz", "Location of output rdf.gz file")
-	geoPred    = flag.String("geopred", "loc", "Predicate to use to store geometries")
-)
-
 // TODO: Reconsider if we need this binary.
 func writeToFile(fpath string, ch chan []byte) error {
 	f, err := os.Create(fpath)
@@ -106,7 +98,7 @@ func convertGeoFile(input string, output string) error {
 
 		geometry := strings.Replace(string(b), `"`, "'", -1)
 		bn := fmt.Sprintf("_:%s-%d", name, count)
-		rdf := fmt.Sprintf("%s <%s> \"%s\"^^<geo:geojson> .\n", bn, *geoPred, geometry)
+		rdf := fmt.Sprintf("%s <%s> \"%s\"^^<geo:geojson> .\n", bn, opt.geopred, geometry)
 		chb <- []byte(rdf)
 
 		for k, _ := range f.Properties {
@@ -127,12 +119,3 @@ func convertGeoFile(input string, output string) error {
 	fmt.Printf("%d features converted. %d rdf's generated\n", count, rdfCount)
 	return <-che
 }
-
-func main() {
-	flag.Parse()
-	if len(*geoFile) == 0 {
-		fmt.Printf("The file to be loaded must be specified using the --geo flag.\n")
-		os.Exit(1)
-	}
-	x.Check(convertGeoFile(*geoFile, *outputFile))
-}

dgraph/cmd/conv/run.go

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 Dgraph Labs, Inc.
+ *
+ * This file is available under the Apache License, Version 2.0,
+ * with the Commons Clause restriction.
+ */
+
+package conv
+
+import (
+	"os"
+
+	"github.com/dgraph-io/dgraph/x"
+	"github.com/spf13/cobra"
+)
+
+var Conv x.SubCommand
+
+var opt struct {
+	geo     string
+	out     string
+	geopred string
+}
+
+func init() {
+	Conv.Cmd = &cobra.Command{
+		Use:   "conv",
+		Short: "Dgraph Geo file converter",
+		Args:  cobra.NoArgs,
+		Run: func(cmd *cobra.Command, args []string) {
+			defer x.StartProfile(Conv.Conf).Stop()
+			if err := run(); err != nil {
+				x.Println(err)
+				os.Exit(1)
+			}
+		},
+	}
+
+	flag := Conv.Cmd.Flags()
+	flag.StringVar(&opt.geo, "geo", "", "Location of geo file to convert")
+	flag.StringVar(&opt.out, "out", "output.rdf.gz", "Location of output rdf.gz file")
+	flag.StringVar(&opt.geopred, "geopred", "loc", "Predicate to use to store geometries")
+	Conv.Cmd.MarkFlagRequired("geo")
+}
+
+func run() error {
+	return convertGeoFile(opt.geo, opt.out)
+}

dgraph/cmd/root.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/dgraph-io/dgraph/dgraph/cmd/bulk"
 	"github.com/dgraph-io/dgraph/dgraph/cmd/cert"
+	"github.com/dgraph-io/dgraph/dgraph/cmd/conv"
 	"github.com/dgraph-io/dgraph/dgraph/cmd/debug"
 	"github.com/dgraph-io/dgraph/dgraph/cmd/live"
 	"github.com/dgraph-io/dgraph/dgraph/cmd/server"
@@ -68,7 +69,7 @@ func init() {
 	flag.CommandLine.AddGoFlagSet(goflag.CommandLine)
 
 	var subcommands = []*x.SubCommand{
-		&bulk.Bulk, &cert.Cert, &live.Live, &server.Server, &zero.Zero,
+		&bulk.Bulk, &cert.Cert, &conv.Conv, &live.Live, &server.Server, &zero.Zero,
 		&version.Version, &debug.Debug,
 	}
 	for _, sc := range subcommands {