dave/go-eve-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wire everything up

Browse Source
This commit is contained in:
PhatPhuckDave
2025-10-11 10:51:55 +02:00
parent 22b218c7d3
commit 77287c6361
3 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
orchestrator.go
View File

@@ -114,13 +114,13 @@ func (o *Orchestrator) processCharacter(char types.Character) {
logger.Info("Orchestrator.processCharacter: Starting processing for character: %s (ID: %d)", char.CharacterName, char.ID) logger.Info("Orchestrator.processCharacter: Starting processing for character: %s (ID: %d)", char.CharacterName, char.ID)
// Get extractors for this character // Get extractors for this character
logger.Info("Orchestrator.processCharacter: Getting extractors for character %s", char.CharacterName) // logger.Info("Orchestrator.processCharacter: Getting extractors for character %s", char.CharacterName)
extractors, err := routes.GetExtractorsForCharacter(o.esiClient, int(char.ID), char.AccessToken) // extractors, err := routes.GetExtractorsForCharacter(o.esiClient, int(char.ID), char.AccessToken)
if err != nil { // if err != nil {
logger.Warning("Orchestrator.processCharacter: Failed to get extractors for character %s: %v", char.CharacterName, err) // logger.Warning("Orchestrator.processCharacter: Failed to get extractors for character %s: %v", char.CharacterName, err)
return // return
} // }
logger.Info("Orchestrator.processCharacter: Got %d extractors for character %s", len(extractors), char.CharacterName) // logger.Info("Orchestrator.processCharacter: Got %d extractors for character %s", len(extractors), char.CharacterName)
// Get storage for this character // Get storage for this character
logger.Info("Orchestrator.processCharacter: Getting storage for character %s", char.CharacterName) logger.Info("Orchestrator.processCharacter: Getting storage for character %s", char.CharacterName)
@@ -136,8 +136,8 @@ func (o *Orchestrator) processCharacter(char types.Character) {
o.checkStorageThresholds(char.CharacterName, storage) o.checkStorageThresholds(char.CharacterName, storage)
// Update expiry timers for extractors // Update expiry timers for extractors
logger.Info("Orchestrator.processCharacter: Updating expiry timers for character %s", char.CharacterName) // logger.Info("Orchestrator.processCharacter: Updating expiry timers for character %s", char.CharacterName)
o.updateExpiryTimers(char.CharacterName, extractors) // o.updateExpiryTimers(char.CharacterName, extractors)
logger.Info("Orchestrator.processCharacter: Completed processing for character %s", char.CharacterName) logger.Info("Orchestrator.processCharacter: Completed processing for character %s", char.CharacterName)
} }

74
routes/data.go
View File

