From bafe41fa547154ab4449886d48f1104a0259ab48 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Wed, 16 Sep 2015 14:37:42 -0500
Subject: [PATCH] discsystem - successfully parse cues that are bigger garbage

---
 .../DiscFormats/CUE/CUE_Compile.cs            |  1 +
 .../DiscFormats/CUE/CUE_Parse.cs              | 32 +++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs
index fc6448d9af..53044c6d87 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs
@@ -236,6 +236,7 @@ namespace BizHawk.Emulation.DiscSystem.CUE
 			}
 
 			var cfi = new CompiledCueFile();
+			curr_file = cfi;
 			OUT_CompiledCueFiles.Add(cfi);
 
 			cfi.FullPath = choice;
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Parse.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Parse.cs
index bc517dd8a2..77eded7043 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Parse.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Parse.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.IO;
 using System.Collections.Generic;
 
@@ -27,6 +28,11 @@ namespace BizHawk.Emulation.DiscSystem.CUE
 		/// </summary>
 		public CUE_File OUT_CueFile;
 
+		/// <summary>
+		/// Indicates whether parsing will be strict or lenient
+		/// </summary>
+		public bool IN_Strict = false;
+
 
 		class CueLineParser
 		{
@@ -141,7 +147,22 @@ namespace BizHawk.Emulation.DiscSystem.CUE
 				var clp = new CueLineParser(line);
 
 				string key = clp.ReadToken().ToUpperInvariant();
-				if (key.StartsWith(";"))
+				
+				//remove nonsense at beginning
+				if (!IN_Strict)
+				{
+					while (key.Length > 0)
+					{
+						char c = key[0];
+						if(c == ';') break;
+						if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) break;
+						key = key.Substring(1);
+					}
+				}
+
+				bool startsWithSemicolon = key.StartsWith(";");
+
+				if (startsWithSemicolon)
 				{
 					clp.EOF = true;
 					OUT_CueFile.Commands.Add(new CUE_File.Command.COMMENT() { Value = line });
@@ -237,9 +258,16 @@ namespace BizHawk.Emulation.DiscSystem.CUE
 							}
 							string str_timestamp = clp.ReadToken();
 							var ts = new Timestamp(str_timestamp);
+							if (!ts.Valid && !IN_Strict)
+							{
+								//try cleaning it up
+								str_timestamp = Regex.Replace(str_timestamp, "[^0-9:]", "");
+								ts = new Timestamp(str_timestamp);
+							}
 							if (!ts.Valid)
 							{
-								job.Error("Invalid INDEX timestamp: " + str_timestamp);
+								if (IN_Strict)
+									job.Error("Invalid INDEX timestamp: " + str_timestamp);
 								break;
 							}
 							OUT_CueFile.Commands.Add(new CUE_File.Command.INDEX() { Number = indexnum, Timestamp = ts });