Use normalized version as keys for matching versions in maps

cmaglie · cmaglie · commit 409ed54bf370 · 2023-03-15T11:38:49.000+01:00
diff --git a/.licenses/go/go.bug.st/relaxed-semver.dep.yml b/.licenses/go/go.bug.st/relaxed-semver.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: go.bug.st/relaxed-semver
-version: v0.9.0
+version: v0.9.1-0.20230314182316-c6633824f06f
 type: go
 summary: 
 homepage: https://pkg.go.dev/go.bug.st/relaxed-semver
diff --git a/arduino/libraries/librariesindex/index.go b/arduino/libraries/librariesindex/index.go
@@ -35,7 +35,7 @@ var EmptyIndex = &Index{Libraries: map[string]*Library{}}
 // Library is a library available for download
 type Library struct {
 	Name     string
-	Releases map[string]*Release
+	Releases map[semver.NormalizedString]*Release
 	Latest   *Release `json:"-"`
 	Index    *Index   `json:"-"`
 }
@@ -117,7 +117,7 @@ func (idx *Index) FindRelease(ref *Reference) *Release {
 		if ref.Version == nil {
 			return library.Latest
 		}
-		return library.Releases[ref.Version.String()]
+		return library.Releases[ref.Version.NormalizedString()]
 	}
 	return nil
 }
