dominic/FLEcli
1
0
Fork 0
mirror of https://github.com/on4kjm/FLEcli.git synced 2025-01-18 13:01:09 +01:00
Code Issues Releases Activity

Permit comment after other input on the line (#119)

Browse source
This commit is contained in:
Bryan Nehl 2024-01-17 11:01:13 -05:00 committed by GitHub
parent daa46da5b6
commit caefd46994
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fleprocess/load_file.go
View file

@ -53,6 +53,7 @@ func LoadFile(inputFilename string, isInterpolateTime bool) (filleFullLog []LogL
isInferTimeFatalError := false
regexpLineComment := regexp.MustCompile(`^[[:blank:]]*#`)
regexpInLineComment := regexp.MustCompile(`.*#.*`)
regexpOnlySpaces := regexp.MustCompile(`^\s+$`)
regexpSingleMultiLineComment := regexp.MustCompile(`^[[:blank:]]*{.+}$`)
regexpStartMultiLineComment := regexp.MustCompile(`^[[:blank:]]*{`)
@ -104,6 +105,10 @@ func LoadFile(inputFilename string, isInterpolateTime bool) (filleFullLog []LogL
if (len(eachline) == 0) || (regexpOnlySpaces.MatchString(eachline)) {
continue
}
// a comment starts somewhere on the line, remove the comment
if regexpInLineComment.MatchString(eachline) {
eachline = strings.Split(eachline, "#")[0]
}
// Process multi-line comments
if regexpStartMultiLineComment.MatchString(eachline) {

9
fleprocess/load_file_test.go
View file

@ -49,6 +49,7 @@ func TestLoadFile_happyCase(t *testing.T) {
dataArray = append(dataArray, "40m cw 0950 ik5zve/5 9 5")
dataArray = append(dataArray, "on6zq")
dataArray = append(dataArray, "0954 on4do")
dataArray = append(dataArray, "0955 k0emt # on line comment")
temporaryDataFileName := createTestFile(dataArray)
@ -115,6 +116,14 @@ func TestLoadFile_happyCase(t *testing.T) {
if loadedLogFile[2].Time != expectedValue {
t.Errorf("Not the expected Time[2] value: %s (expecting %s)", loadedLogFile[2].Time, expectedValue)
}
expectedValue = "K0EMT"
if loadedLogFile[3].Call != expectedValue {
t.Errorf("Not the expected Call[3] value: %s (expecting %s)", loadedLogFile[3].Call, expectedValue)
}
expectedValue = "0955"
if loadedLogFile[3].Time != expectedValue {
t.Errorf("Not the expected Time[3] value: %s (expecting %s)", loadedLogFile[3].Time, expectedValue)
}
//Clean Up
os.Remove(temporaryDataFileName)
}