Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
23f8dce272 | ||
|
|
8e45432aab | ||
|
|
e9bb0ae00a | ||
|
|
4116c56b7d | ||
|
|
e30ac0961a | ||
|
|
1ef9f06e35 |
+1
-1
Submodule DiscUtils updated: f53a1dab61...a99992e5f4
@@ -3,19 +3,18 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Assembly Properties -->
|
<!-- Assembly Properties -->
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<PackAsTool>true</PackAsTool>
|
<TargetName>irdkit</TargetName>
|
||||||
<ToolCommandName>irdkit</ToolCommandName>
|
<AssemblyName>irdkit</AssemblyName>
|
||||||
<PackageOutputPath>./nupkg</PackageOutputPath>
|
|
||||||
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
|
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
|
||||||
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>0.3.0</Version>
|
<Version>0.4.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Deterous</Authors>
|
<Authors>Deterous</Authors>
|
||||||
<Description>Library for ISO Rebuild Data</Description>
|
<Description>Library for ISO Rebuild Data</Description>
|
||||||
<Copyright>Copyright (c) Deterous 2023</Copyright>
|
<Copyright>Copyright (c) Deterous 2023-2024</Copyright>
|
||||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||||
<RepositoryUrl>https://github.com/Deterous/LibIRD</RepositoryUrl>
|
<RepositoryUrl>https://github.com/Deterous/LibIRD</RepositoryUrl>
|
||||||
<RepositoryType>git</RepositoryType>
|
<RepositoryType>git</RepositoryType>
|
||||||
@@ -29,8 +28,8 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\LibIRD\LibIRD.csproj" />
|
<ProjectReference Include="..\LibIRD\LibIRD.csproj" />
|
||||||
<ProjectReference Include="..\DiscUtils\Library\DiscUtils.Core\DiscUtils.Core.csproj" />
|
<ProjectReference Include="..\DiscUtils\Library\DiscUtils.Core\DiscUtils.Core.csproj" />
|
||||||
<ProjectReference Include="..\DiscUtils\Library\DiscUtils.Iso9660\DiscUtils.Iso9660.csproj" />
|
<ProjectReference Include="..\DiscUtils\Library\DiscUtils.Iso9660\DiscUtils.Iso9660.csproj" />
|
||||||
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
||||||
<PackageReference Include="SabreTools.RedumpLib" Version="1.3.2" />
|
<PackageReference Include="SabreTools.RedumpLib" Version="1.3.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
+236
-107
@@ -44,6 +44,9 @@ namespace IRDKit
|
|||||||
|
|
||||||
[Option('r', "recurse", HelpText = "Recurse through all subdirectories and generate IRDs for all ISOs")]
|
[Option('r', "recurse", HelpText = "Recurse through all subdirectories and generate IRDs for all ISOs")]
|
||||||
public bool Recurse { get; set; }
|
public bool Recurse { get; set; }
|
||||||
|
|
||||||
|
[Option('v', "verbose", HelpText = "Print more information during IRD creation")]
|
||||||
|
public bool Verbose { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -111,12 +114,17 @@ namespace IRDKit
|
|||||||
case CreateOptions opt:
|
case CreateOptions opt:
|
||||||
|
|
||||||
// Validate ISO paths
|
// Validate ISO paths
|
||||||
ArgumentNullException.ThrowIfNull(opt.ISOPath);
|
if (opt.ISOPath == null || !opt.ISOPath.Any())
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine("Provide a valid ISO path to create an IRD");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
foreach (string isoPath in opt.ISOPath)
|
foreach (string isoPath in opt.ISOPath)
|
||||||
{
|
{
|
||||||
// Validate ISO path
|
// Validate ISO path
|
||||||
ArgumentNullException.ThrowIfNull(isoPath);
|
if (string.IsNullOrEmpty(isoPath))
|
||||||
|
continue;
|
||||||
|
|
||||||
// If directory, search for all ISOs in current directory
|
// If directory, search for all ISOs in current directory
|
||||||
if (Directory.Exists(isoPath))
|
if (Directory.Exists(isoPath))
|
||||||
@@ -125,47 +133,57 @@ namespace IRDKit
|
|||||||
IEnumerable<string> isoFiles;
|
IEnumerable<string> isoFiles;
|
||||||
if (opt.Recurse)
|
if (opt.Recurse)
|
||||||
{
|
{
|
||||||
if (isoPath == ".")
|
if (opt.Verbose && isoPath == ".")
|
||||||
Console.WriteLine($"Recursively searching for ISOs in current directory");
|
Console.WriteLine($"Recursively searching for ISOs in current directory");
|
||||||
else
|
else if (opt.Verbose)
|
||||||
Console.WriteLine($"Recursively searching for ISOs in {isoPath}");
|
Console.WriteLine($"Recursively searching for ISOs in {isoPath}");
|
||||||
isoFiles = Directory.EnumerateFiles(isoPath, "*.iso", SearchOption.AllDirectories);
|
isoFiles = Directory.EnumerateFiles(isoPath, "*.iso", SearchOption.AllDirectories);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (isoPath == ".")
|
if (opt.Verbose && isoPath == ".")
|
||||||
Console.WriteLine($"Searching for ISOs in current directory");
|
Console.WriteLine($"Searching for ISOs in current directory");
|
||||||
else
|
else if (opt.Verbose)
|
||||||
Console.WriteLine($"Searching for ISOs in {isoPath}");
|
Console.WriteLine($"Searching for ISOs in {isoPath}");
|
||||||
isoFiles = Directory.EnumerateFiles(isoPath, "*.iso", SearchOption.TopDirectoryOnly);
|
isoFiles = Directory.EnumerateFiles(isoPath, "*.iso", SearchOption.TopDirectoryOnly);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Warn if no files are found
|
// Warn if no files are found
|
||||||
if (!isoFiles.Any())
|
if (!isoFiles.Any())
|
||||||
Console.WriteLine("No ISOs found (ensure .iso extension)");
|
{
|
||||||
|
if (opt.Recurse)
|
||||||
|
Console.Error.WriteLine($"No ISOs found in {isoPath} (ensure .iso extension)");
|
||||||
|
else
|
||||||
|
Console.Error.WriteLine($"No ISOs found in {isoPath} (ensure .iso extension, or try use -r)");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine output IRD folder
|
||||||
|
string outputPath = Path.GetDirectoryName(opt.IRDPath);
|
||||||
|
|
||||||
// Create an IRD file for all ISO files found
|
// Create an IRD file for all ISO files found
|
||||||
foreach (string file in isoFiles)
|
foreach (string file in isoFiles)
|
||||||
ISO2IRD(file);
|
ISO2IRD(file, irdPath: outputPath, verbose: opt.Verbose);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Check that given file exists
|
// Check that given file exists
|
||||||
if (!File.Exists(isoPath)) throw new ArgumentException("Not a valid file or directory");
|
if (!File.Exists(isoPath))
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine($"ISO not found: {isoPath}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Save to given output path, if only 1 IRD is being created
|
string irdPath;
|
||||||
if (opt.ISOPath.Count() == 1 && opt.IRDPath != null && opt.IRDPath != "")
|
// Save to given output path and filename, if only 1 IRD is being created
|
||||||
{
|
if (opt.ISOPath.Count() == 1)
|
||||||
string irdPath = ISO2IRD(isoPath, opt.IRDPath, opt.Key, opt.KeyFile, opt.GetKeyLog, opt.Layerbreak);
|
irdPath = ISO2IRD(isoPath, irdPath: opt.IRDPath, hexKey: opt.Key, keyPath: opt.KeyFile, getKeyLog: opt.GetKeyLog, layerbreak: opt.Layerbreak, verbose: opt.Verbose);
|
||||||
if (irdPath != null)
|
// Save to given output path, if more than 1 IRD is being created
|
||||||
Console.WriteLine($"IRD saved to {irdPath}");
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
irdPath = ISO2IRD(isoPath, irdPath: Path.GetDirectoryName(opt.IRDPath), verbose: opt.Verbose);
|
||||||
string irdPath = ISO2IRD(isoPath, null, opt.Key, opt.KeyFile, opt.GetKeyLog, opt.Layerbreak);
|
|
||||||
if (irdPath != null)
|
if (irdPath != null)
|
||||||
Console.WriteLine($"IRD saved to {irdPath}");
|
Console.WriteLine($"IRD saved to {irdPath}");
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,7 +193,11 @@ namespace IRDKit
|
|||||||
case InfoOptions opt:
|
case InfoOptions opt:
|
||||||
|
|
||||||
// Validate required parameter
|
// Validate required parameter
|
||||||
ArgumentNullException.ThrowIfNull(opt.InPath);
|
if (opt.InPath == null || !opt.InPath.Any())
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine("Provide a valid ISO or IRD path to print info about");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Clear the output file path if it exists
|
// Clear the output file path if it exists
|
||||||
if (opt.OutPath != null && opt.OutPath != "")
|
if (opt.OutPath != null && opt.OutPath != "")
|
||||||
@@ -184,7 +206,8 @@ namespace IRDKit
|
|||||||
foreach (string filePath in opt.InPath)
|
foreach (string filePath in opt.InPath)
|
||||||
{
|
{
|
||||||
// Validate path
|
// Validate path
|
||||||
ArgumentNullException.ThrowIfNull(filePath);
|
if (string.IsNullOrEmpty(filePath))
|
||||||
|
continue;
|
||||||
|
|
||||||
// If directory, search for all ISOs in current directory
|
// If directory, search for all ISOs in current directory
|
||||||
if (Directory.Exists(filePath))
|
if (Directory.Exists(filePath))
|
||||||
@@ -213,7 +236,10 @@ namespace IRDKit
|
|||||||
|
|
||||||
// Warn if no files are found
|
// Warn if no files are found
|
||||||
if (!isoFiles.Any() && !irdFiles.Any())
|
if (!isoFiles.Any() && !irdFiles.Any())
|
||||||
Console.WriteLine("No IRDs or ISOs found (ensure .ird and .iso extensions)");
|
{
|
||||||
|
Console.Error.WriteLine("No IRDs or ISOs found (ensure .ird and .iso extensions)");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Open JSON object
|
// Open JSON object
|
||||||
if (opt.Json)
|
if (opt.Json)
|
||||||
@@ -245,7 +271,7 @@ namespace IRDKit
|
|||||||
{
|
{
|
||||||
// Not a valid ISO file despite extension, assume file is an IRD
|
// Not a valid ISO file despite extension, assume file is an IRD
|
||||||
if (!opt.Json)
|
if (!opt.Json)
|
||||||
Console.WriteLine($"{file} is not a valid ISO file\n");
|
Console.Error.WriteLine($"{file} is not a valid ISO file\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -264,7 +290,11 @@ namespace IRDKit
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Check that given file exists
|
// Check that given file exists
|
||||||
if (!File.Exists(filePath)) throw new ArgumentException($"{filePath} is not a valid file or directory");
|
if (!File.Exists(filePath))
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine($"{filePath} is not a valid file");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// Print info from given file
|
// Print info from given file
|
||||||
PrintInfo(filePath, opt.Json, true, opt.OutPath);
|
PrintInfo(filePath, opt.Json, true, opt.OutPath);
|
||||||
@@ -279,11 +309,12 @@ namespace IRDKit
|
|||||||
// Process options from a `diff` command
|
// Process options from a `diff` command
|
||||||
case DiffOptions opt:
|
case DiffOptions opt:
|
||||||
|
|
||||||
// Validate required parameter
|
// Validate required parameters
|
||||||
ArgumentNullException.ThrowIfNull(opt.InPath1);
|
if (opt.InPath1 == null || opt.InPath2 == null || !File.Exists(opt.InPath1) || !File.Exists(opt.InPath2))
|
||||||
ArgumentNullException.ThrowIfNull(opt.InPath2);
|
{
|
||||||
if (!File.Exists(opt.InPath1)) throw new ArgumentException($"{opt.InPath1} is not a valid file or directory");
|
Console.Error.WriteLine("Provide two paths to IRDs to compare");
|
||||||
if (!File.Exists(opt.InPath2)) throw new ArgumentException($"{opt.InPath2} is not a valid file or directory");
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Clear the output file path if it exists
|
// Clear the output file path if it exists
|
||||||
if (opt.OutPath != null && opt.OutPath != "")
|
if (opt.OutPath != null && opt.OutPath != "")
|
||||||
@@ -355,9 +386,9 @@ namespace IRDKit
|
|||||||
if (json)
|
if (json)
|
||||||
return;
|
return;
|
||||||
if (isISO)
|
if (isISO)
|
||||||
Console.WriteLine($"{inPath} is not a valid ISO file\n");
|
Console.Error.WriteLine($"{inPath} is not a valid ISO file\n");
|
||||||
else
|
else
|
||||||
Console.WriteLine($"{inPath} is not a valid IRD file\n");
|
Console.Error.WriteLine($"{inPath} is not a valid IRD file\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -372,10 +403,13 @@ namespace IRDKit
|
|||||||
public static void PrintISO(string isoPath, bool json, bool single = true, string outPath = null)
|
public static void PrintISO(string isoPath, bool json, bool single = true, string outPath = null)
|
||||||
{
|
{
|
||||||
// Open ISO file for reading
|
// Open ISO file for reading
|
||||||
using FileStream fs = new FileStream(isoPath, FileMode.Open, FileAccess.Read) ?? throw new FileNotFoundException(isoPath);
|
using FileStream fs = new(isoPath, FileMode.Open, FileAccess.Read);
|
||||||
// Validate ISO file stream
|
// Validate ISO file stream
|
||||||
if (!CDReader.Detect(fs))
|
if (fs == null || !CDReader.Detect(fs))
|
||||||
throw new InvalidFileSystemException($"{isoPath} is not a valid ISO file");
|
{
|
||||||
|
Console.Error.WriteLine($"{isoPath} is not a valid ISO file");
|
||||||
|
return;
|
||||||
|
}
|
||||||
// Create new ISO reader
|
// Create new ISO reader
|
||||||
using CDReader reader = new(fs, true, true);
|
using CDReader reader = new(fs, true, true);
|
||||||
|
|
||||||
@@ -412,7 +446,7 @@ namespace IRDKit
|
|||||||
catch (FileNotFoundException)
|
catch (FileNotFoundException)
|
||||||
{
|
{
|
||||||
if (!json)
|
if (!json)
|
||||||
Console.WriteLine($"{isoPath} is not a valid PS3 ISO file\n");
|
Console.Error.WriteLine($"{isoPath} is not a valid PS3 ISO file\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -435,7 +469,7 @@ namespace IRDKit
|
|||||||
catch (FileNotFoundException)
|
catch (FileNotFoundException)
|
||||||
{
|
{
|
||||||
if (!json)
|
if (!json)
|
||||||
Console.WriteLine($"\\PS3_GAME\\PARAM.SFO not found in {isoPath}\n");
|
Console.Error.WriteLine($"\\PS3_GAME\\PARAM.SFO not found in {isoPath}\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
// End JSON object
|
// End JSON object
|
||||||
@@ -469,7 +503,7 @@ namespace IRDKit
|
|||||||
// Check they are different IRDs
|
// Check they are different IRDs
|
||||||
if (Path.GetFullPath(irdPath1) == Path.GetFullPath(irdPath2))
|
if (Path.GetFullPath(irdPath1) == Path.GetFullPath(irdPath2))
|
||||||
{
|
{
|
||||||
Console.WriteLine("Provide two different IRDs for a diff");
|
Console.Error.WriteLine("Provide two different IRDs for a diff");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -480,45 +514,69 @@ namespace IRDKit
|
|||||||
// Build a formatted diff
|
// Build a formatted diff
|
||||||
StringBuilder printText = new();
|
StringBuilder printText = new();
|
||||||
|
|
||||||
|
// Print any version difference
|
||||||
if (IRD1.Version != IRD2.Version)
|
if (IRD1.Version != IRD2.Version)
|
||||||
printText.AppendLine($"Version: {IRD1.Version} vs {IRD2.Version}");
|
printText.AppendLine($"Version: {IRD1.Version} vs {IRD2.Version}");
|
||||||
|
|
||||||
|
// Print any title ID difference
|
||||||
if (IRD1.TitleID != IRD2.TitleID)
|
if (IRD1.TitleID != IRD2.TitleID)
|
||||||
printText.AppendLine($"TitleID: {IRD1.TitleID} vs {IRD2.TitleID}");
|
printText.AppendLine($"TitleID: {IRD1.TitleID} vs {IRD2.TitleID}");
|
||||||
|
|
||||||
|
// Print any title difference
|
||||||
if (IRD1.Title != IRD2.Title)
|
if (IRD1.Title != IRD2.Title)
|
||||||
printText.AppendLine($"Title: {IRD1.Title} vs {IRD2.Title}");
|
printText.AppendLine($"Title: \"{IRD1.Title}\" vs \"{IRD2.Title}\"");
|
||||||
|
|
||||||
|
// Print any system version difference
|
||||||
if (IRD1.SystemVersion != IRD2.SystemVersion)
|
if (IRD1.SystemVersion != IRD2.SystemVersion)
|
||||||
printText.AppendLine($"PUP Version: {IRD1.SystemVersion} vs {IRD2.SystemVersion}");
|
printText.AppendLine($"PUP Version: {IRD1.SystemVersion} vs {IRD2.SystemVersion}");
|
||||||
|
|
||||||
|
// Print any disc version difference
|
||||||
if (IRD1.DiscVersion != IRD2.DiscVersion)
|
if (IRD1.DiscVersion != IRD2.DiscVersion)
|
||||||
printText.AppendLine($"Disc Version: {IRD1.DiscVersion} vs {IRD2.DiscVersion}");
|
printText.AppendLine($"Disc Version: {IRD1.DiscVersion} vs {IRD2.DiscVersion}");
|
||||||
|
|
||||||
|
// Print any app version difference
|
||||||
if (IRD1.AppVersion != IRD2.AppVersion)
|
if (IRD1.AppVersion != IRD2.AppVersion)
|
||||||
printText.AppendLine($"App Version: {IRD1.AppVersion} vs {IRD2.AppVersion}");
|
printText.AppendLine($"App Version: {IRD1.AppVersion} vs {IRD2.AppVersion}");
|
||||||
|
|
||||||
|
// Un-gzip the headers to compare them
|
||||||
byte[] header1 = Decompress(IRD1.Header);
|
byte[] header1 = Decompress(IRD1.Header);
|
||||||
byte[] header2 = Decompress(IRD2.Header);
|
byte[] header2 = Decompress(IRD2.Header);
|
||||||
|
|
||||||
|
// Print the difference in header length, if not 0
|
||||||
if (header1.Length != header2.Length)
|
if (header1.Length != header2.Length)
|
||||||
printText.AppendLine($"Header Length: {header1.Length} vs {header2.Length}");
|
printText.AppendLine($"Header Length: {header1.Length} vs {header2.Length}");
|
||||||
|
|
||||||
if (!header1.SequenceEqual(header2))
|
// Print number of bytes that the headers differ by, if not 0
|
||||||
printText.AppendLine($"Header: Differs");
|
int headerDiff;
|
||||||
|
if (header1.Length < header2.Length)
|
||||||
|
headerDiff = header2.Length - header1.Length + header1.Where((x, i) => x != header2[i]).Count();
|
||||||
|
else
|
||||||
|
headerDiff = header1.Length - header2.Length + header2.Where((x, i) => x != header1[i]).Count();
|
||||||
|
if (headerDiff != 0)
|
||||||
|
printText.AppendLine($"Header: Differs by {headerDiff} bytes");
|
||||||
|
|
||||||
|
// Un-gzip the footers to compare them
|
||||||
byte[] footer1 = Decompress(IRD1.Footer);
|
byte[] footer1 = Decompress(IRD1.Footer);
|
||||||
byte[] footer2 = Decompress(IRD2.Footer);
|
byte[] footer2 = Decompress(IRD2.Footer);
|
||||||
|
|
||||||
|
// Print the difference in footer length, if not 0
|
||||||
if (footer1.Length != footer2.Length)
|
if (footer1.Length != footer2.Length)
|
||||||
printText.AppendLine($"Footer Length: {footer1.Length} vs {footer2.Length}");
|
printText.AppendLine($"Footer Length: {footer1.Length} vs {footer2.Length}");
|
||||||
|
|
||||||
if (!footer1.SequenceEqual(footer2))
|
// Print number of bytes that the footers differ by, if not 0
|
||||||
printText.AppendLine($"Footer: Differs");
|
int footerDiff;
|
||||||
|
if (footer1.Length < footer2.Length)
|
||||||
|
footerDiff = footer2.Length - footer1.Length + footer1.Where((x, i) => x != footer2[i]).Count();
|
||||||
|
else
|
||||||
|
footerDiff = footer1.Length - footer2.Length + footer2.Where((x, i) => x != footer1[i]).Count();
|
||||||
|
if (footerDiff != 0)
|
||||||
|
printText.AppendLine($"Footer: Differs by {footerDiff} bytes");
|
||||||
|
|
||||||
|
// Print the difference in number of regions, if not 0
|
||||||
if (IRD1.RegionCount != IRD2.RegionCount)
|
if (IRD1.RegionCount != IRD2.RegionCount)
|
||||||
printText.AppendLine($"Region Count: {IRD1.RegionCount} vs {IRD2.RegionCount}");
|
printText.AppendLine($"Region Count: {IRD1.RegionCount} vs {IRD2.RegionCount}");
|
||||||
|
|
||||||
|
// Print any differences in region hashes
|
||||||
int regionCount = IRD2.RegionCount < IRD1.RegionCount ? IRD2.RegionCount : IRD1.RegionCount;
|
int regionCount = IRD2.RegionCount < IRD1.RegionCount ? IRD2.RegionCount : IRD1.RegionCount;
|
||||||
if (regionCount > IRD1.RegionHashes.Length)
|
if (regionCount > IRD1.RegionHashes.Length)
|
||||||
regionCount = IRD1.RegionHashes.Length;
|
regionCount = IRD1.RegionHashes.Length;
|
||||||
@@ -530,44 +588,56 @@ namespace IRDKit
|
|||||||
printText.AppendLine($"Region {i} Hash: {Convert.ToHexString(IRD1.RegionHashes[i])} vs {Convert.ToHexString(IRD2.RegionHashes[i])}");
|
printText.AppendLine($"Region {i} Hash: {Convert.ToHexString(IRD1.RegionHashes[i])} vs {Convert.ToHexString(IRD2.RegionHashes[i])}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Print the difference in number of files, if not 0
|
||||||
if (IRD1.FileCount != IRD2.FileCount)
|
if (IRD1.FileCount != IRD2.FileCount)
|
||||||
printText.AppendLine($"File Count: {IRD1.FileCount} vs {IRD2.FileCount}");
|
printText.AppendLine($"File Count: {IRD1.FileCount} vs {IRD2.FileCount}");
|
||||||
|
|
||||||
int fileCount = IRD2.FileCount < IRD1.FileCount ? (int)IRD2.FileCount : (int)IRD1.FileCount;
|
// Print the mismatch file hashes, for each file offset at which they differ
|
||||||
if (fileCount > IRD1.FileKeys.Length)
|
List<long> missingOffsets1 = [];
|
||||||
fileCount = IRD1.FileKeys.Length;
|
List<long> missingOffsets2 = [];
|
||||||
if (fileCount > IRD2.FileKeys.Length)
|
for (int i = 0; i < IRD1.FileKeys.Length; i++)
|
||||||
fileCount = IRD2.FileKeys.Length;
|
|
||||||
if (fileCount > IRD1.FileHashes.Length)
|
|
||||||
fileCount = IRD1.FileHashes.Length;
|
|
||||||
if (fileCount > IRD2.FileHashes.Length)
|
|
||||||
fileCount = IRD2.FileHashes.Length;
|
|
||||||
for (int i = 0; i < fileCount; i++)
|
|
||||||
{
|
{
|
||||||
if (IRD1.FileKeys[i] != IRD2.FileKeys[i])
|
int j = Array.FindIndex(IRD2.FileKeys, element => element == IRD1.FileKeys[i]);
|
||||||
printText.AppendLine($"File {i} Offset: {IRD1.FileKeys[i]} vs {IRD2.FileKeys[i]}");
|
if (j == -1)
|
||||||
if (!IRD1.FileHashes[i].SequenceEqual(IRD2.FileHashes[i]))
|
missingOffsets2.Add(IRD1.FileKeys[i]);
|
||||||
printText.AppendLine($"File {i} Hash: {Convert.ToHexString(IRD1.FileHashes[i])} vs {Convert.ToHexString(IRD2.FileHashes[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])}");
|
||||||
}
|
}
|
||||||
|
for (int i = 0; i < IRD2.FileKeys.Length; i++)
|
||||||
|
{
|
||||||
|
int j = Array.FindIndex(IRD1.FileKeys, element => element == IRD2.FileKeys[i]);
|
||||||
|
if (j == -1)
|
||||||
|
missingOffsets1.Add(IRD2.FileKeys[i]);
|
||||||
|
}
|
||||||
|
// Print the file offsets that differ
|
||||||
|
printText.AppendLine($"File Offsets not Present in {irdPath1}: {string.Join(", ", missingOffsets1)}");
|
||||||
|
printText.AppendLine($"File Offsets not Present in {irdPath2}: {string.Join(", ", missingOffsets2)}");
|
||||||
|
|
||||||
|
// Print any extra config data difference
|
||||||
if (IRD1.ExtraConfig != IRD2.ExtraConfig)
|
if (IRD1.ExtraConfig != IRD2.ExtraConfig)
|
||||||
printText.AppendLine($"Extra Config: {IRD1.ExtraConfig:X4} vs {IRD2.ExtraConfig:X4}");
|
printText.AppendLine($"Extra Config: {IRD1.ExtraConfig:X4} vs {IRD2.ExtraConfig:X4}");
|
||||||
|
|
||||||
|
// Print any attachments data difference
|
||||||
if (IRD1.Attachments != IRD2.Attachments)
|
if (IRD1.Attachments != IRD2.Attachments)
|
||||||
printText.AppendLine($"Attachments: {IRD1.Attachments:X4} vs {IRD2.Attachments:X4}");
|
printText.AppendLine($"Attachments: {IRD1.Attachments:X4} vs {IRD2.Attachments:X4}");
|
||||||
|
|
||||||
|
// Print any unique ID difference
|
||||||
if (IRD1.UID != IRD2.UID)
|
if (IRD1.UID != IRD2.UID)
|
||||||
printText.AppendLine($"Unique ID: {IRD1.UID:X8} vs {IRD2.UID:X8}");
|
printText.AppendLine($"Unique ID: {IRD1.UID:X8} vs {IRD2.UID:X8}");
|
||||||
|
|
||||||
|
// Print any data 1 key difference
|
||||||
if (!IRD1.Data1Key.SequenceEqual(IRD2.Data1Key))
|
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: {Convert.ToHexString(IRD1.Data1Key)} vs {Convert.ToHexString(IRD2.Data1Key)}");
|
||||||
|
|
||||||
|
// Print any data 2 key difference
|
||||||
if (!IRD1.Data2Key.SequenceEqual(IRD2.Data2Key))
|
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: {Convert.ToHexString(IRD1.Data2Key)} vs {Convert.ToHexString(IRD2.Data2Key)}");
|
||||||
|
|
||||||
|
// Print any PIC difference
|
||||||
if (!IRD1.PIC.SequenceEqual(IRD2.PIC))
|
if (!IRD1.PIC.SequenceEqual(IRD2.PIC))
|
||||||
printText.AppendLine($"PIC: {Convert.ToHexString(IRD1.PIC)} vs {Convert.ToHexString(IRD2.PIC)}");
|
printText.AppendLine($"PIC: {Convert.ToHexString(IRD1.PIC)} vs {Convert.ToHexString(IRD2.PIC)}");
|
||||||
|
|
||||||
|
// Write formatted string to file if output path provided, otherwise to console
|
||||||
if (outPath != null)
|
if (outPath != null)
|
||||||
File.AppendAllText(outPath, printText.ToString());
|
File.AppendAllText(outPath, printText.ToString());
|
||||||
else
|
else
|
||||||
@@ -583,17 +653,32 @@ namespace IRDKit
|
|||||||
/// <param name="keyPath">Disc key file (overridden by hex string if present)</param>
|
/// <param name="keyPath">Disc key file (overridden by hex string if present)</param>
|
||||||
/// <param name="getKeyLog">GetKey log file (overridden by disc key or key file if present)</param>
|
/// <param name="getKeyLog">GetKey log file (overridden by disc key or key file if present)</param>
|
||||||
/// <param name="layerbreak">Layerbreak value of disc</param>
|
/// <param name="layerbreak">Layerbreak value of disc</param>
|
||||||
public static string ISO2IRD(string isoPath, string irdPath = null, string hexKey = null, string keyPath = null, string getKeyLog = null, long? layerbreak = null)
|
public static string ISO2IRD(string isoPath, string irdPath = null, string hexKey = null, string keyPath = null, string getKeyLog = null, long? layerbreak = null, bool verbose = false)
|
||||||
{
|
{
|
||||||
// Check file exists
|
// Check file exists
|
||||||
FileInfo iso = new(isoPath);
|
FileInfo iso;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
iso = new(isoPath);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine(e.Message + ", failed to create IRD");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
if (!iso.Exists)
|
if (!iso.Exists)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"{nameof(isoPath)} is not a valid file or directory");
|
Console.Error.WriteLine($"{nameof(isoPath)} is not a valid file or directory");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Determine IRD path if only folder given
|
||||||
|
if (Directory.Exists(irdPath))
|
||||||
|
irdPath = Path.Combine(irdPath, Path.GetFileName(Path.ChangeExtension(isoPath, ".ird")));
|
||||||
|
|
||||||
// Determine IRD path if none given
|
// Determine IRD path if none given
|
||||||
|
if (irdPath == string.Empty)
|
||||||
|
irdPath = Path.GetFileName(Path.ChangeExtension(isoPath, ".ird"));
|
||||||
irdPath ??= Path.ChangeExtension(isoPath, ".ird");
|
irdPath ??= Path.ChangeExtension(isoPath, ".ird");
|
||||||
|
|
||||||
// Create new reproducible redump-style IRD with a given hex key
|
// Create new reproducible redump-style IRD with a given hex key
|
||||||
@@ -604,17 +689,21 @@ namespace IRDKit
|
|||||||
// Get disc key from hex string
|
// Get disc key from hex string
|
||||||
byte[] discKey = Convert.FromHexString(hexKey);
|
byte[] discKey = Convert.FromHexString(hexKey);
|
||||||
if (discKey == null || discKey.Length != 16)
|
if (discKey == null || discKey.Length != 16)
|
||||||
throw new ArgumentException(hexKey);
|
Console.Error.WriteLine($"{hexKey} is not a valid key, detecting key automatically...");
|
||||||
|
else
|
||||||
Console.WriteLine($"Creating {irdPath} with Key: {hexKey}");
|
{
|
||||||
IRD ird1 = new ReIRD(isoPath, discKey, layerbreak);
|
Console.WriteLine($"Creating {irdPath} with Key: {hexKey}");
|
||||||
ird1.Write(irdPath);
|
IRD ird1 = new ReIRD(isoPath, discKey, layerbreak);
|
||||||
ird1.Print();
|
ird1.Write(irdPath);
|
||||||
return irdPath;
|
if (verbose)
|
||||||
|
ird1.Print();
|
||||||
|
return irdPath;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (ArgumentException)
|
catch (ArgumentException e)
|
||||||
{
|
{
|
||||||
Console.Error.WriteLine($"{hexKey} is not a valid key, detecting key automatically...");
|
Console.Error.WriteLine(e.Message + ", failed to create IRD");
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
catch (FileNotFoundException)
|
catch (FileNotFoundException)
|
||||||
{
|
{
|
||||||
@@ -626,19 +715,26 @@ namespace IRDKit
|
|||||||
// Create new reproducible redump-style IRD with a given key file
|
// Create new reproducible redump-style IRD with a given key file
|
||||||
if (keyPath != null)
|
if (keyPath != null)
|
||||||
{
|
{
|
||||||
// Read key from .key file
|
|
||||||
byte[] discKey = File.ReadAllBytes(keyPath);
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IRD ird2 = new ReIRD(isoPath, discKey, layerbreak);
|
// Read key from .key file
|
||||||
Console.WriteLine($"Creating {irdPath} with Key: {Convert.ToHexString(discKey)}");
|
byte[] discKey = File.ReadAllBytes(keyPath);
|
||||||
ird2.Write(irdPath);
|
if (discKey == null || discKey.Length != 16)
|
||||||
ird2.Print();
|
Console.Error.WriteLine($"{hexKey} is not a valid key, detecting key automatically...");
|
||||||
return irdPath;
|
else
|
||||||
|
{
|
||||||
|
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)
|
catch (ArgumentException e)
|
||||||
{
|
{
|
||||||
Console.Error.WriteLine($"{Convert.ToHexString(discKey)} is not a valid key, detecting key automatically...");
|
Console.Error.WriteLine(e.Message + ", failed to create IRD");
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
catch (FileNotFoundException)
|
catch (FileNotFoundException)
|
||||||
{
|
{
|
||||||
@@ -653,11 +749,17 @@ namespace IRDKit
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Creating {irdPath} with key from: {getKeyLog}");
|
Console.WriteLine($"Creating {irdPath} with key from: {getKeyLog}");
|
||||||
IRD ird3 = new ReIRD(isoPath, getKeyLog);
|
IRD ird1 = new ReIRD(isoPath, getKeyLog);
|
||||||
ird3.Write(irdPath);
|
ird1.Write(irdPath);
|
||||||
ird3.Print();
|
if (verbose)
|
||||||
|
ird1.Print();
|
||||||
return irdPath;
|
return irdPath;
|
||||||
}
|
}
|
||||||
|
catch (ArgumentException e)
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine(e.Message + ", failed to create IRD");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
catch (FileNotFoundException)
|
catch (FileNotFoundException)
|
||||||
{
|
{
|
||||||
Console.Error.WriteLine("File not found, failed to create IRD");
|
Console.Error.WriteLine("File not found, failed to create IRD");
|
||||||
@@ -674,19 +776,23 @@ namespace IRDKit
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Read key from .key file
|
// Read key from .key file
|
||||||
byte[] discKey = File.ReadAllBytes(keyfilePath);
|
byte[] discKey = File.ReadAllBytes(keyPath);
|
||||||
if (discKey == null || discKey.Length != 16)
|
if (discKey == null || discKey.Length != 16)
|
||||||
throw new ArgumentException(keyfilePath);
|
Console.Error.WriteLine($"{hexKey} is not a valid key, detecting key automatically...");
|
||||||
|
else
|
||||||
Console.WriteLine($"Creating {irdPath} with Key: {Convert.ToHexString(discKey)}");
|
{
|
||||||
IRD ird2 = new ReIRD(isoPath, discKey, layerbreak);
|
IRD ird1 = new ReIRD(isoPath, discKey, layerbreak);
|
||||||
ird2.Write(irdPath);
|
Console.WriteLine($"Creating {irdPath} with Key: {Convert.ToHexString(discKey)}");
|
||||||
ird2.Print();
|
ird1.Write(irdPath);
|
||||||
return irdPath;
|
if (verbose)
|
||||||
|
ird1.Print();
|
||||||
|
return irdPath;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (ArgumentException)
|
catch (ArgumentException e)
|
||||||
{
|
{
|
||||||
Console.Error.WriteLine("Given key file not valid, detecting key automatically...");
|
Console.Error.WriteLine(e.Message + ", failed to create IRD");
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
catch (FileNotFoundException)
|
catch (FileNotFoundException)
|
||||||
{
|
{
|
||||||
@@ -703,12 +809,18 @@ namespace IRDKit
|
|||||||
// Found .getkey.log file, check it is valid
|
// Found .getkey.log file, check it is valid
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Creating {irdPath} with key from: {logfilePath}");
|
Console.WriteLine($"Creating {irdPath} with key from: {getKeyLog}");
|
||||||
IRD ird3 = new ReIRD(isoPath, logfilePath);
|
IRD ird1 = new ReIRD(isoPath, getKeyLog);
|
||||||
ird3.Write(irdPath);
|
ird1.Write(irdPath);
|
||||||
ird3.Print();
|
if (verbose)
|
||||||
|
ird1.Print();
|
||||||
return irdPath;
|
return irdPath;
|
||||||
}
|
}
|
||||||
|
catch (ArgumentException e)
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine(e.Message + ", failed to create IRD");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
catch (FileNotFoundException)
|
catch (FileNotFoundException)
|
||||||
{
|
{
|
||||||
Console.Error.WriteLine("File not found, failed to create IRD");
|
Console.Error.WriteLine("File not found, failed to create IRD");
|
||||||
@@ -717,7 +829,8 @@ namespace IRDKit
|
|||||||
}
|
}
|
||||||
|
|
||||||
// No key provided, try get key from redump.org
|
// No key provided, try get key from redump.org
|
||||||
Console.WriteLine("No key provided... Searching for key on redump.org");
|
if (verbose)
|
||||||
|
Console.WriteLine("No key provided... Searching for key on redump.org");
|
||||||
|
|
||||||
// Compute CRC32 hash
|
// Compute CRC32 hash
|
||||||
byte[] crc32;
|
byte[] crc32;
|
||||||
@@ -737,12 +850,12 @@ namespace IRDKit
|
|||||||
int id;
|
int id;
|
||||||
if (ids.Count == 0)
|
if (ids.Count == 0)
|
||||||
{
|
{
|
||||||
Console.WriteLine("ISO not found in redump, cannot automatically retreive key");
|
Console.Error.WriteLine("ISO not found in redump and no valid key provided, cannot create IRD");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
else if (ids.Count > 1)
|
else if (ids.Count > 1)
|
||||||
{
|
{
|
||||||
// Compute SHA1 hash
|
// More than one result for the CRC32 hash, compute SHA1 hash instead
|
||||||
byte[] sha1;
|
byte[] sha1;
|
||||||
using (FileStream fs = File.OpenRead(isoPath))
|
using (FileStream fs = File.OpenRead(isoPath))
|
||||||
{
|
{
|
||||||
@@ -755,18 +868,19 @@ namespace IRDKit
|
|||||||
List<int> ids2 = redump.CheckSingleSitePage("http://redump.org/discs/system/ps3/quicksearch/" + sha1_hash).ConfigureAwait(false).GetAwaiter().GetResult();
|
List<int> ids2 = redump.CheckSingleSitePage("http://redump.org/discs/system/ps3/quicksearch/" + sha1_hash).ConfigureAwait(false).GetAwaiter().GetResult();
|
||||||
if (ids2.Count == 0)
|
if (ids2.Count == 0)
|
||||||
{
|
{
|
||||||
Console.WriteLine("ISO not found in redump, cannot automatically retreive key");
|
Console.Error.WriteLine("ISO not found in redump and no valid key provided, cannot create IRD");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
else if (ids2.Count > 1)
|
else if (ids2.Count > 1)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Cannot automatically get key from redump. Please search redump.org and run again with -k");
|
Console.Error.WriteLine("Cannot automatically get key from redump. Please search redump.org and run again with -k");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
id = ids2[0];
|
id = ids2[0];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// One result found, assume it is the PS3 ISO
|
||||||
id = ids[0];
|
id = ids[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -774,15 +888,30 @@ namespace IRDKit
|
|||||||
byte[] key = redump.GetByteArrayAsync($"http://redump.org/disc/{id}/key").ConfigureAwait(false).GetAwaiter().GetResult();
|
byte[] key = redump.GetByteArrayAsync($"http://redump.org/disc/{id}/key").ConfigureAwait(false).GetAwaiter().GetResult();
|
||||||
if (key.Length != 16)
|
if (key.Length != 16)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Invalid key obtained from redump");
|
Console.Error.WriteLine("Invalid key obtained from redump and no valid key provided, cannot create IRD");
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create IRD with key from redump
|
// Create IRD with key from redump
|
||||||
Console.WriteLine($"Creating {irdPath} with Key: {Convert.ToHexString(key)}");
|
Console.WriteLine($"Creating {irdPath} with Key from redump.org: {Convert.ToHexString(key)}");
|
||||||
IRD ird = new ReIRD(isoPath, key, layerbreak);
|
try
|
||||||
ird.Write(irdPath);
|
{
|
||||||
ird.Print();
|
IRD ird = new ReIRD(isoPath, key, layerbreak);
|
||||||
return irdPath;
|
ird.Write(irdPath);
|
||||||
|
if (verbose)
|
||||||
|
ird.Print();
|
||||||
|
return irdPath;
|
||||||
|
}
|
||||||
|
catch (ArgumentException 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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
+40
-6
@@ -1,7 +1,41 @@
|
|||||||
## How to use IRDKit
|
# How to use IRDKit
|
||||||
|
|
||||||
IRDKit is a tool that allows direct use of LibIRD functionality from the command line interface. The basic usage is:
|
IRDKit is a tool that allows direct use of LibIRD functionality from the command line interface.
|
||||||
```
|
For full help instructions, run `irdkit help`
|
||||||
irdkit game.iso game.ird
|
|
||||||
```
|
## Creating ISOs
|
||||||
For detailed usage, run `irdkit --help`
|
|
||||||
|
For all options, run `irdkit help create`
|
||||||
|
|
||||||
|
To create an IRD from an ISO, run `irdkit create game.iso`
|
||||||
|
Multiple ISOs can be processed at once with `irdkit create game1.iso game2.iso`
|
||||||
|
Or a whole directory of ISOs can be processed with `irdkit create ./ISO`, or recursively with `irdkit create -r ./ISO`
|
||||||
|
|
||||||
|
The IRD will be created in the same folder as the ISO, with the same filename.
|
||||||
|
A different IRD path and/or filename can be defined with `-o` or `--output=`
|
||||||
|
|
||||||
|
### Key
|
||||||
|
By default, IRDs will be created by pulling keys from redump.org
|
||||||
|
A key can be manually provided with `-k` or `--key=`
|
||||||
|
A key file can be provided with `-f game.key` or `--key-file=`
|
||||||
|
A key from GetKey log file can be used with `-l game.getkey.log` or `--getkey-log=`
|
||||||
|
|
||||||
|
### PIC
|
||||||
|
By default, a PIC will be generated assuming a default layerbreak
|
||||||
|
A layerbreak value can be provided with `-b` or `--layerbreak=`
|
||||||
|
A PIC from a GetKey log file can be used with `-l game.getkey.log` or `--getkey-log=`
|
||||||
|
|
||||||
|
## Printing info
|
||||||
|
|
||||||
|
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`
|
||||||
|
|
||||||
|
## Comparing IRDs
|
||||||
|
|
||||||
|
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=`
|
||||||
|
|||||||
+22
-14
@@ -117,7 +117,6 @@ namespace LibIRD
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
private byte[] _discKey;
|
private byte[] _discKey;
|
||||||
// TODO: Link Data1Key and Disc Key
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// D1 key
|
/// D1 key
|
||||||
@@ -406,7 +405,6 @@ namespace LibIRD
|
|||||||
private protected static byte[] GenerateD1(byte[] key)
|
private protected static byte[] GenerateD1(byte[] key)
|
||||||
{
|
{
|
||||||
// Validate key
|
// Validate key
|
||||||
ArgumentNullException.ThrowIfNull(key, nameof(key));
|
|
||||||
if (key.Length != 16)
|
if (key.Length != 16)
|
||||||
throw new ArgumentException("Disc Key must be a byte array of length 16", nameof(key));
|
throw new ArgumentException("Disc Key must be a byte array of length 16", nameof(key));
|
||||||
|
|
||||||
@@ -440,7 +438,6 @@ namespace LibIRD
|
|||||||
private protected static byte[] GenerateDiscKey(byte[] d1)
|
private protected static byte[] GenerateDiscKey(byte[] d1)
|
||||||
{
|
{
|
||||||
// Validate key
|
// Validate key
|
||||||
ArgumentNullException.ThrowIfNull(d1, nameof(d1));
|
|
||||||
if (d1.Length != 16)
|
if (d1.Length != 16)
|
||||||
throw new ArgumentException("Disc Key must be a byte array of length 16", nameof(d1));
|
throw new ArgumentException("Disc Key must be a byte array of length 16", nameof(d1));
|
||||||
|
|
||||||
@@ -474,7 +471,6 @@ namespace LibIRD
|
|||||||
private protected static byte[] GenerateD2(byte[] d2)
|
private protected static byte[] GenerateD2(byte[] d2)
|
||||||
{
|
{
|
||||||
// Validate id
|
// Validate id
|
||||||
ArgumentNullException.ThrowIfNull(d2, nameof(d2));
|
|
||||||
if (d2.Length != 16) throw new ArgumentException("Disc ID must be a byte array of length 16", nameof(d2));
|
if (d2.Length != 16) throw new ArgumentException("Disc ID must be a byte array of length 16", nameof(d2));
|
||||||
|
|
||||||
// Setup AES encryption
|
// Setup AES encryption
|
||||||
@@ -507,7 +503,6 @@ namespace LibIRD
|
|||||||
private protected static byte[] GenerateDiscID(byte[] d2)
|
private protected static byte[] GenerateDiscID(byte[] d2)
|
||||||
{
|
{
|
||||||
// Validate id
|
// Validate id
|
||||||
ArgumentNullException.ThrowIfNull(d2 , nameof(d2));
|
|
||||||
if (d2.Length != 16)
|
if (d2.Length != 16)
|
||||||
throw new ArgumentException("Disc ID must be a byte array of length 16", nameof(d2));
|
throw new ArgumentException("Disc ID must be a byte array of length 16", nameof(d2));
|
||||||
|
|
||||||
@@ -540,9 +535,7 @@ namespace LibIRD
|
|||||||
/// <exception cref="InvalidDataException"></exception>
|
/// <exception cref="InvalidDataException"></exception>
|
||||||
private protected void ParseGetKeyLog(string getKeyLog)
|
private protected void ParseGetKeyLog(string getKeyLog)
|
||||||
{
|
{
|
||||||
|
|
||||||
// Validate .getkey.log file path
|
// Validate .getkey.log file path
|
||||||
ArgumentNullException.ThrowIfNull(getKeyLog, nameof(getKeyLog));
|
|
||||||
if (!File.Exists(getKeyLog))
|
if (!File.Exists(getKeyLog))
|
||||||
throw new FileNotFoundException(nameof(getKeyLog));
|
throw new FileNotFoundException(nameof(getKeyLog));
|
||||||
|
|
||||||
@@ -640,7 +633,7 @@ namespace LibIRD
|
|||||||
ExtraConfig |= 0x01;
|
ExtraConfig |= 0x01;
|
||||||
|
|
||||||
// Redump-style IRDs use fields from PS3_DISC.SFB
|
// Redump-style IRDs use fields from PS3_DISC.SFB
|
||||||
using DiscUtils.Streams.SparseStream s = reader.OpenFile("PS3_DISC.SFB", FileMode.Open, FileAccess.Read);
|
using SparseStream s = reader.OpenFile("PS3_DISC.SFB", FileMode.Open, FileAccess.Read);
|
||||||
|
|
||||||
// Parse PS3_DISC.SFB file
|
// Parse PS3_DISC.SFB file
|
||||||
PS3_DiscSFB ps3_DiscSFB = new(s);
|
PS3_DiscSFB ps3_DiscSFB = new(s);
|
||||||
@@ -658,7 +651,7 @@ namespace LibIRD
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Read PS3 Metadata from PARAM.SFO
|
// Read PS3 Metadata from PARAM.SFO
|
||||||
using (DiscUtils.Streams.SparseStream s = reader.OpenFile("\\PS3_GAME\\PARAM.SFO", FileMode.Open, FileAccess.Read))
|
using (SparseStream s = reader.OpenFile("\\PS3_GAME\\PARAM.SFO", FileMode.Open, FileAccess.Read))
|
||||||
{
|
{
|
||||||
// Parse PARAM.SFO file
|
// Parse PARAM.SFO file
|
||||||
ParamSFO paramSFO = new(s);
|
ParamSFO paramSFO = new(s);
|
||||||
@@ -722,7 +715,7 @@ namespace LibIRD
|
|||||||
HashFiles(fs, reader, rootDir);
|
HashFiles(fs, reader, rootDir);
|
||||||
if (FileCount != fileCount)
|
if (FileCount != fileCount)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Likely contains non-contiguous files: detected {FileCount} out of {fileCount} expected files");
|
Console.WriteLine($"{isoPath} contains split files: detected {FileCount} out of {fileCount} expected files");
|
||||||
long[] tempFileKeys = FileKeys;
|
long[] tempFileKeys = FileKeys;
|
||||||
Array.Resize(ref tempFileKeys, (int)FileCount);
|
Array.Resize(ref tempFileKeys, (int)FileCount);
|
||||||
FileKeys = tempFileKeys;
|
FileKeys = tempFileKeys;
|
||||||
@@ -744,7 +737,7 @@ namespace LibIRD
|
|||||||
private void GetSystemVersion(FileStream fs, CDReader reader)
|
private void GetSystemVersion(FileStream fs, CDReader reader)
|
||||||
{
|
{
|
||||||
// Determine PUP file offset via cluster
|
// Determine PUP file offset via cluster
|
||||||
DiscUtils.Streams.Range<long, long>[] updateClusters = reader.PathToClusters("\\PS3_UPDATE\\PS3UPDAT.PUP");
|
Range<long, long>[] updateClusters = reader.PathToClusters("\\PS3_UPDATE\\PS3UPDAT.PUP");
|
||||||
if (updateClusters == null && updateClusters.Length == 0 && updateClusters[0] == null)
|
if (updateClusters == null && updateClusters.Length == 0 && updateClusters[0] == null)
|
||||||
throw new InvalidFileSystemException("Invalid file extents for PS3UPDAT.PUP");
|
throw new InvalidFileSystemException("Invalid file extents for PS3UPDAT.PUP");
|
||||||
|
|
||||||
@@ -787,7 +780,7 @@ namespace LibIRD
|
|||||||
private void GetHeader(FileStream fs, CDReader reader)
|
private void GetHeader(FileStream fs, CDReader reader)
|
||||||
{
|
{
|
||||||
// Determine the extent of the header via cluster (Sector 0 to first data sector)
|
// Determine the extent of the header via cluster (Sector 0 to first data sector)
|
||||||
DiscUtils.Streams.Range<long, long>[] sfbClusters = reader.PathToClusters("\\PS3_DISC.SFB");
|
Range<long, long>[] sfbClusters = reader.PathToClusters("\\PS3_DISC.SFB");
|
||||||
if (sfbClusters == null && sfbClusters.Length == 0 && sfbClusters[0] == null)
|
if (sfbClusters == null && sfbClusters.Length == 0 && sfbClusters[0] == null)
|
||||||
throw new InvalidFileSystemException("Invalid file extents for PS3_DISC.SFB");
|
throw new InvalidFileSystemException("Invalid file extents for PS3_DISC.SFB");
|
||||||
// End of header is at beginning of first byte of dedicated cluster
|
// End of header is at beginning of first byte of dedicated cluster
|
||||||
@@ -795,7 +788,11 @@ namespace LibIRD
|
|||||||
|
|
||||||
// Begin a GZip stream to write header to
|
// Begin a GZip stream to write header to
|
||||||
using MemoryStream headerStream = new();
|
using MemoryStream headerStream = new();
|
||||||
|
#if NET6_0_OR_GREATER
|
||||||
using (GZipStream gzs = new(headerStream, CompressionLevel.SmallestSize))
|
using (GZipStream gzs = new(headerStream, CompressionLevel.SmallestSize))
|
||||||
|
#else
|
||||||
|
using (GZipStream gzs = new(headerStream, CompressionLevel.Optimal))
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
// Start reading data from the beginning of the ISO file
|
// Start reading data from the beginning of the ISO file
|
||||||
fs.Seek(0, SeekOrigin.Begin);
|
fs.Seek(0, SeekOrigin.Begin);
|
||||||
@@ -823,7 +820,11 @@ namespace LibIRD
|
|||||||
{
|
{
|
||||||
// Begin a GZip stream to write footer to
|
// Begin a GZip stream to write footer to
|
||||||
using MemoryStream footerStream = new();
|
using MemoryStream footerStream = new();
|
||||||
|
#if NET6_0_OR_GREATER
|
||||||
using (GZipStream gzs = new(footerStream, CompressionLevel.SmallestSize))
|
using (GZipStream gzs = new(footerStream, CompressionLevel.SmallestSize))
|
||||||
|
#else
|
||||||
|
using (GZipStream gzs = new(footerStream, CompressionLevel.Optimal))
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
// Start reading data from after last file (PS3UPDAT.PUP)
|
// Start reading data from after last file (PS3UPDAT.PUP)
|
||||||
fs.Seek(UpdateEnd, SeekOrigin.Begin);
|
fs.Seek(UpdateEnd, SeekOrigin.Begin);
|
||||||
@@ -929,7 +930,7 @@ namespace LibIRD
|
|||||||
string filePath = fileInfo.FullName;
|
string filePath = fileInfo.FullName;
|
||||||
|
|
||||||
// Determine the extents of the file via clusters
|
// Determine the extents of the file via clusters
|
||||||
DiscUtils.Streams.Range<long, long>[] fileClusters = reader.PathToClusters(filePath);
|
Range<long, long>[] fileClusters = reader.PathToClusters(filePath);
|
||||||
|
|
||||||
// If invalid clusters were returned, we can't hash this file
|
// If invalid clusters were returned, we can't hash this file
|
||||||
if (fileClusters == null && fileClusters.Length == 0)
|
if (fileClusters == null && fileClusters.Length == 0)
|
||||||
@@ -951,6 +952,9 @@ namespace LibIRD
|
|||||||
if (Array.Exists(FileKeys, element => element == firstSector))
|
if (Array.Exists(FileKeys, element => element == firstSector))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if (fileClusters.Length > 1)
|
||||||
|
Console.WriteLine($"Split file detected: {filePath}");
|
||||||
|
|
||||||
// Add file offset to keys
|
// Add file offset to keys
|
||||||
FileKeys[FileCount] = firstSector;
|
FileKeys[FileCount] = firstSector;
|
||||||
|
|
||||||
@@ -1060,7 +1064,7 @@ namespace LibIRD
|
|||||||
CountFiles(dirInfo);
|
CountFiles(dirInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region IRD File
|
#region IRD File
|
||||||
|
|
||||||
@@ -1175,7 +1179,11 @@ namespace LibIRD
|
|||||||
// Create the IRD file stream
|
// Create the IRD file stream
|
||||||
using FileStream fs = new(irdPath, FileMode.Create, FileAccess.Write);
|
using FileStream fs = new(irdPath, FileMode.Create, FileAccess.Write);
|
||||||
// Create a GZipped IRD file stream
|
// Create a GZipped IRD file stream
|
||||||
|
#if NET6_0_OR_GREATER
|
||||||
using GZipStream gzStream = new(fs, CompressionLevel.SmallestSize);
|
using GZipStream gzStream = new(fs, CompressionLevel.SmallestSize);
|
||||||
|
#else
|
||||||
|
using GZipStream gzStream = new(fs, CompressionLevel.Optimal);
|
||||||
|
#endif
|
||||||
// Write entire gzipped IRD stream to file
|
// Write entire gzipped IRD stream to file
|
||||||
stream.Position = 0;
|
stream.Position = 0;
|
||||||
stream.CopyTo(gzStream);
|
stream.CopyTo(gzStream);
|
||||||
|
|||||||
@@ -2,16 +2,17 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Assembly Properties -->
|
<!-- Assembly Properties -->
|
||||||
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
|
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
|
||||||
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>0.3.0</Version>
|
<Version>0.4.0</Version>
|
||||||
|
<PackageOutputPath>../nupkg</PackageOutputPath>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Deterous</Authors>
|
<Authors>Deterous</Authors>
|
||||||
<Description>Library for ISO Rebuild Data</Description>
|
<Description>Library for ISO Rebuild Data</Description>
|
||||||
<Copyright>Copyright (c) Deterous 2024</Copyright>
|
<Copyright>Copyright (c) Deterous 2023-2024</Copyright>
|
||||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||||
<RepositoryUrl>https://github.com/Deterous/LibIRD/</RepositoryUrl>
|
<RepositoryUrl>https://github.com/Deterous/LibIRD/</RepositoryUrl>
|
||||||
<RepositoryType>git</RepositoryType>
|
<RepositoryType>git</RepositoryType>
|
||||||
|
|||||||
@@ -33,12 +33,8 @@ namespace LibIRD
|
|||||||
/// Constructor using a PARAM.SFO file path
|
/// Constructor using a PARAM.SFO file path
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="sfbPath">Full file path to the PS3_DISC.SFB file</param>
|
/// <param name="sfbPath">Full file path to the PS3_DISC.SFB file</param>
|
||||||
/// <exception cref="ArgumentNullException"></exception>
|
|
||||||
public PS3_DiscSFB(string sfbPath)
|
public PS3_DiscSFB(string sfbPath)
|
||||||
{
|
{
|
||||||
// Validate file path
|
|
||||||
ArgumentNullException.ThrowIfNull(sfbPath, nameof(sfbPath));
|
|
||||||
|
|
||||||
// Read file as a stream, and parse file
|
// Read file as a stream, and parse file
|
||||||
using FileStream fs = new(sfbPath, FileMode.Open, FileAccess.Read);
|
using FileStream fs = new(sfbPath, FileMode.Open, FileAccess.Read);
|
||||||
Parse(fs);
|
Parse(fs);
|
||||||
|
|||||||
+40
-42
@@ -1,6 +1,8 @@
|
|||||||
using System;
|
using DiscUtils.Iso9660;
|
||||||
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.IO.Hashing;
|
using System.IO.Hashing;
|
||||||
|
using System.Security;
|
||||||
|
|
||||||
namespace LibIRD
|
namespace LibIRD
|
||||||
{
|
{
|
||||||
@@ -51,15 +53,6 @@ namespace LibIRD
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class ReIRD : IRD
|
public class ReIRD : IRD
|
||||||
{
|
{
|
||||||
#region Properties
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ISO file size
|
|
||||||
/// </summary>
|
|
||||||
private long Size { get; set; }
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Constructors
|
#region Constructors
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -67,25 +60,11 @@ namespace LibIRD
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="isoPath">Path to the ISO</param>
|
/// <param name="isoPath">Path to the ISO</param>
|
||||||
/// <param name="getKeyLog">Path to the GetKey log file</param>
|
/// <param name="getKeyLog">Path to the GetKey log file</param>
|
||||||
/// <param name="layerbreak">Layerbreak value, in sectors</param>
|
|
||||||
/// <exception cref="InvalidDataException"></exception>
|
/// <exception cref="InvalidDataException"></exception>
|
||||||
public ReIRD(string isoPath, string getKeyLog, long? layerbreak = null) : base(isoPath, getKeyLog, true)
|
public ReIRD(string isoPath, string getKeyLog) : base(isoPath, getKeyLog, true)
|
||||||
{
|
{
|
||||||
// Generate Unique Identifier using ISO CRC32
|
// Generate Unique Identifier using ISO CRC32
|
||||||
UID = GenerateUID(isoPath);
|
UID = GenerateUID(isoPath);
|
||||||
|
|
||||||
// Determine ISO file size
|
|
||||||
Size = CalculateSize(isoPath);
|
|
||||||
|
|
||||||
// Generate Data 2 using Disc ID
|
|
||||||
DiscID = GenerateID(Size);
|
|
||||||
|
|
||||||
// Generate Disc PIC
|
|
||||||
byte[] pic = GeneratePIC(Size, layerbreak * SectorSize);
|
|
||||||
|
|
||||||
// Check that GetKey log matches expected PIC
|
|
||||||
if (!((ReadOnlySpan<byte>)PIC).SequenceEqual(pic))
|
|
||||||
throw new InvalidDataException("Unexpected PIC in .getkey.log");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -101,16 +80,16 @@ namespace LibIRD
|
|||||||
UID = GenerateUID(isoPath);
|
UID = GenerateUID(isoPath);
|
||||||
|
|
||||||
// Determine ISO file size
|
// Determine ISO file size
|
||||||
Size = CalculateSize(isoPath);
|
long size = CalculateSize(isoPath);
|
||||||
|
|
||||||
// Set Disc Key
|
// Set Disc Key
|
||||||
DiscKey = key;
|
DiscKey = key;
|
||||||
|
|
||||||
// Generate Data 2 using Disc ID
|
// Generate Data 2 using Disc ID
|
||||||
DiscID = GenerateID(Size, region);
|
DiscID = GenerateID(size, region);
|
||||||
|
|
||||||
// Generate Disc PIC
|
// Generate Disc PIC
|
||||||
PIC = GeneratePIC(Size, layerbreak * SectorSize);
|
PIC = GeneratePIC(isoPath, size, layerbreak * SectorSize);
|
||||||
|
|
||||||
// Generate IRD fields
|
// Generate IRD fields
|
||||||
GenerateIRD(isoPath, true);
|
GenerateIRD(isoPath, true);
|
||||||
@@ -143,12 +122,13 @@ namespace LibIRD
|
|||||||
/// <param name="layerbreak">Layer break value, byte at which disc layers are split across</param>
|
/// <param name="layerbreak">Layer break value, byte at which disc layers are split across</param>
|
||||||
/// <param name="exactIRD">True to generate a PIC in 3k3y style (0x03 at 115th byte for BD-50 discs)</param>
|
/// <param name="exactIRD">True to generate a PIC in 3k3y style (0x03 at 115th byte for BD-50 discs)</param>
|
||||||
/// <exception cref="ArgumentException"></exception>
|
/// <exception cref="ArgumentException"></exception>
|
||||||
private static byte[] GeneratePIC(long size, long? layerbreak = null, bool exactIRD = false)
|
private static byte[] GeneratePIC(string isoPath, long size, long? layerbreak = null, bool exactIRD = false)
|
||||||
{
|
{
|
||||||
// Validate size
|
// Validate size
|
||||||
if (size <= 0 || (size % SectorSize) != 0)
|
if (size <= 0 || (size % SectorSize) != 0)
|
||||||
throw new ArgumentException("ISO Size in bytes must be a positive integer multiple of 2048", nameof(size));
|
throw new ArgumentException("ISO Size in bytes must be a positive integer multiple of 2048", nameof(size));
|
||||||
// Validate layerbreak
|
|
||||||
|
// Validate provided layerbreak
|
||||||
if (layerbreak != null)
|
if (layerbreak != null)
|
||||||
{
|
{
|
||||||
if (layerbreak <= 0 || (layerbreak >= size))
|
if (layerbreak <= 0 || (layerbreak >= size))
|
||||||
@@ -156,8 +136,16 @@ namespace LibIRD
|
|||||||
if (layerbreak >= 2 * BDLayerSize || layerbreak % SectorSize != 0)
|
if (layerbreak >= 2 * BDLayerSize || layerbreak % SectorSize != 0)
|
||||||
throw new ArgumentException("Unexpected layerbreak value", nameof(size));
|
throw new ArgumentException("Unexpected layerbreak value", nameof(size));
|
||||||
}
|
}
|
||||||
// If layerbreak value was not set, assume it is a non-hybrid disc with default layerbreak
|
else
|
||||||
long layer_break = layerbreak ?? 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);
|
||||||
|
if (reader.DirectoryExists("\\BDMV"))
|
||||||
|
throw new ArgumentException("Layerbreak must be provided for BD-Video hybrid discs");
|
||||||
|
// Assume disc has default layerbreak
|
||||||
|
layerbreak = BDLayerSize;
|
||||||
|
}
|
||||||
|
|
||||||
// Generate the PIC based on the size and layerbreak of the ISO
|
// Generate the PIC based on the size and layerbreak of the ISO
|
||||||
byte[] pic;
|
byte[] pic;
|
||||||
@@ -167,7 +155,7 @@ namespace LibIRD
|
|||||||
long l0_start_sector = 1048576;
|
long l0_start_sector = 1048576;
|
||||||
|
|
||||||
// Layer 0 end sector = start sector + layerbreak - 2
|
// Layer 0 end sector = start sector + layerbreak - 2
|
||||||
long l0_end_sector = (layer_break / SectorSize) + l0_start_sector - 2;
|
long l0_end_sector = ((long)layerbreak / SectorSize) + l0_start_sector - 2;
|
||||||
// Convert end sector location to hex values for PIC
|
// Convert end sector location to hex values for PIC
|
||||||
byte[] l0es = [(byte)((l0_end_sector >> 24) & 0xFF),
|
byte[] l0es = [(byte)((l0_end_sector >> 24) & 0xFF),
|
||||||
(byte)((l0_end_sector >> 16) & 0xFF),
|
(byte)((l0_end_sector >> 16) & 0xFF),
|
||||||
@@ -175,7 +163,7 @@ namespace LibIRD
|
|||||||
(byte)((l0_end_sector >> 0) & 0xFF)];
|
(byte)((l0_end_sector >> 0) & 0xFF)];
|
||||||
|
|
||||||
// Layer 1 start sector = end of disc (0x01EFFFFE) - layerbreak + 2
|
// Layer 1 start sector = end of disc (0x01EFFFFE) - layerbreak + 2
|
||||||
long l1_start_sector = 32505854 - (layer_break / SectorSize) + 2;
|
long l1_start_sector = 32505854 - ((long)layerbreak! / SectorSize) + 2;
|
||||||
// Convert start of start sector location to hex values for PIC
|
// Convert start of start sector location to hex values for PIC
|
||||||
byte[] l1ss = [(byte)((l1_start_sector >> 24) & 0xFF),
|
byte[] l1ss = [(byte)((l1_start_sector >> 24) & 0xFF),
|
||||||
(byte)((l1_start_sector >> 16) & 0xFF),
|
(byte)((l1_start_sector >> 16) & 0xFF),
|
||||||
@@ -257,11 +245,16 @@ namespace LibIRD
|
|||||||
/// <exception cref="FileNotFoundException"></exception>
|
/// <exception cref="FileNotFoundException"></exception>
|
||||||
private static uint GenerateUID(string isoPath)
|
private static uint GenerateUID(string isoPath)
|
||||||
{
|
{
|
||||||
// Validate ISO path
|
|
||||||
ArgumentNullException.ThrowIfNull(isoPath, nameof(isoPath));
|
|
||||||
|
|
||||||
// Check file exists
|
// Check file exists
|
||||||
var iso = new FileInfo(isoPath);
|
FileInfo iso;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
iso = new FileInfo(isoPath);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
throw new ArgumentException("Invalid ISO Path: " + e.Message);
|
||||||
|
}
|
||||||
if (!iso.Exists)
|
if (!iso.Exists)
|
||||||
throw new FileNotFoundException(nameof(isoPath));
|
throw new FileNotFoundException(nameof(isoPath));
|
||||||
|
|
||||||
@@ -286,11 +279,16 @@ namespace LibIRD
|
|||||||
/// <exception cref="FileNotFoundException"></exception>
|
/// <exception cref="FileNotFoundException"></exception>
|
||||||
private static long CalculateSize(string isoPath)
|
private static long CalculateSize(string isoPath)
|
||||||
{
|
{
|
||||||
// Validate ISO path
|
|
||||||
ArgumentNullException.ThrowIfNull(isoPath, nameof(isoPath));
|
|
||||||
|
|
||||||
// Check file exists
|
// Check file exists
|
||||||
var iso = new FileInfo(isoPath);
|
FileInfo iso;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
iso = new FileInfo(isoPath);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
throw new ArgumentException("Invalid ISO Path: " + e.Message);
|
||||||
|
}
|
||||||
if (!iso.Exists)
|
if (!iso.Exists)
|
||||||
throw new FileNotFoundException(nameof(isoPath));
|
throw new FileNotFoundException(nameof(isoPath));
|
||||||
|
|
||||||
|
|||||||
@@ -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 .`
|
- Printing info about all ISOs and IRDs in a folder: `irdkit info .`
|
||||||
- Creating an IRD from an ISO: `irdkit create game.iso`
|
- Creating an IRD from an ISO: `irdkit create game.iso`
|
||||||
- Finding differences between two IRDs: `irdkit diff game1.ird game2.ird`
|
- Finding differences between two IRDs: `irdkit diff game1.ird game2.ird`
|
||||||
|
|
||||||
For detailed usage, read more [here](IRDKit).
|
For detailed usage, read more [here](IRDKit).
|
||||||
|
|
||||||
## Using the LibIRD library
|
## Using the LibIRD library
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
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"
|
||||||
Reference in New Issue
Block a user