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

[DatFile] Add fix for headered rebuild

Browse Source
This commit is contained in:
Matt Nadareski
2017-03-17 00:33:07 -07:00
parent 2d5d9b74e7
commit ca9821aea0
1 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
View File

@@ -533,7 +533,7 @@ namespace SabreTools.Helper.Dats
return rebuilt; return rebuilt;
} }
Globals.Logger.User("Matches found for '" + Style.GetFileName(file) + "', rebuilding accordingly..."); Globals.Logger.User("Matches found for '" + Style.GetFileName(rom.Name) + "', rebuilding accordingly...");
rebuilt = true; rebuilt = true;
// Now loop through the list and rebuild accordingly // Now loop through the list and rebuild accordingly
@@ -673,7 +673,7 @@ namespace SabreTools.Helper.Dats
item.Machine.Description = machinename; item.Machine.Description = machinename;
} }
Globals.Logger.User("No matches found for '" + Style.GetFileName(file) + "', rebuilding accordingly from inverse flag..."); Globals.Logger.User("No matches found for '" + Style.GetFileName(rom.Name) + "', rebuilding accordingly from inverse flag...");
// Now rebuild to the output file // Now rebuild to the output file
switch (outputFormat) switch (outputFormat)
@@ -741,17 +741,39 @@ namespace SabreTools.Helper.Dats
// Now we want to take care of headers, if applicable // Now we want to take care of headers, if applicable
if (headerToCheckAgainst != null) if (headerToCheckAgainst != null)
{ {
// Get a generic stream for the file
Stream fileStream = new MemoryStream();
// If we have a zipfile, extract the stream to memory
if (isZip != null)
{
string realName = null;
(fileStream, realName) = ArchiveTools.ExtractStream(file, rom.Name);
}
// Otherwise, just open the filestream
else
{
fileStream = FileTools.TryOpenRead(file);
}
// If the stream is null, then continue
if (fileStream == null)
{
return rebuilt;
}
// Check to see if we have a matching header first // Check to see if we have a matching header first
SkipperRule rule = Skipper.GetMatchingRule(file, Path.GetFileNameWithoutExtension(headerToCheckAgainst)); SkipperRule rule = Skipper.GetMatchingRule(fileStream, Path.GetFileNameWithoutExtension(headerToCheckAgainst));
// If there's a match, create the new file to write // If there's a match, create the new file to write
if (rule.Tests != null && rule.Tests.Count != 0) if (rule.Tests != null && rule.Tests.Count != 0)
{ {
// If the file could be transformed correctly // If the file could be transformed correctly
if (rule.TransformFile(file, file + ".new")) MemoryStream transformStream = new MemoryStream();
if (rule.TransformStream(fileStream, transformStream, keepReadOpen: true, keepWriteOpen: true))
{ {
// Get the file informations that we will be using // Get the file informations that we will be using
Rom headerless = FileTools.GetFileInfo(file + ".new"); Rom headerless = FileTools.GetStreamInfo(transformStream, transformStream.Length, keepReadOpen: true);
// Find if the file has duplicates in the DAT // Find if the file has duplicates in the DAT
hasDuplicates = headerless.HasDuplicates(this); hasDuplicates = headerless.HasDuplicates(this);
@@ -768,7 +790,7 @@ namespace SabreTools.Helper.Dats
return rebuilt; return rebuilt;
} }
Globals.Logger.User("Headerless matches found for '" + Style.GetFileName(file) + "', rebuilding accordingly..."); Globals.Logger.User("Headerless matches found for '" + Style.GetFileName(rom.Name) + "', rebuilding accordingly...");
rebuilt = true; rebuilt = true;
// Now loop through the list and rebuild accordingly // Now loop through the list and rebuild accordingly
@@ -793,7 +815,19 @@ namespace SabreTools.Helper.Dats
// Now copy the files over // Now copy the files over
try try
{ {
File.Copy(file + ".new", outfile); FileStream writeStream = FileTools.TryCreate(outfile);
// Copy the input stream to the output
int bufferSize = 4096 * 128;
byte[] ibuffer = new byte[bufferSize];
int ilen;
while ((ilen = transformStream.Read(ibuffer, 0, bufferSize)) > 0)
{
writeStream.Write(ibuffer, 0, ilen);
writeStream.Flush();
}
writeStream.Dispose();
if (date && !String.IsNullOrEmpty(item.Date)) if (date && !String.IsNullOrEmpty(item.Date))
{ {
File.SetCreationTime(outfile, DateTime.Parse(item.Date)); File.SetCreationTime(outfile, DateTime.Parse(item.Date));
@@ -804,10 +838,22 @@ namespace SabreTools.Helper.Dats
catch { } catch { }
try try
{ {
File.Copy(file, headeredOutfile); FileStream writeStream = FileTools.TryCreate(outfile);
if (date && !String.IsNullOrEmpty(rom.Date))
// Copy the input stream to the output
int bufferSize = 4096 * 128;
byte[] ibuffer = new byte[bufferSize];
int ilen;
while ((ilen = fileStream.Read(ibuffer, 0, bufferSize)) > 0)
{ {
File.SetCreationTime(outfile, DateTime.Parse(rom.Date)); writeStream.Write(ibuffer, 0, ilen);
writeStream.Flush();
}
writeStream.Dispose();
if (date && !String.IsNullOrEmpty(item.Date))
{
File.SetCreationTime(outfile, DateTime.Parse(item.Date));
} }
eitherSuccess |= true; eitherSuccess |= true;
@@ -819,34 +865,40 @@ namespace SabreTools.Helper.Dats
break; break;
case OutputFormat.TapeArchive: case OutputFormat.TapeArchive:
rebuilt &= ArchiveTools.WriteTAR(file + ".new", outDir, item, date: date); rebuilt &= ArchiveTools.WriteTAR(transformStream, outDir, item, date: date);
rebuilt &= ArchiveTools.WriteTAR(file, outDir, rom, date: date); rebuilt &= ArchiveTools.WriteTAR(fileStream, outDir, rom, date: date);
break; break;
case OutputFormat.Torrent7Zip: case OutputFormat.Torrent7Zip:
rebuilt &= ArchiveTools.WriteTorrent7Zip(file + ".new", outDir, item, date: date); rebuilt &= ArchiveTools.WriteTorrent7Zip(transformStream, outDir, item, date: date);
rebuilt &= ArchiveTools.WriteTorrent7Zip(file, outDir, rom, date: date); rebuilt &= ArchiveTools.WriteTorrent7Zip(fileStream, outDir, rom, date: date);
break; break;
case OutputFormat.TorrentGzip: case OutputFormat.TorrentGzip:
rebuilt &= ArchiveTools.WriteTorrentGZ(file + ".new", outDir, romba); rebuilt &= ArchiveTools.WriteTorrentGZ(transformStream, outDir, romba);
rebuilt &= ArchiveTools.WriteTorrentGZ(file, outDir, romba); rebuilt &= ArchiveTools.WriteTorrentGZ(fileStream, outDir, romba);
break; break;
case OutputFormat.TorrentLrzip: case OutputFormat.TorrentLrzip:
break; break;
case OutputFormat.TorrentRar: case OutputFormat.TorrentRar:
break; break;
case OutputFormat.TorrentXZ: case OutputFormat.TorrentXZ:
rebuilt &= ArchiveTools.WriteTorrentXZ(file + ".new", outDir, item, date: date); rebuilt &= ArchiveTools.WriteTorrentXZ(transformStream, outDir, item, date: date);
rebuilt &= ArchiveTools.WriteTorrentXZ(file, outDir, rom, date: date); rebuilt &= ArchiveTools.WriteTorrentXZ(fileStream, outDir, rom, date: date);
break; break;
case OutputFormat.TorrentZip: case OutputFormat.TorrentZip:
rebuilt &= ArchiveTools.WriteTorrentZip(file + ".new", outDir, item, date: date); rebuilt &= ArchiveTools.WriteTorrentZip(transformStream, outDir, item, date: date);
rebuilt &= ArchiveTools.WriteTorrentZip(file, outDir, rom, date: date); rebuilt &= ArchiveTools.WriteTorrentZip(fileStream, outDir, rom, date: date);
break; break;
} }
} }
} }
} }
// Dispose of the stream
transformStream?.Dispose();
} }
// Dispose of the stream
fileStream?.Dispose();
} }
// And now clear the temp folder to get rid of any transient files if we unzipped // And now clear the temp folder to get rid of any transient files if we unzipped