Prefer game versions according to acceptable versions list (fixes #181)

The acceptable versions list should now be specified in order of preference, where the last version is the most preferable Minecraft version
2025-10-23 09:24:32 +02:00 · 2023-02-14 16:10:06 +00:00
parent d667447a88
commit d38d279d98
9 changed files with 123 additions and 145 deletions
--- a/curseforge/curseforge.go
+++ b/curseforge/curseforge.go
@@ -110,6 +110,14 @@ func getCurseforgeVersion(mcVersion string) string {
 	return mcVersion
 }

+func getCurseforgeVersions(mcVersions []string) []string {
+	out := make([]string, len(mcVersions))
+	for i, v := range mcVersions {
+		out[i] = getCurseforgeVersion(v)
+	}
+	return out
+}
+
 var urlRegexes = [...]*regexp.Regexp{
 	regexp.MustCompile("^https?://(?P<game>minecraft)\\.curseforge\\.com/projects/(?P<slug>[^/]+)(?:/(?:files|download)/(?P<fileID>\\d+))?"),
 	regexp.MustCompile("^https?://(?:www\\.|beta\\.)?curseforge\\.com/(?P<game>[^/]+)/(?P<category>[^/]+)/(?P<slug>[^/]+)(?:/(?:files|download)/(?P<fileID>\\d+))?"),
@@ -262,32 +270,37 @@ func matchLoaderTypeFileInfo(packLoaders []string, fileInfoData modFileInfo) boo
 	}
 }

