extract abandon info

alaingilbert · Aug 22, 2022 · 1b51ef5 · 1b51ef5
1 parent 3c006f7
commit 1b51ef5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/pkg/extractor/extractor.go b/pkg/extractor/extractor.go
@@ -423,6 +423,10 @@ type PremiumExtractorBytes interface {
 	ExtractPremiumToken(pageHTML []byte, days int64) (token string, err error)
 }
 
+type PlanetLayerExtractorDoc interface {
+	ExtractAbandonInformation(doc *goquery.Document) (abandonToken string, token string)
+}
+
 // Extractor ...
 type Extractor interface {
 	GetLanguage() string
@@ -465,6 +469,7 @@ type Extractor interface {
 	TraderAuctioneerExtractorBytes
 	TraderImportExportExtractorBytes
 
+	PlanetLayerExtractorDoc
 	TraderImportExportExtractorDoc
 
 	ExtractCoord(v string) (coord ogame.Coordinate)

diff --git a/pkg/extractor/v6/extractor.go b/pkg/extractor/v6/extractor.go
@@ -709,6 +709,11 @@ func (e *Extractor) ExtractTechnocratFromDoc(doc *goquery.Document) bool {
 	return extractTechnocratFromDoc(doc)
 }
 
+// ExtractAbandonInformation ...
+func (e *Extractor) ExtractAbandonInformation(doc *goquery.Document) (string, string) {
+	return extractAbandonInformation(doc)
+}
+
 // </ Extract from doc> -------------------------------------------------------
 
 // <Works with []byte only> ---------------------------------------------------

diff --git a/pkg/extractor/v6/extracts.go b/pkg/extractor/v6/extracts.go
@@ -1375,6 +1375,12 @@ func extractTechnocratFromDoc(doc *goquery.Document) bool {
 	return doc.Find("div#officers a.technocrat").HasClass("on")
 }
 
+func extractAbandonInformation(doc *goquery.Document) (string, string) {
+	abandonToken := doc.Find("form#planetMaintenanceDelete input[name=abandon]").AttrOr("value", "")
+	token := doc.Find("form#planetMaintenanceDelete input[name=token]").AttrOr("value", "")
+	return abandonToken, token
+}
+
 func extractPlanetCoordinate(pageHTML []byte) (ogame.Coordinate, error) {
 	m := regexp.MustCompile(`<meta name="ogame-planet-coordinates" content="(\d+):(\d+):(\d+)"/>`).FindSubmatch(pageHTML)
 	if len(m) == 0 {

diff --git a/pkg/wrapper/ogame.go b/pkg/wrapper/ogame.go
@@ -1826,8 +1826,7 @@ func (b *OGame) abandon(v any) error {
 	}
 	pageHTML, _ := b.getPage(PlanetlayerPageName, ChangePlanet(planet.GetID()))
 	doc, _ := goquery.NewDocumentFromReader(bytes.NewReader(pageHTML))
-	abandonToken := doc.Find("form#planetMaintenanceDelete input[name=abandon]").AttrOr("value", "")
-	token := doc.Find("form#planetMaintenanceDelete input[name=token]").AttrOr("value", "")
+	abandonToken, token := b.extractor.ExtractAbandonInformation(doc)
 	payload := url.Values{
 		"abandon":  {abandonToken},
 		"token":    {token},