aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Decode Joliet root directory.

Browse Source
This commit is contained in:
Natalia Portillo
2019-07-22 02:42:17 +01:00
parent 8499e4d2ca
commit 49e5ebc22a
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DiscImageChef.Filesystems/ISO9660/ISO9660.cs
View File

@@ -46,6 +46,7 @@ namespace DiscImageChef.Filesystems.ISO9660
bool debug;
bool highSierra;
IMediaImage image;
Dictionary<string, DecodedDirectoryEntry> jolietRootDirectoryCache;
bool mounted;
Namespace @namespace;
Dictionary<string, DecodedDirectoryEntry> rootDirectoryCache;

24
DiscImageChef.Filesystems/ISO9660/Super.cs
View File

@@ -231,13 +231,13 @@ namespace DiscImageChef.Filesystems.ISO9660
// TODO: Add IP.BIN to debug root directory
// TODO: Add volume descriptors to debug root directory
// TODO: Decode Joliet directory
rootDirectoryCache = cdi
? DecodeCdiDirectory(rootDir)
: highSierra
? DecodeHighSierraDirectory(rootDir)
: DecodeIsoDirectory(rootDir);
if(this.@namespace != Namespace.Joliet)
rootDirectoryCache = cdi
? DecodeCdiDirectory(rootDir)
: highSierra
? DecodeHighSierraDirectory(rootDir)
: DecodeIsoDirectory(rootDir);
XmlFsType.Type = fsFormat;
@@ -245,6 +245,18 @@ namespace DiscImageChef.Filesystems.ISO9660
this.@namespace != Namespace.Vms &&
this.@namespace != Namespace.Rrip && this.@namespace != Namespace.RripNormal)
{
rootLocation = jolietvd.Value.root_directory_record.extent;
rootSize = jolietvd.Value.root_directory_record.size / jolietvd.Value.logical_block_size;
if(pvd.Value.root_directory_record.size % jolietvd.Value.logical_block_size > 0)
rootSize++;
if(rootLocation + rootSize >= imagePlugin.Info.Sectors) return Errno.InvalidArgument;
rootDir = imagePlugin.ReadSectors(rootLocation, rootSize);
jolietRootDirectoryCache = DecodeIsoDirectory(rootDir, true);
XmlFsType.VolumeName = decodedJolietVd.VolumeIdentifier;
if(string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier) ||