Season 10 Update

* Refactor stats object for proper JSON deserialization, rather than use a dynamic object.
* Add Assists, Points, and Periods Played stats.

Author: jsTron

ReboundLogParser/ReboundLogParser/MainForm.Designer.cs

@@ -5,7 +5,6 @@
 using System.IO;
 using CefSharp.WinForms;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace ReboundLogParser {
     public partial class MainForm : Form
@@ -27,11 +26,12 @@ public partial class MainForm : Form
         private ChromiumWebBrowser _browser;
         private List<ComboBox> _homePlayerBoxes;
         private List<ComboBox> _awayPlayerBoxes;
+        private List<Match> _parsedLogs = new List<Match>();
+        private Match _match;
 
         public MainForm()
         {
             CefSettings cefSettings = new CefSettings();
-            CefSharp.Cef.EnableHighDPISupport();
             CefSharp.Cef.Initialize(cefSettings);
 
             InitializeComponent();
@@ -120,7 +120,7 @@ private void ResetFormData()
             LogFileName.Text = String.Empty;
         }
 
-        static bool LoadAndParseLogFiles(List<string> fileNames = null)
+        private bool LoadAndParseLogFiles(List<string> fileNames = null)
         {
             bool success = false;
             fileNames = fileNames ?? new List<string>();
@@ -133,6 +133,7 @@ static bool LoadAndParseLogFiles(List<string> fileNames = null)
                 }
                 _loadedFile += $"{fileName}; ";
             }
+            TabulateSelectedLogs();
 
             _multipleFiles = fileNames.Count > 1;
             _loadedFile = (fileNames.Count() < 1) ? "Problem Loading Files!" : _loadedFile;
@@ -181,12 +182,12 @@ private void PopulateDataGrid()
             awayDataGrid.DataSource = _awayTeamPlayers;
         }
 
-        static bool ParseJson(string fileName)
+        private bool ParseJson(string fileName)
         {
-            dynamic o1 = new JObject();
+            _match = null;
             try
             {
-                o1 = JObject.Parse(File.ReadAllText(fileName));
+                _match = JsonConvert.DeserializeObject<Match>(File.ReadAllText(fileName));
             }
             catch (JsonReaderException jex)
             {
@@ -199,55 +200,63 @@ static bool ParseJson(string fileName)
                 return false;
             }
 
-            _overTime = CheckOvertime(o1);
-            string homeScoreString = o1.score.home;
-            string awayScoreString = o1.score.away;
-            string periodString = o1.current_period;
-            _homeScore += int.Parse(homeScoreString);
-            _awayScore += int.Parse(awayScoreString);
-            _period = int.Parse(periodString);
-            _currentPeriod = o1.current_period;
-            foreach (dynamic player in o1.players)
+            _parsedLogs.Add(_match);
+
+            return true;
+        }
+
+        private bool TabulateSelectedLogs()
+        {
+            _parsedLogs.Sort(delegate (Match m1, Match m2) { return m1.CurrentPeriod.CompareTo(m2.CurrentPeriod); });
+            foreach (Match o1 in _parsedLogs)
             {
-                var isHomeTeam = player.team == "home";
-                var teamToBuild = isHomeTeam ? _homeTeamPlayers : _awayTeamPlayers;
-                if (PlayerExists(player, teamToBuild))
+                _overTime = CheckOvertime(o1);
+                _homeScore += o1.Score.Home;
+                _awayScore += o1.Score.Away;
+                _period = int.Parse(o1.CurrentPeriod);
+                _currentPeriod = o1.CurrentPeriod;
+                foreach (Player player in o1.Players)
                 {
-                    for (int p = 0; p < teamToBuild.Count; p++)
+                    var isHomeTeam = player.Team == "home";
+                    var teamToBuild = isHomeTeam ? _homeTeamPlayers : _awayTeamPlayers;
+                    if (PlayerExists(player, teamToBuild))
                     {
-                        if (teamToBuild[p].PlayerName == player.username.ToString())
+                        for (int p = 0; p < teamToBuild.Count; p++)
                         {
-                            teamToBuild[p].addValues(player);
+                            if (teamToBuild[p].PlayerName == player.Username)
+                            {
+                                teamToBuild[p].addValues(player);
+                            }
                         }
                     }
+                    else
+                    {
+                        teamToBuild.Add(new stats(player));
+                    }
                 }
-                else
-                {
-                    teamToBuild.Add(new stats(player));
-                }
+                _homeTeamPlayers.Sort(delegate (stats c1, stats c2) { return c1.PlayerName.CompareTo(c2.PlayerName); });
+                _awayTeamPlayers.Sort(delegate (stats c1, stats c2) { return c1.PlayerName.CompareTo(c2.PlayerName); });
             }
-            _homeTeamPlayers.Sort(delegate (stats c1, stats c2) { return c1.PlayerName.CompareTo(c2.PlayerName); });
-            _awayTeamPlayers.Sort(delegate (stats c1, stats c2) { return c1.PlayerName.CompareTo(c2.PlayerName); });
 
             return true;
         }
 
