mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-04-19 21:16:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use FlexVer instead of semver for comparing Modrinth version numbers

Browse Source
This commit is contained in:
comp500 2022-11-19 21:39:59 +00:00
parent 6160c2ac01
commit 497585c38a
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modrinth/modrinth.go
View File

@ -3,11 +3,11 @@ package modrinth
import ( import (
modrinthApi "codeberg.org/jmansfield/go-modrinth/modrinth" modrinthApi "codeberg.org/jmansfield/go-modrinth/modrinth"
"errors" "errors"
"github.com/Masterminds/semver/v3"
"github.com/packwiz/packwiz/cmd" "github.com/packwiz/packwiz/cmd"
"github.com/packwiz/packwiz/core" "github.com/packwiz/packwiz/core"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/unascribed/FlexVer/go/flexver"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
"net/http" "net/http"
) )
@ -65,15 +65,10 @@ func getLatestVersion(modID string, pack core.Pack) (*modrinthApi.Version, error
latestValidVersion := result[0] latestValidVersion := result[0]
for _, v := range result[1:] { for _, v := range result[1:] {
currVersion, err1 := semver.NewVersion(*v.VersionNumber) // Use FlexVer to compare versions
latestVersion, err2 := semver.NewVersion(*latestValidVersion.VersionNumber) compare := flexver.Compare(*v.VersionNumber, *latestValidVersion.VersionNumber)
var semverCompare = 0
// Only compare with semver if both are valid semver - otherwise compare by release date
if err1 == nil && err2 == nil {
semverCompare = currVersion.Compare(latestVersion)
}
if semverCompare == 0 { if compare == 0 {
// Prefer Quilt over Fabric (Modrinth backend handles filtering) // Prefer Quilt over Fabric (Modrinth backend handles filtering)
if slices.Contains(v.Loaders, "quilt") && !slices.Contains(latestValidVersion.Loaders, "quilt") { if slices.Contains(v.Loaders, "quilt") && !slices.Contains(latestValidVersion.Loaders, "quilt") {
latestValidVersion = v latestValidVersion = v
@ -84,7 +79,7 @@ func getLatestVersion(modID string, pack core.Pack) (*modrinthApi.Version, error
if v.DatePublished.After(*latestValidVersion.DatePublished) { if v.DatePublished.After(*latestValidVersion.DatePublished) {
latestValidVersion = v latestValidVersion = v
} }
} else if semverCompare == 1 { } else if compare > 0 {
latestValidVersion = v latestValidVersion = v
} }
} }