glm94/LibIRD
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IRDKit minimum functionality

Browse Source
This commit is contained in:
Deterous
2023-11-25 02:39:47 +13:00
parent 652cd4aa52
commit 357a8df11b
2 changed files with 65 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRDKit/Program.cs
+63 -25
View File
@@ -4,6 +4,8 @@ using System.Collections.Generic;
using CommandLine; using CommandLine;
using System.Text; using System.Text;
using System.IO; using System.IO;
using DiscUtils.Iso9660;
using DiscUtils;
namespace IRDKit namespace IRDKit
{ {
@@ -53,14 +55,17 @@ namespace IRDKit
if (errs.IsVersion()) if (errs.IsVersion())
{ {
// --version // --version
Console.WriteLine("Help...");
} }
else if (errs.IsHelp()) else if (errs.IsHelp())
{ {
// --help // --help
Console.WriteLine("Version...");
} }
else else
{ {
// Parsing error // Parsing error
Console.WriteLine("Parsing error");
} }
return; return;
} }
@@ -72,6 +77,25 @@ namespace IRDKit
case CreateOptions c: case CreateOptions c:
Console.OutputEncoding = Encoding.UTF8; Console.OutputEncoding = Encoding.UTF8;
// Create new reproducible redump-style IRD with a hex key
if (c.Key != null)
{
try
{
// Get disc key from hex string
byte[] discKey = Convert.FromHexString(c.Key);
IRD ird1 = new ReIRD(c.ISOPath, discKey);
ird1.Write(c.IRDPath ?? Path.GetFileNameWithoutExtension(c.ISOPath) + ".ird");
ird1.Print();
}
catch (FileNotFoundException)
{
Console.Error.WriteLine("File not found");
}
break;
}
// Create new reproducible redump-style IRD with a key file // Create new reproducible redump-style IRD with a key file
if (c.KeyFile != null) if (c.KeyFile != null)
{ {
@@ -81,13 +105,14 @@ namespace IRDKit
byte[] discKey = File.ReadAllBytes(c.KeyFile); byte[] discKey = File.ReadAllBytes(c.KeyFile);
IRD ird1 = new ReIRD(c.ISOPath, discKey); IRD ird1 = new ReIRD(c.ISOPath, discKey);
ird1.Write(c.IRDPath); ird1.Write(c.IRDPath ?? Path.GetFileNameWithoutExtension(c.ISOPath) + ".ird");
ird1.Print(); ird1.Print();
} }
catch (FileNotFoundException) catch (FileNotFoundException)
{ {
Console.WriteLine("ERROR: File not found"); Console.Error.WriteLine("File not found");
} }
break;
} }
// Create new reproducible redump-style IRD with a GetKey log // Create new reproducible redump-style IRD with a GetKey log
@@ -96,44 +121,57 @@ namespace IRDKit
try try
{ {
IRD ird2 = new ReIRD(c.ISOPath, c.GetKeyLog); IRD ird2 = new ReIRD(c.ISOPath, c.GetKeyLog);
ird2.Write(c.IRDPath); ird2.Write(c.IRDPath ?? Path.GetFileNameWithoutExtension(c.ISOPath) + ".ird");
ird2.Print(); ird2.Print();
} }
catch (FileNotFoundException) catch (FileNotFoundException)
{ {
Console.WriteLine("ERROR: File not found"); Console.Error.WriteLine("File not found");
} }
break;
} }
break; break;
case InfoOptions info: case InfoOptions info:
bool isISO = false; string filetype = Path.GetExtension(info.Path);
if (isISO)
if (String.Compare(filetype, ".iso", StringComparison.OrdinalIgnoreCase) == 0)
{ {
string filename = "./PS3_DISC.SFB"; // Open ISO file for reading
if (File.Exists(filename)) using FileStream fs = new FileStream(info.Path, FileMode.Open, FileAccess.Read) ?? throw new FileNotFoundException(info.Path);
// Validate ISO file stream
if (!CDReader.Detect(fs))
throw new InvalidFileSystemException("Not a valid ISO file");
// Create new ISO reader
CDReader reader = new(fs, true, true);
using (DiscUtils.Streams.SparseStream s = reader.OpenFile("PS3_DISC.SFB", FileMode.Open, FileAccess.Read))
{ {
PS3_DiscSFB ps3_DiscSFB = new(filename); try
Console.WriteLine("PS3_DISC.SFB for: " + ps3_DiscSFB.Field["TITLE_ID"]); {
ps3_DiscSFB.Print(); PS3_DiscSFB ps3_DiscSFB = new(s);
} ps3_DiscSFB.Print();
else }
{ catch
Console.WriteLine(filename + " not found"); {
Console.WriteLine("PS3_DISC.SFB not found");
}
} }
filename = "./PARAM.SFO";
if (File.Exists(filename)) using (DiscUtils.Streams.SparseStream s = reader.OpenFile("PS3_GAME\\PARAM.SFO", FileMode.Open, FileAccess.Read))
{ {
ParamSFO paramSFO = new(filename); try
Console.WriteLine("PARAM.SFO for: " + paramSFO["TITLE_ID"]); {
paramSFO.Print(); ParamSFO paramSFO = new(s);
} paramSFO.Print();
else }
{ catch
Console.WriteLine(filename + " not found"); {
Console.WriteLine("./PARAM.SFO not found");
}
} }
} }
else else // Assume it is an IRD file
{ {
IRD.Read(info.Path).Print(); IRD.Read(info.Path).Print();
} }
LibIRD/PS3_DiscSFB.cs
+1
View File
@@ -116,6 +116,7 @@ namespace LibIRD
print.Append(": "); print.Append(": ");
print.AppendLine(field.Value); print.AppendLine(field.Value);
} }
print.Append(Environment.NewLine);
// Ensure UTF-8 will display properly // Ensure UTF-8 will display properly
Console.OutputEncoding = Encoding.UTF8; Console.OutputEncoding = Encoding.UTF8;