SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-09 02:16:55 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Be descriptive about types

Browse Source
This commit is contained in:
Matt Nadareski
2025-11-04 10:49:03 -05:00
parent cca08e7103
commit fcf7fcfd44
1 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
SabreTools.Serialization/Readers/ISO9660.cs
View File

@@ -401,11 +401,8 @@ namespace SabreTools.Serialization.Readers
var groups = new List<PathTableGroup>();
foreach (VolumeDescriptor vd in vdSet)
{
if (vd is not BaseVolumeDescriptor bvd)
continue;
// Parse the path table group in the base volume descriptor
var pathTableGroups = ParsePathTableGroup(data, sectorLength, bvd);
var pathTableGroups = ParsePathTableGroup(data, sectorLength, vd);
if (pathTableGroups.Count > 0)
groups.AddRange(pathTableGroups);
}
@@ -424,17 +421,33 @@ namespace SabreTools.Serialization.Readers
/// <param name="sectorLength">Number of bytes in a logical sector (usually 2048)</param>
/// <param name="vd">Primary/Supplementary/Enhanced Volume Descriptor pointing to path table(s)</param>
/// <returns>Filled list of PathTableGroup on success, null on error</returns>
public static List<PathTableGroup> ParsePathTableGroup(Stream data, short sectorLength, BaseVolumeDescriptor vd)
public static List<PathTableGroup> ParsePathTableGroup(Stream data, short sectorLength, VolumeDescriptor vd)
{
int sizeL, sizeB, locationL, locationL2, locationM, locationM2;
if (vd is PrimaryVolumeDescriptor pvd)
{
sizeL = pvd.PathTableSize.LittleEndian;
sizeB = pvd.PathTableSize.BigEndian;
locationL = pvd.PathTableLocationL;
locationL2 = pvd.OptionalPathTableLocationL;
locationM = pvd.PathTableLocationM;
locationM2 = pvd.OptionalPathTableLocationM;
}
else if (vd is SupplementaryVolumeDescriptor svd)
{
sizeL = svd.PathTableSize.LittleEndian;
sizeB = svd.PathTableSize.BigEndian;
locationL = svd.PathTableLocationL;
locationL2 = svd.OptionalPathTableLocationL;
locationM = svd.PathTableLocationM;
locationM2 = svd.OptionalPathTableLocationM;
}
else
{
return [];
}
var groups = new List<PathTableGroup>();
int sizeL = vd.PathTableSize.LittleEndian;
int sizeB = vd.PathTableSize.BigEndian;
int locationL = vd.PathTableLocationL;
int locationL2 = vd.OptionalPathTableLocationL;
int locationM = vd.PathTableLocationM;
int locationM2 = vd.OptionalPathTableLocationM;
short blockLength = vd.GetLogicalBlockSize(sectorLength);
var groupL = new PathTableGroup();
@@ -575,14 +588,19 @@ namespace SabreTools.Serialization.Readers
var directories = new Dictionary<int, FileExtent>();
foreach (VolumeDescriptor vd in vdSet)
{
if (vd is not BaseVolumeDescriptor bvd)
DirectoryRecord rootDirectoryRecord;
if (vd is PrimaryVolumeDescriptor pvd)
rootDirectoryRecord = pvd.RootDirectoryRecord;
else if (vd is SupplementaryVolumeDescriptor svd)
rootDirectoryRecord = svd.RootDirectoryRecord;
else
continue;
// Determine logical block size
short blockLength = bvd.GetLogicalBlockSize(sectorLength);
short blockLength = vd.GetLogicalBlockSize(sectorLength);
// Parse the root directory pointed to from the base volume descriptor
var descriptors = ParseDirectory(data, sectorLength, blockLength, bvd.RootDirectoryRecord, false);
var descriptors = ParseDirectory(data, sectorLength, blockLength, rootDirectoryRecord, false);
if (descriptors == null || descriptors.Count == 0)
continue;