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

Make TrimMerge and DatSplit properly bool-returning

Browse Source
This commit is contained in:
Matt Nadareski
2016-04-20 02:40:01 -07:00
parent f5b40b7c7c
commit dab5bcc506
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DATabase/Import.cs
View File

@@ -64,7 +64,7 @@ namespace SabreTools
/// Import the data from file into the database /// Import the data from file into the database
/// </summary> /// </summary>
/// <returns>True if the data was imported, false otherwise</returns> /// <returns>True if the data was imported, false otherwise</returns>
public bool ImportData () public bool ImportData()
{ {
// If file doesn't exist, error and return // If file doesn't exist, error and return
if (!File.Exists(_filepath)) if (!File.Exists(_filepath))

17
DATabase/TrimMerge.cs
View File

@@ -35,14 +35,19 @@ namespace SabreTools
/// <summary> /// <summary>
/// Trim and process the given DAT or folder of DATs /// Trim and process the given DAT or folder of DATs
/// </summary> /// </summary>
public void Process() /// <returns>True if the DAT could be updated, false otherwise</returns>
public bool Process()
{ {
// If file doesn't exist, error and return
if (!File.Exists(_filename))
{
_logger.Error("File '" + _filename + "' doesn't exist");
return false;
}
_path = (_path == "" ? Environment.CurrentDirectory : _path); _path = (_path == "" ? Environment.CurrentDirectory : _path);
// Drag and drop means quotes; we don't want quotes // We want the full path of the file, just in case
_filename = _filename.Replace("\"", "");
// We also want the full path of the file, just in case
_filename = Path.GetFullPath(_filename); _filename = Path.GetFullPath(_filename);
// If it's a single file, handle it as such // If it's a single file, handle it as such
@@ -68,7 +73,7 @@ namespace SabreTools
} }
} }
_logger.Close(); return true;
} }
/// <summary> /// <summary>

22
DatSplit/DatSplit.cs
View File

@@ -68,14 +68,28 @@ namespace SabreTools
/// <summary> /// <summary>
/// Split a DAT based on filtering by 2 extensions /// Split a DAT based on filtering by 2 extensions
/// </summary> /// </summary>
public void Split() /// <returns>True if DAT was split, false otherwise</returns>
public bool Split()
{ {
// If file doesn't exist, error and return
if (!File.Exists(_filename))
{
_logger.Error("File '" + _filename + "' doesn't exist");
return false;
}
List<RomData> romsA = new List<RomData>(); List<RomData> romsA = new List<RomData>();
List<RomData> romsB = new List<RomData>(); List<RomData> romsB = new List<RomData>();
// Load the current DAT to be processed // Load the current DAT to be processed
List<RomData> roms = RomManipulation.Parse(_filename, 0, 0, _logger); List<RomData> roms = RomManipulation.Parse(_filename, 0, 0, _logger);
// If roms is empty, return false
if (roms.Count == 0)
{
return false;
}
// Now separate the roms accordingly // Now separate the roms accordingly
foreach (RomData rom in roms) foreach (RomData rom in roms)
{ {
@@ -95,10 +109,12 @@ namespace SabreTools
} }
// Then write out both files // Then write out both files
Output.WriteToDat(Path.GetFileNameWithoutExtension(_filename) + "." + _extA, Path.GetFileNameWithoutExtension(_filename) + "." + _extA, bool success = Output.WriteToDat(Path.GetFileNameWithoutExtension(_filename) + "." + _extA, Path.GetFileNameWithoutExtension(_filename) + "." + _extA,
"", "", "", "", false, !RomManipulation.IsXmlDat(_filename), "", romsA, _logger); "", "", "", "", false, !RomManipulation.IsXmlDat(_filename), "", romsA, _logger);
Output.WriteToDat(Path.GetFileNameWithoutExtension(_filename) + "." + _extB, Path.GetFileNameWithoutExtension(_filename) + "." + _extB, success &= Output.WriteToDat(Path.GetFileNameWithoutExtension(_filename) + "." + _extB, Path.GetFileNameWithoutExtension(_filename) + "." + _extB,
"", "", "", "", false, !RomManipulation.IsXmlDat(_filename), "", romsB, _logger); "", "", "", "", false, !RomManipulation.IsXmlDat(_filename), "", romsB, _logger);
return success;
} }
} }
} }