Trim DiscUtils further

.gitmodules

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

IRDKit/IRDKit.csproj

@@ -5,11 +5,13 @@
     <OutputType>Exe</OutputType>
     <TargetName>irdkit</TargetName>
     <AssemblyName>irdkit</AssemblyName>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net472;net48;netcoreapp3.1;net5.0;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>
-	<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+	<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
-    <Version>0.4.1</Version>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Version>0.7.0</Version>
     
     <!-- Package Properties -->
     <Authors>Deterous</Authors>
@@ -27,11 +29,13 @@
   </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" />
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.2" />
+    <PackageReference Include="SabreTools.Hashing" Version="1.1.3" />
+    <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,31 @@ 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('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 +121,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>
@@ -159,11 +182,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)
+                            foreach (string file in isoFiles.OrderBy(x => x))
-                                ISO2IRD(file, irdPath: outputPath, verbose: opt.Verbose);
+                                ISO2IRD(file, irdPath: outputPath, keyPath: opt.KeyFile, verbose: opt.Verbose);
                         }
                         else
                         {
@@ -171,7 +196,7 @@ namespace IRDKit
                             if (!File.Exists(isoPath))
                             {
                                 Console.Error.WriteLine($"ISO not found: {isoPath}");
-                                return;
+                                continue;
                             }
 
                             string irdPath;
@@ -267,7 +292,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)
@@ -328,6 +353,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, 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, crc: opt.CRC, verbose: opt.Verbose);
+                            }
+                            catch (Exception e)
+                            {
+                                Console.Error.WriteLine(e);
+                            }
+                        }
+                    }
+
+                    break;
+
                 // Unknown command
                 default:
                     break;
@@ -355,7 +473,7 @@ namespace IRDKit
                     PrintISO(inPath, json, single, outPath);
                     return;
                 }
-                catch (InvalidFileSystemException)
+                catch (IOException)
                 {
                     // Not a valid ISO file despite extension, try open as IRD
                 }
@@ -405,18 +523,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)
                 {
@@ -453,7 +571,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)
                 {
@@ -585,7 +703,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
@@ -601,7 +719,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++)
             {
@@ -613,7 +731,7 @@ namespace IRDKit
             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)}");
+                printText.AppendLine($"File Offsets not Present in {irdPath2}: {string.Join(", ", missingOffsets2)}");
 
             // Print any extra config data difference
             if (IRD1.ExtraConfig != IRD2.ExtraConfig)
@@ -629,15 +747,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)
@@ -689,7 +807,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
@@ -702,16 +820,11 @@ namespace IRDKit
                         return irdPath;
                     }
                 }
-                catch (ArgumentException e)
+                catch (Exception e)
                 {
                     Console.Error.WriteLine(e.Message + ", failed to create IRD");
                     return null;
                 }
-                catch (FileNotFoundException)
-                {
-                    Console.Error.WriteLine("File not found, failed to create IRD");
-                    return null;
-                }
             }
 
             // Create new reproducible redump-style IRD with a given key file
@@ -719,30 +832,30 @@ 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
                     {
+                        Console.WriteLine($"Creating {irdPath} with Key: {LibIRD.IRD.ByteArrayToHexString(discKey)}");
                         IRD ird1 = new ReIRD(isoPath, discKey, layerbreak);
-                        Console.WriteLine($"Creating {irdPath} with Key: {Convert.ToHexString(discKey)}");
                         ird1.Write(irdPath);
                         if (verbose)
                             ird1.Print();
                         return irdPath;
                     }
                 }
-                catch (ArgumentException e)
+                catch (Exception e)
                 {
                     Console.Error.WriteLine(e.Message + ", failed to create IRD");
                     return null;
                 }
-                catch (FileNotFoundException)
-                {
-                    Console.Error.WriteLine("File not found, failed to create IRD");
-                    return null;
-                }
             }
 
             // Create new reproducible redump-style IRD with a given GetKey log
@@ -757,16 +870,11 @@ namespace IRDKit
                         ird1.Print();
                     return irdPath;
                 }
-                catch (ArgumentException e)
+                catch (Exception e)
                 {
                     Console.Error.WriteLine(e.Message + ", failed to create IRD");
                     return null;
                 }
-                catch (FileNotFoundException)
-                {
-                    Console.Error.WriteLine("File not found, failed to create IRD");
-                    return null;
-                }
             }
 
             // No key provided, try search for .key file
@@ -778,29 +886,24 @@ 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
                     {
+                        Console.WriteLine($"Creating {irdPath} with Key: {LibIRD.IRD.ByteArrayToHexString(discKey)}");
                         IRD ird1 = new ReIRD(isoPath, discKey, layerbreak);
-                        Console.WriteLine($"Creating {irdPath} with Key: {Convert.ToHexString(discKey)}");
                         ird1.Write(irdPath);
                         if (verbose)
                             ird1.Print();
                         return irdPath;
                     }
                 }
-                catch (ArgumentException e)
+                catch (Exception e)
                 {
                     Console.Error.WriteLine(e.Message + ", failed to create IRD");
                     return null;
                 }
