mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-11-19 01:24:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve error messages when unable to find a CF file/addon

Browse Source
This commit is contained in:
comp500
2022-04-23 20:09:10 +01:00
parent f1eb34d444
commit e29c3022b3
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
curseforge/request.go
View File

@@ -168,6 +168,9 @@ func getModInfo(modID int) (modInfo, error) {
if err != nil {
return modInfo{}, err
}
if resp.StatusCode != 200 {
return modInfo{}, fmt.Errorf("failed to request addon ID %d: %s", modID, resp.Status)
}
err = json.NewDecoder(resp.Body).Decode(&infoRes)
if err != nil && err != io.EOF {
@@ -175,7 +178,7 @@ func getModInfo(modID int) (modInfo, error) {
}
if infoRes.ID != modID {
return modInfo{}, fmt.Errorf("unexpected addon ID in CurseForge response: %d/%d", modID, infoRes.ID)
return modInfo{}, fmt.Errorf("unexpected addon ID in CurseForge response: %d (expected %d)", infoRes.ID, modID)
}
return infoRes, nil
@@ -303,6 +306,9 @@ func getFileInfo(modID int, fileID int) (modFileInfo, error) {
if err != nil {
return modFileInfo{}, err
}
if resp.StatusCode != 200 {
return modFileInfo{}, fmt.Errorf("failed to request file ID %d for addon %d: %s", fileID, modID, resp.Status)
}
err = json.NewDecoder(resp.Body).Decode(&infoRes)
if err != nil && err != io.EOF {
@@ -310,7 +316,7 @@ func getFileInfo(modID int, fileID int) (modFileInfo, error) {
}
if infoRes.ID != fileID {
return modFileInfo{}, fmt.Errorf("unexpected file ID in CurseForge response: %d/%d", modID, infoRes.ID)
return modFileInfo{}, fmt.Errorf("unexpected file ID for addon %d in CurseForge response: %d (expected %d)", modID, infoRes.ID, fileID)
}
return infoRes, nil