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

Compare Modrinth versions by release date, warn if inconsistent with version numbers

Browse Source
This commit is contained in:
comp500 2023-02-14 12:16:24 +00:00
parent 074e68f9b0
commit d667447a88
3 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modrinth/install.go
View File

@ -200,7 +200,7 @@ func installViaSearch(query string, versionFilename string, autoAcceptFirst bool
}
func installProject(project *modrinthApi.Project, versionFilename string, pack core.Pack, index *core.Index) error {
latestVersion, err := getLatestVersion(*project.ID, pack)
latestVersion, err := getLatestVersion(*project.ID, *project.Title, pack)
if err != nil {
return fmt.Errorf("failed to get latest version: %v", err)
}
@ -294,7 +294,7 @@ func installVersion(project *modrinthApi.Project, version *modrinthApi.Version,
return errors.New("failed to get dependency data: invalid response")
}
// Get latest version - could reuse version lookup data but it's not as easy (particularly since the version won't necessarily be the latest)
latestVersion, err := getLatestVersion(*project.ID, pack)
latestVersion, err := getLatestVersion(*project.ID, *project.Title, pack)
if err != nil {
return fmt.Errorf("failed to get latest version of dependency %v: %v", *project.ID, err)
}

68
modrinth/modrinth.go
View File

@ -227,7 +227,40 @@ func parseSlugOrUrl(input string, slug *string, version *string, versionID *stri
return
}
func getLatestVersion(projectID string, pack core.Pack) (*modrinthApi.Version, error) {
func findLatestVersion(versions []*modrinthApi.Version, useFlexVer bool) *modrinthApi.Version {
latestValidVersion := versions[0]
latestValidLoaderIdx := getMinLoaderIdx(versions[0].Loaders)
for _, v := range versions[1:] {
var compare int32
if useFlexVer {
// Use FlexVer to compare versions
compare = flexver.Compare(*v.VersionNumber, *latestValidVersion.VersionNumber)
}
if compare == 0 {
loaderIdx := getMinLoaderIdx(v.Loaders)
// Prefer loaders; principally Quilt over Fabric, mods over datapacks (Modrinth backend handles filtering)
if loaderIdx < latestValidLoaderIdx {
latestValidVersion = v
latestValidLoaderIdx = loaderIdx
continue
}
// FlexVer comparison is equal, compare date instead
if v.DatePublished.After(*latestValidVersion.DatePublished) {
latestValidVersion = v
latestValidLoaderIdx = getMinLoaderIdx(v.Loaders)
}
} else if compare > 0 {
latestValidVersion = v
latestValidLoaderIdx = getMinLoaderIdx(v.Loaders)
}
}
return latestValidVersion
}
func getLatestVersion(projectID string, name string, pack core.Pack) (*modrinthApi.Version, error) {
mcVersion, err := pack.GetMCVersion()
if err != nil {
return nil, err
@ -250,34 +283,15 @@ func getLatestVersion(projectID string, pack core.Pack) (*modrinthApi.Version, e
return nil, errors.New("no valid versions found\nUse the acceptable-game-versions option to accept more game versions\nTo use datapacks, add a datapack loader mod and specify the datapack-folder option with the folder this mod loads datapacks from")
}
latestValidVersion := result[0]
latestValidLoaderIdx := getMinLoaderIdx(result[0].Loaders)
for _, v := range result[1:] {
// Use FlexVer to compare versions
compare := flexver.Compare(*v.VersionNumber, *latestValidVersion.VersionNumber)
if compare == 0 {
loaderIdx := getMinLoaderIdx(v.Loaders)
// Prefer loaders; principally Quilt over Fabric, mods over datapacks (Modrinth backend handles filtering)
if loaderIdx < latestValidLoaderIdx {
latestValidVersion = v
latestValidLoaderIdx = loaderIdx
continue
}
// FlexVer comparison is equal, compare date instead
// TODO: flag to force comparing by date?
if v.DatePublished.After(*latestValidVersion.DatePublished) {
latestValidVersion = v
latestValidLoaderIdx = getMinLoaderIdx(v.Loaders)
}
} else if compare > 0 {
latestValidVersion = v
latestValidLoaderIdx = getMinLoaderIdx(v.Loaders)
}
// TODO: option to always compare using flexver?
// TODO: ask user which one to use?
flexverLatest := findLatestVersion(result, true)
releaseDateLatest := findLatestVersion(result, false)
if flexverLatest != releaseDateLatest && releaseDateLatest.VersionNumber != nil && flexverLatest.VersionNumber != nil {
fmt.Printf("Warning: Modrinth versions for %s inconsistent between version numbers and release dates (%s newer than %s)\n", name, *releaseDateLatest.VersionNumber, *flexverLatest.VersionNumber)
}
return latestValidVersion, nil
return releaseDateLatest, nil
}
func getSide(mod *modrinthApi.Project) string {

2
modrinth/updater.go
View File

@ -47,7 +47,7 @@ func (u mrUpdater) CheckUpdate(mods []core.Mod, mcVersion string, pack core.Pack
data := rawData.(mrUpdateData)
newVersion, err := getLatestVersion(data.ProjectID, pack)
newVersion, err := getLatestVersion(data.ProjectID, mod.Name, pack)
if err != nil {
results[i] = core.UpdateCheck{Error: fmt.Errorf("failed to get latest version: %v", err)}
continue