Skip to content

Commit 269a380

Browse files
committed
feat(builders): improve ant name parsing
1 parent ec20967 commit 269a380

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

builders/ant.go

+12-4
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,20 @@ func locatorFromJar(path string) (module.Locator, error) {
194194
// fall back to parsing file name
195195
re := regexp.MustCompile("(-sources|-javadoc)?.jar$")
196196
nameParts := strings.Split(re.ReplaceAllString(filepath.Base(path), ""), "-")
197+
lenNameParts := len(nameParts)
197198

198-
parsedProjectName := nameParts[0]
199-
parsedRevisionName := ""
199+
var parsedProjectName string
200+
var parsedRevisionName string
200201

201-
if len(nameParts) > 1 {
202-
parsedRevisionName = nameParts[1]
202+
if lenNameParts == 1 {
203+
parsedProjectName = nameParts[0]
204+
} else if lenNameParts > 1 {
205+
parsedProjectName = strings.Join(nameParts[0:lenNameParts-1], "-")
206+
parsedRevisionName = nameParts[lenNameParts-1]
207+
}
208+
209+
if parsedProjectName == "" {
210+
return module.Locator{}, errors.New("unable to parse jar file")
203211
}
204212

205213
return module.Locator{

0 commit comments

Comments
 (0)