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

Change ModID/FileID structs to use AddonFileReference

Browse Source
This commit is contained in:
comp500 2019-11-13 21:24:08 +00:00
parent 1ae7492625
commit f46ff894cc
4 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
curseforge/import.go
View File

@ -174,7 +174,7 @@ var importCmd = &cobra.Command{
modsList := packImport.Mods() modsList := packImport.Mods()
modIDs := make([]int, len(modsList)) modIDs := make([]int, len(modsList))
for i, v := range modsList { for i, v := range modsList {
modIDs[i] = v.ModID modIDs[i] = v.ProjectID
} }
fmt.Println("Querying Curse API for mod info...") fmt.Println("Querying Curse API for mod info...")
@ -195,9 +195,9 @@ var importCmd = &cobra.Command{
referencedModPaths := make([]string, 0, len(modsList)) referencedModPaths := make([]string, 0, len(modsList))
successes := 0 successes := 0
for _, v := range modsList { for _, v := range modsList {
modInfoValue, ok := modInfosMap[v.ModID] modInfoValue, ok := modInfosMap[v.ProjectID]
if !ok { if !ok {
fmt.Printf("Failed to obtain mod information for ID %d\n", v.ModID) fmt.Printf("Failed to obtain mod information for ID %d\n", v.ProjectID)
continue continue
} }
@ -210,9 +210,9 @@ var importCmd = &cobra.Command{
} }
} }
if !found { if !found {
fileInfo, err = getFileInfo(v.ModID, v.FileID) fileInfo, err = getFileInfo(v.ProjectID, v.FileID)
if err != nil { if err != nil {
fmt.Printf("Failed to obtain file information for Mod / File %d / %d: %s\n", v.ModID, v.FileID, err) fmt.Printf("Failed to obtain file information for Mod / File %d / %d: %s\n", v.ProjectID, v.FileID, err)
continue continue
} }
} }

6
curseforge/packinterop/interfaces.go
View File

@ -10,11 +10,7 @@ type ImportPackFile interface {
type ImportPackMetadata interface { type ImportPackMetadata interface {
Name() string Name() string
Versions() map[string]string Versions() map[string]string
// TODO: use AddonFileReference? Mods() []AddonFileReference
Mods() []struct {
ModID int
FileID int
}
GetFiles() ([]ImportPackFile, error) GetFiles() ([]ImportPackFile, error)
} }

17
curseforge/packinterop/manifest.go
View File

@ -48,20 +48,11 @@ func (c cursePackMeta) Versions() map[string]string {
return vers return vers
} }
func (c cursePackMeta) Mods() []struct { func (c cursePackMeta) Mods() []AddonFileReference {
ModID int list := make([]AddonFileReference, len(c.Files))
FileID int
} {
list := make([]struct {
ModID int
FileID int
}, len(c.Files))
for i, v := range c.Files { for i, v := range c.Files {
list[i] = struct { list[i] = AddonFileReference{
ModID int ProjectID: v.ProjectID,
FileID int
}{
ModID: v.ProjectID,
FileID: v.FileID, FileID: v.FileID,
} }
} }

17
curseforge/packinterop/minecraftinstance.go
View File

@ -47,20 +47,11 @@ func (m twitchInstalledPackMeta) Versions() map[string]string {
return vers return vers
} }
func (m twitchInstalledPackMeta) Mods() []struct { func (m twitchInstalledPackMeta) Mods() []AddonFileReference {
ModID int list := make([]AddonFileReference, len(m.ModsInternal))
FileID int
} {
list := make([]struct {
ModID int
FileID int
}, len(m.ModsInternal))
for i, v := range m.ModsInternal { for i, v := range m.ModsInternal {
list[i] = struct { list[i] = AddonFileReference{
ModID int ProjectID: v.ID,
FileID int
}{
ModID: v.ID,
FileID: v.File.ID, FileID: v.File.ID,
} }
} }