Working demo with new app
This commit is contained in:
parent
5fcea16c2c
commit
f58a252c61
46
app/app.go
46
app/app.go
@ -413,7 +413,7 @@ func FetchMCPlayer(id string) (*MCPlayer, error) {
|
|||||||
|
|
||||||
type DisplayTable interface {
|
type DisplayTable interface {
|
||||||
AddPlayer(player HypixelPlayer)
|
AddPlayer(player HypixelPlayer)
|
||||||
AddPlayerN(player string)
|
AddPlayerN(player string, app *App)
|
||||||
Draw()
|
Draw()
|
||||||
GetPlayers() []HypixelPlayer
|
GetPlayers() []HypixelPlayer
|
||||||
}
|
}
|
||||||
@ -430,25 +430,36 @@ func (b *BedwarsDisplayTable) AddPlayer(player HypixelPlayer) {
|
|||||||
b.players = append(b.players, player)
|
b.players = append(b.players, player)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *BedwarsDisplayTable) AddPlayerN(player string) {
|
func (b *BedwarsDisplayTable) AddPlayerN(player string, app *App) {
|
||||||
cachedPlayer, isAlive := app.UUIDCache.Get(UUID)
|
cachedPlayer, isAlive := app.UUIDCache.Get(player)
|
||||||
|
|
||||||
if isAlive {
|
if isAlive {
|
||||||
fmt.Printf("Cached player: %+v\n", cachedPlayer)
|
fetchedPlayer, err := app.API.FetchPlayer(cachedPlayer.Uuid)
|
||||||
} else {
|
|
||||||
playerdat, err := FetchMCPlayer(UUID)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Error fetching player:", err)
|
fmt.Println("Error fetching player from Hypixel API:", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
b.AddPlayer(fetchedPlayer.Player)
|
||||||
} else {
|
} else {
|
||||||
|
playerData, err := FetchMCPlayer(player)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Error fetching player data:", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
app.UUIDCache.Add(&CachedUuid{
|
app.UUIDCache.Add(&CachedUuid{
|
||||||
CleanUuid: strings.ReplaceAll(playerdat.UUID, "-", ""),
|
CleanUuid: strings.ReplaceAll(playerData.UUID, "-", ""),
|
||||||
Uuid: playerdat.UUID,
|
Uuid: playerData.UUID,
|
||||||
PlayerName: playerdat.Username,
|
PlayerName: playerData.Username,
|
||||||
TimeFetched: time.Now(),
|
TimeFetched: time.Now(),
|
||||||
})
|
})
|
||||||
|
|
||||||
fmt.Printf("Fetched and cached player: %+v\n", playerdat)
|
fetchedPlayer, err := app.API.FetchPlayer(playerData.UUID)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Error fetching player from Hypixel API:", err)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
b.AddPlayer(fetchedPlayer.Player)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -587,7 +598,7 @@ func (a *App) onFileEmit(line string) {
|
|||||||
print("Found Player: '")
|
print("Found Player: '")
|
||||||
print(playerName)
|
print(playerName)
|
||||||
print("'\n")
|
print("'\n")
|
||||||
a.CurrentDisplayTable.AddPlayerN(playerName)
|
a.CurrentDisplayTable.AddPlayerN(playerName, a)
|
||||||
|
|
||||||
//playerName := strings.TrimSpace(player)
|
//playerName := strings.TrimSpace(player)
|
||||||
//playerUUID, err := GetUUIDFromName(playerName)
|
//playerUUID, err := GetUUIDFromName(playerName)
|
||||||
@ -614,7 +625,7 @@ func (a *App) onFileEmit(line string) {
|
|||||||
print("Found Leader: '")
|
print("Found Leader: '")
|
||||||
print(playerName)
|
print(playerName)
|
||||||
print("'\n")
|
print("'\n")
|
||||||
a.CurrentDisplayTable.AddPlayerN(playerName)
|
a.CurrentDisplayTable.AddPlayerN(playerName, a)
|
||||||
|
|
||||||
// Parse Party Count
|
// Parse Party Count
|
||||||
party_count_msg, err := LogBuf.GetLineStepsBack(4)
|
party_count_msg, err := LogBuf.GetLineStepsBack(4)
|
||||||
@ -748,13 +759,4 @@ const UUID = "5328930e-d411-49cb-90ad-4e5c7b27dd86"
|
|||||||
func main() {
|
func main() {
|
||||||
app := NewApp(KEY)
|
app := NewApp(KEY)
|
||||||
app.Start()
|
app.Start()
|
||||||
|
|
||||||
res, err := app.API.FetchPlayer(UUID)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
fmt.Printf("%+v\n", res.Player)
|
|
||||||
app.CurrentDisplayTable.AddPlayer(res.Player)
|
|
||||||
app.CurrentDisplayTable.Draw()
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user