fix: boosted creature parsing on overview page (#374)

Author: tobiasehlert

src/TibiaCreaturesOverview.go

@@ -30,8 +30,9 @@ type CreaturesOverviewResponse struct {
 }
 
 var (
-	BoostedCreatureImageRegex = regexp.MustCompile(`<img[^>]+\bsrc=["']([^"']+)["']`)
-	CreatureInformationRegex  = regexp.MustCompile(`.*race=(.*)"><img src="(.*)" border.*div>(.*)<\/div>`)
+	BoostedCreatureNameAndRaceRegex = regexp.MustCompile(`<a.*race=(.*)".*?>(.*)</a>`)
+	BoostedCreatureImageRegex       = regexp.MustCompile(`<img[^>]+\bsrc=["']([^"']+)["']`)
+	CreatureInformationRegex        = regexp.MustCompile(`.*race=(.*)"><img src="(.*)" border.*div>(.*)<\/div>`)
 )
 
 func TibiaCreaturesOverviewImpl(BoxContentHTML string) (CreaturesOverviewResponse, error) {
@@ -51,6 +52,15 @@ func TibiaCreaturesOverviewImpl(BoxContentHTML string) (CreaturesOverviewRespons
 		return CreaturesOverviewResponse{}, fmt.Errorf("[error] TibiaCreaturesOverviewImpl failed at ReaderHTML.Find, err: %s", err)
 	}
 
+	// Regex to get data for name and race param for boosted creature
+	subma1b := BoostedCreatureNameAndRaceRegex.FindAllStringSubmatch(InnerTableContainerTMPB, -1)
+
+	if len(subma1b) > 0 {
+		// Settings vars for usage in JSONData
+		BoostedCreatureName = subma1b[0][2]
+		BoostedCreatureRace = subma1b[0][1]
+	}
+
 	// Regex to get image of boosted creature
 	subma2b := BoostedCreatureImageRegex.FindAllStringSubmatch(InnerTableContainerTMPB, -1)
 
@@ -83,9 +93,7 @@ func TibiaCreaturesOverviewImpl(BoxContentHTML string) (CreaturesOverviewRespons
 		if len(subma1) > 0 && len(subma1[0][3]) > 1 {
 			// Adding bool to indicate features in creature_list
 			FeaturedRace := false
-			if TibiaDataVerifyBoostedCreatureImage(subma1[0][2], BoostedCreatureImage) {
-				BoostedCreatureName = TibiaDataSanitizeEscapedString(subma1[0][3])
-				BoostedCreatureRace = subma1[0][1]
+			if subma1[0][1] == BoostedCreatureRace {
 				FeaturedRace = true
 			}
 

src/TibiaCreaturesOverview_test.go

@@ -27,17 +27,23 @@ func TestOverview(t *testing.T) {
 
 	assert := assert.New(t)
 
-	assert.Equal("Acid Blobs", creaturesJson.Creatures.Boosted.Name)
-	assert.Equal("acidblob", creaturesJson.Creatures.Boosted.Race)
-	assert.Equal("https://static.tibia.com/images/global/header/monsters/acidblob.gif", creaturesJson.Creatures.Boosted.ImageURL)
+	assert.Equal("Minotaur Amazon", creaturesJson.Creatures.Boosted.Name)
+	assert.Equal("minotauramazon", creaturesJson.Creatures.Boosted.Race)
+	assert.Equal("https://static.tibia.com/images/global/header/monsters/minotauramazon.gif", creaturesJson.Creatures.Boosted.ImageURL)
 
 	assert.Equal(638, len(creaturesJson.Creatures.Creatures))
 
 	acidblob := creaturesJson.Creatures.Creatures[0]
 	assert.Equal("Acid Blobs", acidblob.Name)
 	assert.Equal("acidblob", acidblob.Race)
 	assert.Equal("https://static.tibia.com/images/library/acidblob.gif", acidblob.ImageURL)
-	assert.True(acidblob.Featured)
+	assert.False(acidblob.Featured)
+
+	minotauramazon := creaturesJson.Creatures.Creatures[360]
+	assert.Equal("Minotaur Amazons", minotauramazon.Name)
+	assert.Equal("minotauramazon", minotauramazon.Race)
+	assert.Equal("https://static.tibia.com/images/library/minotauramazon.gif", minotauramazon.ImageURL)
+	assert.True(minotauramazon.Featured)
 
 	quarapredator := creaturesJson.Creatures.Creatures[465]
 	assert.Equal("Quara Predators", quarapredator.Name)

src/TibiaDataUtils.go

@@ -6,7 +6,6 @@ import (
 	"log"
 	"net/url"
 	"os"
-	"path"
 	"regexp"
 	"strconv"
 	"strings"
@@ -316,16 +315,3 @@ func TibiaDataGetNewsType(data string) string {
 		return "unknown"
 	}
 }
-
-// TibiaDataVerifyBoostedCreatureImage compares two creature-image URLs and returns true if the filenames are the same, otherwise false.
-func TibiaDataVerifyBoostedCreatureImage(link1, link2 string) bool {
-	getFilename := func(link string) string {
-		parsedURL, err := url.Parse(link)
-		if err != nil {
-			return ""
-		}
-		return path.Base(parsedURL.Path)
-	}
-
-	return getFilename(link1) == getFilename(link2)
-}

src/TibiaDataUtils_test.go

@@ -204,20 +204,6 @@ func TestHTMLRemover(t *testing.T) {
 	assert.Equal(t, sanitizedString, "abc")
 }
 
-func TestTibiaDataVerifyBoostedCreatureImage(t *testing.T) {
-	assert := assert.New(t)
-
-	// Test when the filenames are the same
-	link1 := "https://static.tibia.com/images/global/header/monsters/acidblob.gif"
-	link2 := "https://static.tibia.com/images/library/acidblob.gif"
-	assert.True(TibiaDataVerifyBoostedCreatureImage(link1, link2))
-
-	// Test when the filenames are different
-	link3 := "https://static.tibia.com/images/global/header/monsters/acidblob.gif"
-	link4 := "https://static.tibia.com/images/library/cultacolyte.gif"
-	assert.False(TibiaDataVerifyBoostedCreatureImage(link3, link4))
-}
-
 func TestFake(t *testing.T) {
 	assert := assert.New(t)
 	const str = "<"