@@ -173,13 +173,10 @@ func (idx *Index) ResolveDependencies(lib *Release) []*Release {
 
 // Versions returns an array of all versions available of the library
 func (library *Library) Versions() []*semver.Version {
-	res := []*semver.Version{}
-	for version := range library.Releases {
-		v, err := semver.Parse(version)
-		if err == nil {
-			res = append(res, v)
-		}
+	res := semver.List{}
+	for _, release := range library.Releases {
+		res = append(res, release.Version)
 	}
-	sort.Sort(semver.List(res))
+	sort.Sort(res)
 	return res
 }
diff --git a/arduino/libraries/librariesindex/json.go b/arduino/libraries/librariesindex/json.go
@@ -90,7 +90,7 @@ func (indexLib *indexRelease) extractLibraryIn(index *Index) {
 	if !exist {
 		library = &Library{
 			Name:     indexLib.Name,
-			Releases: map[string]*Release{},
+			Releases: map[semver.NormalizedString]*Release{},
 		}
 		index.Libraries[indexLib.Name] = library
 	}
@@ -120,7 +120,7 @@ func (indexLib *indexRelease) extractReleaseIn(library *Library) {
 		License:          indexLib.License,
 		ProvidesIncludes: indexLib.ProvidesIncludes,
 	}
-	library.Releases[indexLib.Version.String()] = release
+	library.Releases[indexLib.Version.NormalizedString()] = release
 	if library.Latest == nil || library.Latest.Version.LessThan(release.Version) {
 		library.Latest = release
 	}
diff --git a/commands/lib/search.go b/commands/lib/search.go
@@ -78,8 +78,8 @@ func indexLibraryToRPCSearchLibrary(lib *librariesindex.Library, omitReleasesDet
 	var releases map[string]*rpc.LibraryRelease
 	if !omitReleasesDetails {
 		releases = map[string]*rpc.LibraryRelease{}
-		for str, rel := range lib.Releases {
-			releases[str] = getLibraryParameters(rel)
+		for _, rel := range lib.Releases {
+			releases[rel.Version.String()] = getLibraryParameters(rel)
 		}
 	}
 
diff --git a/go.mod b/go.mod
@@ -35,7 +35,7 @@ require (
 	github.com/stretchr/testify v1.8.0
 	go.bug.st/cleanup v1.0.0
 	go.bug.st/downloader/v2 v2.1.1
-	go.bug.st/relaxed-semver v0.9.0
+	go.bug.st/relaxed-semver v0.9.1-0.20230314182316-c6633824f06f
 	go.bug.st/serial v1.3.2
 	golang.org/x/crypto v0.7.0
 	golang.org/x/text v0.8.0
diff --git a/go.sum b/go.sum
@@ -357,8 +357,8 @@ go.bug.st/cleanup v1.0.0 h1:XVj1HZxkBXeq3gMT7ijWUpHyIC1j8XAoNSyQ06CskgA=
 go.bug.st/cleanup v1.0.0/go.mod h1:EqVmTg2IBk4znLbPD28xne3abjsJftMdqqJEjhn70bk=
 go.bug.st/downloader/v2 v2.1.1 h1:nyqbUizo3E2IxCCm4YFac4FtSqqFpqWP+Aae5GCMuw4=
 go.bug.st/downloader/v2 v2.1.1/go.mod h1:VZW2V1iGKV8rJL2ZEGIDzzBeKowYv34AedJz13RzVII=
-go.bug.st/relaxed-semver v0.9.0 h1:qt0T8W70VCurvsbxRK25fQwiTOFjkzwC/fDOpyPnchQ=
-go.bug.st/relaxed-semver v0.9.0/go.mod h1:ug0/W/RPYUjliE70Ghxg77RDHmPxqpo7SHV16ijss7Q=
+go.bug.st/relaxed-semver v0.9.1-0.20230314182316-c6633824f06f h1:FGckvc9KbIG8vTQfAt41xzVl53hCV3vsP2nDluykfn8=
+go.bug.st/relaxed-semver v0.9.1-0.20230314182316-c6633824f06f/go.mod h1:lPVGdtzbQ9/2fv6iXqIXWHOj6cMTUJ/l/Lu1w+sgdio=
 go.bug.st/serial v1.3.2 h1:6BFZZd/wngoL5PPYYTrFUounF54SIkykHpT98eq6zvk=
 go.bug.st/serial v1.3.2/go.mod h1:jDkjqASf/qSjmaOxHSHljwUQ6eHo/ZX/bxJLQqSlvZg=
 go.bug.st/testifyjson v1.1.1 h1:nHotIMK151LF3vYsU/b2RaoVaWCgrf2kvQeGNoZkGaA=

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ var EmptyIndex = &Index{Libraries: map[string]*Library{}}`
`35`	`35`	`// Library is a library available for download`
`36`	`36`	`type Library struct {`
`37`	`37`	`Name string`
`38`		`- Releases map[string]*Release`
	`38`	`+ Releases map[semver.NormalizedString]*Release`
`39`	`39`	Latest *Release `json:"-"`
`40`	`40`	Index *Index `json:"-"`
`41`	`41`	`}`
`@@ -117,7 +117,7 @@ func (idx Index) FindRelease(ref Reference) *Release {`
`117`	`117`	`if ref.Version == nil {`
`118`	`118`	`return library.Latest`
`119`	`119`	`}`
`120`		`- return library.Releases[ref.Version.String()]`
	`120`	`+ return library.Releases[ref.Version.NormalizedString()]`
`121`	`121`	`}`
`122`	`122`	`return nil`
`123`	`123`	`}`
`@@ -173,13 +173,10 @@ func (idx Index) ResolveDependencies(lib Release) []*Release {`
`173`	`173`
`174`	`174`	`// Versions returns an array of all versions available of the library`
`175`	`175`	`func (library Library) Versions() []semver.Version {`
`176`		`- res := []*semver.Version{}`
`177`		`- for version := range library.Releases {`
`178`		`- v, err := semver.Parse(version)`
`179`		`- if err == nil {`
`180`		`- res = append(res, v)`
`181`		`- }`
	`176`	`+ res := semver.List{}`
	`177`	`+ for _, release := range library.Releases {`
	`178`	`+ res = append(res, release.Version)`
`182`	`179`	`}`
`183`		`- sort.Sort(semver.List(res))`
	`180`	`+ sort.Sort(res)`
`184`	`181`	`return res`
`185`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func (indexLib indexRelease) extractLibraryIn(index Index) {`
`90`	`90`	`if !exist {`
`91`	`91`	`library = &Library{`
`92`	`92`	`Name: indexLib.Name,`
`93`		`- Releases: map[string]*Release{},`
	`93`	`+ Releases: map[semver.NormalizedString]*Release{},`
`94`	`94`	`}`
`95`	`95`	`index.Libraries[indexLib.Name] = library`
`96`	`96`	`}`
`@@ -120,7 +120,7 @@ func (indexLib indexRelease) extractReleaseIn(library Library) {`
`120`	`120`	`License: indexLib.License,`
`121`	`121`	`ProvidesIncludes: indexLib.ProvidesIncludes,`
`122`	`122`	`}`
`123`		`- library.Releases[indexLib.Version.String()] = release`
	`123`	`+ library.Releases[indexLib.Version.NormalizedString()] = release`
`124`	`124`	`if library.Latest == nil \|\| library.Latest.Version.LessThan(release.Version) {`
`125`	`125`	`library.Latest = release`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ func indexLibraryToRPCSearchLibrary(lib *librariesindex.Library, omitReleasesDet`
`78`	`78`	`var releases map[string]*rpc.LibraryRelease`
`79`	`79`	`if !omitReleasesDetails {`
`80`	`80`	`releases = map[string]*rpc.LibraryRelease{}`
`81`		`- for str, rel := range lib.Releases {`
`82`		`- releases[str] = getLibraryParameters(rel)`
	`81`	`+ for _, rel := range lib.Releases {`
	`82`	`+ releases[rel.Version.String()] = getLibraryParameters(rel)`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`