From 900ce76a3b67409b6316309c69a41d55944ca50f Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 1 Nov 2014 13:37:18 +0000
Subject: [PATCH] TasMovie - add a VerificationLog.txt file in the tasproj,
 doesn't use it yet but it does properly save and load it, will save if there
 is any log entries, will load it if the file exists in the tasproj

---
 BizHawk.Client.Common/BinarySaveStates.cs     |  4 +-
 .../movie/tasproj/TasMovie.IO.cs              | 42 ++++++++++++++++++-
 .../movie/tasproj/TasMovie.cs                 |  1 +
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.Common/BinarySaveStates.cs b/BizHawk.Client.Common/BinarySaveStates.cs
index 17a19c6ff2..a4c93a35f9 100644
--- a/BizHawk.Client.Common/BinarySaveStates.cs
+++ b/BizHawk.Client.Common/BinarySaveStates.cs
@@ -26,7 +26,8 @@ namespace BizHawk.Client.Common
 		Greenzone,
 		GreenzoneSettings,
 		Markers,
-		ClientSettings
+		ClientSettings,
+		VerificationLog
 	}
 
 	public static class BinaryStateFileNames
@@ -61,6 +62,7 @@ namespace BizHawk.Client.Common
 			AddLumpName(BinaryStateLump.GreenzoneSettings, "GreenZoneSettings.txt");
 			AddLumpName(BinaryStateLump.Markers, "Markers.txt");
 			AddLumpName(BinaryStateLump.ClientSettings, "ClientSettings.json");
+			AddLumpName(BinaryStateLump.VerificationLog, "VerificationLog.txt");
 		}
 
 		public static string GetReadName(BinaryStateLump lump)
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
index 2fd389cf31..255fcfa045 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 
 using BizHawk.Common;
 using BizHawk.Common.CollectionExtensions;
@@ -30,7 +32,8 @@ namespace BizHawk.Client.Common
 
 				bs.PutLump(BinaryStateLump.Input, tw => tw.WriteLine(RawInputLog()));
 
-				
+				// TasProj extras
+
 				bs.PutLump(BinaryStateLump.GreenzoneSettings, tw => tw.WriteLine(StateManager.Settings.ToString()));
 				if (StateManager.Settings.SaveGreenzone)
 				{
@@ -57,6 +60,11 @@ namespace BizHawk.Client.Common
 					var clientSettingsJson = ClientSettingsForSave();
 					bs.PutLump(BinaryStateLump.ClientSettings, (TextWriter tw) => tw.Write(clientSettingsJson));
 				}
+
+				if (VerificationLog.Any())
+				{
+					bs.PutLump(BinaryStateLump.VerificationLog, tw => tw.WriteLine(InputLogToString(VerificationLog)));
+				}
 			}
 
 			Changes = false;
@@ -200,6 +208,27 @@ namespace BizHawk.Client.Common
 
 					GetClientSettingsOnLoad(clientSettings);
 				}
+
+				if (bl.HasLump(BinaryStateLump.VerificationLog))
+				{
+					bl.GetLump(BinaryStateLump.VerificationLog, true, delegate(TextReader tr)
+					{
+						VerificationLog.Clear();
+						while (true)
+						{
+							var line = tr.ReadLine();
+							if (string.IsNullOrEmpty(line))
+							{
+								break;
+							}
+
+							if (line.StartsWith("|"))
+							{
+								VerificationLog.Add(line);
+							}
+						}
+					});
+				}
 			}
 
 			Changes = false;
@@ -212,5 +241,16 @@ namespace BizHawk.Client.Common
 			StateManager.Clear();
 			Markers.Clear();
 		}
+
+		private static string InputLogToString(List<string> log)
+		{
+			var sb = new StringBuilder();
+			foreach (var record in log)
+			{
+				sb.AppendLine(record);
+			}
+
+			return sb.ToString();
+		}
 	}
 }
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index c8b3f260e9..c14fb80d43 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -18,6 +18,7 @@ namespace BizHawk.Client.Common
 		private readonly TasStateManager StateManager;
 		private readonly List<bool> LagLog = new List<bool>();
 		private readonly Dictionary<int, IController> InputStateCache = new Dictionary<int, IController>();
+		private readonly List<string> VerificationLog = new List<string>(); // For movies that do not begin with power-on, this is the input required to get into the initial state
 
 		public TasMovie(string path, bool startsFromSavestate = false) : base(path)
 		{