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

Proper printing

Browse Source
This commit is contained in:
Deterous
2023-12-05 00:02:09 +13:00
parent ba7bacc11c
commit a036481560
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRDKit/Program.cs
+24 -19
View File
@@ -147,7 +147,7 @@ namespace IRDKit
if (opt.Recurse) if (opt.Recurse)
{ {
if (opt.InPath == ".") if (opt.InPath == ".")
Console.WriteLine($"Recursively searching for IRDs and ISOs in current directory"); Console.WriteLine($"Recursively searching for IRDs and ISOs in current directory\n");
else else
Console.WriteLine($"Recursively searching for IRDs and ISOs in {opt.InPath}"); Console.WriteLine($"Recursively searching for IRDs and ISOs in {opt.InPath}");
irdFiles = Directory.EnumerateFiles(opt.InPath, "*.ird", SearchOption.AllDirectories); irdFiles = Directory.EnumerateFiles(opt.InPath, "*.ird", SearchOption.AllDirectories);
@@ -156,7 +156,7 @@ namespace IRDKit
else else
{ {
if (opt.InPath == ".") if (opt.InPath == ".")
Console.WriteLine($"Searching for IRDs and ISOs in current directory"); Console.WriteLine($"Searching for IRDs and ISOs in current directory\n");
else else
Console.WriteLine($"Searching for IRDs and ISOs in {opt.InPath}"); Console.WriteLine($"Searching for IRDs and ISOs in {opt.InPath}");
irdFiles = Directory.EnumerateFiles(opt.InPath, "*.ird", SearchOption.TopDirectoryOnly); irdFiles = Directory.EnumerateFiles(opt.InPath, "*.ird", SearchOption.TopDirectoryOnly);
@@ -191,7 +191,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"); Console.WriteLine($"{file} is not a valid ISO file\n");
} }
} }
@@ -249,26 +249,29 @@ namespace IRDKit
{ {
if (json) if (json)
{ {
IRD ird = IRD.Read(inPath);
if (outPath != null) if (outPath != null)
File.AppendAllText(outPath, $"\"{inPath}\": "); File.AppendAllText(outPath, $"\"{inPath}\": ");
else else
Console.Write($"\"{inPath}\": "); Console.Write($"\"{inPath}\": ");
IRD.Read(inPath).PrintJson(outPath, single); ird.PrintJson(outPath, single);
} }
else else
IRD.Read(inPath).Print(outPath, inPath); IRD.Read(inPath).Print(outPath, inPath);
if (isISO) if (json)
Console.WriteLine($"{inPath} was a valid IRD despite .iso extension"); return;
return; return;
} }
catch (InvalidDataException) catch (InvalidDataException)
{ {
// Not a valid IRD file despite extension, give up // Not a valid IRD file despite extension, give up
if (json)
return;
if (isISO) if (isISO)
Console.WriteLine($"{inPath} is not a valid ISO file"); Console.WriteLine($"{inPath} is not a valid ISO file\n");
else else
Console.WriteLine($"{inPath} is not a valid IRD file"); Console.WriteLine($"{inPath} is not a valid IRD file\n");
} }
} }
@@ -290,15 +293,6 @@ namespace IRDKit
// Create new ISO reader // Create new ISO reader
using CDReader reader = new(fs, true, true); using CDReader reader = new(fs, true, true);
// Begin JSON object
if (json)
{
if (outPath != null)
File.AppendAllText(outPath, $"\"{isoPath}\": {{\n");
else
Console.WriteLine($"\"{isoPath}\": {{");
}
// Write PS3_DISC.SFB info // Write PS3_DISC.SFB info
try try
{ {
@@ -306,6 +300,16 @@ namespace IRDKit
PS3_DiscSFB ps3_DiscSFB = new(s); PS3_DiscSFB ps3_DiscSFB = new(s);
if (json) if (json)
{ {
// Begin JSON object
if (json)
{
if (outPath != null)
File.AppendAllText(outPath, $"\"{isoPath}\": {{\n");
else
Console.WriteLine($"\"{isoPath}\": {{");
}
// Print PS3_DISC.SFB info
if (outPath != null) if (outPath != null)
File.AppendAllText(outPath, "\"PS3_DISC.SFB\": "); File.AppendAllText(outPath, "\"PS3_DISC.SFB\": ");
else else
@@ -322,7 +326,8 @@ namespace IRDKit
catch (FileNotFoundException) catch (FileNotFoundException)
{ {
if (!json) if (!json)
Console.WriteLine($"PS3_DISC.SFB not found in {isoPath}. Not a valid PS3 ISO?"); Console.WriteLine($"{isoPath} not a valid PS3 ISO file\n");
return;
} }
// Write PARAM.SFO info // Write PARAM.SFO info
@@ -344,7 +349,7 @@ namespace IRDKit
catch (FileNotFoundException) catch (FileNotFoundException)
{ {
if (!json) if (!json)
Console.WriteLine($"PS3_GAME\\PARAM.SFO not found in {isoPath}. Not a valid PS3 ISO?"); Console.WriteLine($"PS3_GAME\\PARAM.SFO not found in {isoPath}\n");
} }
// End JSON object // End JSON object