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

Add rudimentary support for addonid/fileid specifying on command line

Browse Source
This commit is contained in:
comp500 2020-03-25 20:17:32 +00:00
parent 4a568fdcb3
commit 615fe97369
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
curseforge/install.go
View File

@ -27,10 +27,6 @@ var installCmd = &cobra.Command{
Aliases: []string{"add", "get"}, Aliases: []string{"add", "get"},
Args: cobra.ArbitraryArgs, Args: cobra.ArbitraryArgs,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
if len(args[0]) == 0 {
fmt.Println("You must specify a mod.")
os.Exit(1)
}
pack, err := core.LoadPack() pack, err := core.LoadPack()
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
@ -49,8 +45,19 @@ var installCmd = &cobra.Command{
var done bool var done bool
var modID, fileID int var modID, fileID int
// If mod/file IDs are provided in command line, use those
// TODO: use file id with slug if it exists?
if addonIDFlag != 0 {
modID = addonIDFlag
fileID = fileIDFlag
done = true
}
if (len(args) == 0 || len(args[0]) == 0) && !done {
fmt.Println("You must specify a mod.")
os.Exit(1)
}
// If there are more than 1 argument, go straight to searching - URLs/Slugs should not have spaces! // If there are more than 1 argument, go straight to searching - URLs/Slugs should not have spaces!
if len(args) == 1 { if !done && len(args) == 1 {
done, modID, fileID, err = getFileIDsFromString(args[0]) done, modID, fileID, err = getFileIDsFromString(args[0])
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
@ -269,6 +276,7 @@ func searchCurseforgeInternal(args []string, mcVersion string) (bool, modInfo) {
if len(results) == 0 { if len(results) == 0 {
fmt.Println("No mods found!") fmt.Println("No mods found!")
os.Exit(1) os.Exit(1)
return false, modInfo{}
} else if len(results) == 1 { } else if len(results) == 1 {
return false, results[0] return false, results[0]
} else { } else {
@ -316,8 +324,6 @@ func searchCurseforgeInternal(args []string, mcVersion string) (bool, modInfo) {
} }
return false, modInfoData return false, modInfoData
} }
// This should never be executed, but Go requires it!
return false, modInfo{}
} }
func getLatestFile(modInfoData modInfo, mcVersion string, fileID int) (modFileInfo, error) { func getLatestFile(modInfoData modInfo, mcVersion string, fileID int) (modFileInfo, error) {
@ -349,6 +355,12 @@ func getLatestFile(modInfoData modInfo, mcVersion string, fileID int) (modFileIn
return fileInfoData, nil return fileInfoData, nil
} }
var addonIDFlag int
var fileIDFlag int
func init() { func init() {
curseforgeCmd.AddCommand(installCmd) curseforgeCmd.AddCommand(installCmd)
installCmd.Flags().IntVar(&addonIDFlag, "addon-id", 0, "The curseforge addon ID to use")
installCmd.Flags().IntVar(&fileIDFlag, "file-id", 0, "The curseforge file ID to use")
} }

2
curseforge/request.go
View File

@ -220,7 +220,7 @@ type modFileInfo struct {
GameVersions []string `json:"gameVersion"` GameVersions []string `json:"gameVersion"`
Fingerprint int `json:"packageFingerprint"` Fingerprint int `json:"packageFingerprint"`
Dependencies []struct { Dependencies []struct {
ModID int `json:"addonId"` ModID int `json:"addonIDFlag"`
Type int `json:"type"` Type int `json:"type"`
} `json:"dependencies"` } `json:"dependencies"`
} }