From f03ea810f3e01db949aac1c8d4135f7801c455f3 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@gmail.com>
Date: Fri, 18 Mar 2016 19:47:10 -0700
Subject: [PATCH] Address softlist and trurip peculiarity

---
 DATabase/Importer.cs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/DATabase/Importer.cs b/DATabase/Importer.cs
index bf6723b6..35f170cf 100644
--- a/DATabase/Importer.cs
+++ b/DATabase/Importer.cs
@@ -129,7 +129,7 @@ namespace DATabase
 					manufacturer = mameInfo[1].Value;
 					system = mameInfo[2].Value;
 					source = "MAME";
-					date = File.GetLastWriteTime(_filepath).ToString("Y-m-d G:i:s");
+					date = File.GetLastWriteTime(_filepath).ToString("yyyy-MM-dd HH:mm:ss");
 					break;
 				case DatType.nointro:
 					if (!Remapping.NoIntro.ContainsKey(fileinfo[1].Value))
@@ -189,7 +189,7 @@ namespace DATabase
 					manufacturer = truripInfo[1].Value;
 					system = truripInfo[2].Value;
 					source = "trurip";
-					date = File.GetLastWriteTime(_filepath).ToString("Y-m-d G:i:s");
+					date = File.GetLastWriteTime(_filepath).ToString("yyyy-MM-dd HH:mm:ss");
 					break;
 				case DatType.custom:
 				default:
@@ -258,6 +258,8 @@ namespace DATabase
 				FileStream fs = File.OpenRead(_filepath);
 				StreamReader sr = new StreamReader(fs);
 
+				Console.WriteLine("got here");
+
 				// Set necessary dat values
 				string format = "";
 				bool machinefound = false;
@@ -277,19 +279,19 @@ namespace DATabase
 					// If the input style hasn't been set, set it according to the header
 					if (format == "")
 					{
-						if (line.IndexOf("<!DOCTYPE datafile") != -1)
-						{
+						if (line.IndexOf("<?xml version=\"1.0\" encoding=\"utf-8\"?>") != -1)
+                        {
 							format = "logiqx";
 						}
-						else if (line.IndexOf("<!DOCTYPE softwarelist") != -1)
-						{
-							format = "softwarelist";
-						}
 						else if (line.IndexOf("clrmamepro (") != -1 || line.IndexOf("romvault (") != -1)
 						{
 							format = "romvault";
 						}
 					}
+					else if (line.IndexOf("<!DOCTYPE softwarelist") != -1)
+					{
+						format = "softwarelist";
+					}
 
 					// If there's an XML-style comment, stop the presses and skip until it's over
 					else if (line.IndexOf("-->") != -1)