latest

Author: CSDotNET0211

ConsoleApp/Program.cs

@@ -7,11 +7,11 @@
 
 START: ;
 string jsonString = string.Empty;
-//string fileName = Console.ReadLine();
-string fileName = @"C:\Users\CSDotNET\Downloads\config.ttc";
-fileName = fileName.Replace("\"", 
+string fileName = Console.ReadLine();
+//string fileName = @"C:\Users\CSDotNET\Downloads\config.ttc";
+/*fileName = fileName.Replace("\"", 
 var json=JsonSerializer.Deserialize<ConfigDataTTC>(File.ReadAllText(fileName));
-"");
+"");*/
 
 using (StreamReader reader = new StreamReader(fileName, Encoding.UTF8))
 {

TetrLoader/IReplayData.cs

@@ -7,25 +7,19 @@ namespace TetrLoader
 {
 	public interface IReplayData
 	{
-		 List<Event>? GetReplayEvents(string username, int gameIndex);
-		 int GetPlayerCount();
-		 Stats GetReplayStats(string username, int replayIndex);
-		  int GetGameTotalFrames(int replayIndex);
-		 string GetUsername(int playerIndex,int version);
-		 int GetGamesCount();
-
-		 int? GetEndEventFrame(string username, int replayIndex);
-
-		 EndContext GetEndContext(int playerIndex);
-		 string[] GetUsernames();
-
-		 GameType? GetGameType();
-
-
+		List<Event>? GetReplayEvents(string username, int gameIndex);
+		int GetPlayerCount();
+		Stats GetReplayStats(string username, int replayIndex);
+		int GetGameTotalFrames(int replayIndex);
+		string GetUsername(int playerIndex, int version);
 
+		int GetGamesCount();
 
+		//EventFullData GetEventFullData(string rawEvents);
+		int? GetEndEventFrame(string username, int replayIndex);
+		EndContext GetEndContext(int playerIndex);
+		string[] GetUsernames();
 
+		GameType? GetGameType();
 	}
-
-
-}
+}

TetrLoader/JsonClass/Event/EventEnd.cs

@@ -15,6 +15,6 @@ public EventEnd(int? id, int frame, EventType? type, EventEndData data) : base(i
 	public class EventEndData
 	{
 		public string? reason { get; set; } = null;
-		public Export? export { get; set; } = null;
+		public EventFullData? export { get; set; } = null;
 	}
 }

TetrLoader/JsonClass/Event/EventFull.cs

@@ -8,7 +8,6 @@ public EventFull(int? id,int frame,EventType? type, EventFullData data) : base(i
 		{
 			this.data = data;
 		}
-
 		public new EventFullData data { get; set; }
 	}
 
@@ -24,5 +23,7 @@ public class EventFullData
 		public EventFullOptionsData? options { get; set; } = null;
 		public EventFullStatsData? stats { get; set; } = null;
 		public EventFullGameData? game { get; set; } = null;
+		
+		public AggregateStats? aggregatestats { get; set; } = null;
 	}
 }

TetrLoader/JsonClass/Event/EventFullOptions.cs

@@ -32,6 +32,7 @@ public class EventFullOptionsData
 		public bool? physical { get; set; }
 		public bool? display_username { get; set; }
 		public string? username { get; set; }
+		public User? user { get; set; }
 		public int? nextcount { get; set; }
 		public int? stock { get; set; }
 		public bool? hasgarbage { get; set; }

TetrLoader/JsonClass/ReplayDataTTRM.cs

@@ -126,9 +126,34 @@ public void ProcessReplayData(ReplayDataTTRM data, List<TetrLoader.JsonClass.Eve
 
 			if (events != null)
 			{
-				for (var index = 0; index < events.Count; index++)
+				/*bool fullFlag = false;
+				bool startFlag = false;
+				foreach (var ev in events)
 				{
-					var @event = events[index];
+					if (ev.type == EventType.Start)
+					{
+						startFlag = true;
+					}
+
+					//TODO:fullを追加してfullとendの強制対応を消す	
+					if (ev.type == EventType.Full)
+					{
+						fullFlag = true;
+					}
+				}
+
+				if (!fullFlag)
+				{
+					var eventEnd = (events.LastOrDefault(ev => ev.type == EventType.End) as EventEnd).data;
+					events.Insert(0, new Event.EventFull(0, 0, EventType.Full, eventEnd.export));
+				}
+
+				if (!startFlag)
+					events.Insert(0, new Event.Event(0, 0, EventType.Start));
+*/
+				for (var eventIndex = 0; eventIndex < events.Count; eventIndex++)
+				{
+					var @event = events[eventIndex];
 					if (@event.type == EventType.Ige)
 					{
 						dynamic eventDynamic = @event;
@@ -162,7 +187,7 @@ public void ProcessReplayData(ReplayDataTTRM data, List<TetrLoader.JsonClass.Eve
 						var newEvent = new EventIge(null, eventDynamic.frame, EventType.Ige, igeData);
 
 
-						events[index] = newEvent;
+						events[eventIndex] = newEvent;
 					}
 					else if (@event.type == EventType.Full)
 					{
@@ -225,11 +250,17 @@ public string GetUsername(int playerIndex, int version)
 	{
 		foreach (var rawEventbyPlayer in data?[replayIndex].replays)
 		{
-			var eventFull = rawEventbyPlayer.events?.FirstOrDefault(ev => ev.type == EventType.Full);
-			if (eventFull == null)
-				return null;
-			string eventFullStr = eventFull.data.ToString();
-			var eventUserName = Util.GetUsername(ref eventFullStr);
+			var options = (rawEventbyPlayer.events?.FirstOrDefault(ev => ev.type == EventType.Full) as EventFull)?.data
+				.options;
+
+			options ??= JsonSerializer
+				.Deserialize<EventEndData>(rawEventbyPlayer.events?.LastOrDefault(ev => ev.type == EventType.End).data
+					.ToString()).export.options;
+
+			if (options == null)
+				throw new Exception("not full or end event detected");
+
+			var eventUserName = Util.GetUsernameFromFullData(options);
 			if (eventUserName == username)
 				return rawEventbyPlayer.events;
 		}

TetrLoader/Util.cs

@@ -30,14 +30,11 @@ public static string GetIgeDataType(ref string igeJsonString)
 			throw new Exception("unknown type");
 	}
 
-	public static string GetUsername(ref string fullDataString)
+	public static string GetUsernameFromFullData(EventFullOptionsData fullDataOptionsData)
 	{
-		JsonDocument json = JsonDocument.Parse(fullDataString);
-		JsonElement usernameString;
-		if (!json.RootElement.GetProperty("options").TryGetProperty("username", out usernameString))
-			json.RootElement.GetProperty("options").GetProperty("user").TryGetProperty("username", out usernameString);
-
-		return usernameString.GetString();
+		string? username = fullDataOptionsData.username;
+		username ??= fullDataOptionsData.user.username;
+		return username;
 	}
 
 	/// <summary>