Merge pull request #139 from OpzekerIT/dev

Getting matches from cache (1 month old)
This commit is contained in:
Lanta 2023-11-22 15:32:59 +01:00 committed by GitHub
commit 8e7b1af261
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 40 deletions

View file

@ -20,18 +20,18 @@ $ogDescription = "Dive into the detailed match stats of DTCH Clan in PUBG. Explo
<?php
include './config/config.php';
$players_matches = json_decode(file_get_contents('./data/player_matches.json'), true);
$players_matches = json_decode(file_get_contents('./data/cached_matches.json'), true);
$players = json_decode(file_get_contents('./config/clanmembers.json'), true);
// Display buttons for each player
echo "<form method='get' action=''>";
foreach ($players_matches as $player_data) {
if (isset($player_data['playername'])) {
$player_name = $player_data['playername'];
echo "<button type='submit' name='selected_player' value='$player_name' class='btn'>$player_name</button>";
}
foreach ($players['clanMembers'] as $player) {
echo "<button type='submit' name='selected_player' value='$player' class='btn'>$player</button>";
}
echo "</form><br>";
$selected_player = $_GET['selected_player'] ?? $players_matches[0]['playername'];
$selected_player = $_GET['selected_player'] ?? $players[0];
echo "<form method='get' action=''>
<input type='submit' name='filter_by_match_type' value='all' class='btn'>
<input type='submit' name='filter_by_match_type' value='airoyale' class='btn'>
@ -57,19 +57,17 @@ $ogDescription = "Dive into the detailed match stats of DTCH Clan in PUBG. Explo
"Tiger_Main" => "Taego"
);
// Display the player's match stats
foreach ($players_matches as $player_data) {
if (isset($player_data['playername']) && $player_data['playername'] === $selected_player) {
echo "<h2>Recent Matches for $selected_player</h2>";
echo "<table border='1' class='sortable'>";
echo "<tr><th>Match Date</th><th>Game Mode</th><th>Match Type</th><th>Map</th><th>Kills</th><th>Damage Dealt</th><th>Time Survived</th><th>win Place</th></tr>";
foreach ($player_data['player_matches'] as $match) {
foreach ($players_matches as $match) {
if ($match['stats']['name'] === $selected_player) {
if (isset($_GET['filter_by_match_type'])) {
if ($_GET['filter_by_match_type'] !== 'all' && $match['matchType'] !== $_GET['filter_by_match_type']) {
continue;
}
}
$date = new DateTime($match['createdAt']);
$date->modify('+1 hours');
@ -93,11 +91,13 @@ $ogDescription = "Dive into the detailed match stats of DTCH Clan in PUBG. Explo
<td><a href='matchinfo.php?matchid=" . $match['id'] . "'>" . $winPlace . "</a></td>
</tr>";
}
echo "</table><br>";
}
}
echo "</table><br>";
?>
</section>
</main>

View file

@ -12,7 +12,7 @@ new-lock -by "get_matches"
# Read the content of the file as a single string
$fileContent = Get-Content -Path "$scriptroot/../config/config.php" -Raw
$players = (Get-Content -Path "$scriptroot/../config/clanmembers.json" | ConvertFrom-Json).clanmembers
# Use regex to match the apiKey value
if ($fileContent -match "\`$apiKey\s*=\s*\'([^\']+)\'") {
$apiKey = $matches[1]
@ -37,7 +37,8 @@ foreach ($player in $player_data) {
if (Test-Path "$scriptroot/../data/matches/$match.json") {
write-output "Getting $match from cache"
$stats = get-content "$scriptroot/../data/matches/$match.json" | convertfrom-json
}else{
}
else {
$stats = Invoke-RestMethod -Uri "https://api.pubg.com/shards/steam/matches/$match" -Method GET -Headers $headers
$stats | ConvertTo-Json -Depth 100 | Out-File "$scriptroot/../data/matches/$match.json"
}
@ -76,8 +77,6 @@ if (test-path "$scriptroot/../data/player_matches.json") {
}
$currentDateTime = Get-Date
# Get current timezone
@ -92,5 +91,36 @@ $playermatches += [PSCustomObject]@{
$player_matches | convertto-json -Depth 100 | out-file "$scriptroot/../data/player_matches.json"
write-output 'Cleaning matches'
$matchfiles = Get-ChildItem "$scriptroot/../data/matches" -Filter *.json
$player_matches_object = @()
foreach ($file in $matchfiles) {
$filecontent = get-content $file | convertfrom-json
$matchfiledate = $filecontent.data.attributes.createdAt
if ($matchfiledate -lt (get-date).AddMonths(-1)) {
write-output "archiving $matchfiledate"
Move-Item -Path $file -Destination "$scriptroot/../data/matches/archive"
}
else {
$result = ($filecontent.included | where-object { $_.type -eq 'participant' } | Where-Object { $players -contains $_.attributes.stats.name })
$filecontent.data.id
$result.count
$player_matches_cached = ($filecontent.included | where-object { $_.type -eq 'participant' } | Where-Object { $players -contains $_.attributes.stats.name }).attributes.stats
if ($null -ne $player_matches_cached) {
$player_matches_object += [PSCustomObject]@{
matchType = $filecontent.data.attributes.matchType
gameMode = $filecontent.data.attributes.gameMode
createdAt = $filecontent.data.attributes.createdAt
mapName = $filecontent.data.attributes.mapName
id = $filecontent.data.id
stats = $player_matches_cached
}
}
write-output "NEW $matchfiledate"
}
}
$player_matches_object | convertto-json -Depth 100 | out-file "$scriptroot/../data/cached_matches.json"
remove-lock
Stop-Transcript