SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-04-05 22:01:33 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Read/write with variable initial offset (#74)

Browse Source
This commit is contained in:
Deterous
2026-03-30 10:54:16 +09:00
committed by GitHub
parent 0debcaa8d1
commit 28f4808dbb
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SabreTools.Serialization.Readers/XDVDFS.cs
View File

@@ -22,6 +22,9 @@ namespace SabreTools.Serialization.Readers
try
{
// Cache the current offset
long initialOffset = data.Position;
// Create a new Volume to fill
var volume = new Volume();
@@ -39,7 +42,7 @@ namespace SabreTools.Serialization.Readers
volume.LayoutDescriptor = ParseLayoutDescriptor(data);
// Parse the descriptors from the root directory descriptor
var dd = ParseDirectoryDescriptors(data, vd.RootOffset, vd.RootSize);
var dd = ParseDirectoryDescriptors(data, initialOffset, vd.RootOffset, vd.RootSize);
if (dd is null)
return null;
@@ -129,7 +132,7 @@ namespace SabreTools.Serialization.Readers
/// <param name="offset">Sector number descriptor is located at</param>
/// <param name="size">Number of bytes descriptor contains</param>
/// <returns>Filled Dictionary of int to DirectoryDescriptors on success, null on error</returns>
public static Dictionary<uint, DirectoryDescriptor>? ParseDirectoryDescriptors(Stream data, uint offset, uint size)
public static Dictionary<uint, DirectoryDescriptor>? ParseDirectoryDescriptors(Stream data, long initialOffset, uint offset, uint size)
{
// Ensure descriptor size is valid
if (size < 14)
@@ -141,7 +144,7 @@ namespace SabreTools.Serialization.Readers
var obj = new Dictionary<uint, DirectoryDescriptor>();
var dd = ParseDirectoryDescriptor(data, offset, size);
var dd = ParseDirectoryDescriptor(data, initialOffset, offset, size);
if (dd is null)
return null;
@@ -157,7 +160,7 @@ namespace SabreTools.Serialization.Readers
continue;
// Get all descriptors from child
var descriptors = ParseDirectoryDescriptors(data, dr.ExtentOffset, dr.ExtentSize);
var descriptors = ParseDirectoryDescriptors(data, initialOffset, dr.ExtentOffset, dr.ExtentSize);
if (descriptors is null)
continue;
@@ -180,7 +183,7 @@ namespace SabreTools.Serialization.Readers
/// <param name="offset">Sector number descriptor is located at</param>
/// <param name="size">Number of bytes descriptor contains</param>
/// <returns>Filled DirectoryDescriptor on success, null on error</returns>
public static DirectoryDescriptor? ParseDirectoryDescriptor(Stream data, uint offset, uint size)
public static DirectoryDescriptor? ParseDirectoryDescriptor(Stream data, long initialOffset, uint offset, uint size)
{
// Ensure descriptor size is valid
if (size < Constants.MinimumRecordLength)
@@ -193,7 +196,7 @@ namespace SabreTools.Serialization.Readers
var obj = new DirectoryDescriptor();
var records = new List<DirectoryRecord>();
data.SeekIfPossible(((long)offset) * Constants.SectorSize, SeekOrigin.Begin);
data.SeekIfPossible(initialOffset + ((long)offset) * Constants.SectorSize, SeekOrigin.Begin);
long curPosition;
while (size > data.Position - (((long)offset) * Constants.SectorSize))
{

11
SabreTools.Wrappers/XDVDFS.Extraction.cs
View File

@@ -25,14 +25,17 @@ namespace SabreTools.Wrappers
// Clear the extraction state
extractedFiles.Clear();
// Cache the current offset
long initialOffset = _dataSource.Position;
// Extract files from all directories from root directory
return ExtractDescriptor(outputDirectory, includeDebug, VolumeDescriptor.RootOffset);
return ExtractDescriptor(outputDirectory, includeDebug, initialOffset, VolumeDescriptor.RootOffset);
}
/// <summary>
/// Extracts all directory records recursively from directory descriptor
/// </summary>
public bool ExtractDescriptor(string outputDirectory, bool includeDebug, uint sectorNumber)
public bool ExtractDescriptor(string outputDirectory, bool includeDebug, long initialOffset, uint sectorNumber)
{
// If no descriptor exists at that sector, we cannot extract from it
if (!DirectoryDescriptors.ContainsKey(sectorNumber))
@@ -58,7 +61,7 @@ namespace SabreTools.Wrappers
if (!string.IsNullOrEmpty(outputPath) && !Directory.Exists(outputPath))
Directory.CreateDirectory(outputPath);
allExtracted |= ExtractDescriptor(outputPath, includeDebug, dr.ExtentOffset);
allExtracted |= ExtractDescriptor(outputPath, includeDebug, initialOffset, dr.ExtentOffset);
}
else
{
@@ -88,7 +91,7 @@ namespace SabreTools.Wrappers
lock (_dataSourceLock)
{
long fileOffset = ((long)dr.ExtentOffset) * Constants.SectorSize;
_dataSource.SeekIfPossible(fileOffset, SeekOrigin.Begin);
_dataSource.SeekIfPossible(initialOffset + fileOffset, SeekOrigin.Begin);
// Get the length, and make sure it won't EOF
uint length = dr.ExtentSize;