Merge pull request #143 from OpzekerIT/dev

trycatch
This commit is contained in:
Lanta 2023-11-23 21:53:19 +01:00 committed by GitHub
commit 10a2d34aa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 13 deletions

View file

@ -62,7 +62,12 @@ $map_map = @{
"Tiger_Main" = "Taego" "Tiger_Main" = "Taego"
} }
$player_matches = get-content "$scriptroot/../data/player_matches.json" | convertfrom-json -Depth 100 try {
$player_matches = get-content "$scriptroot/../data/player_matches.json" | convertfrom-json -Depth 100
}
catch {
Write-Output 'Unable to read file exitin'
}
$new_win_matches = $player_matches[-1].new_win_matches $new_win_matches = $player_matches[-1].new_win_matches

View file

@ -26,7 +26,13 @@ $headers = @{
'Authorization' = "$apiKey" 'Authorization' = "$apiKey"
} }
$player_matches = @() $player_matches = @()
$player_data = get-content "$scriptroot/../data/player_data.json" | convertfrom-json -Depth 100 try {
$player_data = get-content "$scriptroot/../data/player_data.json" | convertfrom-json -Depth 100
}
catch {
Write-Output 'Unable to read file exitin'
exit
}
foreach ($player in $player_data) { foreach ($player in $player_data) {
@ -66,8 +72,13 @@ foreach ($player in $player_data) {
} }
if (test-path "$scriptroot/../data/player_matches.json") { if (test-path "$scriptroot/../data/player_matches.json") {
try{$old_player_data = get-content "$scriptroot/../data/player_matches.json" | convertfrom-json -Depth 100} try {
catch {exit} $old_player_data = get-content "$scriptroot/../data/player_matches.json" | convertfrom-json -Depth 100
}
catch {
Write-Output 'Unable to read file exitin'
exit
}
$new_ids = ($player_matches.player_matches | where-object { $_.stats.winplace -eq 1 }).id $new_ids = ($player_matches.player_matches | where-object { $_.stats.winplace -eq 1 }).id
$old_ids = ($old_player_data.player_matches | where-object { $_.stats.winplace -eq 1 }).id $old_ids = ($old_player_data.player_matches | where-object { $_.stats.winplace -eq 1 }).id
$new_win_matches = ((Compare-Object -ReferenceObject $old_ids -DifferenceObject $new_ids) | Where-Object { $_.SideIndicator -eq '=>' }).InputObject | Select-Object -Unique $new_win_matches = ((Compare-Object -ReferenceObject $old_ids -DifferenceObject $new_ids) | Where-Object { $_.SideIndicator -eq '=>' }).InputObject | Select-Object -Unique
@ -111,11 +122,11 @@ foreach ($file in $matchfiles) {
if ($null -ne $player_matches_cached) { if ($null -ne $player_matches_cached) {
$player_matches_object += [PSCustomObject]@{ $player_matches_object += [PSCustomObject]@{
matchType = $filecontent.data.attributes.matchType matchType = $filecontent.data.attributes.matchType
gameMode = $filecontent.data.attributes.gameMode gameMode = $filecontent.data.attributes.gameMode
createdAt = $filecontent.data.attributes.createdAt createdAt = $filecontent.data.attributes.createdAt
mapName = $filecontent.data.attributes.mapName mapName = $filecontent.data.attributes.mapName
id = $filecontent.data.id id = $filecontent.data.id
stats = @($player_matches_cached) stats = @($player_matches_cached)
} }
} }
write-output "NEW $matchfiledate" write-output "NEW $matchfiledate"

View file

@ -46,7 +46,7 @@ function get-killstats {
$gameMode $gameMode
) )
$kills = $telemetry | where-object { $_.killer.name -eq $player_name -and $_._T -eq 'LOGPLAYERKILLV2'} $kills = $telemetry | where-object { $_.killer.name -eq $player_name -and $_._T -eq 'LOGPLAYERKILLV2' }
$HumanDmg = $([math]::Round(($telemetry | Where-Object { $_._T -eq 'LOGPLAYERTAKEDAMAGE' -and $_.attacker.name -eq $player_name -and $_.victim.accountId -notlike "ai.*" -and $_.victim.teamId -ne $_.attacker.teamId } | Measure-Object -Property damage -Sum).Sum)) $HumanDmg = $([math]::Round(($telemetry | Where-Object { $_._T -eq 'LOGPLAYERTAKEDAMAGE' -and $_.attacker.name -eq $player_name -and $_.victim.accountId -notlike "ai.*" -and $_.victim.teamId -ne $_.attacker.teamId } | Measure-Object -Property damage -Sum).Sum))
return @{ return @{
playername = $player_name playername = $player_name
@ -93,7 +93,15 @@ else {
$oldstats = @() $oldstats = @()
} }
$all_player_matches = get-content "$scriptroot/../data/player_matches.json" | convertfrom-json -Depth 100 try {
$all_player_matches = get-content "$scriptroot/../data/player_matches.json" | convertfrom-json -Depth 100
}
catch {
Write-Output 'Unable to read file exitin'
exit
}
foreach ($player in $all_player_matches) { foreach ($player in $all_player_matches) {
if ($player.psobject.properties.name -eq 'new_win_matches') { if ($player.psobject.properties.name -eq 'new_win_matches') {
@ -166,10 +174,10 @@ function Get-MatchStatsPlayer {
if ($null -eq $player) { if ($null -eq $player) {
continue continue
} }
if($GameMode){ if ($GameMode) {
$filterProperty = 'gameMode' $filterProperty = 'gameMode'
} }
if($MatchType){ if ($MatchType) {
$filterProperty = 'matchType' $filterProperty = 'matchType'
} }
$deaths = (($killstats.stats | where-object { $_.playername -eq $player -and $_.$filterProperty -like $typemodevalue }).deaths | Measure-Object -sum).sum $deaths = (($killstats.stats | where-object { $_.playername -eq $player -and $_.$filterProperty -like $typemodevalue }).deaths | Measure-Object -sum).sum