fix interface

alaingilbert · Aug 18, 2022 · ea51052 · ea51052
1 parent 6692419
commit ea51052
Show file tree

Hide file tree

Showing 9 changed files with 324 additions and 164 deletions.
diff --git a/extractor_v6.go b/extractor_v6.go
@@ -166,7 +166,7 @@ func (e ExtractorV6) ExtractAttacks(pageHTML []byte, ownCoords []Coordinate) ([]
 
 func (e ExtractorV6) extractAttacks(pageHTML []byte, clock clockwork.Clock, ownCoords []Coordinate) ([]AttackEvent, error) {
 	doc, _ := goquery.NewDocumentFromReader(bytes.NewReader(pageHTML))
-	return e.ExtractAttacksFromDoc(doc, clock, ownCoords)
+	return e.extractAttacksFromDoc(doc, clock, ownCoords)
 }
 
 // ExtractOfferOfTheDay ...
@@ -414,7 +414,11 @@ func (e ExtractorV6) ExtractOGameSessionFromDoc(doc *goquery.Document) string {
 }
 
 // ExtractAttacksFromDoc ...
-func (e ExtractorV6) ExtractAttacksFromDoc(doc *goquery.Document, clock clockwork.Clock, ownCoords []Coordinate) ([]AttackEvent, error) {
+func (e ExtractorV6) ExtractAttacksFromDoc(doc *goquery.Document, ownCoords []Coordinate) ([]AttackEvent, error) {
+	return e.extractAttacksFromDoc(doc, clockwork.NewRealClock(), ownCoords)
+}
+
+func (e ExtractorV6) extractAttacksFromDoc(doc *goquery.Document, clock clockwork.Clock, ownCoords []Coordinate) ([]AttackEvent, error) {
 	return extractAttacksFromDocV6(doc, clock, ownCoords)
 }
 

diff --git a/extractor_v71.go b/extractor_v71.go
@@ -114,8 +114,8 @@ func (e ExtractorV71) ExtractAllResources(pageHTML []byte) (map[CelestialID]Reso
 }
 
 // ExtractAttacksFromDoc ...
-func (e ExtractorV71) ExtractAttacksFromDoc(doc *goquery.Document, clock clockwork.Clock, ownCoords []Coordinate) ([]AttackEvent, error) {
-	return extractAttacksFromDocV71(doc, clock, ownCoords)
+func (e ExtractorV71) ExtractAttacksFromDoc(doc *goquery.Document, ownCoords []Coordinate) ([]AttackEvent, error) {
+	return e.extractAttacksFromDoc(doc, clockwork.NewRealClock(), ownCoords)
 }
 
 // ExtractAttacks ...
@@ -125,7 +125,11 @@ func (e ExtractorV71) ExtractAttacks(pageHTML []byte, ownCoords []Coordinate) ([
 
 func (e ExtractorV71) extractAttacks(pageHTML []byte, clock clockwork.Clock, ownCoords []Coordinate) ([]AttackEvent, error) {
 	doc, _ := goquery.NewDocumentFromReader(bytes.NewReader(pageHTML))
-	return e.ExtractAttacksFromDoc(doc, clock, ownCoords)
+	return e.extractAttacksFromDoc(doc, clock, ownCoords)
+}
+
+func (e ExtractorV71) extractAttacksFromDoc(doc *goquery.Document, clock clockwork.Clock, ownCoords []Coordinate) ([]AttackEvent, error) {
+	return extractAttacksFromDocV71(doc, clock, ownCoords)
 }
 
 // DMCost ...

diff --git a/fetcher.go b/fetcher.go
@@ -105,6 +105,7 @@ func getAjaxPage[T AjaxPagePages](b *OGame, vals url.Values, opts ...Option) (T,
 	case MissileAttackLayerAjaxPage:
 	case FetchTechsAjaxPage:
 	case RocketlayerAjaxPage:
+	case PhalanxAjaxPage:
 	default:
 		panic("not implemented")
 	}

diff --git a/interfaces.go b/interfaces.go
@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/PuerkitoBio/goquery"
-	"github.com/alaingilbert/clockwork"
 )
 
 // Prioritizable ...
@@ -348,7 +347,7 @@ type Extractor interface {
 	ExtractFacilitiesFromDoc(doc *goquery.Document) (Facilities, error)
 	ExtractResearchFromDoc(doc *goquery.Document) Researches
 	ExtractOGameSessionFromDoc(doc *goquery.Document) string
-	ExtractAttacksFromDoc(doc *goquery.Document, clock clockwork.Clock, ownCoords []Coordinate) ([]AttackEvent, error)
+	ExtractAttacksFromDoc(doc *goquery.Document, ownCoords []Coordinate) ([]AttackEvent, error)
 	ExtractOfferOfTheDayFromDoc(doc *goquery.Document) (price int64, importToken string, planetResources PlanetResources, multiplier Multiplier, err error)
 	ExtractProductionFromDoc(doc *goquery.Document) ([]Quantifiable, error)
 	ExtractOverviewProductionFromDoc(doc *goquery.Document) ([]Quantifiable, error)