Merge pull request #11 from rrbarbosa/stdin

Read input from stdin

csv.go

@@ -8,6 +8,8 @@ import (
 	"os"
 	"strings"
 	"unicode/utf8"
+
+	"github.com/cheggaaa/pb"
 )
 
 func containsDelimiter(col string) bool {
@@ -100,20 +102,27 @@ func copyCSVRows(i *Import, reader *csv.Reader, ignoreErrors bool, delimiter str
 
 func importCSV(filename string, connStr string, schema string, tableName string, ignoreErrors bool, skipHeader bool, fields string, delimiter string) error {
 
-	file, err := os.Open(filename)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
 	db, err := connect(connStr, schema)
 	if err != nil {
 		return err
 	}
 	defer db.Close()
 
-	bar := NewProgressBar(file)
-	reader := csv.NewReader(io.TeeReader(file, bar))
+	var reader *csv.Reader
+	var bar *pb.ProgressBar 
+	if filename != "" {
+		file, err := os.Open(filename)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+
+		bar = NewProgressBar(file)
+		reader = csv.NewReader(io.TeeReader(file, bar))
+	} else {
+		reader = csv.NewReader(os.Stdin)
+	}
+
 	reader.Comma, _ = utf8.DecodeRuneInString(delimiter)
 	reader.LazyQuotes = true
 
@@ -129,9 +138,14 @@ func importCSV(filename string, connStr string, schema string, tableName string,
 		return err
 	}
 
-	bar.Start()
-	err, success, failed := copyCSVRows(i, reader, ignoreErrors, delimiter, columns)
-	bar.Finish()
+	var success, failed int
+	if filename != "" {
+		bar.Start()
+		err, success, failed = copyCSVRows(i, reader, ignoreErrors, delimiter, columns)
+		bar.Finish()
+	} else {
+		err, success, failed = copyCSVRows(i, reader, ignoreErrors, delimiter, columns)
+	}
 
 	if err != nil {
 		lineNumber := success + failed

json.go

@@ -77,7 +77,12 @@ func importJSONObject(filename string, connStr string, schema string, tableName
 	// The entire file is read into memory because we need to add
 	// it into the PostgreSQL transaction, this will hit memory limits
 	// for big JSON objects
-	bytes, err := ioutil.ReadFile(filename)
+	var bytes []byte
+	if filename == "" {
+		bytes, err = ioutil.ReadAll(os.Stdin)
+	} else {
+		bytes, err = ioutil.ReadFile(filename)
+	}
 	if err != nil {
 		return err
 	}
@@ -100,12 +105,6 @@ func importJSONObject(filename string, connStr string, schema string, tableName
 
 func importJSON(filename string, connStr string, schema string, tableName string, ignoreErrors bool) error {
 
-	file, err := os.Open(filename)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
 	db, err := connect(connStr, schema)
 	if err != nil {
 		return err
@@ -117,12 +116,24 @@ func importJSON(filename string, connStr string, schema string, tableName string
 		return err
 	}
 
-	bar := NewProgressBar(file)
-	reader := bufio.NewReader(io.TeeReader(file, bar))
+	var success, failed int
+	if filename == "" {
+		reader := bufio.NewReader(os.Stdin)
+		err, success, failed = copyJSONRows(i, reader, ignoreErrors)
+	} else {
+		file, err := os.Open(filename)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+
+		bar := NewProgressBar(file)
+		reader := bufio.NewReader(io.TeeReader(file, bar))
+		bar.Start()
+		err, success, failed = copyJSONRows(i, reader, ignoreErrors)
+		bar.Finish()
+	}
 
-	bar.Start()
-	err, success, failed := copyJSONRows(i, reader, ignoreErrors)
-	bar.Finish()
 
 	if err != nil {
 		lineNumber := success + failed

pgfutter.go

@@ -20,6 +20,10 @@ func exitOnError(err error) {
 func parseTableName(c *cli.Context, filename string) string {
 	tableName := c.GlobalString("table")
 	if tableName == "" {
+		if filename == "" {
+			// if no filename is not set, we reading stdin
+			filename = "stdin"
+		}
 		base := filepath.Base(filename)
 		ext := filepath.Ext(filename)
 		tableName = strings.TrimSuffix(base, ext)
@@ -92,10 +96,6 @@ func main() {
 				cli.CommandHelpTemplate = strings.Replace(cli.CommandHelpTemplate, "[arguments...]", "<json-file>", -1)
 
 				filename := c.Args().First()
-				if filename == "" {
-					cli.ShowCommandHelp(c, "json")
-					os.Exit(1)
-				}
 
 				ignoreErrors := c.GlobalBool("ignore-errors")
 				schema := c.GlobalString("schema")
@@ -113,10 +113,6 @@ func main() {
 				cli.CommandHelpTemplate = strings.Replace(cli.CommandHelpTemplate, "[arguments...]", "<json-file>", -1)
 
 				filename := c.Args().First()
-				if filename == "" {
-					cli.ShowCommandHelp(c, "jsonobj")
-					os.Exit(1)
-				}
 
 				schema := c.GlobalString("schema")
 				tableName := parseTableName(c, filename)
@@ -148,10 +144,6 @@ func main() {
 				cli.CommandHelpTemplate = strings.Replace(cli.CommandHelpTemplate, "[arguments...]", "<csv-file>", -1)
 
 				filename := c.Args().First()
-				if filename == "" {
-					cli.ShowCommandHelp(c, "csv")
-					os.Exit(1)
-				}
 
 				ignoreErrors := c.GlobalBool("ignore-errors")
 				schema := c.GlobalString("schema")