Separated PlayerPositionsStats out into a separate export json file + added AllOutputData model

Author: JimmyWoodhouse

Directory.Build.props

@@ -15,7 +15,7 @@
         <Company>Source Engine Discord</Company>
         <Copyright>© 2014 EHVAG, 2020 Source Engine Discord and contributors</Copyright>
         <Product>SourceEngine.Demo</Product>
-        <Version>2.2.1</Version>
+        <Version>2.3.0</Version>
     </PropertyGroup>
 
     <PropertyGroup Label="Package Metadata">

src/SourceEngine.Demo.Stats.App/Program.cs

@@ -508,7 +508,7 @@ static void Main(string[] args)
 						WriteTicks = true
 					};
 
-                    var allStats = mdTest.CreateFiles(processedData);
+                    AllOutputData allOutputData = mdTest.CreateFiles(processedData);
 
                     passCount++;
 

src/SourceEngine.Demo.Stats/DemoProcessor.cs

@@ -803,17 +803,19 @@ public static MatchData FromDemoFile(string file, bool parseChickens, bool parse
 			return md;
 		}
 
-        public AllStats CreateFiles(ProcessedData processedData, bool createJsonFile = true)
+        public AllOutputData CreateFiles(ProcessedData processedData, bool createJsonFile = true)
         {
             var mapDateSplit = (!string.IsNullOrWhiteSpace(processedData.DemoInformation.TestDate) && processedData.DemoInformation.TestDate != "unknown") ? processedData.DemoInformation.TestDate.Split('/')  : null;
             var mapDateString = (mapDateSplit != null && mapDateSplit.Count() >= 3) ? (mapDateSplit[2] + "_" + mapDateSplit[0] + "_" + mapDateSplit[1]) : string.Empty;
 
             var mapNameSplit = (processedData.MatchStartValues.Count() > 0) ? processedData.MatchStartValues.ElementAt(0).Mapname.Split('/') : new string[] { processedData.DemoInformation.MapName };
             var mapNameString = mapNameSplit.Count() > 2 ? mapNameSplit[2] : mapNameSplit[0];
 
-
 			var dataAndPlayerNames = GetDataAndPlayerNames(processedData);
 
+
+			PlayerPositionsStats playerPositionsStats = null;
+
 			AllStats allStats = new AllStats
 			{
 				versionNumber = GetVersionNumber(),
@@ -848,18 +850,24 @@ public AllStats CreateFiles(ProcessedData processedData, bool createJsonFile = t
 
 			allStats.firstDamageStats = GetFirstDamageStats(processedData);
 
-			if (processedData.ParsePlayerPositions)
+			// JSON creation
+			if (createJsonFile)
 			{
-				allStats.playerPositionsStats = GetPlayerPositionsStats(processedData);
+				CreateJsonAllStats(processedData, allStats, mapNameString, mapDateString);
 			}
 
-			// JSON creation
-			if (createJsonFile)
+			if (processedData.ParsePlayerPositions)
 			{
-				CreateJson(processedData, allStats, mapNameString, mapDateString);
+				playerPositionsStats = GetPlayerPositionsStats(processedData, allStats);
+				CreateJsonPlayerPositionsStats(processedData, allStats, playerPositionsStats, mapNameString, mapDateString);
 			}
 
-            return allStats;
+			// return for testing purposes
+			return new AllOutputData()
+			{
+				AllStats = allStats,
+				PlayerPositionsStats = playerPositionsStats,
+			};
         }
 
 		public DataAndPlayerNames GetDataAndPlayerNames(ProcessedData processedData)
@@ -1922,18 +1930,20 @@ public List<firstDamageStats> GetFirstDamageStats(ProcessedData processedData)
 			return firstDamageStats;
 		}
 
-		public List<playerPositionsStats> GetPlayerPositionsStats(ProcessedData processedData)
+		public PlayerPositionsStats GetPlayerPositionsStats(ProcessedData processedData, AllStats allStats)
 		{
-			List<playerPositionsStats> playerPositionsStats = new List<playerPositionsStats>();
+			PlayerPositionsStats playerPositionsStats;
+
+			List<PlayerPositionByRound> playerPositionByRound = new List<PlayerPositionByRound>();
 
-			// create playerPositionsStats with empty PlayerPositionByTimeInRound
+			// create playerPositionByRound with empty PlayerPositionByTimeInRound
 			foreach (var roundsGroup in processedData.PlayerPositionsValues.GroupBy(x => x.Round))
 			{
 				int lastRound = processedData.RoundEndReasonValues.Count();
 
 				foreach (var round in roundsGroup.Where(x => x.Round > 0 && x.Round <= lastRound).Select(x => x.Round).Distinct())
 				{
-					playerPositionsStats.Add(new playerPositionsStats()
+					playerPositionByRound.Add(new PlayerPositionByRound()
 					{
 						Round = round,
 						PlayerPositionByTimeInRound = new List<PlayerPositionByTimeInRound>(),
@@ -1942,7 +1952,7 @@ public List<playerPositionsStats> GetPlayerPositionsStats(ProcessedData processe
 			}
 
 			//create PlayerPositionByTimeInRound with empty PlayerPositionBySteamId
-			foreach (var playerPositionsStat in playerPositionsStats)
+			foreach (var playerPositionsStat in playerPositionByRound)
 			{
 				foreach (var timeInRoundsGroup in processedData.PlayerPositionsValues.Where(x => x.Round == playerPositionsStat.Round).GroupBy(x => x.TimeInRound))
 				{
@@ -1958,7 +1968,7 @@ public List<playerPositionsStats> GetPlayerPositionsStats(ProcessedData processe
 			}
 
 			//create PlayerPositionBySteamId
-			foreach (var playerPositionsStat in playerPositionsStats)
+			foreach (var playerPositionsStat in playerPositionByRound)
 			{
 				foreach (var playerPositionByTimeInRound in playerPositionsStat.PlayerPositionByTimeInRound)
 				{
@@ -1983,10 +1993,16 @@ public List<playerPositionsStats> GetPlayerPositionsStats(ProcessedData processe
 				}
 			}
 
+			playerPositionsStats = new PlayerPositionsStats()
+			{
+				DemoName = allStats.mapInfo.DemoName,
+				PlayerPositionByRound = playerPositionByRound,
+			};
+
 			return playerPositionsStats;
 		}
 
-		public void CreateJson(ProcessedData processedData, AllStats allStats, string mapNameString, string mapDateString)
+		public string GetOutputJsonFilepath(ProcessedData processedData, AllStats allStats, PlayerPositionsStats playerPositionsStats, string mapNameString, string mapDateString)
 		{
 			string filename = processedData.SameFilename ? allStats.mapInfo.DemoName : Guid.NewGuid().ToString();
 
@@ -2017,16 +2033,66 @@ public void CreateJson(ProcessedData processedData, AllStats allStats, string ma
 				path += mapDateString + "_";
 			}
 
-			path += mapNameString + "_" + filename + ".json";
+			path += mapNameString + "_" + filename;
+
+			if (playerPositionsStats != null)
+			{
+				path += "_playerpositions";
+			}
+
+			path += ".json";
+
+			return path;
+		}
+
+		public void CreateJsonAllStats(ProcessedData processedData, AllStats allStats, string mapNameString, string mapDateString)
+		{
+			var outputFilepath = string.Empty;
+
+			try
+			{
+				outputFilepath = GetOutputJsonFilepath(processedData, allStats, null, mapNameString, mapDateString);
+
+				StreamWriter sw = new StreamWriter(outputFilepath, false);
+
+				string json = JsonConvert.SerializeObject(allStats, Formatting.Indented);
+
+				sw.WriteLine(json);
+				/* JSON creation end*/
+
+				sw.Close();
+			}
+			catch (Exception e)
+			{
+				Console.WriteLine("Could not create json file.");
+				Console.WriteLine(string.Concat("Filename: ", outputFilepath));
+				Console.WriteLine(string.Concat("Demoname: ", allStats.mapInfo.DemoName));
+			}
+		}
+
+		public void CreateJsonPlayerPositionsStats(ProcessedData processedData, AllStats allStats, PlayerPositionsStats playerPositionsStats, string mapNameString, string mapDateString)
+		{
+			var outputFilepath = string.Empty;
+
+			try
+			{
+				outputFilepath = GetOutputJsonFilepath(processedData, allStats, playerPositionsStats, mapNameString, mapDateString);
 
-			StreamWriter sw = new StreamWriter(path, false);
+				StreamWriter sw = new StreamWriter(outputFilepath, false);
 
-			string json = JsonConvert.SerializeObject(allStats, Formatting.Indented);
+				string json = JsonConvert.SerializeObject(playerPositionsStats, Formatting.Indented);
 
-			sw.WriteLine(json);
-			/* JSON creation end*/
+				sw.WriteLine(json);
+				/* JSON creation end*/
 
-			sw.Close();
+				sw.Close();
+			}
+			catch (Exception e)
+			{
+				Console.WriteLine("Could not create json file.");
+				Console.WriteLine(string.Concat("Filename: ", outputFilepath));
+				Console.WriteLine(string.Concat("Demoname: ", allStats.mapInfo.DemoName));
+			}
 		}
 
         public long GetSteamIdByPlayerName(Dictionary<long, Dictionary<string, string>> playerNames, string name)

src/SourceEngine.Demo.Stats/Models/AllOutputData.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SourceEngine.Demo.Stats.Models
+{
+	public class AllOutputData
+	{
+		public AllStats AllStats { get; set; }
+		public PlayerPositionsStats PlayerPositionsStats { get; set; }
+
+		public AllOutputData() { }
+	}
+}

src/SourceEngine.Demo.Stats/Models/AllStats.cs

@@ -21,7 +21,6 @@ public class AllStats
         public chickenStats chickenStats { get; set; }
         public List<teamStats> teamStats { get; set; }
         public List<firstDamageStats> firstDamageStats { get; set; }
-        public List<playerPositionsStats> playerPositionsStats { get; set; }
 
         public AllStats() { }
     }

src/SourceEngine.Demo.Stats/Models/PlayerPositionByRound.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace SourceEngine.Demo.Stats.Models
+{
+	public class PlayerPositionByRound
+	{
+		public int Round { get; set; }
+		public List<PlayerPositionByTimeInRound> PlayerPositionByTimeInRound { get; set; }
+
+		public PlayerPositionByRound() { }
+	}
+}

src/SourceEngine.Demo.Stats/Models/playerPositionsStats.cs

@@ -2,11 +2,11 @@
 
 namespace SourceEngine.Demo.Stats.Models
 {
-	public class playerPositionsStats
+	public class PlayerPositionsStats
     {
-        public int Round { get; set; }
-        public List<PlayerPositionByTimeInRound> PlayerPositionByTimeInRound { get; set; }
+        public string DemoName { get; set; }
+        public List<PlayerPositionByRound> PlayerPositionByRound { get; set; }
 
-        public playerPositionsStats() { }
+        public PlayerPositionsStats() { }
     }
 }