mv file reading operations to data.go

p2/data.go

@@ -63,3 +63,19 @@ func parseRecords(r [][]string) ([][]float64, error) {
 
 	return data, nil
 }
+
+func readFile(s *string) ([][]float64, error) {
+	f, err := os.Open(*s)
+	if err != nil {
+		return [][]float64{}, err
+	}
+
+	defer f.Close()
+
+	data, err := readData(f)
+	if err != nil {
+		return [][]float64{}, err
+	}
+
+	return data, nil
+}

p2/run.go

@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"log"
-	"os"
 
 	"git.dotya.ml/wanderer/ak9im/p2/stats"
 )
@@ -14,14 +13,7 @@ func run() error {
 	flag.Parse()
 
 	if *datafile != "" {
-		f, err := os.Open(*datafile)
+		data, err := readFile(datafile)
-		if err != nil {
-			return err
-		}
-
-		defer f.Close()
-
-		data, err := readData(f)
 		if err != nil {
 			return err
 		}