claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set FileName explictily where appropriate

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-25 11:29:19 -07:00
parent 9303d41fb5
commit 8323464e49
6 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DATabase/DATabase.cs
View File

@@ -1501,6 +1501,7 @@ Make a selection:
Romba = romba, Romba = romba,
}; };
datdata = RomManipulation.Parse(input, 0, 0, datdata, logger); datdata = RomManipulation.Parse(input, 0, 0, datdata, logger);
datdata.FileName += "-miss";
datdata.Name += "-miss"; datdata.Name += "-miss";
datdata.Description += "-miss"; datdata.Description += "-miss";

2
DATabase/ExtSplit.cs
View File

@@ -64,6 +64,7 @@ namespace SabreTools
OutputFormat outputFormat = RomManipulation.GetOutputFormat(_filename); OutputFormat outputFormat = RomManipulation.GetOutputFormat(_filename);
DatData datdataA = new DatData DatData datdataA = new DatData
{ {
FileName = datdata.FileName + "." + _extA,
Name = datdata.Name + "." + _extA, Name = datdata.Name + "." + _extA,
Description = datdata.Description + "." + _extA, Description = datdata.Description + "." + _extA,
Category = datdata.Category, Category = datdata.Category,
@@ -79,6 +80,7 @@ namespace SabreTools
}; };
DatData datdataB = new DatData DatData datdataB = new DatData
{ {
FileName = datdata.FileName + "." + _extB,
Name = datdata.Name + "." + _extB, Name = datdata.Name + "." + _extB,
Description = datdata.Description + "." + _extB, Description = datdata.Description + "." + _extB,
Category = datdata.Category, Category = datdata.Category,

9
DATabase/HashSplit.cs
View File

@@ -70,16 +70,14 @@ namespace SabreTools
// Get the file data to be split // Get the file data to be split
OutputFormat outputFormat = RomManipulation.GetOutputFormat(filename); OutputFormat outputFormat = RomManipulation.GetOutputFormat(filename);
DatData datdata = new DatData DatData datdata = new DatData();
{
Description = Path.GetFileNameWithoutExtension(filename),
};
datdata = RomManipulation.Parse(filename, 0, 0, datdata, _logger, true); datdata = RomManipulation.Parse(filename, 0, 0, datdata, _logger, true);
// Create each of the respective output DATs // Create each of the respective output DATs
_logger.User("Creating and populating new DATs"); _logger.User("Creating and populating new DATs");
DatData nodump = new DatData DatData nodump = new DatData
{ {
FileName = datdata.FileName + " (Nodump)",
Name = datdata.Name + " (Nodump)", Name = datdata.Name + " (Nodump)",
Description = datdata.Description + " (Nodump)", Description = datdata.Description + " (Nodump)",
Category = datdata.Category, Category = datdata.Category,
@@ -101,6 +99,7 @@ namespace SabreTools
}; };
DatData sha1 = new DatData DatData sha1 = new DatData
{ {
FileName = datdata.FileName + " (SHA-1)",
Name = datdata.Name + " (SHA-1)", Name = datdata.Name + " (SHA-1)",
Description = datdata.Description + " (SHA-1)", Description = datdata.Description + " (SHA-1)",
Category = datdata.Category, Category = datdata.Category,
@@ -122,6 +121,7 @@ namespace SabreTools
}; };
DatData md5 = new DatData DatData md5 = new DatData
{ {
FileName = datdata.FileName + " (MD5)",
Name = datdata.Name + " (MD5)", Name = datdata.Name + " (MD5)",
Description = datdata.Description + " (MD5)", Description = datdata.Description + " (MD5)",
Category = datdata.Category, Category = datdata.Category,
@@ -143,6 +143,7 @@ namespace SabreTools
}; };
DatData crc = new DatData DatData crc = new DatData
{ {
FileName = datdata.FileName + " (CRC)",
Name = datdata.Name + " (CRC)", Name = datdata.Name + " (CRC)",
Description = datdata.Description + " (CRC)", Description = datdata.Description + " (CRC)",
Category = datdata.Category, Category = datdata.Category,

2
DATabase/TrimMerge.cs
View File

@@ -123,7 +123,7 @@ namespace SabreTools
Output.WriteDatfile(datdata, Path.GetDirectoryName(filename), _logger); Output.WriteDatfile(datdata, Path.GetDirectoryName(filename), _logger);
// Remove the original file if different and inform the user // 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 try
{ {

1
Filter/Filter.cs
View File

@@ -379,6 +379,7 @@ namespace SabreTools
} }
// Get the correct output values // Get the correct output values
datdata.FileName = Path.GetFileNameWithoutExtension(datdata.FileName) + " (Filtered)" + Path.GetExtension(datdata.FileName);
datdata.Name += " (Filtered)"; datdata.Name += " (Filtered)";
datdata.Description += " (Filtered)"; datdata.Description += " (Filtered)";
datdata.Roms = dict; datdata.Roms = dict;

6
SabreHelper/RomManipulation.cs
View File

@@ -94,6 +94,12 @@ namespace SabreTools.Helper
/// <returns>DatData object representing the read-in data</returns> /// <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) 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 // Make sure there's a dictionary to read to
if (datdata.Roms == null) if (datdata.Roms == null)
{ {