extractor.go | 2 +- validators.go | 7 ++++++- diff --git a/extractor.go b/extractor.go index 11161a31f2795feb2d0b8b3bb591e295586d1c97..0a1036186b132f4efe7edb9e1dfe3ca957595df1 100644 --- a/extractor.go +++ b/extractor.go @@ -41,7 +41,7 @@ if len(input) >= len(candidatePath+"(") && strings.Index(input, candidatePath+"(") != -1 { continue } - if isEmail(candidatePath) || isDate(candidatePath) || isVersion(candidatePath) || isGitRange(candidatePath) || isGitInstruction(candidatePath) || startsWithInvalidString(candidatePath) || endsWithInvalidString(candidatePath) || containsInvalidString(candidatePath) || len(candidatePath) <= 2 { + if isEmail(candidatePath) || isDate(candidatePath) || isVersion(candidatePath) || isGitRange(candidatePath) || isGitInstruction(candidatePath) || startsWithInvalidString(candidatePath) || endsWithInvalidString(candidatePath) || containsInvalidString(candidatePath) || len(candidatePath) <= 2 || isSpace(candidatePath) { continue } if isGitPath(candidatePath) { diff --git a/validators.go b/validators.go index 5f67fdbc47851f7a3812d02b63799cf9175a2368..38704c79ee284d5e5239afde882fab9d0823778b 100644 --- a/validators.go +++ b/validators.go @@ -56,6 +56,11 @@ r := regexp.MustCompile("^v?[0-9x]\\.[0-9x]{1,2}(\\.[0-9x]{1,3})?$") return r.Match([]byte(input)) } +func isSpace(input string) bool { + r := regexp.MustCompile("^[0-9]*\\.[0-9]+[MGK]$") + return r.Match([]byte(input)) +} + func startsWithInvalidString(input string) bool { invalidBeginnings := []string{"Error/", "Object.", "Array."} for _, s := range invalidBeginnings { @@ -77,7 +82,7 @@ return false } func containsInvalidString(input string) bool { - invalidStrings := []string{"//", "()", "and/or", "origin/", "{", "}", "<", ">", "$", "*", "this."} + invalidStrings := []string{"//", "()", "and/or", "remotes/", "origin/", "{", "}", "<", ">", "$", "*", "this."} for _, s := range invalidStrings { if strings.Contains(input, s) { return true