From 5687f4ed9df209a1a6bd9370f3833a132c5da86e Mon Sep 17 00:00:00 2001
From: Thijs Stobbelaar <thijs.stobbelaar@rws.nl>
Date: Mon, 6 Nov 2023 11:25:56 +0100
Subject: [PATCH] new matchparser

---
 update/matchparser.ps1 | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/update/matchparser.ps1 b/update/matchparser.ps1
index 66a20ac..651d7bc 100644
--- a/update/matchparser.ps1
+++ b/update/matchparser.ps1
@@ -84,35 +84,39 @@ foreach ($player in $all_player_matches) {
         $j++
         write-output "$($player.player_matches.count)/ $j"
        
-        
-        $telemetryfile = "$scriptroot/../data/telemetry_cache/$($match.telemetry_url.split("/")[-1])"
-        if (!(test-path -Path $telemetryfile)) {
-            write-output "Saving $telemetryfile"
-            $telemetry_content = (Invoke-WebRequest -Uri $match.telemetry_url).content
-            $telemetry_content | out-file $telemetryfile
-            $telemetry = $telemetry_content | ConvertFrom-Json
-        }
-        else {
-            write-output "Getting from cache $telemetryfile"
-            $telemetry = get-content $telemetryfile  | convertfrom-json
-        }
+        if (!(Test-Path -path "$scriptroot/../data/killstats/$($match.id)_$player_name.json" )) {
+            $telemetryfile = "$scriptroot/../data/telemetry_cache/$($match.telemetry_url.split("/")[-1])"
+            if (!(test-path -Path $telemetryfile)) {
+                write-output "Saving $telemetryfile"
+                $telemetry_content = (Invoke-WebRequest -Uri $match.telemetry_url).content
+                $telemetry_content | out-file $telemetryfile
+                $telemetry = $telemetry_content | ConvertFrom-Json
+            }
+            else {
+                write-output "Getting from cache $telemetryfile"
+                $telemetry = get-content $telemetryfile  | convertfrom-json
+            }
        
-        write-output "Analyzing for player $player_name telemetry: $($match.telemetry_url)"
-        $killstat = get-killstats -player_name $player_name -telemetry ($telemetry | where-object { $_._T -eq 'LOGPLAYERKILLV2' }) -gameMode $match.gameMode -matchType $match.matchType
-        $killstats += $killstat
-        if ($true) {
+            write-output "Analyzing for player $player_name telemetry: $($match.telemetry_url)"
+            $killstat = get-killstats -player_name $player_name -telemetry ($telemetry | where-object { $_._T -eq 'LOGPLAYERKILLV2' }) -gameMode $match.gameMode -matchType $match.matchType
+        
+        
             $savekillstats = @{
                 matchid = $match.id
                 created = $match.createdAt
                 stats   = $killstat
+                winplace = (($all_player_matches | where-object { $_.playername -eq $player_name } ).player_matches | where-object {$_.id -eq $match.id}).stats.winplace
             }
-            $savekillstats | ConvertTo-Json | out-file "$scriptroot/../data/killstats/$($match.id).json"
+            $savekillstats | ConvertTo-Json | out-file "$scriptroot/../data/killstats/$($match.id)_$player_name.json"
+            $killstats += $killstat
+        } else{
+            write-output "match $($match.id) already in cache"
+            $killstats += (get-content "$scriptroot/../data/killstats/$($match.id)_$player_name.json" | ConvertFrom-Json).stats
         }
-    }       
 
+    }
 }
 
-
 $playerstats_all = @()
 foreach ($player in $all_player_matches.playername) {
     if ($null -eq $player) {