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

🎨🎨🎨 Removed methods in images that only returned what's already in the ImageInfo structure.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-26 02:51:10 +00:00
parent 03a4e286cc
commit a002253fa4
135 changed files with 2111 additions and 8526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,7 +164,7 @@ namespace DiscImageChef.Filesystems.LisaFS
// Search for the first sector describing the catalog
// While root catalog is not stored in S-Records, probably rest are? (unchecked)
// If root catalog is not pointed in MDDF (unchecked) maybe it's always following S-Records File?
for(ulong i = 0; i < device.GetSectors(); i++)
for(ulong i = 0; i < device.ImageInfo.Sectors; i++)
{
DecodeTag(device.ReadSectorTag(i, SectorTagType.AppleSectorTag), out LisaTag.PriamTag catTag);

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

@@ -194,7 +194,7 @@ namespace DiscImageChef.Filesystems.LisaFS
if(count == 0) return Errno.NoSuchFile;
buf = !tags ? new byte[count * device.GetSectorSize()] : new byte[count * devTagSize];
buf = !tags ? new byte[count * device.ImageInfo.SectorSize] : new byte[count * devTagSize];
// Should be enough to check 100 sectors?
for(ulong i = 0; i < 100; i++)
@@ -325,7 +325,7 @@ namespace DiscImageChef.Filesystems.LisaFS
int sectorSize;
if(tags) sectorSize = devTagSize;
else sectorSize = (int)device.GetSectorSize();
else sectorSize = (int)device.ImageInfo.SectorSize;
byte[] temp = new byte[file.length * sectorSize];

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

@@ -54,7 +54,7 @@ namespace DiscImageChef.Filesystems.LisaFS
BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
// Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
if(imagePlugin.GetSectors() < 800) return false;
if(imagePlugin.ImageInfo.Sectors < 800) return false;
int beforeMddf = -1;
@@ -83,18 +83,20 @@ namespace DiscImageChef.Filesystems.LisaFS
DicConsole.DebugWriteLine("LisaFS plugin", "Current sector = {0}", i);
DicConsole.DebugWriteLine("LisaFS plugin", "mddf.mddf_block = {0}", infoMddf.mddf_block);
DicConsole.DebugWriteLine("LisaFS plugin", "Disk size = {0} sectors", imagePlugin.GetSectors());
DicConsole.DebugWriteLine("LisaFS plugin", "Disk size = {0} sectors",
imagePlugin.ImageInfo.Sectors);
DicConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size = {0} sectors", infoMddf.vol_size);
DicConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size - 1 = {0}", infoMddf.volsize_minus_one);
DicConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size - mddf.mddf_block -1 = {0}",
infoMddf.volsize_minus_mddf_minus_one);
DicConsole.DebugWriteLine("LisaFS plugin", "Disk sector = {0} bytes", imagePlugin.GetSectorSize());
DicConsole.DebugWriteLine("LisaFS plugin", "Disk sector = {0} bytes",
imagePlugin.ImageInfo.SectorSize);
DicConsole.DebugWriteLine("LisaFS plugin", "mddf.blocksize = {0} bytes", infoMddf.blocksize);
DicConsole.DebugWriteLine("LisaFS plugin", "mddf.datasize = {0} bytes", infoMddf.datasize);
if(infoMddf.mddf_block != i - beforeMddf) return false;
if(infoMddf.vol_size > imagePlugin.GetSectors()) return false;
if(infoMddf.vol_size > imagePlugin.ImageInfo.Sectors) return false;
if(infoMddf.vol_size - 1 != infoMddf.volsize_minus_one) return false;
@@ -102,9 +104,9 @@ namespace DiscImageChef.Filesystems.LisaFS
if(infoMddf.datasize > infoMddf.blocksize) return false;
if(infoMddf.blocksize < imagePlugin.GetSectorSize()) return false;
if(infoMddf.blocksize < imagePlugin.ImageInfo.SectorSize) return false;
return infoMddf.datasize == imagePlugin.GetSectorSize();
return infoMddf.datasize == imagePlugin.ImageInfo.SectorSize;
}
return false;
@@ -131,7 +133,7 @@ namespace DiscImageChef.Filesystems.LisaFS
BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
// Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
if(imagePlugin.GetSectors() < 800) return;
if(imagePlugin.ImageInfo.Sectors < 800) return;
int beforeMddf = -1;
@@ -274,7 +276,7 @@ namespace DiscImageChef.Filesystems.LisaFS
if(infoMddf.mddf_block != i - beforeMddf) return;
if(infoMddf.vol_size > imagePlugin.GetSectors()) return;
if(infoMddf.vol_size > imagePlugin.ImageInfo.Sectors) return;
if(infoMddf.vol_size - 1 != infoMddf.volsize_minus_one) return;
@@ -282,9 +284,9 @@ namespace DiscImageChef.Filesystems.LisaFS
if(infoMddf.datasize > infoMddf.blocksize) return;
if(infoMddf.blocksize < imagePlugin.GetSectorSize()) return;
if(infoMddf.blocksize < imagePlugin.ImageInfo.SectorSize) return;
if(infoMddf.datasize != imagePlugin.GetSectorSize()) return;
if(infoMddf.datasize != imagePlugin.ImageInfo.SectorSize) return;
switch(infoMddf.fsversion)
{

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

@@ -70,7 +70,7 @@ namespace DiscImageChef.Filesystems.LisaFS
BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
// Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
if(device.GetSectors() < 800)
if(device.ImageInfo.Sectors < 800)
{
DicConsole.DebugWriteLine("LisaFS plugin", "Device is too small");
return Errno.InOutError;
@@ -178,11 +178,11 @@ namespace DiscImageChef.Filesystems.LisaFS
mddf.vol_left_mounted = sector[0x138];
// Check that the MDDF is correct
if(mddf.mddf_block != i - volumePrefix || mddf.vol_size > device.GetSectors() ||
if(mddf.mddf_block != i - volumePrefix || mddf.vol_size > device.ImageInfo.Sectors ||
mddf.vol_size - 1 != mddf.volsize_minus_one ||
mddf.vol_size - i - 1 != mddf.volsize_minus_mddf_minus_one - volumePrefix ||
mddf.datasize > mddf.blocksize || mddf.blocksize < device.GetSectorSize() ||
mddf.datasize != device.GetSectorSize())
mddf.datasize > mddf.blocksize || mddf.blocksize < device.ImageInfo.SectorSize ||
mddf.datasize != device.ImageInfo.SectorSize)
{
DicConsole.DebugWriteLine("LisaFS plugin", "Incorrect MDDF found");
return Errno.InvalidArgument;