-func matchGameVersion(mcVersion string, modMcVersion string) bool {
-	if getCurseforgeVersion(mcVersion) == modMcVersion {
-		return true
-	} else {
-		for _, v := range viper.GetStringSlice("acceptable-game-versions") {
-			if getCurseforgeVersion(v) == modMcVersion {
-				return true
-			}
-		}
-		return false
-	}
-}
+// findLatestFile looks at mod info, and finds the latest file ID (and potentially the file info for it - may be null)
+func findLatestFile(modInfoData modInfo, mcVersions []string, packLoaders []string) (fileID uint32, fileInfoData *modFileInfo, fileName string) {
+	cfMcVersions := getCurseforgeVersions(mcVersions)
+	bestMcVer := -1

-func matchGameVersions(mcVersion string, modMcVersions []string) bool {
-	for _, modMcVersion := range modMcVersions {
-		if getCurseforgeVersion(mcVersion) == modMcVersion {
-			return true
-		} else {
-			for _, v := range viper.GetStringSlice("acceptable-game-versions") {
-				if getCurseforgeVersion(v) == modMcVersion {
-					return true
-				}
-			}
+	// For snapshots, curseforge doesn't put them in GameVersionLatestFiles
+	for _, v := range modInfoData.LatestFiles {
+		mcVerIdx := core.HighestSliceIndex(mcVersions, v.GameVersions)
+		// Choose "newest" version by largest ID
+		// Prefer higher indexes of mcVersions
+		if mcVerIdx > -1 && matchLoaderTypeFileInfo(packLoaders, v) && (mcVerIdx >= bestMcVer || v.ID > fileID) {
+			fileID = v.ID
+			fileInfoData = &v
+			fileName = v.FileName
+			bestMcVer = mcVerIdx
 		}
 	}
-	return false
+	// TODO: change to timestamp-based comparison??
+	// TODO: manage alpha/beta/release correctly, check update channel?
+	for _, v := range modInfoData.GameVersionLatestFiles {
+		mcVerIdx := slices.Index(cfMcVersions, v.GameVersion)
+		// Choose "newest" version by largest ID
+		// Prefer higher indexes of mcVersions
+		if mcVerIdx > -1 && matchLoaderType(packLoaders, v.Modloader) && (mcVerIdx >= bestMcVer || v.ID > fileID) {
+			fileID = v.ID
+			fileInfoData = nil // (no file info in GameVersionLatestFiles)
+			fileName = v.Name
+			bestMcVer = mcVerIdx
+		}
+	}
+	return
 }

 type cfUpdateData struct {
@@ -311,16 +324,20 @@ func (u cfUpdater) ParseUpdate(updateUnparsed map[string]interface{}) (interface

 type cachedStateStore struct {
 	modInfo
-	hasFileInfo bool
-	fileID      uint32
-	fileInfo    modFileInfo
+	fileID   uint32
+	fileInfo *modFileInfo
 }

-func (u cfUpdater) CheckUpdate(mods []core.Mod, mcVersion string, pack core.Pack) ([]core.UpdateCheck, error) {
+func (u cfUpdater) CheckUpdate(mods []core.Mod, pack core.Pack) ([]core.UpdateCheck, error) {
 	results := make([]core.UpdateCheck, len(mods))
 	modIDs := make([]uint32, len(mods))
 	modInfos := make([]modInfo, len(mods))

+	mcVersions, err := pack.GetSupportedMCVersions()
+	if err != nil {
+		return nil, err
+	}
+
 	for i, v := range mods {
 		projectRaw, ok := v.GetParsedUpdateData("curseforge")
 		if !ok {
@@ -354,56 +371,19 @@ func (u cfUpdater) CheckUpdate(mods []core.Mod, mcVersion string, pack core.Pack
 		}
 		project := projectRaw.(cfUpdateData)

-		updateAvailable := false
-		fileID := project.FileID
-		fileInfoObtained := false
-		var fileInfoData modFileInfo
-		var fileName string
-
-		// For snapshots, curseforge doesn't put them in GameVersionLatestFiles
-		for _, v := range modInfos[i].LatestFiles {
-			// Choose "newest" version by largest ID
-			if matchGameVersions(mcVersion, v.GameVersions) && v.ID > fileID && matchLoaderTypeFileInfo(packLoaders, v) {
-				updateAvailable = true
-				fileID = v.ID
-				fileInfoData = v
-				fileInfoObtained = true
-				fileName = v.FileName
+		fileID, fileInfoData, fileName := findLatestFile(modInfos[i], mcVersions, packLoaders)
+		if fileID > project.FileID && fileID != 0 {
+			// Update available!
+			results[i] = core.UpdateCheck{
+				UpdateAvailable: true,
+				UpdateString:    v.FileName + " -> " + fileName,
+				CachedState:     cachedStateStore{modInfos[i], fileID, fileInfoData},
 			}
-		}
-
-		for _, file := range modInfos[i].GameVersionLatestFiles {
-			// TODO: change to timestamp-based comparison??
-			// TODO: manage alpha/beta/release correctly, check update channel?
-			// Choose "newest" version by largest ID
-			if matchGameVersion(mcVersion, file.GameVersion) && file.ID > fileID && matchLoaderType(packLoaders, file.Modloader) {
-				updateAvailable = true
-				fileID = file.ID
-				fileName = file.Name
-				fileInfoObtained = false // Make sure we get the file info again
-			}
-		}
-
-		if !updateAvailable {
+		} else {
+			// Could not find a file, too old, or up to date: no update available
 			results[i] = core.UpdateCheck{UpdateAvailable: false}
 			continue
 		}
-
-		// The API also provides some files inline, because that's efficient!
-		if !fileInfoObtained {
-			for _, file := range modInfos[i].LatestFiles {
-				if file.ID == fileID {
-					fileInfoObtained = true
-					fileInfoData = file
-				}
-			}
-		}
-
-		results[i] = core.UpdateCheck{
-			UpdateAvailable: true,
-			UpdateString:    v.FileName + " -> " + fileName,
-			CachedState:     cachedStateStore{modInfos[i], fileInfoObtained, fileID, fileInfoData},
-		}
 	}
 	return results, nil
 }
@@ -413,8 +393,10 @@ func (u cfUpdater) DoUpdate(mods []*core.Mod, cachedState []interface{}) error {
 	for i, v := range mods {
 		modState := cachedState[i].(cachedStateStore)

-		fileInfoData := modState.fileInfo
-		if !modState.hasFileInfo {
+		var fileInfoData modFileInfo
+		if modState.fileInfo != nil {
+			fileInfoData = *modState.fileInfo
+		} else {
 			var err error
 			fileInfoData, err = cfDefaultClient.getFileInfo(modState.ID, modState.fileID)
 			if err != nil {
--- a/curseforge/install.go
+++ b/curseforge/install.go
@@ -39,7 +39,7 @@ var installCmd = &cobra.Command{
 			fmt.Println(err)
 			os.Exit(1)
 		}
-		mcVersion, err := pack.GetMCVersion()
+		mcVersions, err := pack.GetSupportedMCVersions()
 		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)
@@ -90,9 +90,9 @@ var installCmd = &cobra.Command{
 			var cancelled bool
 			if slug == "" {
 				searchTerm := strings.Join(args, " ")
-				cancelled, modInfoData = searchCurseforgeInternal(searchTerm, false, game, category, mcVersion, getSearchLoaderType(pack))
+				cancelled, modInfoData = searchCurseforgeInternal(searchTerm, false, game, category, mcVersions, getSearchLoaderType(pack))
 			} else {
-				cancelled, modInfoData = searchCurseforgeInternal(slug, true, game, category, mcVersion, getSearchLoaderType(pack))
+				cancelled, modInfoData = searchCurseforgeInternal(slug, true, game, category, mcVersions, getSearchLoaderType(pack))
 			}
 			if cancelled {
 				return
@@ -115,7 +115,7 @@ var installCmd = &cobra.Command{
 		}

 		var fileInfoData modFileInfo
-		fileInfoData, err = getLatestFile(modInfoData, mcVersion, fileID, pack.GetLoaders())
+		fileInfoData, err = getLatestFile(modInfoData, mcVersions, fileID, pack.GetLoaders())
 		if err != nil {
 			fmt.Printf("Failed to get file for project: %v\n", err)
 			os.Exit(1)
@@ -182,7 +182,7 @@ var installCmd = &cobra.Command{
 					depIDPendingQueue = depIDPendingQueue[:0]

 					for _, currData := range depInfoData {
-						depFileInfo, err := getLatestFile(currData, mcVersion, 0, pack.GetLoaders())
+						depFileInfo, err := getLatestFile(currData, mcVersions, 0, pack.GetLoaders())
 						if err != nil {
 							fmt.Printf("Error retrieving dependency data: %s\n", err.Error())
 							continue
@@ -265,7 +265,7 @@ func (r modResultsList) Len() int {
 	return len(r)
 }

-func searchCurseforgeInternal(searchTerm string, isSlug bool, game string, category string, mcVersion string, searchLoaderType modloaderType) (bool, modInfo) {
+func searchCurseforgeInternal(searchTerm string, isSlug bool, game string, category string, mcVersions []string, searchLoaderType modloaderType) (bool, modInfo) {
 	if isSlug {
 		fmt.Println("Looking up CurseForge slug...")
 	} else {
@@ -328,9 +328,9 @@ func searchCurseforgeInternal(searchTerm string, isSlug bool, game string, categ
 	}

 	// If there are more than one acceptable version, we shouldn't filter by game version at all (as we can't filter by multiple)
-	filterGameVersion := getCurseforgeVersion(mcVersion)
-	if len(viper.GetStringSlice("acceptable-game-versions")) > 0 {
-		filterGameVersion = ""
+	filterGameVersion := ""
+	if len(mcVersions) == 1 {
+		filterGameVersion = getCurseforgeVersion(mcVersions[0])
 	}
 	var search, slug string
 	if isSlug {
@@ -403,39 +403,18 @@ func searchCurseforgeInternal(searchTerm string, isSlug bool, game string, categ
 	}
 }

-func getLatestFile(modInfoData modInfo, mcVersion string, fileID uint32, packLoaders []string) (modFileInfo, error) {
+func getLatestFile(modInfoData modInfo, mcVersions []string, fileID uint32, packLoaders []string) (modFileInfo, error) {
 	if fileID == 0 {
-		var fileInfoData modFileInfo
-		fileInfoObtained := false
-		anyFileObtained := false
-
-		// For snapshots, curseforge doesn't put them in GameVersionLatestFiles
-		for _, v := range modInfoData.LatestFiles {
-			anyFileObtained = true
-			// Choose "newest" version by largest ID
-			if matchGameVersions(mcVersion, v.GameVersions) && v.ID > fileID && matchLoaderTypeFileInfo(packLoaders, v) {
-				fileID = v.ID
-				fileInfoData = v
-				fileInfoObtained = true
-			}
-		}
-		// TODO: change to timestamp-based comparison??
-		for _, v := range modInfoData.GameVersionLatestFiles {
-			anyFileObtained = true
-			// Choose "newest" version by largest ID
-			if matchGameVersion(mcVersion, v.GameVersion) && v.ID > fileID && matchLoaderType(packLoaders, v.Modloader) {
-				fileID = v.ID
-				fileInfoObtained = false // Make sure we get the file info
-			}
-		}
-		if fileInfoObtained {
-			return fileInfoData, nil
-		}
-
-		if !anyFileObtained {
+		if len(modInfoData.LatestFiles) == 0 && len(modInfoData.GameVersionLatestFiles) == 0 {
 			return modFileInfo{}, fmt.Errorf("addon %d has no files", modInfoData.ID)
 		}

+		var fileInfoData *modFileInfo
+		fileID, fileInfoData, _ = findLatestFile(modInfoData, mcVersions, packLoaders)
+		if fileInfoData != nil {
+			return *fileInfoData, nil
+		}
+
 		// Possible to reach this point without obtaining file info; particularly from GameVersionLatestFiles
 		if fileID == 0 {
 			return modFileInfo{}, errors.New("mod not available for the configured Minecraft version(s) (use the acceptable-game-versions option to accept more) or loader")