From 8bee08e8dcbcce1f97e7c319e563da6ba32e375c Mon Sep 17 00:00:00 2001 From: Alain Gilbert Date: Thu, 4 Aug 2022 16:37:14 -0700 Subject: [PATCH] simplify code --- extracts_v9.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/extracts_v9.go b/extracts_v9.go index f2a77334..cc0e0dca 100644 --- a/extracts_v9.go +++ b/extracts_v9.go @@ -10,18 +10,7 @@ import ( ) func extractResourcesFromDocV9(doc *goquery.Document) Resources { - res := Resources{} - metalDoc, _ := goquery.NewDocumentFromReader(strings.NewReader(doc.Find("div#metal_box").AttrOr("title", ""))) - crystalDoc, _ := goquery.NewDocumentFromReader(strings.NewReader(doc.Find("div#crystal_box").AttrOr("title", ""))) - deuteriumDoc, _ := goquery.NewDocumentFromReader(strings.NewReader(doc.Find("div#deuterium_box").AttrOr("title", ""))) - energyDoc, _ := goquery.NewDocumentFromReader(strings.NewReader(doc.Find("div#energy_box").AttrOr("title", ""))) - darkmatterDoc, _ := goquery.NewDocumentFromReader(strings.NewReader(doc.Find("div#darkmatter_box").AttrOr("title", ""))) - res.Metal = ParseInt(metalDoc.Find("table tr").Eq(0).Find("td").Eq(0).Text()) - res.Crystal = ParseInt(crystalDoc.Find("table tr").Eq(0).Find("td").Eq(0).Text()) - res.Deuterium = ParseInt(deuteriumDoc.Find("table tr").Eq(0).Find("td").Eq(0).Text()) - res.Energy = ParseInt(energyDoc.Find("table tr").Eq(0).Find("td").Eq(0).Text()) - res.Darkmatter = ParseInt(darkmatterDoc.Find("table tr").Eq(0).Find("td").Eq(0).Text()) - return res + return extractResourcesDetailsFromFullPageFromDocV9(doc).Available() } func extractResourcesDetailsFromFullPageFromDocV9(doc *goquery.Document) ResourcesDetails {