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

Switch to better semver library and add pack-format field

Browse Source
This commit is contained in:
comp500
2021-10-12 18:51:02 +01:00
parent a8bf26cc26
commit b628e2762c
6 changed files with 73 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modrinth/modrinth.go
View File

@@ -7,13 +7,12 @@ import (
"io/ioutil"
"net/http"
"net/url"
"strings"
"time"
"github.com/Masterminds/semver/v3"
"github.com/comp500/packwiz/cmd"
"github.com/comp500/packwiz/core"
"github.com/spf13/cobra"
"golang.org/x/mod/semver"
)
const modrinthApiUrl = "https://api.modrinth.com/api/v1/"
@@ -214,13 +213,12 @@ func getLatestVersion(modID string, pack core.Pack) (Version, error) {
latestValidVersion := result[0]
for _, v := range result[1:] {
// For some reason, this library requires a "v" prefix for all version numbers
currVersion := "v" + strings.TrimPrefix(v.VersionNumber, "v")
latestVersion := "v" + strings.TrimPrefix(latestValidVersion.VersionNumber, "v")
currVersion, err1 := semver.NewVersion(v.VersionNumber)
latestVersion, err2 := semver.NewVersion(latestValidVersion.VersionNumber)
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 err1 == nil && err2 == nil {
semverCompare = currVersion.Compare(latestVersion)
}
if semverCompare == 0 {