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

[DatTools] Make sure the file is proper, minor changes

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-06 20:57:03 -07:00
parent 504cbdb389
commit 726ef79120
1 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
SabreTools.Helper/Tools/DatTools.cs
View File

@@ -3043,12 +3043,18 @@ namespace SabreTools.Helper
} }
string newExtBString = string.Join(",", newExtB); string newExtBString = string.Join(",", newExtB);
// Load the current DAT to be processed // Get the file format
OutputFormat outputFormat = GetOutputFormat(filename, logger);
if (outputFormat == OutputFormat.None)
{
return true;
}
// Get the file data to be split
Dat datdata = new Dat(); Dat datdata = new Dat();
datdata = DatTools.Parse(filename, 0, 0, datdata, logger); datdata = Parse(filename, 0, 0, datdata, logger);
// Set all of the appropriate outputs for each of the subsets // Set all of the appropriate outputs for each of the subsets
OutputFormat outputFormat = DatTools.GetOutputFormat(filename, logger);
Dat datdataA = new Dat Dat datdataA = new Dat
{ {
FileName = datdata.FileName + " (" + newExtAString + ")", FileName = datdata.FileName + " (" + newExtAString + ")",
@@ -3156,8 +3162,8 @@ namespace SabreTools.Helper
} }
// Then write out both files // Then write out both files
bool success = DatTools.WriteDatfile(datdataA, outdir, logger); bool success = WriteDatfile(datdataA, outdir, logger);
success &= DatTools.WriteDatfile(datdataB, outdir, logger); success &= WriteDatfile(datdataB, outdir, logger);
return success; return success;
} }
@@ -3175,10 +3181,16 @@ namespace SabreTools.Helper
// Sanitize the basepath to be more predictable // Sanitize the basepath to be more predictable
basepath = (basepath.EndsWith(Path.DirectorySeparatorChar.ToString()) ? basepath : basepath + Path.DirectorySeparatorChar); basepath = (basepath.EndsWith(Path.DirectorySeparatorChar.ToString()) ? basepath : basepath + Path.DirectorySeparatorChar);
// Get the file format
OutputFormat outputFormat = GetOutputFormat(filename, logger);
if (outputFormat == OutputFormat.None)
{
return true;
}
// Get the file data to be split // Get the file data to be split
OutputFormat outputFormat = DatTools.GetOutputFormat(filename, logger);
Dat datdata = new Dat(); Dat datdata = new Dat();
datdata = DatTools.Parse(filename, 0, 0, datdata, logger, true); datdata = 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");
@@ -3352,19 +3364,19 @@ namespace SabreTools.Helper
bool success = true; bool success = true;
if (nodump.Files.Count > 0) if (nodump.Files.Count > 0)
{ {
success &= DatTools.WriteDatfile(nodump, outdir, logger); success &= WriteDatfile(nodump, outdir, logger);
} }
if (sha1.Files.Count > 0) if (sha1.Files.Count > 0)
{ {
success &= DatTools.WriteDatfile(sha1, outdir, logger); success &= WriteDatfile(sha1, outdir, logger);
} }
if (md5.Files.Count > 0) if (md5.Files.Count > 0)
{ {
success &= DatTools.WriteDatfile(md5, outdir, logger); success &= WriteDatfile(md5, outdir, logger);
} }
if (crc.Files.Count > 0) if (crc.Files.Count > 0)
{ {
success &= DatTools.WriteDatfile(crc, outdir, logger); success &= WriteDatfile(crc, outdir, logger);
} }
return success; return success;
@@ -3383,18 +3395,24 @@ namespace SabreTools.Helper
// Sanitize the basepath to be more predictable // Sanitize the basepath to be more predictable
basepath = (basepath.EndsWith(Path.DirectorySeparatorChar.ToString()) ? basepath : basepath + Path.DirectorySeparatorChar); basepath = (basepath.EndsWith(Path.DirectorySeparatorChar.ToString()) ? basepath : basepath + Path.DirectorySeparatorChar);
// Get the file format
OutputFormat outputFormat = GetOutputFormat(filename, logger);
if (outputFormat == OutputFormat.None)
{
return true;
}
// Get the file data to be split // Get the file data to be split
OutputFormat outputFormat = DatTools.GetOutputFormat(filename, logger);
Dat datdata = new Dat(); Dat datdata = new Dat();
datdata = DatTools.Parse(filename, 0, 0, datdata, logger, true); datdata = 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");
Dat romdat = new Dat Dat romdat = new Dat
{ {
FileName = datdata.FileName + " (Rom)", FileName = datdata.FileName + " (ROM)",
Name = datdata.Name + " (Rom)", Name = datdata.Name + " (ROM)",
Description = datdata.Description + " (Rom)", Description = datdata.Description + " (ROM)",
Category = datdata.Category, Category = datdata.Category,
Version = datdata.Version, Version = datdata.Version,
Date = datdata.Date, Date = datdata.Date,
@@ -3488,11 +3506,11 @@ namespace SabreTools.Helper
bool success = true; bool success = true;
if (romdat.Files.Count > 0) if (romdat.Files.Count > 0)
{ {
success &= DatTools.WriteDatfile(romdat, outdir, logger); success &= WriteDatfile(romdat, outdir, logger);
} }
if (diskdat.Files.Count > 0) if (diskdat.Files.Count > 0)
{ {
success &= DatTools.WriteDatfile(diskdat, outdir, logger); success &= WriteDatfile(diskdat, outdir, logger);
} }
return success; return success;