Bump version

IRDKit/IRDKit.csproj

@@ -9,7 +9,7 @@
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <LangVersion>latest</LangVersion>
 	<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>0.4.0</Version>
+    <Version>0.5.0</Version>
     
     <!-- Package Properties -->
     <Authors>Deterous</Authors>
@@ -27,11 +27,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\LibIRD\LibIRD.csproj" />
-	<ProjectReference Include="..\DiscUtils\Library\DiscUtils.Core\DiscUtils.Core.csproj" />
-	<ProjectReference Include="..\DiscUtils\Library\DiscUtils.Iso9660\DiscUtils.Iso9660.csproj" />
+    <ProjectReference Include="..\LibIRD\LibIRD.csproj" PrivateAssets="All" />
+	<ProjectReference Include="..\DiscUtils\Library\DiscUtils.Core\DiscUtils.Core.csproj" PrivateAssets="All" />
+	<ProjectReference Include="..\DiscUtils\Library\DiscUtils.Iso9660\DiscUtils.Iso9660.csproj" PrivateAssets="All" />
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.2" />
+    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.3" />
   </ItemGroup>
 
 </Project>

IRDKit/Program.cs

@@ -31,7 +31,7 @@ namespace IRDKit
             public string IRDPath { get; set; }
 
             [Option('b', "layerbreak", HelpText = "Layerbreak value in bytes (use with BD-Video hybrid discs). Default: 12219392")]
-            public long? Layerbreak {  get; set; }
+            public long? Layerbreak { get; set; }
 
             [Option('k', "key", HelpText = "Hexadecimal representation of the disc key")]
             public string Key { get; set; }
@@ -68,9 +68,9 @@ namespace IRDKit
             public bool Recurse { get; set; }
         }
 
-       /// <summary>
-       /// IRD diff command
-       /// </summary>
+        /// <summary>
+        /// IRD diff command
+        /// </summary>
         [Verb("diff", HelpText = "Compare two IRDs and print their differences")]
         public class DiffOptions
         {
@@ -159,11 +159,13 @@ namespace IRDKit
                             }
 
                             // Determine output IRD folder
-                            string outputPath = Path.GetDirectoryName(opt.IRDPath);
+                            string outputPath = opt.IRDPath;
+                            if (File.Exists(opt.IRDPath))
+                                outputPath = Path.GetDirectoryName(opt.IRDPath);
 
                             // Create an IRD file for all ISO files found
-                            foreach (string file in isoFiles)
-                                ISO2IRD(file, irdPath: outputPath, verbose: opt.Verbose);
+                            foreach (string file in isoFiles.OrderBy(x => x))
+                                ISO2IRD(file, irdPath: outputPath, keyPath: opt.KeyFile, verbose: opt.Verbose);
                         }
                         else
                         {
@@ -610,7 +612,9 @@ namespace IRDKit
                     missingOffsets1.Add(IRD2.FileKeys[i]);
             }
             // Print the file offsets that differ
-            printText.AppendLine($"File Offsets not Present in {irdPath1}: {string.Join(", ", missingOffsets1)}");
+            if (missingOffsets1.Count > 0)
+                printText.AppendLine($"File Offsets not Present in {irdPath1}: {string.Join(", ", missingOffsets1)}");
+            if (missingOffsets2.Count > 0)
             printText.AppendLine($"File Offsets not Present in {irdPath2}: {string.Join(", ", missingOffsets2)}");
 
             // Print any extra config data difference
