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

[SimpleSort] Add header-skipper checks to new method

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-17 18:20:41 -07:00
parent 0a2a85c156
commit 25e521d50d
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
SabreTools.Helper/Objects/SimpleSort.cs
View File

@@ -337,7 +337,6 @@ namespace SabreTools.Helper
#endregion #endregion
// TODO: The below code does NOT check for headerless files as well. This is a problem.
#region Get source file information #region Get source file information
// Now loop through all of the files and check them, DFD style // Now loop through all of the files and check them, DFD style
@@ -355,28 +354,7 @@ namespace SabreTools.Helper
// Hash and match the external files // Hash and match the external files
if (shouldExternalScan) if (shouldExternalScan)
{ {
Rom rom = FileTools.GetSingleFileInfo(file); RebuildToOutputAlternateParseRomHelper(file, ref matchdat);
// If we have a blank RomData, it's an error
if (rom.Name == null)
{
continue;
}
// Otherwise, set the machine name as the full path to the file
rom.Machine.Name = Path.GetDirectoryName(Path.GetFullPath(file));
// Add the rom information to the Dat
if (matchdat.Files.ContainsKey(rom.Machine.Name.ToLowerInvariant()))
{
matchdat.Files[rom.Machine.Name.ToLowerInvariant()].Add(rom);
}
else
{
List<Rom> temp = new List<Rom>();
temp.Add(rom);
matchdat.Files.Add(rom.Machine.Name.ToLowerInvariant(), temp);
}
} }
// If we should scan the file as an archive // If we should scan the file as an archive
@@ -415,6 +393,12 @@ namespace SabreTools.Helper
{ {
RebuildToOutputAlternateParseRomHelper(file, ref matchdat); RebuildToOutputAlternateParseRomHelper(file, ref matchdat);
} }
// Clean the temp directory for the next round
if (Directory.Exists(_tempDir))
{
FileTools.CleanDirectory(_tempDir);
}
} }
} }
} }
@@ -422,6 +406,7 @@ namespace SabreTools.Helper
#endregion #endregion
// HERE BE DRAGONS
#region Find all files to rebuild and bucket by game #region Find all files to rebuild and bucket by game
#endregion #endregion
@@ -464,6 +449,32 @@ namespace SabreTools.Helper
matchdat.Files.Add(rom.Machine.Name.ToLowerInvariant(), temp); matchdat.Files.Add(rom.Machine.Name.ToLowerInvariant(), temp);
} }
// Now attempt to see if the file has a header
SkipperRule rule = Skippers.MatchesSkipper(file, "", _logger);
// If there's a match, get the new information from the stream
if (rule.Tests != null && rule.Tests.Count != 0)
{
MemoryStream output = new MemoryStream();
FileStream input = File.OpenRead(file);
Skippers.TransformStream(input, output, rule, _logger, false, true);
Rom romNH = FileTools.GetSingleStreamInfo(output);
romNH.Name = "HEAD::" + rom.Name;
romNH.Machine.Name = rom.Machine.Name;
// Add the rom information to the Dat
if (matchdat.Files.ContainsKey(romNH.Machine.Name.ToLowerInvariant()))
{
matchdat.Files[romNH.Machine.Name.ToLowerInvariant()].Add(romNH);
}
else
{
List<Rom> temp = new List<Rom>();
temp.Add(romNH);
matchdat.Files.Add(romNH.Machine.Name.ToLowerInvariant(), temp);
}
}
return true; return true;
} }