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

[Constants] Add constants for byte-sizes

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-01 11:33:08 -07:00
parent 12584e5cc3
commit c640e03109
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DATFromDir/DATFromDir.cs
View File

@@ -492,9 +492,9 @@ namespace SabreTools
long extractedsize = Convert.ToInt64(gzsize, 16); long extractedsize = Convert.ToInt64(gzsize, 16);
// Only try to add if the file size is greater than 2.5 GiB // Only try to add if the file size is greater than 2.5 GiB
if (filesize >= (2.5 * 1024 * 1024 * 1024)) if (filesize >= (2.5 * Constants.GibiByte))
{ {
// ISIZE is mod 2^32, 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 header
if (extractedsize < (filesize - neededHeaderSize)) if (extractedsize < (filesize - neededHeaderSize))
{ {
_logger.Log("Filename: '" + Path.GetFullPath(item) + "'\nExtracted file size: " + _logger.Log("Filename: '" + Path.GetFullPath(item) + "'\nExtracted file size: " +
@@ -502,7 +502,7 @@ namespace SabreTools
} }
while (extractedsize < (filesize - neededHeaderSize)) while (extractedsize < (filesize - neededHeaderSize))
{ {
extractedsize += (long)Math.Pow(2, 32); extractedsize += (4 * Constants.GibiByte);
} }
_logger.Log("Final file size: " + extractedsize + "\nExtracted CRC: " + gzcrc + _logger.Log("Final file size: " + extractedsize + "\nExtracted CRC: " + gzcrc +
"\nExtracted MD5: " + gzmd5 + "\nSHA-1: " + Path.GetFileNameWithoutExtension(item)); "\nExtracted MD5: " + gzmd5 + "\nSHA-1: " + Path.GetFileNameWithoutExtension(item));

18
SabreHelper/Data/Constants.cs
View File

@@ -1,4 +1,6 @@
namespace SabreTools.Helper using System;
namespace SabreTools.Helper
{ {
public class Constants public class Constants
{ {
@@ -47,5 +49,19 @@
public static string HeaderPatternCMP = @"(^.*?) \($"; public static string HeaderPatternCMP = @"(^.*?) \($";
public static string ItemPatternCMP = @"^\s*(\S*?) (.*)"; public static string ItemPatternCMP = @"^\s*(\S*?) (.*)";
public static string EndPatternCMP = @"^\s*\)\s*$"; public static string EndPatternCMP = @"^\s*\)\s*$";
// Byte (1024-based) size comparisons
public static long KibiByte = 1024;
public static long MibiByte = (long)Math.Pow(KibiByte, 2);
public static long GibiByte = (long)Math.Pow(KibiByte, 3);
public static long TibiByte = (long)Math.Pow(KibiByte, 4);
public static long PibiByte = (long)Math.Pow(KibiByte, 5);
// Byte (1000-based) size comparisons
public static long KiloByte = 1000;
public static long MegaByte = (long)Math.Pow(KiloByte, 2);
public static long GigaByte = (long)Math.Pow(KiloByte, 2);
public static long TeraByte = (long)Math.Pow(KiloByte, 2);
public static long PetaByte = (long)Math.Pow(KiloByte, 2);
} }
} }