Fix struct tagging by just using string keys

This commit is contained in:
comp500
2019-05-11 14:40:59 +01:00
parent ef98591d02
commit f23f99b5be
3 changed files with 28 additions and 15 deletions

View File

@@ -5,7 +5,7 @@ var UpdateParsers = make(map[string]UpdateParser)
// UpdateParser takes an unparsed interface{} (as a map[string]interface{}), and returns an Updater for a mod file.
// This can be done using the mapstructure library or your own parsing methods.
type UpdateParser interface {
ParseUpdate(interface{}) (Updater, error)
ParseUpdate(map[string]interface{}) (Updater, error)
}
// Updater checks for and does updates on a mod

View File

@@ -8,13 +8,15 @@ import (
// Mod stores metadata about a mod. This is written to a TOML file for each mod.
type Mod struct {
metaFile string // The file for the metadata file, used as an ID
Name string `toml:"name"`
FileName string `toml:"filename"`
Side string `toml:"side,omitempty"`
Optional bool `toml:"optional,omitempty"`
Download ModDownload `toml:"download"`
Update map[string]interface{} `toml:"update"`
metaFile string // The file for the metadata file, used as an ID
Name string `toml:"name"`
FileName string `toml:"filename"`
Side string `toml:"side,omitempty"`
Optional bool `toml:"optional,omitempty"`
Download ModDownload `toml:"download"`
// Update is a map of map of stuff, so you can store arbitrary values on string keys to define updating
Update map[string]map[string]interface{} `toml:"update"`
updaters map[string]Updater
}
// ModDownload specifies how to download the mod file
@@ -37,6 +39,7 @@ func LoadMod(modFile string) (Mod, error) {
if _, err := toml.DecodeFile(modFile, &mod); err != nil {
return Mod{}, err
}
mod.updaters = make(map[string]Updater)
// Horrible reflection library to convert to Updaters
for k, v := range mod.Update {
updateParser, ok := UpdateParsers[k]
@@ -45,7 +48,7 @@ func LoadMod(modFile string) (Mod, error) {
if err != nil {
return mod, err
}
mod.Update[k] = updater
mod.updaters[k] = updater
} else {
return mod, errors.New("Update plugin " + k + " not found!")
}