Skip to content

Commit 57769dd

Browse files
tobiasehlerttobiasehlert
authored
implementing use of response handlers (#4)
1 parent 54ecb00 commit 57769dd

11 files changed

+120
-191
lines changed

‎src/TibiaCharactersCharacterV3.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
package main
22

33
import (
4-
"encoding/json"
5-
"fmt"
64
"html"
75
"log"
86
"regexp"
97
"strings"
108

119
"github.com/PuerkitoBio/goquery"
10+
"github.com/gin-gonic/gin"
1211
//"time"
1312
)
1413

1514
// TibiaCharactersCharacterV3 func
16-
func TibiaCharactersCharacterV3(character string) string {
15+
func TibiaCharactersCharacterV3(c *gin.Context) {
16+
17+
// getting params from URL
18+
character := c.Param("character")
1719

1820
// Child of Character
1921
type Houses struct {
@@ -519,11 +521,8 @@ func TibiaCharactersCharacterV3(character string) string {
519521
},
520522
}
521523

522-
js, _ := json.Marshal(jsonData)
523-
if TibiadataDebug {
524-
fmt.Printf("%s\n", js)
525-
}
526-
return string(js)
524+
// return jsonData
525+
TibiaDataAPIHandleSuccessResponse(c, "TibiaCharactersCharacterV3", jsonData)
527526
}
528527

529528
// TibiaDataParseKiller func - insert a html string and get the killers back

‎src/TibiaCreaturesCreatureV3.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package main
22

33
import (
4-
"encoding/json"
5-
"fmt"
64
"log"
75
"regexp"
86
"strings"
97

108
"github.com/PuerkitoBio/goquery"
9+
"github.com/gin-gonic/gin"
1110
)
1211

1312
// TibiaCreaturesCreatureV3 func
14-
func TibiaCreaturesCreatureV3(race string) string {
13+
func TibiaCreaturesCreatureV3(c *gin.Context) {
14+
15+
// getting params from URL
16+
race := c.Param("race")
1517

1618
// Child of JSONData
1719
type Creature struct {
@@ -165,9 +167,6 @@ func TibiaCreaturesCreatureV3(race string) string {
165167
},
166168
}
167169

168-
js, _ := json.Marshal(jsonData)
169-
if TibiadataDebug {
170-
fmt.Printf("%s\n", js)
171-
}
172-
return string(js)
170+
// return jsonData
171+
TibiaDataAPIHandleSuccessResponse(c, "TibiaCreaturesCreatureV3", jsonData)
173172
}

‎src/TibiaCreaturesOverviewV3.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package main
22

33
import (
4-
"encoding/json"
5-
"fmt"
64
"log"
75
"regexp"
86
"strings"
97

108
"github.com/PuerkitoBio/goquery"
9+
"github.com/gin-gonic/gin"
1110
)
1211

1312
// TibiaCreaturesOverviewV3 func
14-
func TibiaCreaturesOverviewV3() string {
13+
func TibiaCreaturesOverviewV3(c *gin.Context) {
1514

1615
// Child of Creatures (used for list of creatures and boosted section)
1716
type Creature struct {
@@ -122,9 +121,6 @@ func TibiaCreaturesOverviewV3() string {
122121
},
123122
}
124123

125-
js, _ := json.Marshal(jsonData)
126-
if TibiadataDebug {
127-
fmt.Printf("%s\n", js)
128-
}
129-
return string(js)
124+
// return jsonData
125+
TibiaDataAPIHandleSuccessResponse(c, "TibiaCreaturesOverviewV3", jsonData)
130126
}

‎src/TibiaFansitesV3.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package main
22

33
import (
4-
"encoding/json"
5-
"fmt"
64
"html"
75
"log"
86
"regexp"
97
"strings"
108

119
"github.com/PuerkitoBio/goquery"
10+
"github.com/gin-gonic/gin"
1211
)
1312

1413
// TibiaFansitesV3 func
15-
func TibiaFansitesV3() string {
14+
func TibiaFansitesV3(c *gin.Context) {
1615

1716
// Child of Fansite
1817
type ContentType struct {
@@ -292,9 +291,6 @@ func TibiaFansitesV3() string {
292291
},
293292
}
294293

295-
js, _ := json.Marshal(jsonData)
296-
if TibiadataDebug {
297-
fmt.Printf("%s\n", js)
298-
}
299-
return string(js)
294+
// return jsonData
295+
TibiaDataAPIHandleSuccessResponse(c, "TibiaFansitesV3", jsonData)
300296
}

‎src/TibiaHighscoresV3.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
package main
22

33
import (
4-
"encoding/json"
5-
"fmt"
64
"log"
75
"regexp"
86
"strings"
97

108
"github.com/PuerkitoBio/goquery"
9+
"github.com/gin-gonic/gin"
1110
)
1211

1312
// TibiaHighscoresV3 func
14-
func TibiaHighscoresV3(world string, category string, vocation string) string {
13+
func TibiaHighscoresV3(c *gin.Context) {
14+
15+
// getting params from URL
16+
world := c.Param("world")
17+
category := c.Param("category")
18+
vocation := c.Param("vocation")
1519

1620
// do some validation of category and vocation
1721
// maybe return error on faulty value?!
@@ -45,7 +49,7 @@ func TibiaHighscoresV3(world string, category string, vocation string) string {
4549

4650
// Adding fix for First letter to be upper and rest lower
4751
if strings.EqualFold(world, "all") {
48-
world = "ALL"
52+
world = ""
4953
} else {
5054
world = TibiadataStringWorldFormatToTitleV3(world)
5155
}
@@ -250,9 +254,6 @@ func TibiaHighscoresV3(world string, category string, vocation string) string {
250254
},
251255
}
252256

253-
js, _ := json.Marshal(jsonData)
254-
if TibiadataDebug {
255-
fmt.Printf("%s\n", js)
256-
}
257-
return string(js)
257+
// return jsonData
258+
TibiaDataAPIHandleSuccessResponse(c, "TibiaHighscoresV3", jsonData)
258259
}

‎src/TibiaKillstatisticsV3.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package main
22

33
import (
4-
"encoding/json"
5-
"fmt"
64
"log"
75
"regexp"
86
"strings"
97

108
"github.com/PuerkitoBio/goquery"
9+
"github.com/gin-gonic/gin"
1110
)
1211

1312
// TibiaKillstatisticsV3 func
14-
func TibiaKillstatisticsV3(world string) string {
13+
func TibiaKillstatisticsV3(c *gin.Context) {
14+
15+
// getting params from URL
16+
world := c.Param("world")
1517

1618
// Child of KillStatistics
1719
type Entry struct {
@@ -123,9 +125,7 @@ func TibiaKillstatisticsV3(world string) string {
123125
},
124126
}
125127

126-
js, _ := json.Marshal(jsonData)
127-
if TibiadataDebug {
128-
fmt.Printf("%s\n", js)
129-
}
130-
return string(js)
128+
// return jsonData
129+
TibiaDataAPIHandleSuccessResponse(c, "TibiaKillstatisticsV3", jsonData)
130+
131131
}

‎src/TibiaSpellsOverviewV3.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
package main
22

33
import (
4-
"encoding/json"
5-
"fmt"
64
"log"
75
"regexp"
86
"strings"
97

108
"github.com/PuerkitoBio/goquery"
9+
"github.com/gin-gonic/gin"
1110
)
1211

1312
// TibiaSpellsOverviewV3 func
14-
func TibiaSpellsOverviewV3(vocation string) string {
13+
func TibiaSpellsOverviewV3(c *gin.Context) {
14+
15+
// getting params from URL
16+
vocation := c.Param("vocation")
17+
if vocation == "" {
18+
vocation = TibiadataDefaultVoc
19+
}
1520

1621
// Child of Spells
1722
type Spell struct {
@@ -155,9 +160,6 @@ func TibiaSpellsOverviewV3(vocation string) string {
155160
},
156161
}
157162

158-
js, _ := json.Marshal(jsonData)
159-
if TibiadataDebug {
160-
fmt.Printf("%s\n", js)
161-
}
162-
return string(js)
163+
// return jsonData
164+
TibiaDataAPIHandleSuccessResponse(c, "TibiaSpellsOverviewV3", jsonData)
163165
}

‎src/TibiaSpellsSpellV3.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package main
22

33
import (
4-
"encoding/json"
5-
"fmt"
64
"log"
75
"regexp"
86
"strings"
97

108
"github.com/PuerkitoBio/goquery"
9+
"github.com/gin-gonic/gin"
1110
)
1211

1312
// TibiaSpellsSpellV3 func
14-
func TibiaSpellsSpellV3(spell string) string {
13+
func TibiaSpellsSpellV3(c *gin.Context) {
14+
15+
// getting params from URL
16+
spell := c.Param("spell")
1517

1618
// Child of SpellInformation
1719
type SpellInformation struct {
@@ -313,9 +315,6 @@ func TibiaSpellsSpellV3(spell string) string {
313315
},
314316
}
315317

316-
js, _ := json.Marshal(jsonData)
317-
if TibiadataDebug {
318-
fmt.Printf("%s\n", js)
319-
}
320-
return string(js)
318+
// return jsonData
319+
TibiaDataAPIHandleSuccessResponse(c, "TibiaSpellsSpellV3", jsonData)
321320
}

‎src/TibiaWorldsOverviewV3.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package main
22

33
import (
4-
"encoding/json"
5-
"fmt"
64
"log"
75
"regexp"
86
"strings"
97

108
"github.com/PuerkitoBio/goquery"
9+
"github.com/gin-gonic/gin"
1110
)
1211

1312
// TibiaWorldsOverviewV3 func
14-
func TibiaWorldsOverviewV3() string {
13+
func TibiaWorldsOverviewV3(c *gin.Context) {
1514

1615
// Child of Worlds
1716
type World struct {
@@ -198,9 +197,6 @@ func TibiaWorldsOverviewV3() string {
198197
},
199198
}
200199

201-
js, _ := json.Marshal(jsonData)
202-
if TibiadataDebug {
203-
fmt.Printf("%s\n", js)
204-
}
205-
return string(js)
200+
// return jsonData
201+
TibiaDataAPIHandleSuccessResponse(c, "TibiaWorldsOverviewV3", jsonData)
206202
}

‎src/TibiaWorldsWorldV3.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package main
22

33
import (
4-
"encoding/json"
5-
"fmt"
64
"log"
75
"regexp"
86
"strings"
97

108
"github.com/PuerkitoBio/goquery"
9+
"github.com/gin-gonic/gin"
1110
)
1211

1312
// TibiaWorldsWorldV3 func
14-
func TibiaWorldsWorldV3(world string) string {
13+
func TibiaWorldsWorldV3(c *gin.Context) {
14+
15+
// getting params from URL
16+
world := c.Param("world")
1517

1618
// Child of World
1719
type OnlinePlayers struct {
@@ -220,9 +222,6 @@ func TibiaWorldsWorldV3(world string) string {
220222
},
221223
}
222224

223-
js, _ := json.Marshal(jsonData)
224-
if TibiadataDebug {
225-
fmt.Printf("%s\n", js)
226-
}
227-
return string(js)
225+
// return jsonData
226+
TibiaDataAPIHandleSuccessResponse(c, "TibiaWorldsWorldV3", jsonData)
228227
}

0 commit comments

Comments
 (0)