Extract ACS info

pkg/extractor/extractor.go

@@ -123,6 +123,7 @@ type FleetDispatchExtractorBytes interface {
 type FleetDispatchExtractorDoc interface {
 	FleetsExtractorBytes
 	ExtractFleet1ShipsFromDoc(doc *goquery.Document) (s ogame.ShipsInfos)
+	ExtractFleetDispatchACSFromDoc(doc *goquery.Document) []ogame.ACSValues
 }
 
 type FleetDispatchExtractorBytesDoc interface {
@@ -463,7 +464,7 @@ type Extractor interface {
 	PremiumExtractorBytes
 	TraderAuctioneerExtractorBytes
 	TraderImportExportExtractorBytes
-	
+
 	TraderImportExportExtractorDoc
 
 	ExtractCoord(v string) (coord ogame.Coordinate)

pkg/extractor/v6/extractor.go

@@ -474,6 +474,11 @@ func (e *Extractor) ExtractFleet1ShipsFromDoc(doc *goquery.Document) (s ogame.Sh
 	return extractFleet1ShipsFromDoc(doc)
 }
 
+// ExtractFleetDispatchACSFromDoc ...
+func (e *Extractor) ExtractFleetDispatchACSFromDoc(doc *goquery.Document) []ogame.ACSValues {
+	return extractFleetDispatchACSFromDoc(doc)
+}
+
 // ExtractEspionageReportMessageIDsFromDoc ...
 func (e *Extractor) ExtractEspionageReportMessageIDsFromDoc(doc *goquery.Document) ([]ogame.EspionageReportSummary, int64) {
 	return extractEspionageReportMessageIDsFromDoc(doc)

pkg/extractor/v6/extracts.go

@@ -568,6 +568,19 @@ func extractFleet1ShipsFromDoc(doc *goquery.Document) (s ogame.ShipsInfos) {
 	return
 }
 
+func extractFleetDispatchACSFromDoc(doc *goquery.Document) []ogame.ACSValues {
+	out := make([]ogame.ACSValues, 0)
+	doc.Find("select[name=acsValues] option").Each(func(i int, s *goquery.Selection) {
+		acsValues := s.AttrOr("value", "")
+		m := regexp.MustCompile(`\d+#\d+#\d+#\d+#.*#(\d+)`).FindStringSubmatch(acsValues)
+		if len(m) == 2 {
+			optUnionID := utils.DoParseI64(m[1])
+			out = append(out, ogame.ACSValues{ACSValues: acsValues, Union: optUnionID})
+		}
+	})
+	return out
+}
+
 func extractEspionageReportMessageIDsFromDoc(doc *goquery.Document) ([]ogame.EspionageReportSummary, int64) {
 	msgs := make([]ogame.EspionageReportSummary, 0)
 	nbPage := utils.DoParseI64(doc.Find("ul.pagination li").Last().AttrOr("data-page", "1"))

pkg/ogame/ogame.go

@@ -249,3 +249,8 @@ type Preferences struct {
 		Account                 bool
 	}
 }
+
+type ACSValues struct {
+	ACSValues string
+	Union     int64
+}

pkg/wrapper/ogame.go

@@ -3384,19 +3384,16 @@ func (b *OGame) sendFleet(celestialID ogame.CelestialID, ships []ogame.Quantifia
 
 	if unionID != 0 {
 		found := false
-		fleet1Doc.Find("select[name=acsValues] option").Each(func(i int, s *goquery.Selection) {
-			acsValues := s.AttrOr("value", "")
-			m := regexp.MustCompile(`\d+#\d+#\d+#\d+#.*#(\d+)`).FindStringSubmatch(acsValues)
-			if len(m) == 2 {
-				optUnionID := utils.DoParseI64(m[1])
-				if unionID == optUnionID {
-					found = true
-					payload.Add("acsValues", acsValues)
-					payload.Add("union", m[1])
-					mission = ogame.GroupedAttack
-				}
+		acsArr := b.extractor.ExtractFleetDispatchACSFromDoc(fleet1Doc)
+		for _, acs := range acsArr {
+			if unionID == acs.Union {
+				found = true
+				payload.Add("acsValues", acs.ACSValues)
+				payload.Add("union", utils.FI64(acs.Union))
+				mission = ogame.GroupedAttack
+				break
 			}
-		})
+		}
 		if !found {
 			return ogame.Fleet{}, ogame.ErrUnionNotFound
 		}
@@ -4740,3 +4737,22 @@ func (b *OGame) OfferSellMarketplace(itemID any, quantity, priceType, price, pri
 func (b *OGame) OfferBuyMarketplace(itemID any, quantity, priceType, price, priceRange int64, celestialID ogame.CelestialID) error {
 	return b.WithPriority(taskRunner.Normal).OfferBuyMarketplace(itemID, quantity, priceType, price, priceRange, celestialID)
 }
+
+type IGetCoordinate interface {
+	GetCoordinate() ogame.Coordinate
+}
+
+func ConvertToCoordinate(v any) (out ogame.Coordinate) {
+	if celestial, ok := v.(IGetCoordinate); ok {
+		out = celestial.GetCoordinate()
+	} else if coord, ok := v.(ogame.Coordinate); ok {
+		out = coord
+	} else if coordStr, ok := v.(string); ok {
+		coord, err := ogame.ParseCoord(coordStr)
+		if err != nil {
+			return
+		}
+		out = coord
+	}
+	return
+}