From 8323464e49fb1642832689a93c53a58b1abed319 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 25 May 2016 11:29:19 -0700
Subject: [PATCH] Set FileName explictily where appropriate

---
 DATabase/DATabase.cs           | 1 +
 DATabase/ExtSplit.cs           | 2 ++
 DATabase/HashSplit.cs          | 9 +++++----
 DATabase/TrimMerge.cs          | 2 +-
 Filter/Filter.cs               | 1 +
 SabreHelper/RomManipulation.cs | 6 ++++++
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs
index 3513af74..8f35b03b 100644
--- a/DATabase/DATabase.cs
+++ b/DATabase/DATabase.cs
@@ -1501,6 +1501,7 @@ Make a selection:
 					Romba = romba,
 				};
 				datdata = RomManipulation.Parse(input, 0, 0, datdata, logger);
+				datdata.FileName += "-miss";
 				datdata.Name += "-miss";
 				datdata.Description += "-miss";
 
diff --git a/DATabase/ExtSplit.cs b/DATabase/ExtSplit.cs
index cc00e6d7..57052559 100644
--- a/DATabase/ExtSplit.cs
+++ b/DATabase/ExtSplit.cs
@@ -64,6 +64,7 @@ namespace SabreTools
 			OutputFormat outputFormat = RomManipulation.GetOutputFormat(_filename);
 			DatData datdataA = new DatData
 			{
+				FileName = datdata.FileName + "." + _extA,
 				Name = datdata.Name + "." + _extA,
 				Description = datdata.Description + "." + _extA,
 				Category = datdata.Category,
@@ -79,6 +80,7 @@ namespace SabreTools
 			};
 			DatData datdataB = new DatData
 			{
+				FileName = datdata.FileName + "." + _extB,
 				Name = datdata.Name + "." + _extB,
 				Description = datdata.Description + "." + _extB,
 				Category = datdata.Category,
diff --git a/DATabase/HashSplit.cs b/DATabase/HashSplit.cs
index ead49a5d..73bcfa93 100644
--- a/DATabase/HashSplit.cs
+++ b/DATabase/HashSplit.cs
@@ -70,16 +70,14 @@ namespace SabreTools
 
 			// Get the file data to be split
 			OutputFormat outputFormat = RomManipulation.GetOutputFormat(filename);
-			DatData datdata = new DatData
-			{
-				Description = Path.GetFileNameWithoutExtension(filename),
-			};
+			DatData datdata = new DatData();
 			datdata = RomManipulation.Parse(filename, 0, 0, datdata, _logger, true);
 
 			// Create each of the respective output DATs
 			_logger.User("Creating and populating new DATs");
 			DatData nodump = new DatData
 			{
+				FileName = datdata.FileName + " (Nodump)",
 				Name = datdata.Name + " (Nodump)",
 				Description = datdata.Description + " (Nodump)",
 				Category = datdata.Category,
@@ -101,6 +99,7 @@ namespace SabreTools
 			};
 			DatData sha1 = new DatData
 			{
+				FileName = datdata.FileName + " (SHA-1)",
 				Name = datdata.Name + " (SHA-1)",
 				Description = datdata.Description + " (SHA-1)",
 				Category = datdata.Category,
@@ -122,6 +121,7 @@ namespace SabreTools
 			};
 			DatData md5 = new DatData
 			{
+				FileName = datdata.FileName + " (MD5)",
 				Name = datdata.Name + " (MD5)",
 				Description = datdata.Description + " (MD5)",
 				Category = datdata.Category,
@@ -143,6 +143,7 @@ namespace SabreTools
 			};
 			DatData crc = new DatData
 			{
+				FileName = datdata.FileName + " (CRC)",
 				Name = datdata.Name + " (CRC)",
 				Description = datdata.Description + " (CRC)",
 				Category = datdata.Category,
diff --git a/DATabase/TrimMerge.cs b/DATabase/TrimMerge.cs
index acf4da90..63bd6c55 100644
--- a/DATabase/TrimMerge.cs
+++ b/DATabase/TrimMerge.cs
@@ -123,7 +123,7 @@ namespace SabreTools
 			Output.WriteDatfile(datdata, Path.GetDirectoryName(filename), _logger);
 
 			// Remove the original file if different and inform the user
-			if (filename != datdata.Description + (RomManipulation.GetOutputFormat(filename) == OutputFormat.Xml ? ".xml" : ".dat"))
+			if (filename != Style.CreateOutfileName(" ", datdata).Remove(0, 1))
 			{
 				try
 				{
diff --git a/Filter/Filter.cs b/Filter/Filter.cs
index 2425b919..5d4426fb 100644
--- a/Filter/Filter.cs
+++ b/Filter/Filter.cs
@@ -379,6 +379,7 @@ namespace SabreTools
 			}
 
 			// Get the correct output values
+			datdata.FileName = Path.GetFileNameWithoutExtension(datdata.FileName) + " (Filtered)" + Path.GetExtension(datdata.FileName);
 			datdata.Name += " (Filtered)";
 			datdata.Description += " (Filtered)";
 			datdata.Roms = dict;
diff --git a/SabreHelper/RomManipulation.cs b/SabreHelper/RomManipulation.cs
index 11448bc5..783a6d61 100644
--- a/SabreHelper/RomManipulation.cs
+++ b/SabreHelper/RomManipulation.cs
@@ -94,6 +94,12 @@ namespace SabreTools.Helper
 		/// <returns>DatData object representing the read-in data</returns>
 		public static DatData Parse(string filename, int sysid, int srcid, DatData datdata, Logger logger, bool keep = false)
 		{
+			// If the output filename isn't set already, get the internal filename
+			if (String.IsNullOrEmpty(datdata.FileName))
+			{
+				datdata.FileName = Path.GetFileNameWithoutExtension(filename);
+			}
+
 			// Make sure there's a dictionary to read to
 			if (datdata.Roms == null)
 			{