@@ -27,65 +27,59 @@ type StorageInfo struct {
} }
// GetExtractorsForCharacter retrieves extractor information for a character // GetExtractorsForCharacter retrieves extractor information for a character
func GetExtractorsForCharacter(esiClient esi.ESIInterface, characterID int, accessToken string) ([]ExtractorInfo, error) { func GetExtractorsForCharacter(esiClient esi.ESIInterface, characterID int, accessToken string, planetIDs []int64) ([]ExtractorInfo, error) {
logger.Info("GetExtractorsForCharacter: Starting for character ID %d", characterID) logger.Info("GetExtractorsForCharacter: Starting for character ID %d", characterID)
// Get character planets logger.Info("GetExtractorsForCharacter: Found %d planets for character %d", len(planetIDs), characterID)
planets, err := esiClient.GetCharacterPlanets(context.Background(), characterID, accessToken)
if err != nil {
logger.Error("GetExtractorsForCharacter: Failed to get planets for character %d: %v", characterID, err)
return nil, err
}
logger.Info("GetExtractorsForCharacter: Found %d planets for character %d", len(planets), characterID)
var extractors []ExtractorInfo var extractors []ExtractorInfo
for i, planet := range planets { for i, planetID := range planetIDs {
logger.Info("GetExtractorsForCharacter: Processing planet %d/%d (ID: %d)", i+1, len(planets), planet.PlanetID) logger.Info("GetExtractorsForCharacter: Processing planet %d/%d (ID: %d)", i+1, len(planetIDs), planetID)
// Get planet details // Get planet details
details, err := esiClient.GetPlanetDetails(context.Background(), characterID, planet.PlanetID, accessToken) details, err := esiClient.GetPlanetPI(context.Background(), characterID, planetID, accessToken)
if err != nil { if err != nil {
logger.Warning("GetExtractorsForCharacter: Failed to fetch details for planet %d: %v", planet.PlanetID, err) logger.Warning("GetExtractorsForCharacter: Failed to fetch details for planet %d: %v", planetID, err)
continue continue
} }
logger.Info("GetExtractorsForCharacter: Got planet details for planet %d with %d pins", planet.PlanetID, len(details.Pins)) logger.Info("GetExtractorsForCharacter: Got planet details for planet %d with %d pins", planetID, len(details.Pins))
if details != nil { if details != nil {
// Get planet name from universe endpoint // Get planet name from universe endpoint
planetNameData, err := esiClient.GetPlanetName(context.Background(), planet.PlanetID) planetNameData, err := esiClient.GetPlanetName(context.Background(), planetID)
if err != nil { if err != nil {
logger.Error("GetExtractorsForCharacter: Failed to get planet name for planet ID %d: %v", planet.PlanetID, err) logger.Error("GetExtractorsForCharacter: Failed to get planet name for planet ID %d: %v", planetID, err)
continue continue
} }
logger.Info("GetExtractorsForCharacter: Planet %d name: %s", planet.PlanetID, planetNameData.Name) logger.Info("GetExtractorsForCharacter: Planet %d name: %s", planetID, planetNameData.Name)
// Count extractors and get expiry dates // Count extractors and get expiry dates
extractorCount := 0 extractorCount := 0
for j, pin := range details.Pins { // for j, pin := range details.Pins {
logger.Info("GetExtractorsForCharacter: Processing pin %d/%d (TypeID: %d) on planet %s", j+1, len(details.Pins), pin.TypeID, planetNameData.Name) // logger.Info("GetExtractorsForCharacter: Processing pin %d/%d (TypeID: %d) on planet %s", j+1, len(details.Pins), pin.TypeID, planetNameData.Name)
if pin.ExtractorDetails != nil { // if pin.ExtractorDetails != nil {
logger.Info("GetExtractorsForCharacter: Found extractor (TypeID: %d) on planet %s", pin.TypeID, planetNameData.Name) // logger.Info("GetExtractorsForCharacter: Found extractor (TypeID: %d) on planet %s", pin.TypeID, planetNameData.Name)
extractorCount++ // extractorCount++
expiryDate := "N/A" // expiryDate := "N/A"
if pin.ExpiryTime != nil { // if pin.ExpiryTime != nil {
expiryDate = *pin.ExpiryTime // expiryDate = *pin.ExpiryTime
logger.Info("GetExtractorsForCharacter: Extractor expiry: %s", expiryDate) // logger.Info("GetExtractorsForCharacter: Extractor expiry: %s", expiryDate)
} else { // } else {
logger.Info("GetExtractorsForCharacter: Extractor has no expiry time") // logger.Info("GetExtractorsForCharacter: Extractor has no expiry time")
} // }
extractors = append(extractors, ExtractorInfo{ // extractors = append(extractors, ExtractorInfo{
PlanetName: planetNameData.Name, // PlanetName: planetNameData.Name,
ExtractorNumber: extractorCount, // ExtractorNumber: extractorCount,
ExpiryDate: expiryDate, // ExpiryDate: expiryDate,
}) // })
logger.Info("GetExtractorsForCharacter: Added extractor %d to results", extractorCount) // logger.Info("GetExtractorsForCharacter: Added extractor %d to results", extractorCount)
} else { // } else {
logger.Info("GetExtractorsForCharacter: Pin %d is not an extractor (TypeID: %d)", j+1, pin.TypeID) // logger.Info("GetExtractorsForCharacter: Pin %d is not an extractor (TypeID: %d)", j+1, pin.TypeID)
} // }
} // }
logger.Info("GetExtractorsForCharacter: Found %d extractors on planet %s", extractorCount, planetNameData.Name) logger.Info("GetExtractorsForCharacter: Found %d extractors on planet %s", extractorCount, planetNameData.Name)
} }
} }
@@ -112,7 +106,7 @@ func GetStorageForCharacter(esiClient esi.ESIInterface, characterID int, accessT
logger.Info("GetStorageForCharacter: Processing planet %d/%d (ID: %d)", i+1, len(planets), planet.PlanetID) logger.Info("GetStorageForCharacter: Processing planet %d/%d (ID: %d)", i+1, len(planets), planet.PlanetID)
// Get planet details // Get planet details
details, err := esiClient.GetPlanetDetails(context.Background(), characterID, planet.PlanetID, accessToken) details, err := esiClient.GetPlanetPI(context.Background(), characterID, planet.PlanetID, accessToken)
if err != nil { if err != nil {
logger.Warning("GetStorageForCharacter: Failed to fetch details for planet %d: %v", planet.PlanetID, err) logger.Warning("GetStorageForCharacter: Failed to fetch details for planet %d: %v", planet.PlanetID, err)
continue continue
@@ -141,7 +135,7 @@ func GetStorageForCharacter(esiClient esi.ESIInterface, characterID int, accessT
} }
logger.Info("GetStorageForCharacter: Pin %d is a storage facility (TypeID: %d)", j+1, pin.TypeID) logger.Info("GetStorageForCharacter: Pin %d is a storage facility (TypeID: %d)", j+1, pin.TypeID)
storageType, exists := constants.PI_TYPES_MAP[pin.TypeID] storageType, exists := constants.PITypesMap[pin.TypeID]
if !exists { if !exists {
logger.Error("GetStorageForCharacter: Unknown storage type ID %d for planet %s - this should not happen", pin.TypeID, planetNameData.Name) logger.Error("GetStorageForCharacter: Unknown storage type ID %d for planet %s - this should not happen", pin.TypeID, planetNameData.Name)
return nil, fmt.Errorf("unknown storage type ID %d", pin.TypeID) return nil, fmt.Errorf("unknown storage type ID %d", pin.TypeID)

21
routes/routes.go
View File

@@ -150,7 +150,7 @@ func (rh *RouteHandler) handlePlanetDetails(ctx *fasthttp.RequestCtx) {
} }
// Fetch planet details using ESI API // Fetch planet details using ESI API
planetDetail, err := rh.ESI.GetPlanetDetails(context.Background(), int(char.ID), planetID, char.AccessToken) planetDetail, err := rh.ESI.GetPlanetPI(context.Background(), int(char.ID), int64(planetID), char.AccessToken)
if err != nil { if err != nil {
logger.Error("Failed to fetch planet details for character %s, planet %d: %v", charNameStr, planetID, err) logger.Error("Failed to fetch planet details for character %s, planet %d: %v", charNameStr, planetID, err)
ctx.SetStatusCode(fasthttp.StatusInternalServerError) ctx.SetStatusCode(fasthttp.StatusInternalServerError)
@@ -197,12 +197,12 @@ func (rh *RouteHandler) handlePlanetsFull(ctx *fasthttp.RequestCtx) {
// Fetch details for each planet // Fetch details for each planet
type PlanetWithDetails struct { type PlanetWithDetails struct {
Planet esi.Planet Planet esi.Planet
Details *esi.PlanetDetail Details *esi.PlanetPI
} }
var planetsWithDetails []PlanetWithDetails var planetsWithDetails []PlanetWithDetails
for _, planet := range planets { for _, planet := range planets {
details, err := rh.ESI.GetPlanetDetails(context.Background(), int(char.ID), planet.PlanetID, char.AccessToken) details, err := rh.ESI.GetPlanetPI(context.Background(), int(char.ID), planet.PlanetID, char.AccessToken)
if err != nil { if err != nil {
logger.Warning("Failed to fetch details for planet %d: %v", planet.PlanetID, err) logger.Warning("Failed to fetch details for planet %d: %v", planet.PlanetID, err)
// Continue with other planets even if one fails // Continue with other planets even if one fails
@@ -237,8 +237,21 @@ func (rh *RouteHandler) handleGetExtractors(ctx *fasthttp.RequestCtx) {
return return
} }
planets, err := rh.ESI.GetCharacterPlanets(context.Background(), int(char.ID), char.AccessToken)
if err != nil {
logger.Error("Failed to get planets for character %s: %v", characterName, err)
ctx.SetStatusCode(fasthttp.StatusInternalServerError)
ctx.SetBodyString("Failed to get planets")
return
}
planetIds := make([]int64, len(planets))
for i, planet := range planets {
planetIds[i] = planet.PlanetID
}
// Get extractors using the standalone function // Get extractors using the standalone function
extractors, err := GetExtractorsForCharacter(rh.ESI, int(char.ID), char.AccessToken) extractors, err := GetExtractorsForCharacter(rh.ESI, int(char.ID), char.AccessToken, planetIds)
if err != nil { if err != nil {
logger.Error("Failed to get extractors for character %s: %v", characterName, err) logger.Error("Failed to get extractors for character %s: %v", characterName, err)
ctx.SetStatusCode(fasthttp.StatusInternalServerError) ctx.SetStatusCode(fasthttp.StatusInternalServerError)