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

Finetuning of Romba mode as well as misc fixes for other issues related.

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-01 22:49:02 -07:00
parent 947c6040d4
commit 945a25ea11
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DATFromDir/DATFromDir.cs
View File

@@ -453,7 +453,6 @@ namespace SabreTools
// Special case for if we are in Romba mode (all names are supposed to be SHA-1 hashes)
if (_datdata.Romba)
{
int neededHeaderSize = 32;
string datum = Path.GetFileName(item).ToLowerInvariant();
long filesize = new FileInfo(item).Length;
@@ -465,7 +464,7 @@ namespace SabreTools
}
// Check if the file is at least the minimum length
if (filesize < neededHeaderSize)
if (filesize < 32 /* bytes */)
{
_logger.Warning("Possibly corrupt file '" + item + "' with size " + Style.GetBytesReadable(filesize));
return "";
@@ -478,7 +477,7 @@ namespace SabreTools
{
using (BinaryReader br = new BinaryReader(itemstream))
{
header = br.ReadBytes(neededHeaderSize);
header = br.ReadBytes(32);
br.BaseStream.Seek(-4, SeekOrigin.End);
footer = br.ReadBytes(4);
}
@@ -494,14 +493,14 @@ namespace SabreTools
// Only try to add if the file size is greater than 750 MiB
if (filesize >= (750 * Constants.MibiByte))
{
// ISIZE is mod 4GiB, so we add that if the ISIZE is smaller than the filesize and header
// ISIZE is mod 4GiB, so we add that if the ISIZE is smaller than the filesize and greater than 1% different
bool shouldfollowup = false;
if (extractedsize < (filesize - neededHeaderSize))
if (extractedsize < filesize && (100 * extractedsize / filesize) < 99 /* percent */)
{
_logger.Log("mancalc - Filename: '" + Path.GetFullPath(item) + "'\nExtracted file size: " +
extractedsize + ", " + Style.GetBytesReadable(extractedsize) + "\nArchive file size: " + filesize + ", " + Style.GetBytesReadable(filesize));
}
while (extractedsize < (filesize - neededHeaderSize))
while (extractedsize < filesize && (100 * extractedsize / filesize) < 99 /* percent */)
{
extractedsize += (4 * Constants.GibiByte);
shouldfollowup = true;