Merge branch 'release/42.4.9'

alaingilbert · Sep 27, 2020 · 38a79e6 · 38a79e6
2 parents f9581d1 + addab4a
commit 38a79e6
Show file tree

Hide file tree

Showing 4 changed files with 1,359 additions and 1 deletion.
diff --git a/extracts_v6.go b/extracts_v6.go
@@ -2172,7 +2172,15 @@ func extractAuctionFromDoc(doc *goquery.Document) (Auction, error) {
 	}
 
 	// Find already-bid
-	auction.AlreadyBid = ParseInt(doc.Find("table.table_ressources_sum tr td.auctionInfo.js_alreadyBidden").Text())
+	m := regexp.MustCompile(`var playerBid = ([^;]+);`).FindStringSubmatch(doc.Text())
+	if len(m) != 2 {
+		return Auction{}, errors.New("failed to get playerBid")
+	}
+	var alreadyBid int64
+	if m[1] != "false" {
+		alreadyBid, _ = strconv.ParseInt(m[1], 10, 64)
+	}
+	auction.AlreadyBid = alreadyBid
 
 	// Find min-bid
 	auction.MinimumBid = ParseInt(doc.Find("table.table_ressources_sum tr td.auctionInfo.js_price").Text())

diff --git a/ogame_test.go b/ogame_test.go
@@ -2918,6 +2918,18 @@ func TestFixAttackEvents(t *testing.T) {
 	assert.Equal(t, PlanetType, attacks[0].Destination.Type) // Did not change
 }
 
+func TestExtractAuction_playerBid(t *testing.T) {
+	pageHTMLBytes, _ := ioutil.ReadFile("samples/v7.5.0/en/auction_player_bid.html")
+	res, _ := NewExtractorV6().ExtractAuction(pageHTMLBytes)
+	assert.Equal(t, int64(1603000), res.AlreadyBid)
+}
+
+func TestExtractAuction_noPlayerBid(t *testing.T) {
+	pageHTMLBytes, _ := ioutil.ReadFile("samples/v7.5.0/en/auction_no_player_bid.html")
+	res, _ := NewExtractorV6().ExtractAuction(pageHTMLBytes)
+	assert.Equal(t, int64(0), res.AlreadyBid)
+}
+
 func TestExtractAuction_ongoing2(t *testing.T) {
 	pageHTMLBytes, _ := ioutil.ReadFile("samples/v7.4/en/traderAuctioneer_ongoing.html")
 	res, _ := NewExtractorV6().ExtractAuction(pageHTMLBytes)