Don't reverse CRC32

`-a`/`--all` for irdkit info command

.github/workflows/build.yml

@@ -0,0 +1,73 @@
+name: Build
+
+on:
+  push: {}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        project: [IRDKit]
+        runtime: [win-x86, win-x64, win-arm64, linux-x64, linux-arm64, osx-x64, osx-arm64]
+        framework: [net10.0]
+
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        submodules: 'true'
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v5
+      with:
+        dotnet-version: 10.0.x
+      
+    - name: Build
+      run: dotnet publish ${{ matrix.project }}/${{ matrix.project }}.csproj -f ${{ matrix.framework }} -r ${{ matrix.runtime }} -c Release -p:DebugType=None -p:DebugSymbols=false
+        
+    - name: Upload build
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}
+        path: ${{ matrix.project }}/bin/Release/${{ matrix.framework }}/${{ matrix.runtime }}/publish/*
+      
+  pack:
+    runs-on: windows-latest
+
+    strategy:
+      matrix:
+        project: [LibIRD]
+
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        submodules: 'true'
+
+    - name: Setup MSBuild
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Setup NuGet
+      uses: NuGet/setup-nuget@v2
+      with:
+        nuget-version: 'latest'
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v5
+      with:
+        dotnet-version: 10.0.x
+
+    - name: Restore NuGet packages
+      run: nuget restore LibIRD/LibIRD.csproj
+
+    - name: Build
+      run: msbuild ${{ matrix.project }}/${{ matrix.project }}.csproj /p:Configuration=Release
+
+    - name: Pack
+      run: dotnet pack ${{ matrix.project }}/${{ matrix.project }}.csproj -c Release -o ./artifacts
+        
+    - name: Upload nupkg
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ matrix.project }}
+        path: ./artifacts/*.nupkg

IRDKit/IRDKit.csproj

@@ -1,22 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <!-- Assembly Properties -->
     <OutputType>Exe</OutputType>
     <TargetName>irdkit</TargetName>
     <AssemblyName>irdkit</AssemblyName>
-    <TargetFrameworks>net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+	  <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
-	<CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <LangVersion>latest</LangVersion>
-	<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+    <PublishSingleFile>true</PublishSingleFile>
+    <SelfContained>false</SelfContained>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>0.7.0</Version>
+    <Version>1.0.1</Version>
     
     <!-- Package Properties -->
     <Authors>Deterous</Authors>
     <Description>Library for ISO Rebuild Data</Description>
-    <Copyright>Copyright (c) Deterous 2023-2024</Copyright>
+    <Copyright>Copyright (c) Deterous 2023-2025</Copyright>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/Deterous/LibIRD</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
@@ -30,8 +33,8 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="SabreTools.Hashing" Version="1.1.3" />
-    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.4" />
+    <PackageReference Include="SabreTools.Hashing" Version="1.6.0" />
+    <PackageReference Include="SabreTools.RedumpLib" Version="1.9.0" />
   </ItemGroup>
 
   <ItemGroup>

IRDKit/Program.cs

@@ -59,6 +59,9 @@ namespace IRDKit
             [Option('o', "output", HelpText = "Path to the text or json file to be created (will overwrite)")]
             public string OutPath { get; set; }
 
+            [Option('a', "all", HelpText = "Print the entire contents of the IRD")]
+            public bool All { get; set; }
+
             [Option('j', "json", HelpText = "Print IRD or ISO information as a JSON object")]
             public bool Json { get; set; }
 
@@ -97,6 +100,9 @@ namespace IRDKit
             [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; }
 
@@ -107,6 +113,19 @@ namespace IRDKit
             public bool Verbose { get; set; }
         }
 
+        /// <summary>
+        /// IRD verify command
+        /// </summary>
+        [Verb("verify", HelpText = "Verify a folder using an IRD")]
+        public class VerifyOptions
+        {
+            [Value(0, Required = true, HelpText = "Path to IRD file to use for validation")]
+            public string IRDPath { get; set; }
+            
+            [Value(1, Required = true, HelpText = "Folder path to validate")]
+            public string FolderPath { get; set; }
+        }
+
         #endregion
 
         #region Program
@@ -121,7 +140,7 @@ namespace IRDKit
             Console.OutputEncoding = Encoding.UTF8;
 
             // Parse arguments
-            var result = Parser.Default.ParseArguments<CreateOptions, InfoOptions, DiffOptions, RenameOptions>(args).WithParsed(Run);
+            var result = Parser.Default.ParseArguments<CreateOptions, InfoOptions, DiffOptions, RenameOptions, VerifyOptions>(args).WithParsed(Run);
         }
 
         /// <summary>
@@ -280,7 +299,7 @@ namespace IRDKit
                             string lastIRD = irdFiles.Last();
                             foreach (string file in irdFiles)
                             {
-                                PrintInfo(file, opt.Json, (noISO && file.Equals(lastIRD)), opt.OutPath);
+                                PrintInfo(file, opt.Json, (noISO && file.Equals(lastIRD)), opt.OutPath, opt.All);
                             }
 
 
@@ -322,7 +341,7 @@ namespace IRDKit
                             }
 
                             // Print info from given file
-                            PrintInfo(filePath, opt.Json, true, opt.OutPath);
+                            PrintInfo(filePath, opt.Json, true, opt.OutPath, opt.All);
 
                             if (opt.OutPath != null && opt.OutPath != "")
                                 Console.WriteLine($"Info saved to {opt.OutPath}");
@@ -414,7 +433,7 @@ namespace IRDKit
                             {
                                 try
                                 {
-                                    RenameIRD(file, datfile, serial: opt.Serial, crc: opt.CRC, verbose: opt.Verbose);
+                                    RenameIRD(file, datfile, serial: opt.Serial, ver: opt.Ver, crc: opt.CRC, verbose: opt.Verbose);
                                 }
                                 catch (Exception e)
                                 {
@@ -435,7 +454,7 @@ namespace IRDKit
                             // Rename provided IRD path
                             try
                             {
-                                RenameIRD(irdPath, datfile, serial: opt.Serial, crc: opt.CRC, verbose: opt.Verbose);
+                                RenameIRD(irdPath, datfile, serial: opt.Serial, ver: opt.Ver, crc: opt.CRC, verbose: opt.Verbose);
                             }
                             catch (Exception e)
                             {
@@ -446,6 +465,60 @@ namespace IRDKit
 
                     break;
 
+                // Process options from a 'rename' command
+                case VerifyOptions opt:
+
+                    string verifyIRDPath = opt.IRDPath;
+                    string verifyFolderPath = opt.FolderPath;
+
+                    // Validate required parameters
+                    if (string.IsNullOrEmpty(verifyIRDPath))
+                    {
+                        Console.Error.WriteLine("Provide a IRD path to verify with");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(verifyFolderPath))
+                    {
+                        Console.Error.WriteLine("Provide a folder path to verify");
+                        return;
+                    }
+
+                    bool switched = false;
+                    if (!File.Exists(verifyIRDPath))
+                    {
+                        // Check if arguments are switched
+                        if (File.Exists(verifyFolderPath))
+                        {
+                            switched = true;
+                            string temp = verifyIRDPath;
+                            verifyIRDPath = verifyFolderPath;
+                            verifyFolderPath = temp;
+                        }
+                        else
+                        {
+                            Console.Error.WriteLine("Provide a valid IRD file to verify with");
+                            return;
+                        }
+                    }
+
+                    if (!Directory.Exists(verifyFolderPath))
+                    {
+                        if (switched)
+                        {
+                            Console.Error.WriteLine("Provide a valid IRD file to verify with");
+                            return;
+                        }
+                        else
+                        {
+                            Console.Error.WriteLine("Provide a valid folder path to verify");
+                            return;
+                        }
+                    }
+
+                    VerifyIRD(verifyIRDPath, verifyFolderPath);
+
+                    break;
+
                 // Unknown command
                 default:
                     break;
@@ -461,8 +534,9 @@ namespace IRDKit
         /// </summary>
         /// <param name="inPath">File to retrieve info from</param>
         /// <param name="json">Whether to format output as JSON (true) or plain text (false)</param>
+        /// <param name="single">Whether to print a single JSON object or not</param>
         /// <param name="outPath">File to output info to</param>
-        public static void PrintInfo(string inPath, bool json, bool single = true, string outPath = null)
+        public static void PrintInfo(string inPath, bool json, bool single = true, string outPath = null, bool printAll = false)
         {
             // Check if file is an ISO
             bool isISO = String.Compare(Path.GetExtension(inPath), ".iso", StringComparison.OrdinalIgnoreCase) == 0;
@@ -489,10 +563,10 @@ namespace IRDKit
                         File.AppendAllText(outPath, $"\"{Path.GetFileName(inPath)}\": ");
                     else
                         Console.Write($"\"{Path.GetFileName(inPath)}\": ");
-                    ird.PrintJson(outPath, single);
+                    ird.PrintJson(outPath, single, printAll);
                 }
                 else
-                    IRD.Read(inPath).Print(outPath, Path.GetFileName(inPath));
+                    IRD.Read(inPath).Print(outPath, Path.GetFileName(inPath), printAll);
 
                 if (json)
                     return;
@@ -515,6 +589,7 @@ namespace IRDKit
         /// </summary>
         /// <param name="isoPath">Path to ISO file</param>
         /// <param name="json">Whether to format output as JSON (true) or plain text (false)</param>
+        /// <param name="single">Whether to print a single JSON object or not</param>
         /// <param name="outPath">File to output info to</param>
         /// <exception cref="FileNotFoundException"></exception>
         /// <exception cref="InvalidFileSystemException"></exception>
@@ -764,6 +839,32 @@ namespace IRDKit
                 Console.WriteLine(printText.ToString());
         }
 
+        /// <summary>
+        /// Verify a folder matches against an IRD
+        /// </summary>
+        /// <param name="irdPath">IRD path to verify with</param>
+        /// <param name="folderPath">Folder containing files to verify against</param>
+        public static void VerifyIRD(string irdPath, string folderPath)
+        {
+            // Get file paths and their hashes to verify with
+            var fileHashes = IRD.Read(irdPath).GetFileHashes();
+
+            // Check that all files and their hashes exist in the folder path
+            foreach (var kvp in fileHashes)
+            {
+                string filePath = Path.Combine(folderPath, kvp.Key);
+                if (!File.Exists(filePath))
+                {
+                    Console.WriteLine($"{filePath} doesn't exist");
+                    continue;
+                }
+                var hash = HashTool.GetFileHashArray(filePath, HashType.MD5);
+                if (!hash.SequenceEqual(kvp.Value))
+                    Console.WriteLine($"{filePath}: {IRD.ByteArrayToHexString(hash)}");
+            }
+            Console.WriteLine("Verification complete!");
+        }
+
         /// <summary>
         /// Creates an IRD file from an ISO file
         /// </summary>
@@ -937,17 +1038,11 @@ namespace IRDKit
             string crc32String = LibIRD.IRD.ByteArrayToHexString(crc32).ToLowerInvariant();
 
             // Convert to UInt for use as UID in IRD
-            Array.Reverse(crc32);
             uint crc32UInt = BitConverter.ToUInt32(crc32, 0);
 
             // Search for ISO on redump.org
-#if !NETFRAMEWORK
-            RedumpHttpClient redump = new();
+            RedumpClient redump = new();
             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)
             {
@@ -960,11 +1055,7 @@ namespace IRDKit
                 string sha1String = HashTool.GetFileHash(isoPath, HashType.SHA1);
 
                 // Search redump.org for SHA1 hash
-#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");
@@ -984,12 +1075,8 @@ 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)
+            byte[] key = redump.DownloadData($"http://redump.org/disc/{id}/key").ConfigureAwait(false).GetAwaiter().GetResult();
+            if (key == null || key.Length != 16)
             {
                 Console.Error.WriteLine("Invalid key obtained from redump and no valid key provided, cannot create IRD");
                 return null;
@@ -1034,7 +1121,7 @@ namespace IRDKit
             return node.Attribute("name").Value;
         }
 
-        public static void RenameIRD(string irdPath, XDocument datfile, bool serial = false, bool crc = false, bool verbose = false)
+        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);
 
@@ -1043,7 +1130,9 @@ namespace IRDKit
 
             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)}]";
+                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}]";
 

IRDKit/README.md

@@ -32,6 +32,7 @@ For all options, run `irdkit help info`
 To print info about an ISO or IRD file, run `irdkit info game.iso` or `irdkit info game.ird`
 The info can be printed to a file, e.g. `-o out.txt` or `--output=`
 The info can be formatted as a JSON with `-j` or `--json`
+To print all info in the IRD use `-a` or `--all`
 
 ## Comparing IRDs
 
@@ -39,3 +40,13 @@ 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`
+
+## Verifying with an IRD
+
+To verify that a folder containing files from a PS3 disc match the file hashes within an IRD, run `irdkit verify game.ird folder/of/files`

LibIRD/IRD.cs

@@ -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;
@@ -636,27 +647,35 @@ namespace LibIRD
                 // Redump-style IRDs set the lowest bit of ExtraConfig to 1
                 ExtraConfig |= 0x01;
 
-                // Redump-style IRDs use fields from PS3_DISC.SFB
-                using SparseStream s = reader.OpenFile("PS3_DISC.SFB", FileMode.Open, FileAccess.Read);
+                // 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);
 
-                // Parse PS3_DISC.SFB file
-                PS3_DiscSFB ps3_DiscSFB = new(s);
+                    // Parse PS3_DISC.SFB file
+                    PS3_DiscSFB ps3_DiscSFB = new(s);
 
-                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 = titleID.Substring(0, 4) + titleID.Substring(5, 5);
+                    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 = 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
-                bool discVersionFound = ps3_DiscSFB.Field.TryGetValue("VERSION", out string discVersion);
-                if (discVersionFound)
-                    DiscVersion = discVersion;
+                    // 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
+                    bool discVersionFound = ps3_DiscSFB.Field.TryGetValue("VERSION", out string discVersion);
+                    if (discVersionFound)
+                        DiscVersion = discVersion;
+                }
+                catch { }
             }
 
-            // Read PS3 Metadata from PARAM.SFO
-            using (SparseStream s = reader.OpenFile("\\PS3_GAME\\PARAM.SFO", FileMode.Open, FileAccess.Read))
+            // Try to get Title ID, Title, Disc Version, and App Version from PARAM.SFO
+            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);
 
@@ -691,18 +710,33 @@ namespace LibIRD
                 else
                     AppVersion = "\0\0\0\0\0";
             }
+            catch { }
 
-            // Determine system update version
-            GetSystemVersion(fs, reader);
+            // Ensure Title ID is set and valid
+            if (string.IsNullOrEmpty(TitleID) || TitleID.Length != 9)
+                TitleID = "\0\0\0\0\0\0\0\0\0";
 
-            // Read and compress the ISO header
-            GetHeader(fs, reader);
+            // Ensure Title is set
+            Title ??= string.Empty;
 
-            // Read and compress the ISO footer
-            GetFooter(fs);
+            // Ensure Disc Version is set and valid
+            if (string.IsNullOrEmpty(DiscVersion) || DiscVersion.Length != 5)
+                DiscVersion = "\0\0\0\0\0";
 
-            // Get info region info from ISO
-            GetRegions(fs);
+            // 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 { }
+
+            // Ensure System Version was set and valid
+            if (string.IsNullOrEmpty(SystemVersion) || SystemVersion.Length != 4)
+                SystemVersion = "\0\0\0\0";
 
             // 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
 
@@ -756,13 +807,13 @@ namespace LibIRD
                 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
             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)
@@ -771,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);
@@ -989,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;
@@ -1035,6 +1091,10 @@ namespace LibIRD
                 CountFiles(dirInfo);
         }
 
+        #endregion
+
+        #region Hashing
+
         /// <summary>
         /// Calculate hashes for all region and file extents
         /// </summary>
@@ -1080,13 +1140,31 @@ 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)
                     {
+                        isoHasher.Terminate();
                         crc32 = isoHasher.CurrentHashBytes;
-                        Array.Reverse(crc32);
+                        isoHasher.Dispose();
                         UID = BitConverter.ToUInt32(crc32, 0);
                     }
+
                     return;
                 }
 
@@ -1180,7 +1258,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);
@@ -1215,7 +1293,7 @@ namespace LibIRD
                     // Check if current file has ended in this buffer (assumes last extent contains last byte)
                     int lastExtent = FileExtents[i].Length - 1;
                     long lastByte = SectorSize * FileExtents[i][lastExtent].Offset + FileExtents[i][lastExtent].Count;
-                    if (lastByte < SectorSize * (currentSector + bufSectors)
+                    if (lastByte <= SectorSize * (currentSector + bufSectors)
                         && lastByte > SectorSize * currentSector)
                     {
                         // Close file hash
@@ -1342,7 +1420,6 @@ namespace LibIRD
             // Calculate the little-endian 32-bit "IEEE 802.3" CRC value of the IRD contents so far
             stream.Position = 0;
             byte[] crc32 = HashTool.GetStreamHashArray(stream, HashType.CRC32, true);
-            Array.Reverse(crc32);
 
             // Write final CRC value to the stream
             stream.Write(crc32, 0, 4);
@@ -1359,7 +1436,14 @@ namespace LibIRD
 #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>
@@ -1477,7 +1561,9 @@ namespace LibIRD
         /// Prints IRD fields to console
         /// </summary>
         /// <param name="printPath">Optional path to save file to</param>
-        public void Print(string printPath = null, string irdName = null)
+        /// <param name="printAll">Optionally print IRD name in output header</param>
+        /// <param name="printAll">Optionally print all IRD data</param>
+        public void Print(string printPath = null, string irdName = null, bool printAll = false)
         {
             // Build string from parameters
             StringBuilder printText = new();
@@ -1495,11 +1581,38 @@ namespace LibIRD
             printText.AppendLine($"PUP Version:  {SystemVersion}");
             printText.AppendLine($"Disc Version: {DiscVersion}");
             printText.AppendLine($"App Version:  {AppVersion}");
+            if (printAll)
+            {
+                printText.AppendLine($"Header:       {ByteArrayToHexString(Header)}");
+                printText.AppendLine($"Footer:       {ByteArrayToHexString(Footer)}");
+            }
             printText.AppendLine($"Regions:      {RegionCount}");
+            if (printAll)
+            {
+                for (int i = 0; i < RegionCount; i++)
+                {
+                    printText.Append($"              Region {i} : ");
+                    if (RegionHashes[i] == null)
+                        printText.AppendLine($"{ByteArrayToHexString(NullMD5)}");
+                    else
+                        printText.AppendLine($"{ByteArrayToHexString(RegionHashes[i])}");
+                }
+            }
             printText.AppendLine($"Files:        {FileCount}");
-            if (ExtraConfig != 0x0000)
+            if (printAll)
+            {
+                for (int i = 0; i < FileCount; i++)
+                {
+                    printText.Append($"              {FileKeys[i]:X7} : ");
+                    if (FileHashes[i] == null)
+                        printText.AppendLine($"{ByteArrayToHexString(NullMD5)}");
+                    else
+                        printText.AppendLine($"{ByteArrayToHexString(FileHashes[i])}");
+                }
+            }
+            if (printAll || ExtraConfig != 0x0000)
                 printText.AppendLine($"Extra Config: {ExtraConfig:X4}");
-            if (Attachments != 0x0000)
+            if (printAll || Attachments != 0x0000)
                 printText.AppendLine($"Attachments:  {Attachments:X4}");
             printText.AppendLine($"Unique ID:    {UID:X8}");
             printText.AppendLine($"Data 1 Key:   {ByteArrayToHexString(Data1Key)}");
@@ -1526,7 +1639,9 @@ namespace LibIRD
         /// Prints IRD fields to a json object
         /// </summary>
         /// <param name="jsonPath">Optionally print to json file</param>
-        public void PrintJson(string jsonPath = null, bool single = true)
+        /// <param name="single">Optionally print single object (no trailing comma)</param>
+        /// <param name="printAll">Optionally print all IRD data</param>
+        public void PrintJson(string jsonPath = null, bool single = true, bool printAll = false)
         {
             // Build string from parameters
             StringBuilder json = new();
@@ -1540,11 +1655,58 @@ namespace LibIRD
             json.AppendLine($"  \"PUP Version\": \"{SystemVersion}\",");
             json.AppendLine($"  \"Disc Version\": \"{DiscVersion}\",");
             json.AppendLine($"  \"App Version\": \"{AppVersion}\",");
-            json.AppendLine($"  \"Regions\": \"{RegionCount}\",");
-            json.AppendLine($"  \"Files\": \"{FileCount}\",");
-            if (ExtraConfig != 0x0000)
+            if (printAll)
+            {
+                json.AppendLine($"  \"Header\": \"{ByteArrayToHexString(Header)}\",");
+                json.AppendLine($"  \"Footer\": \"{ByteArrayToHexString(Footer)}\",");
+            }
+            if (!printAll)
+                json.AppendLine($"  \"Regions\": \"{RegionCount}\",");
+            else
+            {
+                json.Append($"  \"Regions\": [ ");
+                for (int i = 0; i < RegionCount - 1; i++)
+                {
+                    if (RegionHashes[i] == null)
+                        json.Append($"\"{ByteArrayToHexString(NullMD5)}\", ");
+                    else
+                        json.Append($"\"{ByteArrayToHexString(RegionHashes[i])}\", ");
+                }
+                if (RegionCount > 0)
+                {
+                    if (RegionHashes[RegionCount - 1] == null)
+                        json.Append($"\"{ByteArrayToHexString(NullMD5)}\"");
+                    else
+                        json.Append($"\"{ByteArrayToHexString(RegionHashes[RegionCount - 1])}\"");
+                }
+                json.AppendLine(" ],");
+            }
+            if(!printAll)
+                json.AppendLine($"  \"Files\": \"{FileCount}\",");
+            else
+            {
+                json.Append($"  \"Files\": [ ");
+                for (int i = 0; i < RegionCount - 1; i++)
+                {
+                    json.Append($"  \"{FileKeys[i]}\" : ");
+                    if (RegionHashes[i] == null)
+                        json.Append($"\"{ByteArrayToHexString(NullMD5)}\", ");
+                    else
+                        json.Append($"\"{ByteArrayToHexString(FileHashes[i])}\", ");
+                }
+                if (FileCount > 0)
+                {
+                    json.Append($"  \"{FileKeys[FileCount - 1]}\" : ");
+                    if (FileHashes[FileCount - 1] == null)
+                        json.Append($"\"{ByteArrayToHexString(NullMD5)}\"");
+                    else
+                        json.Append($"\"{ByteArrayToHexString(FileHashes[FileCount - 1])}\"");
+                }
+                json.AppendLine(" ],");
+            }
+            if (printAll || ExtraConfig != 0x0000)
                 json.AppendLine($"  \"Extra Config\": \"{ExtraConfig:X4}\",");
-            if (Attachments != 0x0000)
+            if (printAll || Attachments != 0x0000)
                 json.AppendLine($"  \"Attachments\": \"{Attachments:X4}\",");
             json.AppendLine($"  \"Unique ID\": \"{UID:X8}\",");
             json.AppendLine($"  \"Data 1 Key\": \"{ByteArrayToHexString(Data1Key)}\",");
@@ -1573,6 +1735,82 @@ namespace LibIRD
 
         #endregion
 
+        #region IRD Validation
+
+        /// <summary>
+        /// Returns dictionary of file paths and their offset
+        /// </summary>
+        /// <param name="cd">CDReader object</param>
+        public Dictionary<string, byte[]> GetFileHashes()
+        {
+            using MemoryStream headerStream = new MemoryStream(Header);
+            using GZipStream gzStream = new GZipStream(headerStream, CompressionMode.Decompress);
+            using MemoryStream isoStream = new MemoryStream();
+#if NETCOREAPP || NETSTANDARD || NET40_OR_GREATER
+            gzStream.CopyTo(isoStream);
+#else
+            byte[] buffer = new byte[SectorSize];
+            int bytesRead;
+            while ((bytesRead = gzStream.Read(buffer, 0, buffer.Length)) > 0)
+            {
+                isoStream.Write(buffer, 0, bytesRead);
+            }
+#endif
+            isoStream.Position = 0;
+            using CDReader reader = new CDReader(isoStream);
+
+            // Get all file paths and their offsets
+            var files = new Dictionary<string, long>();
+            DiscDirectoryInfo rootDir = reader.GetDirectoryInfo("\\");
+            GetFileOffsets(reader, rootDir, files);
+
+            // Get all paths at each offset
+            var offsetToHash = new Dictionary<long, byte[]>();
+            for (int i = 0; i < FileCount; i++)
+                offsetToHash[FileKeys[i]] = FileHashes[i];
+
+            // Return dictionary of paths and hashes
+            var result = new Dictionary<string, byte[]>();
+            foreach (KeyValuePair<string, long> kvp in files)
+            {
+                if (offsetToHash.ContainsKey(kvp.Value))
+                    result[kvp.Key] = offsetToHash[kvp.Value];
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Gets all file paths from the ISO header
+        /// </summary>
+        /// <param name="reader">CDReader object</param>
+        /// <param name="path">Path to look within</param>
+        /// <param name="files">Dictionary of files and their offset</param>
+        public void GetFileOffsets(CDReader reader, DiscDirectoryInfo path, Dictionary<string, long> files)
+        {
+            foreach (DiscFileInfo fileInfo in path.GetFiles())
+            {
+                string filePath = fileInfo.FullName;
+                Range<long, long>[] fileExtent = reader.PathToClusters(filePath);
+                if (fileExtent == null && fileExtent.Length == 0)
+                    throw new IOException($"Unexpected file extents for {filePath}");
+                long offset = fileExtent[0].Offset;
+                for (int i = 1; i < fileExtent.Length; i++)
+                {
+                    if (fileExtent[i] == null)
+                        throw new IOException($"Unexpected file extents for {filePath}");
+                    if (fileExtent[i].Offset < offset)
+                        offset = fileExtent[i].Offset;
+                }
+                files[filePath] = offset;
+            }
+            foreach (DiscDirectoryInfo dirInfo in path.GetDirectories())
+            {
+                GetFileOffsets(reader, dirInfo, files);
+            }
+        }
+
+        #endregion
+
         #region Helper Functions
 
         /// <summary>

LibIRD/LibIRD.csproj

@@ -1,20 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <!-- Assembly Properties -->
-    <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>
+    <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <LangVersion>latest</LangVersion>
-	<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>0.7.0</Version>
+    <Version>1.0.1</Version>
     <PackageOutputPath>../nupkg</PackageOutputPath>
-    
+
+    <!-- Avoid inexact read with 'System.IO.Stream.Read' -->
+    <NoWarn>CA2022</NoWarn>
+
     <!-- Package Properties -->
     <Authors>Deterous</Authors>
     <Description>Library for ISO Rebuild Data</Description>
-    <Copyright>Copyright (c) Deterous 2023-2024</Copyright>
+    <Copyright>Copyright (c) Deterous 2023-2025</Copyright>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/Deterous/LibIRD/</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
@@ -27,9 +29,14 @@
     <None Include="./README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
+  <!-- Support for old .NET versions -->
+  <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`))">
+      <PackageReference Include="Net30.LinqBridge" Version="1.3.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="SabreTools.Hashing" Version="1.1.3" />
+    <PackageReference Include="SabreTools.Hashing" Version="1.6.0" />
   </ItemGroup>
 
 </Project>

README.md

@@ -13,7 +13,8 @@ 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\`
+- Renaming an IRD or folder of IRDs using a redump DAT: `irdkit rename -d redump.dat game.ird`
+- Verify a JB Folder with an IRD: `irdkit verify game.ird folder`
 
 For detailed usage, read more [here](IRDKit).
 

publish-irdkit.ps1

@@ -1,15 +0,0 @@
-dotnet publish -c Release -f net8.0 -r win-x86 --self-contained=false  -p:PublishSingleFile=true -p:DebugType=None IRDKit\IRDKit.csproj
-dotnet publish -c Release -f net8.0 -r win-x64 --self-contained=false  -p:PublishSingleFile=true -p:DebugType=None IRDKit\IRDKit.csproj
-dotnet publish -c Release -f net8.0 -r win-arm64 --self-contained=false  -p:PublishSingleFile=true -p:DebugType=None IRDKit\IRDKit.csproj
-dotnet publish -c Release -f net8.0 -r linux-x64 --self-contained=false  -p:PublishSingleFile=true -p:DebugType=None IRDKit\IRDKit.csproj
-dotnet publish -c Release -f net8.0 -r linux-arm64 --self-contained=false  -p:PublishSingleFile=true -p:DebugType=None IRDKit\IRDKit.csproj
-dotnet publish -c Release -f net8.0 -r osx-x64 --self-contained=false  -p:PublishSingleFile=true -p:DebugType=None IRDKit\IRDKit.csproj
-dotnet publish -c Release -f net8.0 -r osx-arm64 --self-contained=false  -p:PublishSingleFile=true -p:DebugType=None IRDKit\IRDKit.csproj
-
-Compress-Archive -Path "./IRDKit/bin/Release/net8.0/win-x86/publish/irdkit.exe" -Destination "./irdkit-win-x86.zip" -CompressionLevel "Optimal"
-Compress-Archive -Path "./IRDKit/bin/Release/net8.0/win-x64/publish/irdkit.exe" -Destination "./irdkit-win-x64.zip" -CompressionLevel "Optimal"
-Compress-Archive -Path "./IRDKit/bin/Release/net8.0/win-arm64/publish/irdkit.exe" -Destination "./irdkit-win-arm64.zip" -CompressionLevel "Optimal"
-Compress-Archive -Path "./IRDKit/bin/Release/net8.0/linux-x64/publish/irdkit" -Destination "./irdkit-linux-x64.zip" -CompressionLevel "Optimal"
-Compress-Archive -Path "./IRDKit/bin/Release/net8.0/linux-arm64/publish/irdkit" -Destination "./irdkit-linux-arm64.zip" -CompressionLevel "Optimal"
-Compress-Archive -Path "./IRDKit/bin/Release/net8.0/osx-x64/publish/irdkit" -Destination "./irdkit-osx-x64.zip" -CompressionLevel "Optimal"
-Compress-Archive -Path "./IRDKit/bin/Release/net8.0/osx-arm64/publish/irdkit" -Destination "./irdkit-osx-arm64.zip" -CompressionLevel "Optimal"