-        static bool CheckOvertime(dynamic statsObject)
+        private bool CheckOvertime(Match statsObject)
         {
             bool returnBool = false;
             double homeTeamOT = 0;
             double awayTeamOT = 0;
 
             for (int i = 0; i < 5; i++)
             {
-                if (statsObject.players[i].team == "away")
+                if (statsObject.Players[i].Team == "away")
                 {
                     break;
                 }
 
                 try
                 {
-                    homeTeamOT = statsObject.players[i].stats.overtime_wins;
+                    homeTeamOT = statsObject.Players[i].Stats.OvertimeWins;
                 }
                 catch
                 {
@@ -258,7 +267,7 @@ static bool CheckOvertime(dynamic statsObject)
                 {
                     try
                     {
-                        awayTeamOT = statsObject.players[i].stats.overtime_losses;
+                        awayTeamOT = statsObject.Players[i].Stats.OvertimeLosses;
                     }
                     catch
                     {
@@ -280,12 +289,12 @@ static bool CheckOvertime(dynamic statsObject)
             return returnBool;
         }
 
-        static bool PlayerExists(dynamic passedPlayer, List<stats> playerArray)
+        static bool PlayerExists(Player passedPlayer, List<stats> playerArray)
         {
             bool returnValue = false;
             for (int j = 0; j < playerArray.Count; j++)
             {
-                if (playerArray[j].PlayerName == passedPlayer.username.ToString())
+                if (playerArray[j].PlayerName == passedPlayer.Username)
                 {
                     returnValue = true;
                 }
@@ -462,7 +471,9 @@ private void ClearLogsButton_Click(object sender, EventArgs e)
         {
             _loadedFiles.Clear();
             _lastLoadedFiles.Clear();
+            _parsedLogs.Clear();
             ResetFormData();
+            MultipleFiles.Visible = false;
         }
     }
 }

ReboundLogParser/ReboundLogParser/MainForm.cs

@@ -0,0 +1,85 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace ReboundLogParser
+{
+    public class Match
+    {
+        public string Type { get; set; }
+        public string Winner { get; set; }
+        public string Arena { get; set; }
+        [JsonProperty("periods_enabled")]
+        public string PeriodsEnabled { get; set; }
+        [JsonProperty("current_period")]
+        public string CurrentPeriod { get; set; }
+        [JsonProperty("custom_mercy_rule")]
+        public string CustomMercyRule { get; set; }
+        [JsonProperty("match_length")]
+        public string MatchLength { get; set; }
+        [JsonProperty("end_reason")]
+        public string EndReason { get; set; }
+        public Score Score { get; set; }
+        public List<Player> Players { get; set; }
+
+    }
+
+    public class Score
+    {
+        public int Home { get; set; }
+        public int Away { get; set; }
+    }
+
+    public class Player
+    {
+        [JsonProperty("game_user_id")]
+        public string GameUserId { get; set; }
+        public string Team { get; set; }
+        public Stats Stats { get; set; }
+        public string Username { get; set; }
+    }
+
+    public class Stats
+    {
+        // Standard Stats
+        public double Goals { get; set; }
+        public double Assists { get; set; }
+        [JsonProperty("primary_assists")]
+        public double PrimaryAssists { get; set; }
+        [JsonProperty("secondary_assists")]
+        public double SecondaryAssists { get; set; }
+        public double Shots { get; set; }
+        public double Saves { get; set; }
+        [JsonProperty("faceoffs_won")]
+        public double FaceoffsWon { get; set; }
+        [JsonProperty("faceoffs_lost")]
+        public double FaceoffsLost { get; set; }
+        public double Takeaways { get; set; }
+        public double Turnovers { get; set; }
+        [JsonProperty("post_hits")]
+        public double PostHits { get; set; }
+        public double Passes { get; set; }
+        public double Blocks { get; set; }
+        [JsonProperty("game_winning_goals")]
+        public double GameWinningGoals { get; set; }
+        [JsonProperty("possession_time_sec")]
+        public double PossessionTimeSec { get; set; }
+
+        // Extended Stats
+        [JsonProperty("contributed_goals")]
+        public double ContributedGoals { get; set; }
+        [JsonProperty("conceded_goals")]
+        public double ConcededGoals { get; set; }
+        [JsonProperty("games_played")]
+        public double GamesPlayed { get; set; }
+        public double Wins { get; set; }
+        public double Losses { get; set; }
+        public double Score { get; set; }
+        [JsonProperty("shutouts_against")]
+        public double ShutoutsAgainst { get; set; }
+        public double Shutouts { get; set; }
+        [JsonProperty("overtime_wins")]
+        public double OvertimeWins { get; set; }
+        [JsonProperty("overtime_losses")]
+        public double OvertimeLosses { get; set; }
+    }
+}