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

REFACTOR: All refactor in DiscImageChef.Decoders.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-22 02:04:18 +00:00
parent 7f829422a8
commit 49144eeb01
148 changed files with 2606 additions and 1939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscImageChef.Filesystems/LisaFS/Dir.cs
View File

@@ -171,7 +171,7 @@ namespace DiscImageChef.Filesystems.LisaFS
LisaTag.PriamTag catTag;
DecodeTag(device.ReadSectorTag(i, SectorTagType.AppleSectorTag), out catTag);
if(catTag.fileID != FILEID_CATALOG || catTag.relPage != 0) continue;
if(catTag.FileId != FILEID_CATALOG || catTag.RelPage != 0) continue;
firstCatalogBlock = device.ReadSectors(i, 4);
break;
@@ -190,7 +190,7 @@ namespace DiscImageChef.Filesystems.LisaFS
DecodeTag(device.ReadSectorTag(prevCatalogPointer + mddf.mddf_block + volumePrefix, SectorTagType.AppleSectorTag),
out prevTag);
if(prevTag.fileID != FILEID_CATALOG) return Errno.InvalidArgument;
if(prevTag.FileId != FILEID_CATALOG) return Errno.InvalidArgument;
firstCatalogBlock = device.ReadSectors(prevCatalogPointer + mddf.mddf_block + volumePrefix, 4);
prevCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7F6);
@@ -209,7 +209,7 @@ namespace DiscImageChef.Filesystems.LisaFS
DecodeTag(device.ReadSectorTag(nextCatalogPointer + mddf.mddf_block + volumePrefix, SectorTagType.AppleSectorTag),
out nextTag);
if(nextTag.fileID != FILEID_CATALOG) return Errno.InvalidArgument;
if(nextTag.FileId != FILEID_CATALOG) return Errno.InvalidArgument;
byte[] nextCatalogBlock = device.ReadSectors(nextCatalogPointer + mddf.mddf_block + volumePrefix, 4);
nextCatalogPointer = BigEndianBitConverter.ToUInt32(nextCatalogBlock, 0x7FA);

4
DiscImageChef.Filesystems/LisaFS/Extent.cs
View File

@@ -85,7 +85,7 @@ namespace DiscImageChef.Filesystems.LisaFS
for(ulong i = 0; i < device.ImageInfo.Sectors; i++)
{
DecodeTag(device.ReadSectorTag(i, SectorTagType.AppleSectorTag), out extTag);
if(extTag.fileID != fileId * -1) continue;
if(extTag.FileId != fileId * -1) continue;
ptr = i;
found = true;
@@ -98,7 +98,7 @@ namespace DiscImageChef.Filesystems.LisaFS
// Checks that the sector tag indicates its the Extents File we are searching for
DecodeTag(device.ReadSectorTag(ptr, SectorTagType.AppleSectorTag), out extTag);
if(extTag.fileID != (short)(-1 * fileId)) return Errno.NoSuchFile;
if(extTag.FileId != (short)(-1 * fileId)) return Errno.NoSuchFile;
byte[] sector;

8
DiscImageChef.Filesystems/LisaFS/File.cs
View File

@@ -195,7 +195,7 @@ namespace DiscImageChef.Filesystems.LisaFS
{
DecodeTag(device.ReadSectorTag(i, SectorTagType.AppleSectorTag), out sysTag);
if(sysTag.fileID == fileId) count++;
if(sysTag.FileId == fileId) count++;
}
if(count == 0) return Errno.NoSuchFile;
@@ -208,7 +208,7 @@ namespace DiscImageChef.Filesystems.LisaFS
{
DecodeTag(device.ReadSectorTag(i, SectorTagType.AppleSectorTag), out sysTag);
if(sysTag.fileID != fileId) continue;
if(sysTag.FileId != fileId) continue;
byte[] sector;
@@ -216,9 +216,9 @@ namespace DiscImageChef.Filesystems.LisaFS
else sector = device.ReadSectorTag(i, SectorTagType.AppleSectorTag);
// Relative block for $Loader starts at $Boot block
if(sysTag.fileID == FILEID_LOADER_SIGNED) sysTag.relPage--;
if(sysTag.FileId == FILEID_LOADER_SIGNED) sysTag.RelPage--;
Array.Copy(sector, 0, buf, sector.Length * sysTag.relPage, sector.Length);
Array.Copy(sector, 0, buf, sector.Length * sysTag.RelPage, sector.Length);
}
if(!tags) systemFileCache.Add(fileId, buf);

12
DiscImageChef.Filesystems/LisaFS/Info.cs
View File

@@ -64,11 +64,11 @@ namespace DiscImageChef.Filesystems.LisaFS
LisaTag.PriamTag searchTag;
DecodeTag(imagePlugin.ReadSectorTag((ulong)i, SectorTagType.AppleSectorTag), out searchTag);
DicConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.fileID);
DicConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
if(before_mddf == -1 && searchTag.fileID == FILEID_LOADER_SIGNED) before_mddf = i - 1;
if(before_mddf == -1 && searchTag.FileId == FILEID_LOADER_SIGNED) before_mddf = i - 1;
if(searchTag.fileID != FILEID_MDDF) continue;
if(searchTag.FileId != FILEID_MDDF) continue;
byte[] sector = imagePlugin.ReadSector((ulong)i);
MDDF info_mddf = new MDDF();
@@ -142,11 +142,11 @@ namespace DiscImageChef.Filesystems.LisaFS
LisaTag.PriamTag searchTag;
DecodeTag(imagePlugin.ReadSectorTag((ulong)i, SectorTagType.AppleSectorTag), out searchTag);
DicConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.fileID);
DicConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
if(before_mddf == -1 && searchTag.fileID == FILEID_LOADER_SIGNED) before_mddf = i - 1;
if(before_mddf == -1 && searchTag.FileId == FILEID_LOADER_SIGNED) before_mddf = i - 1;
if(searchTag.fileID != FILEID_MDDF) continue;
if(searchTag.FileId != FILEID_MDDF) continue;
byte[] sector = imagePlugin.ReadSector((ulong)i);
MDDF info_mddf = new MDDF();

6
DiscImageChef.Filesystems/LisaFS/Super.cs
View File

@@ -85,12 +85,12 @@ namespace DiscImageChef.Filesystems.LisaFS
LisaTag.PriamTag searchTag;
DecodeTag(device.ReadSectorTag(i, SectorTagType.AppleSectorTag), out searchTag);
DicConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.fileID);
DicConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
if(volumePrefix == device.ImageInfo.Sectors && searchTag.fileID == FILEID_LOADER_SIGNED)
if(volumePrefix == device.ImageInfo.Sectors && searchTag.FileId == FILEID_LOADER_SIGNED)
volumePrefix = i - 1;
if(searchTag.fileID != FILEID_MDDF) continue;
if(searchTag.FileId != FILEID_MDDF) continue;
devTagSize = device.ReadSectorTag(i, SectorTagType.AppleSectorTag).Length;