mirror of
https://github.com/packwiz/packwiz.git
synced 2025-04-19 21:16:30 +02:00
Better handling of invalid Modrinth version numbers
This commit is contained in:
parent
7f27e8d130
commit
9ef87bc0d3
@ -215,7 +215,14 @@ func getLatestVersion(modID string, pack core.Pack) (Version, error) {
|
|||||||
latestValidVersion := result[0]
|
latestValidVersion := result[0]
|
||||||
for _, v := range result[1:] {
|
for _, v := range result[1:] {
|
||||||
// For some reason, this library requires a "v" prefix for all version numbers
|
// For some reason, this library requires a "v" prefix for all version numbers
|
||||||
var semverCompare = semver.Compare("v"+strings.TrimPrefix(v.VersionNumber, "v"), "v"+strings.TrimPrefix(latestValidVersion.VersionNumber, "v"))
|
currVersion := "v" + strings.TrimPrefix(v.VersionNumber, "v")
|
||||||
|
latestVersion := "v" + strings.TrimPrefix(latestValidVersion.VersionNumber, "v")
|
||||||
|
var semverCompare = 0
|
||||||
|
// Only compare with semver if both are valid semver - otherwise compare by release date
|
||||||
|
if semver.IsValid(currVersion) && semver.IsValid(latestVersion) {
|
||||||
|
semverCompare = semver.Compare(currVersion, latestVersion)
|
||||||
|
}
|
||||||
|
|
||||||
if semverCompare == 0 {
|
if semverCompare == 0 {
|
||||||
//Semver is equal, compare date instead
|
//Semver is equal, compare date instead
|
||||||
vDate, _ := time.Parse(time.RFC3339Nano, v.DatePublished)
|
vDate, _ := time.Parse(time.RFC3339Nano, v.DatePublished)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user