-                catch (FileNotFoundException)
-                {
-                    Console.Error.WriteLine("File not found, failed to create IRD");
-                    return null;
-                }
             }
 
             // No key provided, try search for .getkey.log file
@@ -811,23 +914,18 @@ namespace IRDKit
                 // Found .getkey.log file, check it is valid
                 try
                 {
-                    Console.WriteLine($"Creating {irdPath} with key from: {getKeyLog}");
+                    Console.WriteLine($"Creating {irdPath} with key from: {logfilePath}");
-                    IRD ird1 = new ReIRD(isoPath, getKeyLog);
+                    IRD ird1 = new ReIRD(isoPath, logfilePath);
                     ird1.Write(irdPath);
                     if (verbose)
                         ird1.Print();
                     return irdPath;
                 }
-                catch (ArgumentException e)
+                catch (Exception e)
                 {
                     Console.Error.WriteLine(e.Message + ", failed to create IRD");
                     return null;
                 }
-                catch (FileNotFoundException)
-                {
-                    Console.Error.WriteLine("File not found, failed to create IRD");
-                    return null;
-                }
             }
 
             // No key provided, try get key from redump.org
@@ -835,20 +933,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);
-            using (FileStream fs = File.OpenRead(isoPath))
+            string crc32String = LibIRD.IRD.ByteArrayToHexString(crc32).ToLowerInvariant();
-            {
+
-                Crc32 hasher = new();
+            // Convert to UInt for use as UID in IRD
-                hasher.Append(fs);
+            Array.Reverse(crc32);
-                crc32 = hasher.GetCurrentHash();
+            uint crc32UInt = BitConverter.ToUInt32(crc32, 0);
-                // Change endianness
-                Array.Reverse(crc32);
-            }
-            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)
             {
@@ -858,16 +957,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");
@@ -887,7 +984,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");
@@ -895,28 +996,80 @@ 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);
+                IRD ird = new ReIRD(isoPath, key, layerbreak, crc32UInt);
                 ird.Write(irdPath);
                 if (verbose)
                     ird.Print();
                 return irdPath;
             }
-            catch (ArgumentException e)
+            catch (Exception e)
             {
                 Console.Error.WriteLine(e.Message + ", failed to create IRD");
                 return null;
             }
-            catch (FileNotFoundException)
+        }
+
+        public static XDocument DatParser(string datpath = null)
+        {
+            try
+            {
+                if (!File.Exists(datpath))
+                    return null;
+
+                return XDocument.Load(datpath);
+            }
+            catch
             {
-                Console.Error.WriteLine("File not found, failed to create IRD");
                 return null;
             }
         }
 
-        #endregion
+        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 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)}-{ird.TitleID.Substring(5, 5)}]";
+            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
 

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/LibIRD.csproj

@@ -2,11 +2,13 @@
 
   <PropertyGroup>
     <!-- Assembly Properties -->
-	<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net472;net48;netcoreapp3.1;net5.0;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>
-	<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+	<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
-    <Version>0.4.1</Version>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Version>0.7.0</Version>
     <PackageOutputPath>../nupkg</PackageOutputPath>
     
     <!-- Package Properties -->
@@ -26,10 +28,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DiscUtils\Library\DiscUtils.Core\DiscUtils.Core.csproj" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <ProjectReference Include="..\DiscUtils\Library\DiscUtils.Iso9660\DiscUtils.Iso9660.csproj" />
+    <PackageReference Include="SabreTools.Hashing" Version="1.1.3" />
-    <ProjectReference Include="..\DiscUtils\Library\DiscUtils.Streams\DiscUtils.Streams.csproj" />
-    <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
   </ItemGroup>
 
 </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
 {
@@ -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);
@@ -159,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>
@@ -171,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
 {
@@ -59,12 +57,7 @@ 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) { }
-        public ReIRD(string isoPath, string getKeyLog) : base(isoPath, getKeyLog, true)
-        {
-            // Generate Unique Identifier using ISO CRC32
-            UID = GenerateUID(isoPath);
-        }
 
         /// <summary>
         /// Constructor with optional additional region to generate a specific Disc ID
@@ -72,11 +65,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
+            // If the ISO CRC32 is provided, use it as the Unique ID
-            UID = GenerateUID(isoPath);
+            UID = uid == null ? 0x00000000 : (uint)uid;
 
             // Determine ISO file size
             long size = CalculateSize(isoPath);
@@ -135,11 +129,11 @@ namespace LibIRD
                 if (layerbreak >= 2 * BDLayerSize || layerbreak % SectorSize != 0)
                     throw new ArgumentException("Unexpected layerbreak value", nameof(size));
             }
-            else
+            else if (size > BDLayerSize)
             {
                 // 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
@@ -188,7 +182,7 @@ namespace LibIRD
 				    l0es[0], l0es[1], l0es[2], l0es[3],
                     // 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,
+                    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]
 				    0x44, 0x49, 0x01, 0x11, 0x00, 0x01, 0x20, 0x00,
@@ -236,45 +230,11 @@ 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="ArgumentNullException"></exception>
-        /// <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>
         /// <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)
         {

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 a folder of IRDs using a redump DAT: `irdkit rename -d redump.dat IRDs\`
 
 For detailed usage, read more [here](IRDKit).