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

Index fixes and performance improvements (fixes #223, #224)

Browse Source 
- Fixed creation of duplicate index entries when importing from CurseForge (fixes #224)
- Automatically remove duplicates in index
- Fixed `packwiz serve` with a custom `--pack-root` argument (fixes #223)
- Fixed `packwiz serve` with a custom index.toml location
- Cleaned up internal serving code, added comments and better errors
- Refactored path handling code
- Improved refreshing/exporting performance
- Factored out duplicated exporting logic
- Replaced GetAllMods calls with cleaner LoadAllMods calls and made the former private
- Improved variable names in update command
- Improved handling of aliassed files
- Changed CheckUpdate to take references to metadata
- Removed the ability to use an absolute path to the index file (that probably didn't work anyway)
- Behaviour change: order of entries in exported files may be random
This commit is contained in:
comp500
2023-05-29 23:15:55 +01:00
parent d25817273b
commit 4fb1f1b59d
14 changed files with 401 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/update.go
View File

@@ -33,27 +33,26 @@ var UpdateCmd = &cobra.Command{
var singleUpdatedName string
if viper.GetBool("update.all") {
updaterMap := make(map[string][]core.Mod)
filesWithUpdater := make(map[string][]*core.Mod)
fmt.Println("Reading metadata files...")
for _, v := range index.GetAllMods() {
modData, err := core.LoadMod(v)
if err != nil {
fmt.Printf("Error reading metadata file: %s\n", err.Error())
continue
}
mods, err := index.LoadAllMods()
if err != nil {
fmt.Printf("Failed to update all files: %v\n", err)
os.Exit(1)
}
for _, modData := range mods {
updaterFound := false
for k := range modData.Update {
slice, ok := updaterMap[k]
slice, ok := filesWithUpdater[k]
if !ok {
_, ok = core.Updaters[k]
if !ok {
continue
}
slice = []core.Mod{}
slice = []*core.Mod{}
}
updaterFound = true
updaterMap[k] = append(slice, modData)
filesWithUpdater[k] = append(slice, modData)
}
if !updaterFound {
fmt.Printf("A supported update system for \"%s\" cannot be found.\n", modData.Name)
@@ -62,9 +61,9 @@ var UpdateCmd = &cobra.Command{
fmt.Println("Checking for updates...")
updatesFound := false
updaterPointerMap := make(map[string][]*core.Mod)
updatableFiles := make(map[string][]*core.Mod)
updaterCachedStateMap := make(map[string][]interface{})
for k, v := range updaterMap {
for k, v := range filesWithUpdater {
checks, err := core.Updaters[k].CheckUpdate(v, pack)
if err != nil {
// TODO: do we return err code 1?
@@ -83,7 +82,7 @@ var UpdateCmd = &cobra.Command{
updatesFound = true
}
fmt.Printf("%s: %s\n", v[i].Name, check.UpdateString)
updaterPointerMap[k] = append(updaterPointerMap[k], &v[i])
updatableFiles[k] = append(updatableFiles[k], v[i])
updaterCachedStateMap[k] = append(updaterCachedStateMap[k], check.CachedState)
}
}
@@ -99,7 +98,7 @@ var UpdateCmd = &cobra.Command{
return
}
for k, v := range updaterPointerMap {
for k, v := range updatableFiles {
err := core.Updaters[k].DoUpdate(v, updaterCachedStateMap[k])
if err != nil {
// TODO: do we return err code 1?
@@ -143,7 +142,7 @@ var UpdateCmd = &cobra.Command{
}
updaterFound = true
check, err := updater.CheckUpdate([]core.Mod{modData}, pack)
check, err := updater.CheckUpdate([]*core.Mod{&modData}, pack)
if err != nil {
fmt.Println(err)
os.Exit(1)