some more re-org

package data

package custom

// SaveGame is the internal representation of a save game.

type SaveGame struct{}

package data

package json

// User is the JSON container for user information.

type User struct {

package data

package xml

import "encoding/xml"

	"path"

	"strings"

	"repositories.muehmer.net/boris.muehmer/sotatool/offline/savegame/data"

	"repositories.muehmer.net/boris.muehmer/sotatool/offline/savegame/data/custom"

	sgjson "repositories.muehmer.net/boris.muehmer/sotatool/offline/savegame/data/json"

	sgxml "repositories.muehmer.net/boris.muehmer/sotatool/offline/savegame/data/xml"

)

// savegame2xml converts an save game to the XML structure

func savegame2xml(filename string) (*data.Database, error) {

func savegame2xml(filename string) (*sgxml.Database, error) {

	f, err := os.Open(filename)

	if err != nil {

		return nil, fmt.Errorf("failed to open file %s", filename)

		case xml.StartElement:

			switch se.Name.Local {

			case "database":

				var database data.Database

				var database sgxml.Database

				xe := xdec.DecodeElement(&database, &se)

				if xe != nil {

					return nil, fmt.Errorf("decode element failed: %v", xe)

}

// Decode an save-game file to an internal structure.

func Decode(filename string) (savegame *data.SaveGame, e error) {

func Decode(filename string) (savegame *custom.SaveGame, e error) {

	database, err := savegame2xml(filename)

	if err != nil {

		return nil, err

			// only a record has JSON data

			switch c.Name {

			case "CharacterName":

				var cn data.CharacterName

				var cn sgjson.CharacterName

				jdec := json.NewDecoder(strings.NewReader(r.DataJSON))

				jerr := jdec.Decode(&cn)

				if jerr != nil {