mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-10-14 15:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update index in import/add, improve index funcs

Browse Source
This commit is contained in:
comp500
2019-06-14 18:07:58 +01:00
parent 310078b1fb
commit 8eeb509565
4 changed files with 112 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
curseforge/curseforge.go
View File

@@ -92,7 +92,7 @@ func getModIDFromString(mod string) (bool, int, error) {
return false, 0, nil
}
func createModFile(flags core.Flags, modInfo modInfo, fileInfo modFileInfo) error {
func createModFile(flags core.Flags, modInfo modInfo, fileInfo modFileInfo, index *core.Index) error {
updateMap := make(map[string]map[string]interface{})
var err error
@@ -100,7 +100,7 @@ func createModFile(flags core.Flags, modInfo modInfo, fileInfo modFileInfo) erro
ProjectID: modInfo.ID,
FileID: fileInfo.ID,
// TODO: determine update channel
ReleaseChannel: "release",
ReleaseChannel: "beta",
}.ToMap()
if err != nil {
return err
@@ -119,15 +119,20 @@ func createModFile(flags core.Flags, modInfo modInfo, fileInfo modFileInfo) erro
},
Update: updateMap,
}
modMeta.SetMetaName(modInfo.Slug, flags)
path := modMeta.SetMetaName(modInfo.Slug, flags)
// If the file already exists, this will overwrite it!!!
// TODO: Should this be improved?
// Current strategy is to go ahead and do stuff without asking, with the assumption that you are using
// VCS anyway.
// TODO: add to index
return modMeta.Write()
format, hash, err := modMeta.Write()
if err != nil {
return err
}
// TODO: send written data directly to index, instead of write+read?
return index.RefreshFileWithHash(path, format, hash, true)
}
func cmdInstall(flags core.Flags, mod string, modArgsTail []string) error {
@@ -234,9 +239,6 @@ func cmdInstall(flags core.Flags, mod string, modArgsTail []string) error {
}
}
fmt.Println(modInfoData)
_ = index
if fileID == 0 {
fmt.Println("WIP: get an actual file ID!!!")
return nil
@@ -247,11 +249,18 @@ func cmdInstall(flags core.Flags, mod string, modArgsTail []string) error {
return cli.NewExitError(err, 1)
}
err = createModFile(flags, modInfoData, fileInfo)
err = createModFile(flags, modInfoData, fileInfo, &index)
if err != nil {
return cli.NewExitError(err, 1)
}
err = index.Write()
if err != nil {
return cli.NewExitError(err, 1)
}
fmt.Printf("Mod \"%s\" successfully installed!\n", modInfoData.Name)
return nil
}

18
curseforge/import.go
View File

@@ -43,6 +43,15 @@ type twitchPackMeta struct {
}
func cmdImport(flags core.Flags, file string) error {
pack, err := core.LoadPack(flags)
if err != nil {
return cli.NewExitError(err, 1)
}
index, err := pack.LoadIndex()
if err != nil {
return cli.NewExitError(err, 1)
}
var packMeta twitchPackMeta
// TODO: is this relative to something?
f, err := os.Open(file)
@@ -83,14 +92,19 @@ func cmdImport(flags core.Flags, file string) error {
continue
}
fmt.Printf("Imported \"%s\" successfully!\n", modInfoValue.Name)
fmt.Printf("Imported mod \"%s\" successfully!\n", modInfoValue.Name)
err = createModFile(flags, modInfoValue, modFileInfo(v.File))
err = createModFile(flags, modInfoValue, modFileInfo(v.File), &index)
if err != nil {
return cli.NewExitError(err, 1)
}
}
err = index.Write()
if err != nil {
return cli.NewExitError(err, 1)
}
// TODO: import existing files (config etc.)
return nil