close opened and created files

Author: F483

lib.go

@@ -45,44 +45,37 @@ func New(probabilistic bool, limit uint32, fpRatio float64) DejaVu {
 // PROCESS TEXT (for dejavu bin) //
 ///////////////////////////////////
 
-func getReaders(paths []string) ([]io.Reader, error) {
-	readers := make([]io.Reader, len(paths))
-	for i, path := range paths {
+// ProcessPaths is equivalent to Process, only that file paths are given.
+// If - in inputs to use stdin and empty out to use stdout.
+func ProcessPaths(d DejaVu, filter bool, out string, inputs ...string) error {
+
+	// get output writer
+	var writer *os.File
+	if out == "" {
+		writer = os.Stdout
+	} else {
+		writer, err := os.Create(out)
+		if err != nil {
+			return err
+		}
+		defer writer.Close()
+	}
+
+	// get input readers
+	readers := make([]io.Reader, len(inputs))
+	for i, path := range inputs {
 		if path == "-" { // read from stdin
 			readers[i] = os.Stdin
 		} else { // read from file path
 			file, err := os.Open(path)
 			if err != nil {
-				return nil, err
+				return err
 			}
+			defer file.Close()
 			readers[i] = file
 		}
 	}
-	return readers, nil
-}
 
-func getWriter(path string) (io.Writer, error) {
-	if path == "" {
-		return os.Stdout, nil
-	}
-	file, err := os.Create(path)
-	if err != nil {
-		return nil, err
-	}
-	return file, nil
-}
-
-// ProcessPaths is equivalent to Process, only that file paths are given.
-// If - in inputs to use stdin and empty out to use stdout.
-func ProcessPaths(d DejaVu, filter bool, out string, inputs ...string) error {
-	writer, err := getWriter(out)
-	if err != nil {
-		return err
-	}
-	readers, err := getReaders(inputs)
-	if err != nil {
-		return err
-	}
 	Process(d, filter, writer, readers...)
 	return nil
 }

lib_test.go

@@ -2,7 +2,6 @@ package dejavu
 
 import (
 	"crypto/rand"
-	"os"
 	"testing"
 )
 
@@ -86,17 +85,3 @@ func TestProcess(t *testing.T) {
 	d := NewProbabilistic(65536, 0.00000001)
 	ProcessPaths(d, true, "/dev/null", "LICENSE", "README.md")
 }
-
-func TestGetWriterStdout(t *testing.T) {
-	w, _ := getWriter("")
-	if w != os.Stdout {
-		t.Errorf("Expected stdout writer!")
-	}
-}
-
-func TestGetReadersStdin(t *testing.T) {
-	r, _ := getReaders([]string{"-"})
-	if len(r) != 1 && r[0] != os.Stdin {
-		t.Errorf("Expected stdin reader!")
-	}
-}