diff options
author | rtz12 <koenig@fagott.pw> | 2016-10-12 20:33:24 (UTC) |
---|---|---|
committer | rtz12 <koenig@fagott.pw> | 2016-10-12 20:33:24 (UTC) |
commit | 6fba92d36432d28e3ad62e6b3da5a3b807011482 (patch) | |
tree | 6899ce02203466fe4efd079f773650d445aa9a76 /tools/importer/ACDv2Reader.go | |
parent | caa0e61762511c32e45caf0df4e9dca4d4670849 (diff) |
Mal wieder Jans Suppe ausgeloeffelt
Diffstat (limited to 'tools/importer/ACDv2Reader.go')
-rw-r--r-- | tools/importer/ACDv2Reader.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tools/importer/ACDv2Reader.go b/tools/importer/ACDv2Reader.go index 4dab3c0..f34dd15 100644 --- a/tools/importer/ACDv2Reader.go +++ b/tools/importer/ACDv2Reader.go | |||
@@ -6,8 +6,7 @@ import ( | |||
6 | "path/filepath" | 6 | "path/filepath" |
7 | "strings" | 7 | "strings" |
8 | 8 | ||
9 | "fagott.pw/grilist/modules/grils" | 9 | "fagott.pw/grilist/models" |
10 | "fagott.pw/grilist/modules/series" | ||
11 | ) | 10 | ) |
12 | 11 | ||
13 | const failMsg = "Offenbar war meine Annahme bzgl. der Traits nicht ganz korrekt" | 12 | const failMsg = "Offenbar war meine Annahme bzgl. der Traits nicht ganz korrekt" |
@@ -45,7 +44,7 @@ type ACDv2Gril struct { | |||
45 | 44 | ||
46 | func (r *ACDv2Reader) Read(path string) WrappedGril { | 45 | func (r *ACDv2Reader) Read(path string) WrappedGril { |
47 | g := WrappedGril{} | 46 | g := WrappedGril{} |
48 | g.Gril = grils.Gril{} | 47 | g.Gril = models.Gril{} |
49 | data, err := ioutil.ReadFile(path) | 48 | data, err := ioutil.ReadFile(path) |
50 | ifErrExit(err) | 49 | ifErrExit(err) |
51 | var jObj ACDv2Gril | 50 | var jObj ACDv2Gril |
@@ -61,7 +60,7 @@ func (r *ACDv2Reader) Read(path string) WrappedGril { | |||
61 | for _, v := range jObj.Tags { | 60 | for _, v := range jObj.Tags { |
62 | g.Gril.Tags = append(g.Gril.Tags, v.Name) | 61 | g.Gril.Tags = append(g.Gril.Tags, v.Name) |
63 | } | 62 | } |
64 | g.Gril.Traits = make([]grils.Trait, 0) | 63 | g.Gril.Traits = make([]models.Trait, 0) |
65 | if len(jObj.Traits.Official) != len(jObj.Traits.Indexed) { | 64 | if len(jObj.Traits.Official) != len(jObj.Traits.Indexed) { |
66 | panic(failMsg) | 65 | panic(failMsg) |
67 | } | 66 | } |
@@ -69,16 +68,16 @@ func (r *ACDv2Reader) Read(path string) WrappedGril { | |||
69 | if jObj.Traits.Official[i].Name != jObj.Traits.Indexed[i].Name { | 68 | if jObj.Traits.Official[i].Name != jObj.Traits.Indexed[i].Name { |
70 | panic(failMsg) | 69 | panic(failMsg) |
71 | } | 70 | } |
72 | t := grils.Trait{ | 71 | t := models.Trait{ |
73 | Name: jObj.Traits.Official[i].Name, | 72 | Name: jObj.Traits.Official[i].Name, |
74 | Value: jObj.Traits.Indexed[i].Value, | 73 | Value: jObj.Traits.Indexed[i].Value, |
75 | OfficialValue: jObj.Traits.Official[i].Value, | 74 | OfficialValue: jObj.Traits.Official[i].Value, |
76 | } | 75 | } |
77 | g.Gril.Traits = append(g.Gril.Traits, t) | 76 | g.Gril.Traits = append(g.Gril.Traits, t) |
78 | } | 77 | } |
79 | g.Gril.Series = make([]series.Series, 0) | 78 | g.Gril.Series = make([]models.Series, 0) |
80 | for _, v := range jObj.Assignments { | 79 | for _, v := range jObj.Assignments { |
81 | s := series.Series{ | 80 | s := models.Series{ |
82 | ID: v, | 81 | ID: v, |
83 | } | 82 | } |
84 | g.Gril.Series = append(g.Gril.Series, s) | 83 | g.Gril.Series = append(g.Gril.Series, s) |
@@ -87,5 +86,5 @@ func (r *ACDv2Reader) Read(path string) WrappedGril { | |||
87 | } | 86 | } |
88 | 87 | ||
89 | func (r *ACDv2Reader) ID() int { | 88 | func (r *ACDv2Reader) ID() int { |
90 | return int(grils.DataSourceACD) | 89 | return int(models.DataSourceACD) |
91 | } | 90 | } |