Selaa lähdekoodia

improve fileInit func by not loading unspecified data (#189)

* improve fileInit func by not loading unsepcified data
erenJag 4 vuotta sitten
vanhempi
commit
25dfcebf4c
2 muutettua tiedostoa jossa 5 lisäystä ja 4 poistoa
  1. 4 3
      pkg/exprhelpers/exprlib.go
  2. 1 1
      pkg/exprhelpers/exprlib_test.go

+ 4 - 3
pkg/exprhelpers/exprlib.go

@@ -60,12 +60,13 @@ func FileInit(fileFolder string, filename string, fileType string) error {
 	}
 	defer file.Close()
 
+	if fileType == "" {
+		log.Debugf("ignored file %s%s because no type specified", fileFolder, filename)
+		return nil
+	}
 	if _, ok := dataFile[filename]; !ok {
 		dataFile[filename] = []string{}
 	}
-	if fileType == "" {
-		fileType = "string"
-	}
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
 		if strings.HasPrefix(scanner.Text(), "#") { // allow comments

+ 1 - 1
pkg/exprhelpers/exprlib_test.go

@@ -165,7 +165,7 @@ func TestFile(t *testing.T) {
 		log.Fatalf(err.Error())
 	}
 
-	err := FileInit(TestFolder, "test_data.txt", "")
+	err := FileInit(TestFolder, "test_data.txt", "string")
 	if err != nil {
 		log.Fatalf(err.Error())
 	}