mirror of
https://github.com/packwiz/packwiz-installer.git
synced 2025-04-19 21:16:30 +02:00
Allow multiple files from the same CurseForge project
This commit is contained in:
parent
758385c225
commit
7b6daaf7e5
@ -49,14 +49,15 @@ private val APIKey = "JDJhJDEwJHNBWVhqblU1N0EzSmpzcmJYM3JVdk92UWk2NHBLS3BnQ2VpbG
|
|||||||
@Throws(JsonSyntaxException::class, JsonIOException::class)
|
@Throws(JsonSyntaxException::class, JsonIOException::class)
|
||||||
fun resolveCfMetadata(mods: List<IndexFile.File>, packFolder: PackwizFilePath, clientHolder: ClientHolder): List<ExceptionDetails> {
|
fun resolveCfMetadata(mods: List<IndexFile.File>, packFolder: PackwizFilePath, clientHolder: ClientHolder): List<ExceptionDetails> {
|
||||||
val failures = mutableListOf<ExceptionDetails>()
|
val failures = mutableListOf<ExceptionDetails>()
|
||||||
val fileIdMap = mutableMapOf<Int, IndexFile.File>()
|
val fileIdMap = mutableMapOf<Int, List<IndexFile.File>>()
|
||||||
|
|
||||||
for (mod in mods) {
|
for (mod in mods) {
|
||||||
if (!mod.linkedFile!!.update.contains("curseforge")) {
|
if (!mod.linkedFile!!.update.contains("curseforge")) {
|
||||||
failures.add(ExceptionDetails(mod.linkedFile!!.name, Exception("Failed to resolve CurseForge metadata: no CurseForge update section")))
|
failures.add(ExceptionDetails(mod.linkedFile!!.name, Exception("Failed to resolve CurseForge metadata: no CurseForge update section")))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
fileIdMap[(mod.linkedFile!!.update["curseforge"] as CurseForgeUpdateData).fileId] = mod
|
val fileId = (mod.linkedFile!!.update["curseforge"] as CurseForgeUpdateData).fileId
|
||||||
|
fileIdMap[fileId] = (fileIdMap[fileId] ?: listOf()) + mod
|
||||||
}
|
}
|
||||||
|
|
||||||
val reqData = GetFilesRequest(fileIdMap.keys.toList())
|
val reqData = GetFilesRequest(fileIdMap.keys.toList())
|
||||||
@ -77,7 +78,7 @@ fun resolveCfMetadata(mods: List<IndexFile.File>, packFolder: PackwizFilePath, c
|
|||||||
val resData = Gson().fromJson(res.body!!.charStream(), GetFilesResponse::class.java)
|
val resData = Gson().fromJson(res.body!!.charStream(), GetFilesResponse::class.java)
|
||||||
res.closeQuietly()
|
res.closeQuietly()
|
||||||
|
|
||||||
val manualDownloadMods = mutableMapOf<Int, Pair<IndexFile.File, Int>>()
|
val manualDownloadMods = mutableMapOf<Int, List<Int>>()
|
||||||
for (file in resData.data) {
|
for (file in resData.data) {
|
||||||
if (!fileIdMap.contains(file.id)) {
|
if (!fileIdMap.contains(file.id)) {
|
||||||
failures.add(ExceptionDetails(file.id.toString(),
|
failures.add(ExceptionDetails(file.id.toString(),
|
||||||
@ -85,12 +86,14 @@ fun resolveCfMetadata(mods: List<IndexFile.File>, packFolder: PackwizFilePath, c
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if (file.downloadUrl == null) {
|
if (file.downloadUrl == null) {
|
||||||
manualDownloadMods[file.modId] = Pair(fileIdMap[file.id]!!, file.id)
|
manualDownloadMods[file.modId] = (manualDownloadMods[file.modId] ?: listOf()) + file.id
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
fileIdMap[file.id]!!.linkedFile!!.resolvedUpdateData["curseforge"] =
|
for (indexFile in fileIdMap[file.id]!!) {
|
||||||
|
indexFile.linkedFile!!.resolvedUpdateData["curseforge"] =
|
||||||
HttpUrlPath(file.downloadUrl!!.toHttpUrl())
|
HttpUrlPath(file.downloadUrl!!.toHttpUrl())
|
||||||
|
}
|
||||||
} catch (e: IllegalArgumentException) {
|
} catch (e: IllegalArgumentException) {
|
||||||
failures.add(ExceptionDetails(file.id.toString(),
|
failures.add(ExceptionDetails(file.id.toString(),
|
||||||
Exception("Failed to parse URL: ${file.downloadUrl} for ID ${file.id}, Project ID ${file.modId}", e)))
|
Exception("Failed to parse URL: ${file.downloadUrl} for ID ${file.id}, Project ID ${file.modId}", e)))
|
||||||
@ -99,10 +102,13 @@ fun resolveCfMetadata(mods: List<IndexFile.File>, packFolder: PackwizFilePath, c
|
|||||||
|
|
||||||
// Some file types don't show up in the API at all! (e.g. shaderpacks)
|
// Some file types don't show up in the API at all! (e.g. shaderpacks)
|
||||||
// Add unresolved files to manualDownloadMods
|
// Add unresolved files to manualDownloadMods
|
||||||
for ((fileId, file) in fileIdMap) {
|
for ((fileId, indexFiles) in fileIdMap) {
|
||||||
|
for (file in indexFiles) {
|
||||||
if (file.linkedFile != null) {
|
if (file.linkedFile != null) {
|
||||||
if (file.linkedFile!!.resolvedUpdateData["curseforge"] == null) {
|
if (file.linkedFile!!.resolvedUpdateData["curseforge"] == null) {
|
||||||
manualDownloadMods[(file.linkedFile!!.update["curseforge"] as CurseForgeUpdateData).projectId] = Pair(file, fileId)
|
val projectId = (file.linkedFile!!.update["curseforge"] as CurseForgeUpdateData).projectId
|
||||||
|
manualDownloadMods[projectId] = (manualDownloadMods[projectId] ?: listOf()) + fileId
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -133,9 +139,18 @@ fun resolveCfMetadata(mods: List<IndexFile.File>, packFolder: PackwizFilePath, c
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
val modFile = manualDownloadMods[mod.id]!!
|
for (fileId in manualDownloadMods[mod.id]!!) {
|
||||||
failures.add(ExceptionDetails(mod.name, Exception("This mod is excluded from the CurseForge API and must be downloaded manually.\n" +
|
if (!fileIdMap.contains(fileId)) {
|
||||||
"Please go to ${mod.links?.websiteUrl}/files/${modFile.second} and save this file to ${modFile.first.destURI.rebase(packFolder).nioPath.absolute()}")))
|
failures.add(ExceptionDetails(mod.name,
|
||||||
|
Exception("Failed to find file from result: file ID $fileId")))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
for (indexFile in fileIdMap[fileId]!!) {
|
||||||
|
failures.add(ExceptionDetails(indexFile.name, Exception("This mod is excluded from the CurseForge API and must be downloaded manually.\n" +
|
||||||
|
"Please go to ${mod.links?.websiteUrl}/files/${fileId} and save this file to ${indexFile.destURI.rebase(packFolder).nioPath.absolute()}")))
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user