diff --git a/cmd/interactive.go b/cmd/interactive.go index b495a109..9035b4c5 100644 --- a/cmd/interactive.go +++ b/cmd/interactive.go @@ -514,7 +514,7 @@ func extractFileNames(input string) []string { // Regex to match file paths starting with optional drive letter, / ./ \ or .\ and include escaped or unescaped spaces (\ or %20) // and followed by more characters and a file extension // This will capture non filename strings, but we'll check for file existence to remove mismatches - regexPattern := `(?:[a-zA-Z]:)?(?:\./|/|\\)[\S\\ ]+?\.(?i:jpg|jpeg|png|svg)\b` + regexPattern := `(?:[a-zA-Z]:)?(?:\./|/|\\)[\S\\ ]+?\.(?i:jpg|jpeg|png)\b` re := regexp.MustCompile(regexPattern) return re.FindAllString(input, -1) diff --git a/cmd/interactive_test.go b/cmd/interactive_test.go index bb7e0aba..118f4264 100644 --- a/cmd/interactive_test.go +++ b/cmd/interactive_test.go @@ -12,44 +12,45 @@ import ( func TestExtractFilenames(t *testing.T) { // Unix style paths input := ` some preamble - ./relative\ path/one.png inbetween1 ./not a valid two.jpg inbetween2 -/unescaped space /three.jpeg inbetween3 /valid\ path/dir/four.png "./quoted with spaces/five.svg` + ./relative\ path/one.png inbetween1 ./not a valid two.jpg inbetween2 ./1.svg +/unescaped space /three.jpeg inbetween3 /valid\ path/dir/four.png "./quoted with spaces/five.JPG` res := extractFileNames(input) assert.Len(t, res, 5) assert.Contains(t, res[0], "one.png") assert.Contains(t, res[1], "two.jpg") assert.Contains(t, res[2], "three.jpeg") assert.Contains(t, res[3], "four.png") - assert.Contains(t, res[4], "five.svg") + assert.Contains(t, res[4], "five.JPG") assert.NotContains(t, res[4], '"') - assert.NotContains(t, res, "inbtween") + assert.NotContains(t, res, "inbetween1") + assert.NotContains(t, res, "./1.svg") // Windows style paths input = ` some preamble c:/users/jdoe/one.png inbetween1 c:/program files/someplace/two.jpg inbetween2 /absolute/nospace/three.jpeg inbetween3 /absolute/with space/four.png inbetween4 -./relative\ path/five.svg inbetween5 "./relative with/spaces/six.png inbetween6 -d:\path with\spaces\seven.svg inbetween7 c:\users\jdoe\eight.png inbetween8 - d:\program files\someplace\nine.png inbetween9 "E:\program files\someplace\ten.svg some ending +./relative\ path/five.JPG inbetween5 "./relative with/spaces/six.png inbetween6 +d:\path with\spaces\seven.JPEG inbetween7 c:\users\jdoe\eight.png inbetween8 + d:\program files\someplace\nine.png inbetween9 "E:\program files\someplace\ten.PNG some ending ` res = extractFileNames(input) assert.Len(t, res, 10) - assert.NotContains(t, res, "inbtween") + assert.NotContains(t, res, "inbetween2") assert.Contains(t, res[0], "one.png") assert.Contains(t, res[0], "c:") assert.Contains(t, res[1], "two.jpg") assert.Contains(t, res[1], "c:") assert.Contains(t, res[2], "three.jpeg") assert.Contains(t, res[3], "four.png") - assert.Contains(t, res[4], "five.svg") + assert.Contains(t, res[4], "five.JPG") assert.Contains(t, res[5], "six.png") - assert.Contains(t, res[6], "seven.svg") + assert.Contains(t, res[6], "seven.JPEG") assert.Contains(t, res[6], "d:") assert.Contains(t, res[7], "eight.png") assert.Contains(t, res[7], "c:") assert.Contains(t, res[8], "nine.png") assert.Contains(t, res[8], "d:") - assert.Contains(t, res[9], "ten.svg") + assert.Contains(t, res[9], "ten.PNG") assert.Contains(t, res[9], "E:") }