@@ -717,14 +721,19 @@ namespace IRDKit
             {
                 try
                 {
+                    // If key directory was given, append filename and .key
+                    if (Directory.Exists(keyPath))
+                    {
+                        keyPath = Path.Combine(keyPath, Path.ChangeExtension(Path.GetFileName(isoPath), ".key"));
+                    }
                     // Read key from .key file
                     byte[] discKey = File.ReadAllBytes(keyPath);
                     if (discKey == null || discKey.Length != 16)
                         Console.Error.WriteLine($"{hexKey} is not a valid key, detecting key automatically...");
                     else
                     {
-                        IRD ird1 = new ReIRD(isoPath, discKey, layerbreak);
                         Console.WriteLine($"Creating {irdPath} with Key: {Convert.ToHexString(discKey)}");
+                        IRD ird1 = new ReIRD(isoPath, discKey, layerbreak);
                         ird1.Write(irdPath);
                         if (verbose)
                             ird1.Print();
@@ -776,13 +785,13 @@ namespace IRDKit
                 try
                 {
                     // Read key from .key file
-                    byte[] discKey = File.ReadAllBytes(keyPath);
+                    byte[] discKey = File.ReadAllBytes(keyfilePath);
                     if (discKey == null || discKey.Length != 16)
                         Console.Error.WriteLine($"{hexKey} is not a valid key, detecting key automatically...");
                     else
                     {
-                        IRD ird1 = new ReIRD(isoPath, discKey, layerbreak);
                         Console.WriteLine($"Creating {irdPath} with Key: {Convert.ToHexString(discKey)}");
+                        IRD ird1 = new ReIRD(isoPath, discKey, layerbreak);
                         ird1.Write(irdPath);
                         if (verbose)
                             ird1.Print();
@@ -809,8 +818,8 @@ namespace IRDKit
                 // Found .getkey.log file, check it is valid
                 try
                 {
-                    Console.WriteLine($"Creating {irdPath} with key from: {getKeyLog}");
-                    IRD ird1 = new ReIRD(isoPath, getKeyLog);
+                    Console.WriteLine($"Creating {irdPath} with key from: {logfilePath}");
+                    IRD ird1 = new ReIRD(isoPath, logfilePath);
                     ird1.Write(irdPath);
                     if (verbose)
                         ird1.Print();
@@ -834,11 +843,13 @@ namespace IRDKit
 
             // Compute CRC32 hash
             byte[] crc32;
+            uint crc32UInt;
             using (FileStream fs = File.OpenRead(isoPath))
             {
                 Crc32 hasher = new();
                 hasher.Append(fs);
                 crc32 = hasher.GetCurrentHash();
+                crc32UInt = BitConverter.ToUInt32(crc32);
                 // Change endianness
                 Array.Reverse(crc32);
             }
@@ -896,7 +907,7 @@ namespace IRDKit
             Console.WriteLine($"Creating {irdPath} with Key from redump.org: {Convert.ToHexString(key)}");
             try
             {
-                IRD ird = new ReIRD(isoPath, key, layerbreak);
+                IRD ird = new ReIRD(isoPath, key, layerbreak, crc32UInt);
                 ird.Write(irdPath);
                 if (verbose)
                     ird.Print();

LibIRD/IRD.cs

@@ -270,7 +270,7 @@ namespace LibIRD
         /// <summary>
         /// MD5 hashes for all decrypted files in the image
         /// </summary>
-        /// <remarks><see cref="FileHashes"/> files, 16-bytes per hash, alternating with each <see cref="FileHashes"/> entry</remarks>
+        /// <remarks><see cref="FileCount"/> files, 16-bytes per hash, alternating with each <see cref="FileHashes"/> entry</remarks>
         public byte[][] FileHashes { get; private set; }
 
         /// <summary>
@@ -715,7 +715,6 @@ namespace LibIRD
             HashFiles(fs, reader, rootDir);
             if (FileCount != fileCount)
             {
-                Console.WriteLine($"{isoPath} contains split files: detected {FileCount} out of {fileCount} expected files");
                 long[] tempFileKeys = FileKeys;
                 Array.Resize(ref tempFileKeys, (int)FileCount);
                 FileKeys = tempFileKeys;
@@ -891,8 +890,8 @@ namespace LibIRD
             RegionEnd[^1] = (UpdateEnd / SectorSize) - 1;
 
             // Determine MD5 hashes for each region
-            using MD5 md5 = MD5.Create();
-            byte[] buf = new byte[SectorSize];
+            int bufSectors = 1024;
+            byte[] buf = new byte[bufSectors * SectorSize];
             for (int i = 0; i < RegionCount; i++)
             {
                 // Start reading data from first sector of region
@@ -900,19 +899,32 @@ namespace LibIRD
 
                 // Compute MD5 hash for just the region portion of the ISO file
                 int numBytes;
-                for (long j = RegionStart[i]; j <= RegionEnd[i]; j++)
+                using MD5 md5 = MD5.Create();
+                int regionSectors = (int)(RegionEnd[i] - RegionStart[i]) + 1;
+                for (int j = bufSectors; j <= regionSectors; j += bufSectors)
                 {
-                    // Read one sector at a time
+                    // Read into buffer
                     numBytes = fs.Read(buf, 0, buf.Length);
-                    // Check that an entire sector was read
+                    // TODO: Process partial buffer if non-zero is returned
                     if (numBytes < buf.Length)
                         throw new InvalidFileSystemException("Disc region ended unexpectedly");
-                    // Process MD5 sum one sector at a time
+
+                    // Process MD5 sum
                     md5.TransformBlock(buf, 0, buf.Length, null, 0);
                 }
 
+                // Read any remaining sectors
+                int bufRemainder = (int)(SectorSize * (regionSectors % bufSectors));
+                if (bufRemainder != 0)
+                {
+                    numBytes = fs.Read(buf, 0, bufRemainder);
+                    // TODO: Process partial buffer if non-zero is returned
+                    if (numBytes < bufRemainder)
+                        throw new InvalidFileSystemException("Disc region ended unexpectedly");
+                }
+
                 // Compute and store MD5 hash of region
-                md5.TransformFinalBlock(buf, 0, 0);
+                md5.TransformFinalBlock(buf, 0, bufRemainder);
                 RegionHashes[i] = md5.Hash;
             }
         }
@@ -938,70 +950,80 @@ namespace LibIRD
 
                 // Determine smallest file offset as first sector
                 long smallestOffset = fileClusters[0].Offset;
+                bool nonContiguous = false;
                 for (int i = 1; i < fileClusters.Length; i++)
                 {
                     if (fileClusters[i] == null)
                         throw new InvalidFileSystemException($"Unexpected file extents for {filePath}");
 
+                    if (fileClusters[i].Offset * SectorSize != fileClusters[i - 1].Offset * SectorSize + fileClusters[i - 1].Count)
+                        nonContiguous = true;
+
                     if (fileClusters[i].Offset < smallestOffset)
                         smallestOffset = fileClusters[i].Offset;
                 }
-                int firstSector = (int)(smallestOffset);
 
                 // If already encountered file offset, skip this file
-                if (Array.Exists(FileKeys, element => element == firstSector))
+                if (Array.Exists(FileKeys, element => element == smallestOffset))
                     continue;
-
-                if (fileClusters.Length > 1)
-                    Console.WriteLine($"Split file detected: {filePath}");
+                else if (nonContiguous)
+                    Console.WriteLine($"Non-contiguous file found: {filePath}");
 
                 // Add file offset to keys
-                FileKeys[FileCount] = firstSector;
+                FileKeys[FileCount] = smallestOffset;
 
                 // Determine whether file is in encrypted or decrypted region
                 bool encrypted = false;
                 for (int i = RegionCount - 1; i > 0; i--)
                 {
-                    if (RegionStart[i] <= firstSector)
+                    if (RegionStart[i] <= smallestOffset)
                     {
                         encrypted = i % 2 == 1;
                         break;
                     }
                 }
 
-                // Hash each non-contiguous portion of the ISO file
-                byte[] buf = new byte[SectorSize];
-                MD5 md5 = MD5.Create();
+                // Read one sector at a time for small files
+                int bufSectors = (fileClusters[0].Count < 1024 * SectorSize) ? 1 : 1024;
+                byte[] buf = new byte[bufSectors * SectorSize];
+
+                // Hash each non-contiguous portion of the file
+                using MD5 md5 = MD5.Create();
                 for (int i = 0; i < fileClusters.Length; i++)
                 {
-                    // Start reading data from the beginning of the ISO file
+                    // Start reading data from the beginning of the current extent
                     fs.Seek(fileClusters[i].Offset * SectorSize, SeekOrigin.Begin);
                     int numBytes;
-                    // Read all data before the first data sector
-                    for (int j = 0; j < (fileClusters[i].Count / SectorSize); j++)
+                    // Read file in buffers
+                    long fileSectors = fileClusters[i].Count / SectorSize;
+                    for (int j = 0; j <= fileSectors - bufSectors; j += bufSectors)
                     {
                         numBytes = fs.Read(buf, 0, buf.Length);
-                        // Check that an entire sector was read
-                        if (numBytes < buf.Length)
+                        // TODO: Process partial buffer if non-zero is returned
+                        if (numBytes != buf.Length)
                             throw new InvalidFileSystemException("Disc region ended unexpectedly");
-                        // Decrypt sector if necessary
+
+                        // Decrypt buffer if necessary
                         if (encrypted)
-                            buf = DecryptSector(buf, firstSector + j);
+                            DecryptSectors(ref buf, (int)fileClusters[i].Offset + j);
+
                         // Hash sector
-                        md5.TransformBlock(buf, 0, numBytes, null, 0);
+                        md5.TransformBlock(buf, 0, buf.Length, null, 0);
                     }
-                    // Read remaining partial sector
-                    if (fileClusters[i].Count % SectorSize != 0)
+                    // Read remaining partial buffer
+                    if ((fileClusters[i].Count % buf.Length) > 0)
                     {
                         numBytes = fs.Read(buf, 0, buf.Length);
-                        // Check that an entire sector was read
-                        if (numBytes < buf.Length)
+                        // TODO: Process partial buffer if non-zero is returned
+                        if (numBytes != buf.Length)
                             throw new InvalidFileSystemException("Disc region ended unexpectedly");
-                        // Decrypt partial sector if necessary
+
+                        // Decrypt buffer if necessary
                         if (encrypted)
-                            buf = DecryptSector(buf, firstSector + (int)(fileClusters[i].Count / SectorSize));
-                        // Hash partial sector
-                        md5.TransformBlock(buf, 0, (int)(fileClusters[i].Count % SectorSize), null, 0);
+                            DecryptSectors(ref buf, (int)fileClusters[i].Offset + bufSectors * (int)(fileClusters[i].Count / buf.Length));
+
+                        // Hash partial buffer
+                        md5.TransformBlock(buf, 0, (int)(fileClusters[i].Count % buf.Length), null, 0);
                     }
                 }
 
@@ -1019,38 +1041,49 @@ namespace LibIRD
         }
 
         /// <summary>
-        /// Decrypts a given sector byte array
+        /// Decrypts a given byte array of sector(s)
         /// </summary>
-        /// <param name="sector">Byte array to be decrypted</param>
+        /// <param name="buffer">Byte array to be decrypted</param>
+        /// <param name="offset">Number of bytes to decrypt</param>
         /// <exception cref="InvalidOperationException"></exception>
-        private protected byte[] DecryptSector(byte[] sector, int sectorNumber)
+        private protected void DecryptSectors(ref byte[] buffer, int sectorNumber)
         {
+            ArgumentNullException.ThrowIfNull(buffer);
+
+            if (buffer.Length == 0 || buffer.Length % SectorSize != 0)
+                throw new ArgumentException("Encrypted buffer must be multiple of SectorSize");
+
             // Setup AES decryption
             using Aes aes = Aes.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings");
-
             // Set AES settings
             aes.Key = DiscKey;
             aes.Padding = PaddingMode.None;
             aes.Mode = CipherMode.CBC;
 
-            // Determine Initial Value based on sector number
-            byte[] iv = new byte[16];
-            for (int i = 0; i < 16; i++)
+            // Decrypt buffer one sector at a time
+            for (int i = 0; i < buffer.Length; i += (int)SectorSize)
             {
-                byte a = (byte)(sectorNumber & 0xFF);
-                iv[16 - i - 1] = (byte)(sectorNumber & 0xFF);
-                sectorNumber >>= 8;
+                // Determine AES Initial Value based on sector number
+                byte[] iv = new byte[16];
+                int tempNum = sectorNumber;
+                for (int j = 0; j < 16; j++)
+                {
+                    iv[16 - j - 1] = (byte)(tempNum & 0xFF);
+                    tempNum >>= 8;
+                }
+                aes.IV = iv;
+
+                // Perform AES decryption
+                using MemoryStream stream = new();
+                using CryptoStream cs = new(stream, aes.CreateDecryptor(), CryptoStreamMode.Write);
+                cs.Write(buffer, i, (int)SectorSize);
+                cs.FlushFinalBlock();
+
+                // Write decrypted sector to output
+                stream.ToArray().CopyTo(buffer, i);
+                sectorNumber++;
             }
-            aes.IV = iv;
-
-            // Perform AES decryption
-            using MemoryStream stream = new();
-            using ICryptoTransform dec = aes.CreateDecryptor();
-            using CryptoStream cs = new(stream, dec, CryptoStreamMode.Write);
-            cs.Write(sector, 0, sector.Length);
-            cs.FlushFinalBlock();
-
-            return stream.ToArray();
+            return;
         }
 
         /// <summary>
@@ -1064,7 +1097,7 @@ namespace LibIRD
                 CountFiles(dirInfo);
         }
 
-#endregion
+        #endregion
 
         #region IRD File
 
@@ -1250,7 +1283,7 @@ namespace LibIRD
             uint fileCount = br.ReadUInt32();
             long[] fileKeys = new long[fileCount];
             byte[][] fileHashes = new byte[fileCount][];
-            for (int i = 0; i  < fileCount; i++)
+            for (int i = 0; i < fileCount; i++)
             {
                 fileKeys[i] = br.ReadInt64();
                 fileHashes[i] = br.ReadBytes(16);

LibIRD/LibIRD.csproj

@@ -6,7 +6,7 @@
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <LangVersion>latest</LangVersion>
 	<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>0.4.0</Version>
+    <Version>0.5.0</Version>
     <PackageOutputPath>../nupkg</PackageOutputPath>
     
     <!-- Package Properties -->
@@ -26,10 +26,19 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\DiscUtils\Library\DiscUtils.Core\DiscUtils.Core.csproj" />
-    <ProjectReference Include="..\DiscUtils\Library\DiscUtils.Iso9660\DiscUtils.Iso9660.csproj" />
-    <ProjectReference Include="..\DiscUtils\Library\DiscUtils.Streams\DiscUtils.Streams.csproj" />
+    <ProjectReference Include="..\DiscUtils\Library\DiscUtils.Core\DiscUtils.Core.csproj" PrivateAssets="All" />
+    <ProjectReference Include="..\DiscUtils\Library\DiscUtils.Iso9660\DiscUtils.Iso9660.csproj" PrivateAssets="All" />
+    <ProjectReference Include="..\DiscUtils\Library\DiscUtils.Streams\DiscUtils.Streams.csproj" PrivateAssets="All" />
     <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
+  </PropertyGroup>
+  <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="BuildOnlySettings;ResolveReferences">
+    <ItemGroup>
+      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')-&gt;WithMetadataValue('PrivateAssets', 'All'))" />
+    </ItemGroup>
+  </Target>
+	
 </Project>

LibIRD/PS3_DiscSFB.cs

@@ -27,7 +27,7 @@ namespace LibIRD
         /// A field within the PS3_DISC.SFB file
         /// </summary>
         /// <remarks>string Key, string Value</remarks>
-        public Dictionary<string, string> Field {  get; private set; }
+        public Dictionary<string, string> Field { get; private set; }
 
         /// <summary>
         /// Constructor using a PARAM.SFO file path
@@ -131,6 +131,11 @@ namespace LibIRD
             }
         }
 
+        /// <summary>
+        /// Define JSON options once
+        /// </summary>
+        private readonly JsonSerializerOptions JsonOpts = new() { WriteIndented = true };
+
         /// <summary>
         /// Prints parameters extracted from PS3_DISC.SFB to a json object
         /// </summary>
@@ -138,7 +143,7 @@ namespace LibIRD
         public void PrintJson(string jsonPath = null)
         {
             // Serialise PS3_Disc.SFB data to a JSON object
-            string json = JsonSerializer.Serialize(Field, new JsonSerializerOptions { WriteIndented = true });
+            string json = JsonSerializer.Serialize(Field, JsonOpts);
 
             // If no path given, output to console
             if (jsonPath == null)

LibIRD/ParamSFO.cs

@@ -43,13 +43,8 @@ namespace LibIRD
         /// Constructor using a PARAM.SFO file path
         /// </summary>
         /// <param name="sfoPath">Full file path to the PARAM.SFO file</param>
-        /// <exception cref="ArgumentNullException"></exception>
         public ParamSFO(string sfoPath)
         {
-            // Validate file path
-            if (sfoPath == null || sfoPath.Length <= 0)
-                throw new ArgumentNullException(nameof(sfoPath));
-
             // Read file as a stream, and parse file
             using FileStream fs = new(sfoPath, FileMode.Open, FileAccess.Read);
             Parse(fs);
@@ -103,7 +98,7 @@ namespace LibIRD
                               - keyOffset[i];
 
                 // Read ith key name
-                string key = Encoding.ASCII.GetString(br.ReadBytes((int) keyLen)).TrimEnd('\0');
+                string key = Encoding.ASCII.GetString(br.ReadBytes((int)keyLen)).TrimEnd('\0');
 
                 // Move stream to ith data
                 sfoStream.Position = dataTableStart + dataOffset[i];
@@ -112,13 +107,13 @@ namespace LibIRD
                 Field[key] = dataFormat[i] switch
                 {
                     // Non-null-terminated UTF-8 String
-                    0x0004 => Encoding.UTF8.GetString(br.ReadBytes((int) dataLength[i])),
+                    0x0004 => Encoding.UTF8.GetString(br.ReadBytes((int)dataLength[i])),
                     // Null-terminated UTF-8 String
-                    0x0204 => Encoding.UTF8.GetString(br.ReadBytes((int) dataLength[i])).TrimEnd('\0'),
+                    0x0204 => Encoding.UTF8.GetString(br.ReadBytes((int)dataLength[i])).TrimEnd('\0'),
                     // Integer
                     0x0404 => br.ReadInt32().ToString(),
                     // Unknown data format, assume null-terminated string
-                    _ => Encoding.UTF8.GetString(br.ReadBytes((int) dataLength[i])).TrimEnd('\0'),
+                    _ => Encoding.UTF8.GetString(br.ReadBytes((int)dataLength[i])).TrimEnd('\0'),
                 };
             }
         }
@@ -159,6 +154,11 @@ namespace LibIRD
             }
         }
 
+        /// <summary>
+        /// Define JSON options once
+        /// </summary>
+        private readonly JsonSerializerOptions JsonOpts = new() { WriteIndented = true };
+
         /// <summary>
         /// Prints parameters extracted from PARAM.SFO to a json object
         /// </summary>
@@ -166,7 +166,7 @@ namespace LibIRD
         public void PrintJson(string jsonPath = null)
         {
             // Serialise PS3_Disc.SFB data to a JSON object
-            string json = JsonSerializer.Serialize(Field, new JsonSerializerOptions { WriteIndented = true });
+            string json = JsonSerializer.Serialize(Field, JsonOpts);
 
             // If no path given, output to console
             if (jsonPath == null)

LibIRD/ReIRD.cs

@@ -2,7 +2,6 @@
 using System;
 using System.IO;
 using System.IO.Hashing;
-using System.Security;
 
 namespace LibIRD
 {
@@ -60,7 +59,6 @@ namespace LibIRD
         /// </summary>
         /// <param name="isoPath">Path to the ISO</param>
         /// <param name="getKeyLog">Path to the GetKey log file</param>
-        /// <exception cref="InvalidDataException"></exception>
         public ReIRD(string isoPath, string getKeyLog) : base(isoPath, getKeyLog, true)
         {
             // Generate Unique Identifier using ISO CRC32
@@ -73,11 +71,12 @@ namespace LibIRD
         /// <param name="isoPath">Path to the ISO</param>
         /// <param name="key">Disc Key, redump-style (AES encrypted Data 1)</param>
         /// <param name="layerbreak">Layerbreak value, in sectors</param>
+        /// <param name="uid">Unique ID, crc32 hash of ISO</param>
         /// <param name="region">Disc Region</param>
-        public ReIRD(string isoPath, byte[] key, long? layerbreak = null, Region region = Region.NONE) : base()
+        public ReIRD(string isoPath, byte[] key, long? layerbreak = null, uint? uid = null, Region region = Region.NONE) : base()
         {
             // Generate Unique Identifier using ISO CRC32
-            UID = GenerateUID(isoPath);
+            UID = uid == null ? GenerateUID(isoPath) : (uint)uid;
 
             // Determine ISO file size
             long size = CalculateSize(isoPath);
@@ -152,62 +151,62 @@ namespace LibIRD
             if (size > BDLayerSize) // if BD-50
             {
                 // Layer 0 start sector = 0x01000000
-             	long l0_start_sector = 1048576;
-			
-			    // Layer 0 end sector = start sector + layerbreak - 2
-			    long l0_end_sector = ((long)layerbreak / SectorSize) + l0_start_sector - 2;
-			    // Convert end sector location to hex values for PIC
-			    byte[] l0es = [(byte)((l0_end_sector >> 24) & 0xFF),
-						       (byte)((l0_end_sector >> 16) & 0xFF),
-						       (byte)((l0_end_sector >> 8) & 0xFF),
-						       (byte)((l0_end_sector >> 0) & 0xFF)];
+                long l0_start_sector = 1048576;
+
+                // Layer 0 end sector = start sector + layerbreak - 2
+                long l0_end_sector = ((long)layerbreak / SectorSize) + l0_start_sector - 2;
+                // Convert end sector location to hex values for PIC
+                byte[] l0es = [(byte)((l0_end_sector >> 24) & 0xFF),
+                    (byte)((l0_end_sector >> 16) & 0xFF),
+                    (byte)((l0_end_sector >> 8) & 0xFF),
+                    (byte)((l0_end_sector >> 0) & 0xFF)];
 
                 // Layer 1 start sector = end of disc (0x01EFFFFE) - layerbreak + 2
                 long l1_start_sector = 32505854 - ((long)layerbreak! / SectorSize) + 2;
-			    // Convert start of start sector location to hex values for PIC
-			    byte[] l1ss = [(byte)((l1_start_sector >> 24) & 0xFF),
-						       (byte)((l1_start_sector >> 16) & 0xFF),
-						       (byte)((l1_start_sector >> 8) & 0xFF),
-						       (byte)((l1_start_sector >> 0) & 0xFF)];
-			
-			    // Total sectors used = num_sectors + Layer 0 start + sectors_between_layers (usually 0x01358C00 - 0x00CA73FE - 3)
-			    long total_sectors = (size / SectorSize) + l0_start_sector + (l1_start_sector - l0_end_sector - 3);
-			    byte[] ts = BitConverter.GetBytes((uint) total_sectors);
+                // Convert start of start sector location to hex values for PIC
+                byte[] l1ss = [(byte)((l1_start_sector >> 24) & 0xFF),
+                    (byte)((l1_start_sector >> 16) & 0xFF),
+                    (byte)((l1_start_sector >> 8) & 0xFF),
+                    (byte)((l1_start_sector >> 0) & 0xFF)];
 
-			    // Define the PIC
-			    pic = [
-				    // Initial portion of PIC (24 bytes)
-				    // [4098 bytes] [2x 0x00] ["DI"]   [v1] [10units] [DI num]
+                // Total sectors used = num_sectors + Layer 0 start + sectors_between_layers (usually 0x01358C00 - 0x00CA73FE - 3)
+                long total_sectors = (size / SectorSize) + l0_start_sector + (l1_start_sector - l0_end_sector - 3);
+                byte[] ts = BitConverter.GetBytes((uint)total_sectors);
+
+                // Define the PIC
+                pic = [
+                    // Initial portion of PIC (24 bytes)
+                    // [4098 bytes] [2x 0x00] ["DI"]   [v1] [10units] [DI num]
 				    0x10, 0x02, 0x00, 0x00, 0x44, 0x49, 0x01, 0x10, 0x00, 0x00, 0x20, 0x00,
-				    //   ["BDR"]         [2 layers]
+                    //   ["BDR"]         [2 layers]
 				    0x42, 0x44, 0x4F, 0x01, 0x21, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-				    // Total sectors used on disc (4 bytes)
+                    // Total sectors used on disc (4 bytes)
 				    ts[3], ts[2], ts[1], ts[0],
-				    // 1st Layer sector start location (4 bytes)
+                    // 1st Layer sector start location (4 bytes)
 				    0x00, 0x10, 0x00, 0x00,
-				    // 1st Layer sector end location (4 bytes), 0x00CA73FE for default BD layerbreak of 12219392
+                    // 1st Layer sector end location (4 bytes), 0x00CA73FE for default BD layerbreak of 12219392
 				    l0es[0], l0es[1], l0es[2], l0es[3],
-				    // 32 bytes of zeros
+                    // 32 bytes of zeros
 				    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 				    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				    // Initial portion of PIC again, for 2nd layer
-				    // ["DI"]  [v1] [11unit][DI num]
+                    // Initial portion of PIC again, for 2nd layer
+                    // ["DI"]  [v1] [11unit][DI num]
 				    0x44, 0x49, 0x01, 0x11, 0x00, 0x01, 0x20, 0x00,
-				    //   ["BDR"]           [2 layers]
+                    //   ["BDR"]           [2 layers]
 				    0x42, 0x44, 0x4F, 0x01, 0x21, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-				    // Total sectors used on disc
+                    // Total sectors used on disc
 				    ts[3], ts[2], ts[1], ts[0],
-				    // 2nd Layer sector start location, 0x01358C00 for default BD layerbreak of 12219392
+                    // 2nd Layer sector start location, 0x01358C00 for default BD layerbreak of 12219392
 				    l1ss[0], l1ss[1], l1ss[2], l1ss[3],
-				    // 2nd Layer sector end location
+                    // 2nd Layer sector end location
 				    0x01, 0xEF, 0xFF, 0xFE,
-				    // Remaining 32 bytes are zeroes
+                    // Remaining 32 bytes are zeroes
 				    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ];
-			    // 3k3y style: 0x03 at last byte
-			    if (exactIRD)
-				    pic[114] = 0x03;
+                // 3k3y style: 0x03 at last byte
+                if (exactIRD)
+                    pic[114] = 0x03;
 
-		    }
+            }
             else // if BD-25
             {
                 // Total sectors used on disc: num_sectors + layer_sector_end (0x00100000) - 1
@@ -233,7 +232,7 @@ namespace LibIRD
                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ];
             }
-            
+
             return pic;
         }
 
@@ -241,7 +240,6 @@ namespace LibIRD
         /// Generates the UID field by computing the CRC32 hash of the ISO
         /// </summary>
         /// <param name="isoPath">Path to the ISO</param>
-        /// <exception cref="ArgumentNullException"></exception>
         /// <exception cref="FileNotFoundException"></exception>
         private static uint GenerateUID(string isoPath)
         {
@@ -275,7 +273,7 @@ namespace LibIRD
         /// Calculates ISO file size
         /// </summary>
         /// <param name="isoPath">Path to the ISO</param>
-        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="ArgumentException"></exception>
         /// <exception cref="FileNotFoundException"></exception>
         private static long CalculateSize(string isoPath)
         {