diff --git a/DiscUtils b/DiscUtils
index a99992e..299030c 160000
--- a/DiscUtils
+++ b/DiscUtils
@@ -1 +1 @@
-Subproject commit a99992e5f4c062acc0dc011fb81eef489950e896
+Subproject commit 299030c20bfd9ae55997429b3a6487e68df967fc
diff --git a/IRDKit/Program.cs b/IRDKit/Program.cs
index dac7e36..9ce8e9e 100644
--- a/IRDKit/Program.cs
+++ b/IRDKit/Program.cs
@@ -31,7 +31,7 @@ namespace IRDKit
public string IRDPath { get; set; }
[Option('b', "layerbreak", HelpText = "Layerbreak value in bytes (use with BD-Video hybrid discs). Default: 12219392")]
- public long? Layerbreak { get; set; }
+ public long? Layerbreak { get; set; }
[Option('k', "key", HelpText = "Hexadecimal representation of the disc key")]
public string Key { get; set; }
@@ -68,9 +68,9 @@ namespace IRDKit
public bool Recurse { get; set; }
}
- ///
- /// IRD diff command
- ///
+ ///
+ /// IRD diff command
+ ///
[Verb("diff", HelpText = "Compare two IRDs and print their differences")]
public class DiffOptions
{
diff --git a/LibIRD/IRD.cs b/LibIRD/IRD.cs
index 4b8efa7..4071aa7 100644
--- a/LibIRD/IRD.cs
+++ b/LibIRD/IRD.cs
@@ -1064,7 +1064,7 @@ namespace LibIRD
CountFiles(dirInfo);
}
-#endregion
+ #endregion
#region IRD File
@@ -1250,7 +1250,7 @@ namespace LibIRD
uint fileCount = br.ReadUInt32();
long[] fileKeys = new long[fileCount];
byte[][] fileHashes = new byte[fileCount][];
- for (int i = 0; i < fileCount; i++)
+ for (int i = 0; i < fileCount; i++)
{
fileKeys[i] = br.ReadInt64();
fileHashes[i] = br.ReadBytes(16);
diff --git a/LibIRD/PS3_DiscSFB.cs b/LibIRD/PS3_DiscSFB.cs
index 03e3ea0..221292f 100644
--- a/LibIRD/PS3_DiscSFB.cs
+++ b/LibIRD/PS3_DiscSFB.cs
@@ -27,7 +27,7 @@ namespace LibIRD
/// A field within the PS3_DISC.SFB file
///
/// string Key, string Value
- public Dictionary Field { get; private set; }
+ public Dictionary Field { get; private set; }
///
/// Constructor using a PARAM.SFO file path
@@ -131,6 +131,11 @@ namespace LibIRD
}
}
+ ///
+ /// Define JSON options once
+ ///
+ private readonly JsonSerializerOptions JsonOpts = new() { WriteIndented = true };
+
///
/// Prints parameters extracted from PS3_DISC.SFB to a json object
///
@@ -138,7 +143,7 @@ namespace LibIRD
public void PrintJson(string jsonPath = null)
{
// Serialise PS3_Disc.SFB data to a JSON object
- string json = JsonSerializer.Serialize(Field, new JsonSerializerOptions { WriteIndented = true });
+ string json = JsonSerializer.Serialize(Field, JsonOpts);
// If no path given, output to console
if (jsonPath == null)
diff --git a/LibIRD/ParamSFO.cs b/LibIRD/ParamSFO.cs
index b216dd7..a3d977c 100644
--- a/LibIRD/ParamSFO.cs
+++ b/LibIRD/ParamSFO.cs
@@ -103,7 +103,7 @@ namespace LibIRD
- keyOffset[i];
// Read ith key name
- string key = Encoding.ASCII.GetString(br.ReadBytes((int) keyLen)).TrimEnd('\0');
+ string key = Encoding.ASCII.GetString(br.ReadBytes((int)keyLen)).TrimEnd('\0');
// Move stream to ith data
sfoStream.Position = dataTableStart + dataOffset[i];
@@ -112,13 +112,13 @@ namespace LibIRD
Field[key] = dataFormat[i] switch
{
// Non-null-terminated UTF-8 String
- 0x0004 => Encoding.UTF8.GetString(br.ReadBytes((int) dataLength[i])),
+ 0x0004 => Encoding.UTF8.GetString(br.ReadBytes((int)dataLength[i])),
// Null-terminated UTF-8 String
- 0x0204 => Encoding.UTF8.GetString(br.ReadBytes((int) dataLength[i])).TrimEnd('\0'),
+ 0x0204 => Encoding.UTF8.GetString(br.ReadBytes((int)dataLength[i])).TrimEnd('\0'),
// Integer
0x0404 => br.ReadInt32().ToString(),
// Unknown data format, assume null-terminated string
- _ => Encoding.UTF8.GetString(br.ReadBytes((int) dataLength[i])).TrimEnd('\0'),
+ _ => Encoding.UTF8.GetString(br.ReadBytes((int)dataLength[i])).TrimEnd('\0'),
};
}
}
@@ -159,6 +159,11 @@ namespace LibIRD
}
}
+ ///
+ /// Define JSON options once
+ ///
+ private readonly JsonSerializerOptions JsonOpts = new() { WriteIndented = true };
+
///
/// Prints parameters extracted from PARAM.SFO to a json object
///
@@ -166,7 +171,7 @@ namespace LibIRD
public void PrintJson(string jsonPath = null)
{
// Serialise PS3_Disc.SFB data to a JSON object
- string json = JsonSerializer.Serialize(Field, new JsonSerializerOptions { WriteIndented = true });
+ string json = JsonSerializer.Serialize(Field, JsonOpts);
// If no path given, output to console
if (jsonPath == null)
diff --git a/LibIRD/ReIRD.cs b/LibIRD/ReIRD.cs
index 8b73594..d29eebf 100644
--- a/LibIRD/ReIRD.cs
+++ b/LibIRD/ReIRD.cs
@@ -2,7 +2,6 @@
using System;
using System.IO;
using System.IO.Hashing;
-using System.Security;
namespace LibIRD
{
@@ -152,62 +151,62 @@ namespace LibIRD
if (size > BDLayerSize) // if BD-50
{
// Layer 0 start sector = 0x01000000
- long l0_start_sector = 1048576;
-
- // Layer 0 end sector = start sector + layerbreak - 2
- long l0_end_sector = ((long)layerbreak / SectorSize) + l0_start_sector - 2;
- // Convert end sector location to hex values for PIC
- byte[] l0es = [(byte)((l0_end_sector >> 24) & 0xFF),
- (byte)((l0_end_sector >> 16) & 0xFF),
- (byte)((l0_end_sector >> 8) & 0xFF),
- (byte)((l0_end_sector >> 0) & 0xFF)];
+ long l0_start_sector = 1048576;
+
+ // Layer 0 end sector = start sector + layerbreak - 2
+ long l0_end_sector = ((long)layerbreak / SectorSize) + l0_start_sector - 2;
+ // Convert end sector location to hex values for PIC
+ byte[] l0es = [(byte)((l0_end_sector >> 24) & 0xFF),
+ (byte)((l0_end_sector >> 16) & 0xFF),
+ (byte)((l0_end_sector >> 8) & 0xFF),
+ (byte)((l0_end_sector >> 0) & 0xFF)];
// Layer 1 start sector = end of disc (0x01EFFFFE) - layerbreak + 2
long l1_start_sector = 32505854 - ((long)layerbreak! / SectorSize) + 2;
- // Convert start of start sector location to hex values for PIC
- byte[] l1ss = [(byte)((l1_start_sector >> 24) & 0xFF),
- (byte)((l1_start_sector >> 16) & 0xFF),
- (byte)((l1_start_sector >> 8) & 0xFF),
- (byte)((l1_start_sector >> 0) & 0xFF)];
-
- // Total sectors used = num_sectors + Layer 0 start + sectors_between_layers (usually 0x01358C00 - 0x00CA73FE - 3)
- long total_sectors = (size / SectorSize) + l0_start_sector + (l1_start_sector - l0_end_sector - 3);
- byte[] ts = BitConverter.GetBytes((uint) total_sectors);
+ // Convert start of start sector location to hex values for PIC
+ byte[] l1ss = [(byte)((l1_start_sector >> 24) & 0xFF),
+ (byte)((l1_start_sector >> 16) & 0xFF),
+ (byte)((l1_start_sector >> 8) & 0xFF),
+ (byte)((l1_start_sector >> 0) & 0xFF)];
- // Define the PIC
- pic = [
- // Initial portion of PIC (24 bytes)
- // [4098 bytes] [2x 0x00] ["DI"] [v1] [10units] [DI num]
+ // Total sectors used = num_sectors + Layer 0 start + sectors_between_layers (usually 0x01358C00 - 0x00CA73FE - 3)
+ long total_sectors = (size / SectorSize) + l0_start_sector + (l1_start_sector - l0_end_sector - 3);
+ byte[] ts = BitConverter.GetBytes((uint)total_sectors);
+
+ // Define the PIC
+ pic = [
+ // Initial portion of PIC (24 bytes)
+ // [4098 bytes] [2x 0x00] ["DI"] [v1] [10units] [DI num]
0x10, 0x02, 0x00, 0x00, 0x44, 0x49, 0x01, 0x10, 0x00, 0x00, 0x20, 0x00,
- // ["BDR"] [2 layers]
+ // ["BDR"] [2 layers]
0x42, 0x44, 0x4F, 0x01, 0x21, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
- // Total sectors used on disc (4 bytes)
+ // Total sectors used on disc (4 bytes)
ts[3], ts[2], ts[1], ts[0],
- // 1st Layer sector start location (4 bytes)
+ // 1st Layer sector start location (4 bytes)
0x00, 0x10, 0x00, 0x00,
- // 1st Layer sector end location (4 bytes), 0x00CA73FE for default BD layerbreak of 12219392
+ // 1st Layer sector end location (4 bytes), 0x00CA73FE for default BD layerbreak of 12219392
l0es[0], l0es[1], l0es[2], l0es[3],
- // 32 bytes of zeros
+ // 32 bytes of zeros
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- // Initial portion of PIC again, for 2nd layer
- // ["DI"] [v1] [11unit][DI num]
+ // Initial portion of PIC again, for 2nd layer
+ // ["DI"] [v1] [11unit][DI num]
0x44, 0x49, 0x01, 0x11, 0x00, 0x01, 0x20, 0x00,
- // ["BDR"] [2 layers]
+ // ["BDR"] [2 layers]
0x42, 0x44, 0x4F, 0x01, 0x21, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
- // Total sectors used on disc
+ // Total sectors used on disc
ts[3], ts[2], ts[1], ts[0],
- // 2nd Layer sector start location, 0x01358C00 for default BD layerbreak of 12219392
+ // 2nd Layer sector start location, 0x01358C00 for default BD layerbreak of 12219392
l1ss[0], l1ss[1], l1ss[2], l1ss[3],
- // 2nd Layer sector end location
+ // 2nd Layer sector end location
0x01, 0xEF, 0xFF, 0xFE,
- // Remaining 32 bytes are zeroes
+ // Remaining 32 bytes are zeroes
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ];
- // 3k3y style: 0x03 at last byte
- if (exactIRD)
- pic[114] = 0x03;
+ // 3k3y style: 0x03 at last byte
+ if (exactIRD)
+ pic[114] = 0x03;
- }
+ }
else // if BD-25
{
// Total sectors used on disc: num_sectors + layer_sector_end (0x00100000) - 1
@@ -233,7 +232,7 @@ namespace LibIRD
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ];
}
-
+
return pic;
}