Bump version

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "DiscUtils"]
-	path = DiscUtils
+	path = LibIRD/DiscUtils
 	url = https://github.com/Deterous/DiscUtils

IRDKit/IRDKit.csproj

@@ -7,9 +7,11 @@
     <AssemblyName>irdkit</AssemblyName>
 	<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <LangVersion>latest</LangVersion>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>0.6.0</Version>
+    <Version>0.9.2</Version>
     
     <!-- Package Properties -->
     <Authors>Deterous</Authors>
@@ -27,11 +29,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <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.3" />
+    <PackageReference Include="SabreTools.Hashing" Version="1.1.4" />
+    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LibIRD\LibIRD.csproj" />
   </ItemGroup>
 
 </Project>

IRDKit/Program.cs

@@ -1,16 +1,14 @@
-using CommandLine;
+using System;
-using DiscUtils;
-using DiscUtils.Iso9660;
-using LibIRD;
-using SabreTools.RedumpLib.Web;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
-using System.IO.Hashing;
 using System.Linq;
-using System.Security.Cryptography;
 using System.Text;
+using System.Xml.Linq;
+using CommandLine;
+using LibIRD;
+using SabreTools.Hashing;
+using SabreTools.RedumpLib.Web;
 
 namespace IRDKit
 {
@@ -24,7 +22,7 @@ namespace IRDKit
         [Verb("create", HelpText = "Create an IRD from an ISO")]
         public class CreateOptions
         {
-            [Value(0, Required = true, HelpText = "Path to an ISO file, or directory of ISO files")]
+            [Value(0, Required = true, HelpText = "Path to ISO file(s), or directory of ISO files")]
             public IEnumerable<string> ISOPath { get; set; }
 
             [Option('o', "output", HelpText = "Path to the IRD file to be created (will overwrite)")]
@@ -55,7 +53,7 @@ namespace IRDKit
         [Verb("info", HelpText = "Print information from an IRD or ISO")]
         public class InfoOptions
         {
-            [Value(0, Required = true, HelpText = "Path to an IRD or ISO file, or directory of IRD and/or ISO files")]
+            [Value(0, Required = true, HelpText = "Path to IRD/ISO file(s), or directory of IRD/ISO files")]
             public IEnumerable<string> InPath { get; set; }
 
             [Option('o', "output", HelpText = "Path to the text or json file to be created (will overwrite)")]
@@ -84,6 +82,34 @@ namespace IRDKit
             public string OutPath { get; set; }
         }
 
+        /// <summary>
+        /// IRD rename command
+        /// </summary>
+        [Verb("rename", HelpText = "Rename one or more IRD files according to the redump PS3 DAT")]
+        public class RenameOptions
+        {
+            [Value(0, Required = true, HelpText = "Path to IRD file(s), or directory of IRD files")]
+            public IEnumerable<string> IRDPath { get; set; }
+
+            [Option('d', "datfile", Required = true, HelpText = "Path to the redump PS3 Datfile")]
+            public string DATPath { get; set; }
+
+            [Option('s', "serial", HelpText = "Appends disc serial to new IRD filename")]
+            public bool Serial { get; set; }
+
+            [Option('e', "version", HelpText = "Appends disc version to new IRD filename")]
+            public bool Ver { get; set; }
+
+            [Option('c', "crc", HelpText = "Appends ISO CRC to new IRD filename")]
+            public bool CRC { get; set; }
+
+            [Option('r', "recurse", HelpText = "Recurse through all subdirectories and rename all IRDs")]
+            public bool Recurse { get; set; }
+
+            [Option('v', "verbose", HelpText = "Print more information about the renaming")]
+            public bool Verbose { get; set; }
+        }
+
         #endregion
 
         #region Program
@@ -98,7 +124,7 @@ namespace IRDKit
             Console.OutputEncoding = Encoding.UTF8;
 
             // Parse arguments
-            var result = Parser.Default.ParseArguments<CreateOptions, InfoOptions, DiffOptions>(args).WithParsed(Run);
+            var result = Parser.Default.ParseArguments<CreateOptions, InfoOptions, DiffOptions, RenameOptions>(args).WithParsed(Run);
         }
 
         /// <summary>
@@ -173,7 +199,7 @@ namespace IRDKit
                             if (!File.Exists(isoPath))
                             {
                                 Console.Error.WriteLine($"ISO not found: {isoPath}");
-                                return;
+                                continue;
                             }
 
                             string irdPath;
@@ -269,7 +295,7 @@ namespace IRDKit
                                 {
                                     PrintISO(file, opt.Json, file.Equals(lastISO), opt.OutPath);
                                 }
-                                catch (InvalidFileSystemException)
+                                catch (IOException)
                                 {
                                     // Not a valid ISO file despite extension, assume file is an IRD
                                     if (!opt.Json)
@@ -330,6 +356,99 @@ namespace IRDKit
 
                     break;
 
+                // Process options from a 'rename' command
+                case RenameOptions opt:
+
+                    // Validate required parameters
+                    if (opt.IRDPath == null || !opt.IRDPath.Any())
+                    {
+                        Console.Error.WriteLine("Provide a valid IRD path to rename");
+                        return;
+                    }
+
+                    // Read DAT file
+                    XDocument datfile = DatParser(opt.DATPath);
+                    if (datfile == null)
+                    {
+                        Console.Error.WriteLine("Unable to parse DAT file");
+                        return;
+                    }
+
+                    foreach (string irdPath in opt.IRDPath)
+                    {
+                        // Validate IRD path
+                        if (string.IsNullOrEmpty(irdPath))
+                            continue;
+
+                        // If directory, search for all ISOs in current directory
+                        if (Directory.Exists(irdPath))
+                        {
+                            // If recurse option enabled, search recursively
+                            IEnumerable<string> irdFiles;
+                            if (opt.Recurse)
+                            {
+                                if (opt.Verbose && irdPath == ".")
+                                    Console.WriteLine($"Recursively renaming IRDs in current directory");
+                                else if (opt.Verbose)
+                                    Console.WriteLine($"Recursively renaming IRDs in {irdPath}");
+                                irdFiles = Directory.EnumerateFiles(irdPath, "*.ird", SearchOption.AllDirectories);
+                            }
+                            else
+                            {
+                                if (opt.Verbose && irdPath == ".")
+                                    Console.WriteLine($"Renaming IRDs in current directory");
+                                else if (opt.Verbose)
+                                    Console.WriteLine($"Renaming IRDs in {irdPath}");
+                                irdFiles = Directory.EnumerateFiles(irdPath, "*.ird", SearchOption.TopDirectoryOnly);
+                            }
+
+                            // Warn if no files are found
+                            if (!irdFiles.Any())
+                            {
+                                if (opt.Recurse)
+                                    Console.Error.WriteLine($"No IRDs found in {irdPath} (ensure .ird extension)");
+                                else
+                                    Console.Error.WriteLine($"No IRDs found in {irdPath} (ensure .ird extension, or try use -r)");
+                                continue;
+                            }
+
+                            // Rename all IRD files found
+                            foreach (string file in irdFiles.OrderBy(x => x))
+                            {
+                                try
+                                {
+                                    RenameIRD(file, datfile, serial: opt.Serial, ver: opt.Ver, crc: opt.CRC, verbose: opt.Verbose);
+                                }
+                                catch (Exception e)
+                                {
+                                    Console.Error.WriteLine(e);
+                                }
+                            }
+
+                        }
+                        else
+                        {
+                            // Check that given file exists
+                            if (!File.Exists(irdPath))
+                            {
+                                Console.Error.WriteLine($"IRD not found: {irdPath}");
+                                continue;
+                            }
+
+                            // Rename provided IRD path
+                            try
+                            {
+                                RenameIRD(irdPath, datfile, serial: opt.Serial, ver: opt.Ver, crc: opt.CRC, verbose: opt.Verbose);
+                            }
+                            catch (Exception e)
+                            {
+                                Console.Error.WriteLine(e);
+                            }
+                        }
+                    }
+
+                    break;
+
                 // Unknown command
                 default:
                     break;
@@ -357,7 +476,7 @@ namespace IRDKit
                     PrintISO(inPath, json, single, outPath);
                     return;
                 }
-                catch (InvalidFileSystemException)
+                catch (IOException)
                 {
                     // Not a valid ISO file despite extension, try open as IRD
                 }
@@ -407,18 +526,18 @@ namespace IRDKit
             // Open ISO file for reading
             using FileStream fs = new(isoPath, FileMode.Open, FileAccess.Read);
             // Validate ISO file stream
-            if (fs == null || !CDReader.Detect(fs))
+            if (fs == null || !LibIRD.DiscUtils.Iso9660.CDReader.Detect(fs))
             {
                 Console.Error.WriteLine($"{isoPath} is not a valid ISO file");
                 return;
             }
             // Create new ISO reader
-            using CDReader reader = new(fs, true, true);
+            using LibIRD.DiscUtils.Iso9660.CDReader reader = new(fs);
 
             // Write PS3_DISC.SFB info
             try
             {
-                using DiscUtils.Streams.SparseStream s = reader.OpenFile("\\PS3_DISC.SFB", FileMode.Open, FileAccess.Read);
+                using LibIRD.DiscUtils.Streams.SparseStream s = reader.OpenFile("\\PS3_DISC.SFB", FileMode.Open, FileAccess.Read);
                 PS3_DiscSFB ps3_DiscSFB = new(s);
                 if (json)
                 {
@@ -455,7 +574,7 @@ namespace IRDKit
             // Write PARAM.SFO info
             try
             {
-                using DiscUtils.Streams.SparseStream s = reader.OpenFile("\\PS3_GAME\\PARAM.SFO", FileMode.Open, FileAccess.Read);
+                using LibIRD.DiscUtils.Streams.SparseStream s = reader.OpenFile("\\PS3_GAME\\PARAM.SFO", FileMode.Open, FileAccess.Read);
                 ParamSFO paramSFO = new(s);
                 if (json)
                 {
@@ -587,7 +706,7 @@ namespace IRDKit
             for (int i = 0; i < regionCount; i++)
             {
                 if (!IRD1.RegionHashes[i].SequenceEqual(IRD2.RegionHashes[i]))
-                    printText.AppendLine($"Region {i} Hash: {Convert.ToHexString(IRD1.RegionHashes[i])} vs {Convert.ToHexString(IRD2.RegionHashes[i])}");
+                    printText.AppendLine($"Region {i} Hash: {LibIRD.IRD.ByteArrayToHexString(IRD1.RegionHashes[i])} vs {LibIRD.IRD.ByteArrayToHexString(IRD2.RegionHashes[i])}");
             }
 
             // Print the difference in number of files, if not 0
@@ -603,7 +722,7 @@ namespace IRDKit
                 if (j == -1)
                     missingOffsets2.Add(IRD1.FileKeys[i]);
                 if (j != -1 && !IRD1.FileHashes[i].SequenceEqual(IRD2.FileHashes[j]))
-                    printText.AppendLine($"File Hash at Offset {IRD1.FileKeys[i]}: {Convert.ToHexString(IRD1.FileHashes[i])} vs {Convert.ToHexString(IRD2.FileHashes[j])}");
+                    printText.AppendLine($"File Hash at Offset {IRD1.FileKeys[i]}: {LibIRD.IRD.ByteArrayToHexString(IRD1.FileHashes[i])} vs {LibIRD.IRD.ByteArrayToHexString(IRD2.FileHashes[j])}");
             }
             for (int i = 0; i < IRD2.FileKeys.Length; i++)
             {
@@ -631,15 +750,15 @@ namespace IRDKit
 
             // Print any data 1 key difference
             if (!IRD1.Data1Key.SequenceEqual(IRD2.Data1Key))
-                printText.AppendLine($"Data 1 Key: {Convert.ToHexString(IRD1.Data1Key)} vs {Convert.ToHexString(IRD2.Data1Key)}");
+                printText.AppendLine($"Data 1 Key: {LibIRD.IRD.ByteArrayToHexString(IRD1.Data1Key)} vs {LibIRD.IRD.ByteArrayToHexString(IRD2.Data1Key)}");
 
             // Print any data 2 key difference
             if (!IRD1.Data2Key.SequenceEqual(IRD2.Data2Key))
-                printText.AppendLine($"Data 2 Key: {Convert.ToHexString(IRD1.Data2Key)} vs {Convert.ToHexString(IRD2.Data2Key)}");
+                printText.AppendLine($"Data 2 Key: {LibIRD.IRD.ByteArrayToHexString(IRD1.Data2Key)} vs {LibIRD.IRD.ByteArrayToHexString(IRD2.Data2Key)}");
 
             // Print any PIC difference
             if (!IRD1.PIC.SequenceEqual(IRD2.PIC))
-                printText.AppendLine($"PIC: {Convert.ToHexString(IRD1.PIC)} vs {Convert.ToHexString(IRD2.PIC)}");
+                printText.AppendLine($"PIC: {LibIRD.IRD.ByteArrayToHexString(IRD1.PIC)} vs {LibIRD.IRD.ByteArrayToHexString(IRD2.PIC)}");
 
             // Write formatted string to file if output path provided, otherwise to console
             if (outPath != null)
@@ -691,7 +810,7 @@ namespace IRDKit
                 try
                 {
                     // Get disc key from hex string
-                    byte[] discKey = Convert.FromHexString(hexKey);
+                    byte[] discKey = LibIRD.IRD.HexStringToByteArray(hexKey);
                     if (discKey == null || discKey.Length != 16)
                         Console.Error.WriteLine($"{hexKey} is not a valid key, detecting key automatically...");
                     else
@@ -727,7 +846,7 @@ namespace IRDKit
                         Console.Error.WriteLine($"{hexKey} is not a valid key, detecting key automatically...");
                     else
                     {
-                        Console.WriteLine($"Creating {irdPath} with Key: {Convert.ToHexString(discKey)}");
+                        Console.WriteLine($"Creating {irdPath} with Key: {LibIRD.IRD.ByteArrayToHexString(discKey)}");
                         IRD ird1 = new ReIRD(isoPath, discKey, layerbreak);
                         ird1.Write(irdPath);
                         if (verbose)
@@ -775,7 +894,7 @@ namespace IRDKit
                         Console.Error.WriteLine($"{hexKey} is not a valid key, detecting key automatically...");
                     else
                     {
-                        Console.WriteLine($"Creating {irdPath} with Key: {Convert.ToHexString(discKey)}");
+                        Console.WriteLine($"Creating {irdPath} with Key: {LibIRD.IRD.ByteArrayToHexString(discKey)}");
                         IRD ird1 = new ReIRD(isoPath, discKey, layerbreak);
                         ird1.Write(irdPath);
                         if (verbose)
@@ -817,22 +936,21 @@ namespace IRDKit
                 Console.WriteLine("No key provided... Searching for key on redump.org");
 
             // Compute CRC32 hash
-            byte[] crc32;
+            byte[] crc32 = HashTool.GetFileHashArray(isoPath, HashType.CRC32);
-            uint crc32UInt;
+            string crc32String = LibIRD.IRD.ByteArrayToHexString(crc32).ToLowerInvariant();
-            using (FileStream fs = File.OpenRead(isoPath))
+
-            {
+            // Convert to UInt for use as UID in IRD
-                Crc32 hasher = new();
-                hasher.Append(fs);
-                crc32 = hasher.GetCurrentHash();
-                crc32UInt = BitConverter.ToUInt32(crc32);
-                // Change endianness
             Array.Reverse(crc32);
-            }
+            uint crc32UInt = BitConverter.ToUInt32(crc32, 0);
-            string crc32_hash = Convert.ToHexString(crc32).ToLower();
 
             // Search for ISO on redump.org
+#if !NETFRAMEWORK
             RedumpHttpClient redump = new();
-            List<int> ids = redump.CheckSingleSitePage("http://redump.org/discs/system/ps3/quicksearch/" + crc32_hash).ConfigureAwait(false).GetAwaiter().GetResult();
+            List<int> ids = redump.CheckSingleSitePage("http://redump.org/discs/system/ps3/quicksearch/" + crc32String).ConfigureAwait(false).GetAwaiter().GetResult();
+#else
+            RedumpWebClient redump = new();
+            List<int> ids = redump.CheckSingleSitePage("http://redump.org/discs/system/ps3/quicksearch/" + crc32String);
+#endif
             int id;
             if (ids.Count == 0)
             {
@@ -842,16 +960,14 @@ namespace IRDKit
             else if (ids.Count > 1)
             {
                 // More than one result for the CRC32 hash, compute SHA1 hash instead
-                byte[] sha1;
+                string sha1String = HashTool.GetFileHash(isoPath, HashType.SHA1);
-                using (FileStream fs = File.OpenRead(isoPath))
-                {
-                    SHA1 hasher = SHA1.Create();
-                    sha1 = hasher.ComputeHash(fs);
-                }
-                string sha1_hash = Convert.ToHexString(sha1).ToLower();
 
                 // Search redump.org for SHA1 hash
-                List<int> ids2 = redump.CheckSingleSitePage("http://redump.org/discs/system/ps3/quicksearch/" + sha1_hash).ConfigureAwait(false).GetAwaiter().GetResult();
+#if !NETFRAMEWORK
+                List<int> ids2 = redump.CheckSingleSitePage("http://redump.org/discs/system/ps3/quicksearch/" + sha1String).ConfigureAwait(false).GetAwaiter().GetResult();
+#else
+                List<int> ids2 = redump.CheckSingleSitePage("http://redump.org/discs/system/ps3/quicksearch/" + sha1String);
+#endif
                 if (ids2.Count == 0)
                 {
                     Console.Error.WriteLine("ISO not found in redump and no valid key provided, cannot create IRD");
@@ -871,7 +987,11 @@ namespace IRDKit
             }
 
             // Download key file from redump.org
+#if !NETFRAMEWORK
             byte[] key = redump.GetByteArrayAsync($"http://redump.org/disc/{id}/key").ConfigureAwait(false).GetAwaiter().GetResult();
+#else
+            byte[] key = redump.DownloadData($"http://redump.org/disc/{id}/key");
+#endif
             if (key.Length != 16)
             {
                 Console.Error.WriteLine("Invalid key obtained from redump and no valid key provided, cannot create IRD");
@@ -879,7 +999,7 @@ namespace IRDKit
             }
 
             // Create IRD with key from redump
-            Console.WriteLine($"Creating {irdPath} with Key from redump.org: {Convert.ToHexString(key)}");
+            Console.WriteLine($"Creating {irdPath} with Key from redump.org: {LibIRD.IRD.ByteArrayToHexString(key)}");
             try
             {
                 IRD ird = new ReIRD(isoPath, key, layerbreak, crc32UInt);
@@ -895,7 +1015,66 @@ namespace IRDKit
             }
         }
 
-        #endregion
+        public static XDocument DatParser(string datpath = null)
+        {
+            try
+            {
+                if (!File.Exists(datpath))
+                    return null;
+
+                return XDocument.Load(datpath);
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public static string GetDatFilename(IRD ird, XDocument datfile)
+        {
+            string crc32 = ird.UID.ToString("X8").ToLower();
+            XElement node = datfile.Root.Elements("game").Where(e => e.Element("rom").Attribute("crc").Value == crc32).FirstOrDefault() ?? throw new ArgumentException("Cannot find ISO in redump DAT");
+            return node.Attribute("name").Value;
+        }
+
+        public static void RenameIRD(string irdPath, XDocument datfile, bool serial = false, bool ver = false, bool crc = false, bool verbose = false)
+        {
+            IRD ird = IRD.Read(irdPath);
+
+            if (ird.ExtraConfig != 0x0001)
+                throw new ArgumentException($"{irdPath} is not a redump-style IRD");
+
+            string filename = GetDatFilename(ird, datfile) ?? throw new ArgumentException($"Cannot determine DAT filename for {irdPath}");
+            if (serial)
+                filename += $" [{ird.TitleID.Substring(0, 4).Replace('\0', ' ')}-{ird.TitleID.Substring(4, 5).Replace('\0', ' ')}]";
+            if (ver)
+                filename += $" [{ird.DiscVersion.Replace('\0', ' ')}]";
+            if (crc)
+                filename += $" [{ird.UID:X8}]";
+
+            // Rename irdPath to filename
+            string directory = Path.GetDirectoryName(Path.GetFullPath(filename));
+            string filepath;
+            if (!string.IsNullOrEmpty(directory))
+                filepath = Path.Combine(Path.GetDirectoryName(irdPath), filename + ".ird");
+            else
+                filepath = filename + ".ird";
+
+            // Rename IRD to new name
+            if (irdPath != filepath)
+            {
+                if (verbose)
+                    Console.WriteLine($"Renaming {Path.GetFileName(irdPath)} to {Path.GetFileName(filepath)}");
+                File.Move(irdPath, filepath);
+            }
+            else
+            {
+                if (verbose)
+                    Console.WriteLine($"Skipping {Path.GetFileName(irdPath)}, already named correctly");
+            }
+        }
+
+#endregion
 
         #region Helper Functions
 

IRDKit/README.md

@@ -39,3 +39,9 @@ For all options, run `irdkit help diff`
 
 To compare two IRDs, run `irdkit diff game1.ird game2.ird`
 The comparison can be printed to a file, e.g. `-o out.txt` or `--output=`
+
+## Renaming IRDs
+
+For all options, run `irdkit help rename`
+
+To rename an IRD (or folder of IRDs) according to a redump DAT, run `irdkit rename -d redump.dat game.ird`

LibIRD.sln

@@ -11,16 +11,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		.gitmodules = .gitmodules
 		LICENSE.txt = LICENSE.txt
+		publish-irdkit.ps1 = publish-irdkit.ps1
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscUtils.Core", "DiscUtils\Library\DiscUtils.Core\DiscUtils.Core.csproj", "{9E71F5CD-887D-4A61-8460-9F7E8F110B46}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscUtils.Iso9660", "DiscUtils\Library\DiscUtils.Iso9660\DiscUtils.Iso9660.csproj", "{9E1EF05F-388B-42C6-A4E7-98BE20C7C8EC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscUtils.Streams", "DiscUtils\Library\DiscUtils.Streams\DiscUtils.Streams.csproj", "{E8D0B8B0-F165-4FA1-AC7B-194F5F48A5F9}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,18 +31,6 @@ Global
 		{9060E3AF-E4FB-436F-93A1-5C47389CB88E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9060E3AF-E4FB-436F-93A1-5C47389CB88E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9060E3AF-E4FB-436F-93A1-5C47389CB88E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E71F5CD-887D-4A61-8460-9F7E8F110B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E71F5CD-887D-4A61-8460-9F7E8F110B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E71F5CD-887D-4A61-8460-9F7E8F110B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E71F5CD-887D-4A61-8460-9F7E8F110B46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E1EF05F-388B-42C6-A4E7-98BE20C7C8EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E1EF05F-388B-42C6-A4E7-98BE20C7C8EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E1EF05F-388B-42C6-A4E7-98BE20C7C8EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E1EF05F-388B-42C6-A4E7-98BE20C7C8EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E8D0B8B0-F165-4FA1-AC7B-194F5F48A5F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8D0B8B0-F165-4FA1-AC7B-194F5F48A5F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8D0B8B0-F165-4FA1-AC7B-194F5F48A5F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E8D0B8B0-F165-4FA1-AC7B-194F5F48A5F9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

LibIRD/IRD.cs

@@ -1,13 +1,13 @@
-using DiscUtils;
+using System;
-using DiscUtils.Iso9660;
-using DiscUtils.Streams;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
-using System.IO.Hashing;
 using System.Security.Cryptography;
 using System.Text;
+using LibIRD.DiscUtils;
+using LibIRD.DiscUtils.Iso9660;
+using LibIRD.DiscUtils.Streams;
+using SabreTools.Hashing;
 
 namespace LibIRD
 {
@@ -280,11 +280,6 @@ namespace LibIRD
         /// <remarks>Last byte to read when reading the header</remarks>
         private long FirstDataSector { get; set; }
 
-        /// <summary>
-        /// First byte of the PS3UPDAT.PUP file
-        /// </summary>
-        private long UpdateOffset { get; set; }
-
         /// <summary>
         /// Last byte of the PS3UPDAT.PUP file
         /// </summary>
@@ -413,7 +408,11 @@ namespace LibIRD
                 throw new ArgumentException("Disc Key must be a byte array of length 16", nameof(key));
 
             // Setup AES decryption
+#if NET35_OR_GREATER || NETCOREAPP
             using Aes aes = Aes.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings");
+#else
+            using Rijndael aes = Rijndael.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings"); ;
+#endif
 
             // Set AES settings
             aes.Key = D1AesKey;
@@ -446,7 +445,11 @@ namespace LibIRD
                 throw new ArgumentException("Disc Key must be a byte array of length 16", nameof(d1));
 
             // Setup AES decryption
+#if NET35_OR_GREATER || NETCOREAPP
             using Aes aes = Aes.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings");
+#else
+            using Rijndael aes = Rijndael.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings"); ;
+#endif
 
             // Set AES settings
             aes.Key = D1AesKey;
@@ -478,7 +481,11 @@ namespace LibIRD
             if (d2.Length != 16) throw new ArgumentException("Disc ID must be a byte array of length 16", nameof(d2));
 
             // Setup AES encryption
+#if NET35_OR_GREATER || NETCOREAPP
             using Aes aes = Aes.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings");
+#else
+            using Rijndael aes = Rijndael.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings"); ;
+#endif
 
             // Set AES settings
             aes.Key = D2AesKey;
@@ -511,7 +518,11 @@ namespace LibIRD
                 throw new ArgumentException("Disc ID must be a byte array of length 16", nameof(d2));
 
             // Setup AES encryption
+#if NET35_OR_GREATER || NETCOREAPP
             using Aes aes = Aes.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings");
+#else
+            using Rijndael aes = Rijndael.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings"); ;
+#endif
 
             // Set AES settings
             aes.Key = D2AesKey;
@@ -540,11 +551,11 @@ namespace LibIRD
         private protected void ParseGetKeyLog(string getKeyLog)
         {
             // Validate .getkey.log file path
-            if (!File.Exists(getKeyLog))
+            if (!System.IO.File.Exists(getKeyLog))
                 throw new FileNotFoundException(nameof(getKeyLog));
 
             // Read from .getkey.log file
-            using StreamReader sr = File.OpenText(getKeyLog);
+            using StreamReader sr = System.IO.File.OpenText(getKeyLog);
 
             // Determine whether GetKey was successful
             string line;
@@ -558,12 +569,12 @@ namespace LibIRD
             if (line == null)
                 throw new InvalidDataException("Could not find Disc Key in .getkey.log");
             // Get Disc Key from log
-            string discKeyStr = line["disc_key = ".Length..];
+            string discKeyStr = line.Substring("disc_key = ".Length);
             // Validate Disc Key from log
             if (discKeyStr.Length != 32)
                 throw new InvalidDataException("Unexpected Disc Key in .getkey.log");
             // Convert Disc Key to byte array
-            discKey = Convert.FromHexString(discKeyStr);
+            discKey = HexStringToByteArray(discKeyStr);
 
             // Read Disc ID
             byte[] discID;
@@ -571,14 +582,14 @@ namespace LibIRD
             if (line == null)
                 throw new InvalidDataException("Could not find Disc ID in .getkey.log");
             // Get Disc ID from log
-            string discIDStr = line["disc_id = ".Length..];
+            string discIDStr = line.Substring("disc_id = ".Length);
             // Validate Disc ID from log
             if (discIDStr.Length != 32)
                 throw new InvalidDataException("Unexpected Disc ID in .getkey.log");
             // Replace X's in Disc ID with 00000001
-            discIDStr = discIDStr[..24] + "00000001";
+            discIDStr = discIDStr.Substring(0, 24) + "00000001";
             // Convert Disc ID to byte array
-            discID = Convert.FromHexString(discIDStr);
+            discID = HexStringToByteArray(discIDStr);
 
             // Look for PIC in log
             byte[] discPIC;
@@ -593,7 +604,7 @@ namespace LibIRD
             if (discPICStr.Length != 256)
                 throw new InvalidDataException("Unexpected PIC in .getkey.log");
             // Convert PIC to byte array
-            discPIC = Convert.FromHexString(discPICStr[..230]);
+            discPIC = HexStringToByteArray(discPICStr.Substring(0, 230));
 
             // Double check for warnings in .getkey.log
             while ((line = sr.ReadLine()) != null && line.Trim().StartsWith("WARNING") == false && line.Trim().StartsWith("SUCCESS") == false)
@@ -618,17 +629,17 @@ namespace LibIRD
         /// <param name="redump">True if redump-style IRD</param>
         /// <exception cref="ArgumentNullException"></exception>
         /// <exception cref="FileNotFoundException"></exception>
-        /// <exception cref="InvalidFileSystemException"></exception>
+        /// <exception cref="IOException"></exception>
         private protected void GenerateIRD(string isoPath, bool redump = false)
         {
             // Parse ISO file as a file stream
             using FileStream fs = new FileStream(isoPath, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, FileOptions.SequentialScan) ?? throw new FileNotFoundException(isoPath);
             // Validate ISO file stream
             if (!CDReader.Detect(fs))
-                throw new InvalidFileSystemException("Not a valid ISO file");
+                throw new IOException("Not a valid ISO file");
 
             // New ISO Reader from DiscUtils
-            CDReader reader = new(fs, true, true);
+            CDReader reader = new(fs);
 
             // If generating redump-style IRD
             if (redump)
@@ -636,6 +647,9 @@ namespace LibIRD
                 // Redump-style IRDs set the lowest bit of ExtraConfig to 1
                 ExtraConfig |= 0x01;
 
+                // Try to get Title ID and Disc Version from PS3_DISC.SFB
+                try
+                {
                     // Redump-style IRDs use fields from PS3_DISC.SFB
                     using SparseStream s = reader.OpenFile("PS3_DISC.SFB", FileMode.Open, FileAccess.Read);
 
@@ -645,7 +659,7 @@ namespace LibIRD
                     bool titleIDFound = ps3_DiscSFB.Field.TryGetValue("TITLE_ID", out string titleID);
                     // If a valid TITLE_ID field is present, remove the hyphen to fit into standard IRD file
                     if (titleIDFound && titleID.Length == 10 && titleID[4] == '-')
-                    TitleID = string.Concat(titleID.AsSpan(0, 4), titleID.AsSpan(5, 5));
+                        TitleID = titleID.Substring(0, 4) + titleID.Substring(5, 5);
 
                     // If the version field is present, this is a multi-game disc
                     // Redump-style IRDs use the VERSION field from PS3_DISC.SFB instead of VERSION from PARAM.SFO
@@ -653,10 +667,15 @@ namespace LibIRD
                     if (discVersionFound)
                         DiscVersion = discVersion;
                 }
+                catch { }
+            }
 
-            // Read PS3 Metadata from PARAM.SFO
+            // Try to get Title ID, Title, Disc Version, and App Version from PARAM.SFO
-            using (SparseStream s = reader.OpenFile("\\PS3_GAME\\PARAM.SFO", FileMode.Open, FileAccess.Read))
+            try
             {
+                // Read PS3 Metadata from PARAM.SFO
+                using SparseStream s = reader.OpenFile("\\PS3_GAME\\PARAM.SFO", FileMode.Open, FileAccess.Read);
+
                 // Parse PARAM.SFO file
                 ParamSFO paramSFO = new(s);
 
@@ -665,7 +684,7 @@ namespace LibIRD
                 {
                     bool titleIDFound = paramSFO.Field.TryGetValue("TITLE_ID", out string titleID);
                     if (titleIDFound)
-                        TitleID = titleID.Length == 9 ? titleID : titleID.PadRight(9, '\0')[..9];
+                        TitleID = titleID.Length == 9 ? titleID : titleID.PadRight(9, '\0').Substring(0, 9);
                     else
                         TitleID = "\0\0\0\0\0\0\0\0\0";
                 }
@@ -679,7 +698,7 @@ namespace LibIRD
                 {
                     bool discVersionFound = paramSFO.Field.TryGetValue("VERSION", out string discVersion);
                     if (discVersionFound)
-                        DiscVersion = discVersion.Length == 5 ? discVersion : discVersion.PadRight(5, '\0')[..5];
+                        DiscVersion = discVersion.Length == 5 ? discVersion : discVersion.PadRight(5, '\0').Substring(0, 5);
                     else
                         DiscVersion = "\0\0\0\0\0";
                 }
@@ -687,22 +706,37 @@ namespace LibIRD
                 // Try use App Version from PARAM.SFO 
                 bool appVersionFound = paramSFO.Field.TryGetValue("APP_VER", out string appVersion);
                 if (appVersionFound)
-                    AppVersion = appVersion.Length == 5 ? appVersion : appVersion.PadRight(5, '\0')[..5];
+                    AppVersion = appVersion.Length == 5 ? appVersion : appVersion.PadRight(5, '\0').Substring(0, 5);
                 else
                     AppVersion = "\0\0\0\0\0";
             }
+            catch { }
 
-            // Determine system update version
+            // Ensure Title ID is set and valid
+            if (string.IsNullOrEmpty(TitleID) || TitleID.Length != 9)
+                TitleID = "\0\0\0\0\0\0\0\0\0";
+
+            // Ensure Title is set
+            Title ??= string.Empty;
+
+            // Ensure Disc Version is set and valid
+            if (string.IsNullOrEmpty(DiscVersion) || DiscVersion.Length != 5)
+                DiscVersion = "\0\0\0\0\0";
+
+            // Ensure App Version is set and valid
+            if (string.IsNullOrEmpty(AppVersion) || AppVersion.Length != 5)
+                AppVersion = "\0\0\0\0\0";
+
+            // Try determine system update version
+            try
+            {
                 GetSystemVersion(fs, reader);
+            }
+            catch { }
 
-            // Read and compress the ISO header
+            // Ensure System Version was set and valid
-            GetHeader(fs, reader);
+            if (string.IsNullOrEmpty(SystemVersion) || SystemVersion.Length != 4)
-
+                SystemVersion = "\0\0\0\0";
-            // Read and compress the ISO footer
-            GetFooter(fs);
-
-            // Get info region info from ISO
-            GetRegions(fs);
 
             // Recursively count all files in ISO to allocate file arrays
             DiscDirectoryInfo rootDir = reader.GetDirectoryInfo("\\");
@@ -731,13 +765,30 @@ namespace LibIRD
             // Sort files by offset
             Array.Sort(FileKeys, FileExtents);
 
+            // Determine start of footer if no update file present
+            if (UpdateEnd == 0)
+            {
+                int lastFile = FileExtents.Length - 1;
+                int lastExtent = FileExtents[lastFile].Length - 1;
+                UpdateEnd = SectorSize * FileExtents[lastFile][lastExtent].Offset + FileExtents[lastFile][lastExtent].Count;
+            }
+
+            // Read and compress the ISO header
+            GetHeader(fs, reader);
+
+            // Read and compress the ISO footer
+            GetFooter(fs);
+
+            // Get info region info from ISO
+            GetRegions(fs);
+
             // Calculate CRC32 hash of ISO only if generating a redump IRD and the UID is not already set
             RegionHashes = new byte[RegionCount][];
             FileHashes = new byte[FileCount][];
             HashISO(fs, redump && UID == 0x00000000);
         }
 
-        #endregion
+#endregion
 
         #region Reading ISO
 
@@ -747,21 +798,22 @@ namespace LibIRD
         /// <remarks>PS3UPDAT.PUP update file version number</remarks>
         /// <param name="fs">ISO filestream</param>
         /// <param name="reader">CDReader</param>
-        /// <exception cref="InvalidFileSystemException"></exception>
+        /// <exception cref="IOException"></exception>
         private void GetSystemVersion(FileStream fs, CDReader reader)
         {
             // Determine PUP file offset via cluster
             Range<long, long>[] updateClusters = reader.PathToClusters("\\PS3_UPDATE\\PS3UPDAT.PUP");
             if (updateClusters == null && updateClusters.Length == 0 && updateClusters[0] == null)
-                throw new InvalidFileSystemException("Invalid file extents for PS3UPDAT.PUP");
+                throw new IOException("Invalid file extents for PS3UPDAT.PUP");
 
             // PS3UPDAT.PUP file begins at first byte of dedicated cluster
-            UpdateOffset = SectorSize * updateClusters[0].Offset;
+            long updateOffset = SectorSize * updateClusters[0].Offset;
             // Update file ends at the last byte of the last cluster
-            UpdateEnd = SectorSize * updateClusters[^1].Offset + updateClusters[^1].Count;
+            int lastExtent = updateClusters.Length - 1;
+            UpdateEnd = SectorSize * updateClusters[lastExtent].Offset + updateClusters[lastExtent].Count;
 
             // Check PUP file Magic
-            fs.Seek(UpdateOffset, SeekOrigin.Begin);
+            fs.Seek(updateOffset, SeekOrigin.Begin);
             byte[] pupMagic = new byte[5];
             fs.Read(pupMagic, 0, pupMagic.Length);
             // If magic is incorrect, set version to all nulls, "\0\0\0\0" (unknown)
@@ -770,13 +822,13 @@ namespace LibIRD
             else
             {
                 // Determine location of version string
-                fs.Seek(UpdateOffset + 0x3E, SeekOrigin.Begin);
+                fs.Seek(updateOffset + 0x3E, SeekOrigin.Begin);
                 byte[] offset = new byte[2];
                 fs.Read(offset, 0, 2);
                 // Move stream to PUP version string
                 Array.Reverse(offset);
                 ushort versionOffset = BitConverter.ToUInt16(offset, 0);
-                fs.Seek(UpdateOffset + versionOffset, SeekOrigin.Begin);
+                fs.Seek(updateOffset + versionOffset, SeekOrigin.Begin);
                 // Read version string
                 byte[] version = new byte[4];
                 fs.Read(version, 0, version.Length);
@@ -790,22 +842,24 @@ namespace LibIRD
         /// </summary>
         /// <param name="fs">ISO filestream</param>
         /// <param name="reader">CDReader</param>
-        /// <exception cref="InvalidFileSystemException"></exception>
+        /// <exception cref="IOException"></exception>
         private void GetHeader(FileStream fs, CDReader reader)
         {
             // Determine the extent of the header via cluster (Sector 0 to first data sector)
             Range<long, long>[] sfbClusters = reader.PathToClusters("\\PS3_DISC.SFB");
             if (sfbClusters == null && sfbClusters.Length == 0 && sfbClusters[0] == null)
-                throw new InvalidFileSystemException("Invalid file extents for PS3_DISC.SFB");
+                throw new IOException("Invalid file extents for PS3_DISC.SFB");
             // End of header is at beginning of first byte of dedicated cluster
             FirstDataSector = sfbClusters[0].Offset;
 
             // Begin a GZip stream to write header to
             using MemoryStream headerStream = new();
 #if NET6_0_OR_GREATER
-            using (GZipStream gzs = new(headerStream, CompressionLevel.SmallestSize))
+            using (GZipStream gzStream = new(headerStream, CompressionLevel.SmallestSize))
+#elif NETCOREAPP || NET45_OR_GREATER
+            using (GZipStream gzStream = new(headerStream, CompressionLevel.Optimal))
 #else
-            using (GZipStream gzs = new(headerStream, CompressionLevel.Optimal))
+            using (GZipStream gzStream = new(headerStream, CompressionMode.Compress))
 #endif
             {
                 // Start reading data from the beginning of the ISO file
@@ -817,7 +871,7 @@ namespace LibIRD
                 for (int i = 0; i < FirstDataSector; i++)
                 {
                     numBytes = fs.Read(buf, 0, buf.Length);
-                    gzs.Write(buf, 0, numBytes);
+                    gzStream.Write(buf, 0, numBytes);
                 }
             }
 
@@ -835,9 +889,11 @@ namespace LibIRD
             // Begin a GZip stream to write footer to
             using MemoryStream footerStream = new();
 #if NET6_0_OR_GREATER
-            using (GZipStream gzs = new(footerStream, CompressionLevel.SmallestSize))
+            using (GZipStream gzStream = new(footerStream, CompressionLevel.SmallestSize))
+#elif NETCOREAPP || NET45_OR_GREATER
+            using (GZipStream gzStream = new(footerStream, CompressionLevel.Optimal))
 #else
-            using (GZipStream gzs = new(footerStream, CompressionLevel.Optimal))
+            using (GZipStream gzStream = new(footerStream, CompressionMode.Compress))
 #endif
             {
                 // Start reading data from after last file (PS3UPDAT.PUP)
@@ -849,7 +905,7 @@ namespace LibIRD
                 while (numBytes != 0)
                 {
                     numBytes = fs.Read(buf, 0, buf.Length);
-                    gzs.Write(buf, 0, numBytes);
+                    gzStream.Write(buf, 0, numBytes);
                 }
             }
 
@@ -862,7 +918,7 @@ namespace LibIRD
         /// Retreives and stores the Region extents
         /// </summary>
         /// <param name="fs">ISO filestream</param>
-        /// <exception cref="InvalidFileSystemException"></exception>
+        /// <exception cref="IOException"></exception>
         private void GetRegions(FileStream fs)
         {
             // Determine the number of unencryted regions
@@ -873,7 +929,7 @@ namespace LibIRD
             // Total number of regions is 2x number of unencrypted regions, minus 1
             RegionCount = (byte)(2 * ((uint)decRegionCount[3]) - 1);
             if (RegionCount <= 0)
-                throw new InvalidFileSystemException("No regions detected in ISO");
+                throw new IOException("No regions detected in ISO");
             RegionStart = new long[RegionCount];
             RegionEnd = new long[RegionCount];
 
@@ -886,22 +942,23 @@ namespace LibIRD
             {
                 // End sector of previous region is start of this region
                 if (i % 2 == 1)
-                    RegionStart[i] = BitConverter.ToInt32(regionSector) + 1;
+                    RegionStart[i] = BitConverter.ToInt32(regionSector, 0) + 1;
                 else
-                    RegionStart[i] = BitConverter.ToInt32(regionSector);
+                    RegionStart[i] = BitConverter.ToInt32(regionSector, 0);
                 // Determine end sector offset of this region
                 fs.Read(regionSector, 0, 4);
                 Array.Reverse(regionSector, 0, 4);
                 if (i % 2 == 1)
-                    RegionEnd[i] = BitConverter.ToInt32(regionSector) - 1;
+                    RegionEnd[i] = BitConverter.ToInt32(regionSector, 0) - 1;
                 else
-                    RegionEnd[i] = BitConverter.ToInt32(regionSector);
+                    RegionEnd[i] = BitConverter.ToInt32(regionSector, 0);
             }
 
             // Remove header from first region
             RegionStart[0] = FirstDataSector;
             // Remove footer from last region
-            RegionEnd[^1] = (UpdateEnd / SectorSize) - 1;
+            int lastRegion = RegionEnd.Length - 1;
+            RegionEnd[lastRegion] = (UpdateEnd / SectorSize) - 1;
         }
 
         /// <summary>
@@ -922,7 +979,7 @@ namespace LibIRD
 
                 // If invalid clusters were returned, we can't hash this file
                 if (fileExtent == null && fileExtent.Length == 0)
-                    throw new InvalidFileSystemException($"Unexpected file extents for {filePath}");
+                    throw new IOException($"Unexpected file extents for {filePath}");
 
                 // Determine smallest file offset as first sector
                 long smallestOffset = fileExtent[0].Offset;
@@ -930,7 +987,7 @@ namespace LibIRD
                 for (int i = 1; i < fileExtent.Length; i++)
                 {
                     if (fileExtent[i] == null)
-                        throw new InvalidFileSystemException($"Unexpected file extents for {filePath}");
+                        throw new IOException($"Unexpected file extents for {filePath}");
 
                     if (fileExtent[i].Offset * SectorSize != fileExtent[i - 1].Offset * SectorSize + fileExtent[i - 1].Count)
                         nonContiguous = true;
@@ -968,7 +1025,8 @@ namespace LibIRD
         /// <exception cref="InvalidOperationException"></exception>
         private protected void DecryptSectors(ref byte[] buffer, int sectorNumber, int offset = 0, int? count = null)
         {
-            ArgumentNullException.ThrowIfNull(buffer);
+            if (buffer == null)
+                throw new ArgumentNullException(nameof(buffer));
 
             if (buffer.Length == 0 || buffer.Length % SectorSize != 0)
                 throw new ArgumentException("Encrypted buffer must be multiple of SectorSize");
@@ -982,7 +1040,12 @@ namespace LibIRD
                 throw new ArgumentException("Number of sectors must be within buffer");
 
             // Setup AES decryption
+#if NET35_OR_GREATER || NETCOREAPP
             using Aes aes = Aes.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings");
+#else
+            using Rijndael aes = Rijndael.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings"); ;
+#endif
+
             // Set AES settings
             aes.Key = DiscKey;
             aes.Padding = PaddingMode.None;
@@ -1028,6 +1091,10 @@ namespace LibIRD
                 CountFiles(dirInfo);
         }
 
+        #endregion
+
+        #region Hashing
+
         /// <summary>
         /// Calculate hashes for all region and file extents
         /// </summary>
@@ -1037,24 +1104,24 @@ namespace LibIRD
         {
             // Initialise CRC32 ISO hasher, only used if making redump-style IRD
             byte[] crc32;
-            Crc32 isoHasher = new();
+            HashWrapper isoHasher = new(HashType.CRC32);
 
             // Initialise MD5 region hashes
             List<int> regions = [];
-            MD5[] regionMD5 = new MD5[RegionCount];
+            HashWrapper[] regionMD5 = new HashWrapper[RegionCount];
             for (int i = 0; i < RegionCount; i++)
             {
                 regions.Add(i);
-                regionMD5[i] = MD5.Create();
+                regionMD5[i] = new(HashType.MD5);
             }
 
             // Initialise MD5 file hashes
             List<int> files = [];
-            MD5[] fileMD5 = new MD5[FileCount];
+            HashWrapper[] fileMD5 = new HashWrapper[FileCount];
             for (int i = 0; i < FileCount; i++)
             {
                 files.Add(i);
-                fileMD5[i] = MD5.Create();
+                fileMD5[i] = new(HashType.MD5);
             }
 
             // Start hashing from beginning of ISO
@@ -1073,12 +1140,30 @@ namespace LibIRD
                 // If end of ISO reached, stop reading
                 if (numBytes == 0)
                 {
+                    // Ensure all hashes have been saved
+                    foreach (int i in regions)
+                    {
+                        // Close region hash
+                        regionMD5[i].Terminate();
+                        RegionHashes[i] = regionMD5[i].CurrentHashBytes;
+                        regionMD5[i].Dispose();
+                    }
+                    foreach (int i in files)
+                    {
+                        // Close file hash
+                        fileMD5[i].Terminate();
+                        FileHashes[i] = fileMD5[i].CurrentHashBytes;
+                        fileMD5[i].Dispose();
+                    }
+
                     // If making redump-style IRD, save CRC32 hash to UID field
                     if (redump)
                     {
-                        crc32 = isoHasher.GetCurrentHash();
+                        crc32 = isoHasher.CurrentHashBytes;
+                        Array.Reverse(crc32);
                         UID = BitConverter.ToUInt32(crc32, 0);
                     }
+
                     return;
                 }
 
@@ -1103,12 +1188,12 @@ namespace LibIRD
                     if (bufSectors == 0)
                         Console.Error.WriteLine("ERROR: Trailing partial sector in ISO filestream");
                     if (numBytes > buf.Length)
-                        throw new InvalidFileSystemException("ERROR: Read more bytes than buffer size???");
+                        throw new IOException("ERROR: Read more bytes than buffer size???");
                 }
 
                 // Hash ISO
                 if (redump)
-                    isoHasher.Append(new ReadOnlySpan<byte>(buf, 0, numBytes));
+                    isoHasher.Process(buf, 0, numBytes);
 
                 // Hash regions
                 List<int> regionsEnded = [];
@@ -1130,23 +1215,24 @@ namespace LibIRD
                         // Determine end byte
                         int endByte = (int)(SectorSize * (RegionEnd[i] - currentSector + 1));
                         // Close region hash
-                        regionMD5[i].TransformFinalBlock(buf, startByte, endByte - startByte);
+                        regionMD5[i].Process(buf, startByte, endByte - startByte);
-                        RegionHashes[i] = regionMD5[i].Hash;
+                        regionMD5[i].Terminate();
-                        regionMD5[i].Clear();
+                        RegionHashes[i] = regionMD5[i].CurrentHashBytes;
+                        regionMD5[i].Dispose();
                         regionsEnded.Add(i);
                     }
                     // Check if region has already begun
                     else if (RegionStart[i] <= currentSector)
                     {
                         // Hash buffer
-                        regionMD5[i].TransformBlock(buf, 0, (int)SectorSize * bufSectors, null, 0);
+                        regionMD5[i].Process(buf, 0, (int)SectorSize * bufSectors);
                     }
                     // Region Start is in this buffer, ending is in the future
                     else
                     {
                         // Hash partial buffer
                         int regionStart = (int)(SectorSize * (RegionStart[i] - currentSector));
-                        regionMD5[i].TransformBlock(buf, regionStart, (int)SectorSize * bufSectors - regionStart, null, 0);
+                        regionMD5[i].Process(buf, regionStart, (int)SectorSize * bufSectors - regionStart);
                     }
                 }
                 if (regionsEnded.Count > 0)
@@ -1171,7 +1257,7 @@ namespace LibIRD
 
                         // Don't decrypt last sectors if the encrypted region ends within this buffer
                         if (RegionEnd[i] < currentSector + bufSectors)
-                            encCount -= (int)(currentSector + bufSectors - RegionEnd[i] + 1);
+                            encCount -= (int)(currentSector + bufSectors - RegionEnd[i] - 1);
 
                         // Decrypt encrypted sectors
                         DecryptSectors(ref buf, (int)currentSector + encOffset, encOffset, encCount);
@@ -1191,7 +1277,7 @@ namespace LibIRD
                     {
                         // Skip hashing file extent if it has not yet started or already ended
                         if (FileExtents[i][j].Offset > currentSector + bufSectors
-                            || SectorSize* FileExtents[i][j].Offset + FileExtents[i][j].Count < SectorSize * currentSector)
+                            || SectorSize * FileExtents[i][j].Offset + FileExtents[i][j].Count < SectorSize * currentSector)
                             continue;
                         // Determine first file byte location in buffer
                         int startByte = FileExtents[i][j].Offset > currentSector ? (int)(SectorSize * (FileExtents[i][j].Offset - currentSector)) : 0;
@@ -1200,18 +1286,19 @@ namespace LibIRD
                         // Don't hash more than the buffer size
                         endByte = endByte < bufSectors * (int)SectorSize ? endByte : bufSectors * (int)SectorSize;
                         // Hash portion of buffer that file exists in
-                        fileMD5[i].TransformBlock(buf, startByte, endByte - startByte, null, 0);
+                        fileMD5[i].Process(buf, startByte, endByte - startByte);
                     }
 
                     // Check if current file has ended in this buffer (assumes last extent contains last byte)
-                    long lastByte = SectorSize * FileExtents[i][^1].Offset + FileExtents[i][^1].Count;
+                    int lastExtent = FileExtents[i].Length - 1;
-                    if (lastByte < SectorSize * (currentSector + bufSectors)
+                    long lastByte = SectorSize * FileExtents[i][lastExtent].Offset + FileExtents[i][lastExtent].Count;
+                    if (lastByte <= SectorSize * (currentSector + bufSectors)
                         && lastByte > SectorSize * currentSector)
                     {
                         // Close file hash
-                        fileMD5[i].TransformFinalBlock(buf, 0, 0);
+                        fileMD5[i].Terminate();
-                        FileHashes[i] = fileMD5[i].Hash;
+                        FileHashes[i] = fileMD5[i].CurrentHashBytes;
-                        fileMD5[i].Clear();
+                        fileMD5[i].Dispose();
                         filesEnded.Add(i);
                     }
                 }
@@ -1240,9 +1327,9 @@ namespace LibIRD
             // Create new stream to uncompressed IRD contents
             using MemoryStream stream = new();
 
-            // Write IRD data to stream in order
+            // Write IRD data to stream as UTF8
-            using (BinaryWriter bw = new(stream, Encoding.UTF8, true))
+            using BinaryWriter bw = new(stream, Encoding.UTF8);
-            {
+
             // IRD File Signature
             bw.Write(Magic);
 
@@ -1328,28 +1415,35 @@ namespace LibIRD
             // IRD Unique Identifier, for versions after 7
             if (_version > 7)
                 bw.Write(UID);
-            }
 
             // Calculate the little-endian 32-bit "IEEE 802.3" CRC value of the IRD contents so far
             stream.Position = 0;
-            Crc32 crc32 = new();
+            byte[] crc32 = HashTool.GetStreamHashArray(stream, HashType.CRC32, true);
-            crc32.Append(stream);
+            Array.Reverse(crc32);
-            byte[] crc = crc32.GetCurrentHash();
 
             // Write final CRC value to the stream
-            stream.Write(crc, 0, 4);
+            stream.Write(crc32, 0, 4);
 
             // Create the IRD file stream
             using FileStream fs = new(irdPath, FileMode.Create, FileAccess.Write);
             // Create a GZipped IRD file stream
 #if NET6_0_OR_GREATER
             using GZipStream gzStream = new(fs, CompressionLevel.SmallestSize);
-#else
+#elif NETCOREAPP || NET45_OR_GREATER
             using GZipStream gzStream = new(fs, CompressionLevel.Optimal);
+#else
+            using GZipStream gzStream = new(fs, CompressionMode.Compress);
 #endif
             // Write entire gzipped IRD stream to file
             stream.Position = 0;
+#if NET40_OR_GREATER || NETCOREAPP
             stream.CopyTo(gzStream);
+#else
+            byte[] buffer = new byte[1024];
+            int numBytes;
+            while ((numBytes = stream.Read(buffer, 0, buffer.Length)) > 0)
+                gzStream.Write(buffer, 0, numBytes);
+#endif
         }
 
         /// <summary>
@@ -1363,7 +1457,7 @@ namespace LibIRD
             // Validate irdPath
             if (irdPath == null || irdPath.Length <= 0)
                 throw new ArgumentNullException(nameof(irdPath));
-            if (!File.Exists(irdPath))
+            if (!System.IO.File.Exists(irdPath))
                 throw new FileNotFoundException(nameof(irdPath));
 
             // Open IRD for reading
@@ -1373,7 +1467,7 @@ namespace LibIRD
 
             // Check for IRD file signature
             byte[] magic = br.ReadBytes(4);
-            if (!((ReadOnlySpan<byte>)Magic).SequenceEqual(magic))
+            if (magic == null || magic.Length != 4 || magic[0] != Magic[0] || magic[1] != Magic[1] || magic[2] != Magic[2] || magic[3] != Magic[3])
                 throw new InvalidDataException("IRD file not recognised");
 
             // Read file version
@@ -1492,9 +1586,9 @@ namespace LibIRD
             if (Attachments != 0x0000)
                 printText.AppendLine($"Attachments:  {Attachments:X4}");
             printText.AppendLine($"Unique ID:    {UID:X8}");
-            printText.AppendLine($"Data 1 Key:   {Convert.ToHexString(Data1Key)}");
+            printText.AppendLine($"Data 1 Key:   {ByteArrayToHexString(Data1Key)}");
-            printText.AppendLine($"Data 2 Key:   {Convert.ToHexString(Data2Key)}");
+            printText.AppendLine($"Data 2 Key:   {ByteArrayToHexString(Data2Key)}");
-            printText.AppendLine($"PIC:          {Convert.ToHexString(PIC)}");
+            printText.AppendLine($"PIC:          {ByteArrayToHexString(PIC)}");
             printText.AppendLine();
 
             if (printPath == null)
@@ -1507,7 +1601,7 @@ namespace LibIRD
             }
             else
             {
-                File.AppendAllText(printPath, printText.ToString());
+                System.IO.File.AppendAllText(printPath, printText.ToString());
             }
         }
 
@@ -1537,9 +1631,9 @@ namespace LibIRD
             if (Attachments != 0x0000)
                 json.AppendLine($"  \"Attachments\": \"{Attachments:X4}\",");
             json.AppendLine($"  \"Unique ID\": \"{UID:X8}\",");
-            json.AppendLine($"  \"Data 1 Key\": \"{Convert.ToHexString(Data1Key)}\",");
+            json.AppendLine($"  \"Data 1 Key\": \"{ByteArrayToHexString(Data1Key)}\",");
-            json.AppendLine($"  \"Data 2 Key\": \"{Convert.ToHexString(Data2Key)}\",");
+            json.AppendLine($"  \"Data 2 Key\": \"{ByteArrayToHexString(Data2Key)}\",");
-            json.AppendLine($"  \"PIC\": \"{Convert.ToHexString(PIC)}\"");
+            json.AppendLine($"  \"PIC\": \"{ByteArrayToHexString(PIC)}\"");
             if (single)
                 json.AppendLine("}");
             else
@@ -1557,10 +1651,70 @@ namespace LibIRD
             else
             {
                 // Write to path
-                File.AppendAllText(jsonPath, json.ToString());
+                System.IO.File.AppendAllText(jsonPath, json.ToString());
             }
         }
 
+#endregion
+
+        #region Helper Functions
+
+        /// <summary>
+        /// Converts a hex string into a byte array
+        /// </summary>
+        /// <param name="hex">Hex string</param>
+        /// <returns>Converted byte array, or null if invalid hex string</returns>
+        public static byte[] HexStringToByteArray(string hexString)
+        {
+            // Valid hex string must be an even number of characters
+            if (string.IsNullOrEmpty(hexString) || hexString!.Length % 2 == 1)
+                return null;
+
+            // Convert ASCII to byte via lookup table
+            int[] hexLookup = [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F];
+            byte[] byteArray = new byte[hexString.Length / 2];
+            for (int i = 0; i < hexString.Length; i += 2)
+            {
+                // Convert next two chars to ASCII value relative to '0'
+                int a = Char.ToUpper(hexString[i]) - '0';
+                int b = Char.ToUpper(hexString[i + 1]) - '0';
+
+                // Ensure hex string only has '0' through '9' and 'A' through 'F' (case insensitive)
+                if ((a < 0 || b < 0 || a > 22 || b > 22) || (a > 10 && a < 17) || (b > 10 && b < 17))
+                    return null;
+                byteArray[i / 2] = (byte)(hexLookup[a] << 4 | hexLookup[b]);
+            }
+
+            return byteArray;
+        }
+
+        /// <summary>
+        /// Converts a byte array into a hex string
+        /// </summary>
+        /// <param name="byteArray">Byte array</param>
+        /// <returns>Hex string representation of byte array, null if invalid</returns>
+        public static string ByteArrayToHexString(byte[] byteArray)
+        {
+            // Validate byte array
+            if (byteArray == null || byteArray.Length == 0)
+                return null;
+
+            // Store map of values to hex string
+            string hex = "0123456789ABCDEF";
+
+            // Add two characters per byte value
+            StringBuilder hexString = new(2 * byteArray.Length);
+            foreach (byte b in byteArray)
+            {
+                hexString.Append(hex[(int)(b >> 4)]);
+                hexString.Append(hex[(int)(b & 0x0F)]);
+            }
+
+            // Return hex string
+            return hexString.ToString();
+        }
+
         #endregion
     }
 }

LibIRD/LibIRD.csproj

@@ -2,11 +2,12 @@
 
   <PropertyGroup>
     <!-- Assembly Properties -->
-	<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <LangVersion>latest</LangVersion>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>0.6.0</Version>
+    <Version>0.9.1</Version>
     <PackageOutputPath>../nupkg</PackageOutputPath>
     
     <!-- Package Properties -->
@@ -21,24 +22,21 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
   
+  <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition="!$(RuntimeIdentifier.StartsWith(`osx-arm`))">
+    <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Include="./README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DiscUtils\Library\DiscUtils.Core\DiscUtils.Core.csproj" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <ProjectReference Include="..\DiscUtils\Library\DiscUtils.Iso9660\DiscUtils.Iso9660.csproj" PrivateAssets="All" />
+    <PackageReference Include="SabreTools.Hashing" Version="1.1.4" />
-    <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

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using System.Text.Json;
+using Newtonsoft.Json;
 
 namespace LibIRD
 {
@@ -68,7 +68,7 @@ namespace LibIRD
             // Read SFB file version
             byte[] buf = br.ReadBytes(2);
             Array.Reverse(buf);
-            Version = BitConverter.ToUInt16(buf);
+            Version = BitConverter.ToUInt16(buf, 0);
 
             // Process all field headers
             sfbStream.Seek(0x20, SeekOrigin.Begin);
@@ -131,11 +131,6 @@ 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>
@@ -143,7 +138,7 @@ namespace LibIRD
         public void PrintJson(string jsonPath = null)
         {
             // Serialise PS3_Disc.SFB data to a JSON object
-            string json = JsonSerializer.Serialize(Field, JsonOpts);
+            string json = JsonConvert.SerializeObject(Field, Formatting.Indented);
 
             // If no path given, output to console
             if (jsonPath == null)

LibIRD/ParamSFO.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using System.Text.Json;
+using Newtonsoft.Json;
 
 namespace LibIRD
 {
@@ -154,11 +154,6 @@ 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 +161,7 @@ namespace LibIRD
         public void PrintJson(string jsonPath = null)
         {
             // Serialise PS3_Disc.SFB data to a JSON object
-            string json = JsonSerializer.Serialize(Field, JsonOpts);
+            string json = JsonConvert.SerializeObject(Field, Formatting.Indented);
 
             // If no path given, output to console
             if (jsonPath == null)

LibIRD/ReIRD.cs

@@ -1,7 +1,5 @@
-using DiscUtils.Iso9660;
+using System;
-using System;
 using System.IO;
-using System.IO.Hashing;
 
 namespace LibIRD
 {
@@ -135,7 +133,7 @@ namespace LibIRD
             {
                 // If no layerbreak provided, ensure ISO is not BD-Video hybrid
                 using FileStream fs = new FileStream(isoPath, FileMode.Open, FileAccess.Read) ?? throw new FileNotFoundException(isoPath);
-                CDReader reader = new(fs, true, true);
+                DiscUtils.Iso9660.CDReader reader = new(fs);
                 if (reader.DirectoryExists("\\BDMV"))
                     throw new ArgumentException("Layerbreak must be provided for BD-Video hybrid discs");
                 // Assume disc has default layerbreak
@@ -232,39 +230,6 @@ namespace LibIRD
             return pic;
         }
 
-        /// <summary>
-        /// Generates the UID field by computing the CRC32 hash of the ISO
-        /// </summary>
-        /// <param name="isoPath">Path to the ISO</param>
-        /// <exception cref="FileNotFoundException"></exception>
-        private static uint GenerateUID(string isoPath)
-        {
-            // Check file exists
-            FileInfo iso;
-            try
-            {
-                iso = new FileInfo(isoPath);
-            }
-            catch (Exception e)
-            {
-                throw new ArgumentException("Invalid ISO Path: " + e.Message);
-            }
-            if (!iso.Exists)
-                throw new FileNotFoundException(nameof(isoPath));
-
-            // Compute CRC32 hash
-            byte[] crc32;
-            using (FileStream fs = File.OpenRead(isoPath))
-            {
-                Crc32 hasher = new();
-                hasher.Append(fs);
-                crc32 = hasher.GetCurrentHash();
-            }
-
-            // Redump ISO CRC32 hash is used as the Unique ID in the reproducible IRD
-            return BitConverter.ToUInt32(crc32, 0);
-        }
-
         /// <summary>
         /// Calculates ISO file size
         /// </summary>

README.md

@@ -13,6 +13,7 @@ IRDKit is a tool that allows direct use of LibIRD functionality from a command l
 - Printing info about all ISOs and IRDs in a folder: `irdkit info .`
 - Creating an IRD from an ISO: `irdkit create game.iso`
 - Finding differences between two IRDs: `irdkit diff game1.ird game2.ird`
+- Renaming an IRD or folder of IRDs using a redump DAT: `irdkit rename -d redump.dat game.ird`
 
 For detailed usage, read more [here](IRDKit).