mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
* TODO:
* README.md: * DiscImageChef.sln: * DiscImageChef/Commands/Ls.cs: * DiscImageChef.Filters/GZip.cs: * DiscImageChef.DiscImages/BLU.cs: * DiscImageChef.DiscImages/VHD.cs: * DiscImageChef.DiscImages/VDI.cs: * DiscImageChef.DiscImages/QED.cs: * DiscImageChef.DiscImages/DIM.cs: * DiscImageChef.DiscImages/GDI.cs: * DiscImageChef.Filters/Filter.cs: * DiscImageChef/Commands/Decode.cs: * DiscImageChef.DiscImages/QCOW.cs: * DiscImageChef.Filters/Filters.cs: * DiscImageChef/Core/Statistics.cs: * DiscImageChef.DiscImages/VHDX.cs: * DiscImageChef.DiscImages/Nero.cs: * DiscImageChef/Commands/Verify.cs: * DiscImageChef.DiscImages/UDIF.cs: * DiscImageChef/Commands/Compare.cs: * DiscImageChef/Commands/Analyze.cs: * DiscImageChef.DiscImages/QCOW2.cs: * DiscImageChef/Commands/Entropy.cs: * DiscImageChef/Commands/Formats.cs: * DiscImageChef/Commands/PrintHex.cs: * DiscImageChef.DiscImages/VMware.cs: * DiscImageChef.Settings/Settings.cs: * DiscImageChef/DetectImageFormat.cs: * DiscImageChef/DiscImageChef.csproj: * DiscImageChef.DiscImages/CDRDAO.cs: * DiscImageChef.DiscImages/CPCDSK.cs: * DiscImageChef/Commands/Checksum.cs: * DiscImageChef.DiscImages/CopyQM.cs: * DiscImageChef.DiscImages/CDRWin.cs: * DiscImageChef/Commands/Configure.cs: * DiscImageChef/Commands/DumpMedia.cs: * DiscImageChef/Commands/Statistics.cs: * DiscImageChef.Filters/ZZZNoFilter.cs: * DiscImageChef.DiscImages/TeleDisk.cs: * DiscImageChef.DiscImages/Apple2MG.cs: * DiscImageChef.Filters/OffsetStream.cs: * DiscImageChef.DiscImages/Parallels.cs: * DiscImageChef/Commands/ExtractFiles.cs: * DiscImageChef.DiscImages/DiskCopy42.cs: * DiscImageChef.DiscImages/Alcohol120.cs: * DiscImageChef.DiscImages/ZZZRawImage.cs: * DiscImageChef/Commands/CreateSidecar.cs: * DiscImageChef.DiscImages/ImagePlugin.cs: * DiscImageChef.DiscImages/BlindWrite5.cs: * DiscImageChef.DiscImages/BlindWrite4.cs: * DiscImageChef.Filters/ForcedSeekStream.cs: * DiscImageChef.Filters/Properties/AssemblyInfo.cs: * DiscImageChef.Filters/DiscImageChef.Filters.csproj: * DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj: Added filters. * DiscImageChef.Filesystems/CPM/Info.cs: Do not throw identification exceptions. * DiscImageChef/Plugins.cs: Sorted plugins lists.
This commit is contained in:
@@ -37,6 +37,7 @@ using DiscImageChef.Console;
|
||||
using DiscImageChef.CommonTypes;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using DiscImageChef.Filters;
|
||||
|
||||
namespace DiscImageChef.ImagePlugins
|
||||
{
|
||||
@@ -65,7 +66,7 @@ namespace DiscImageChef.ImagePlugins
|
||||
/// <summary>Start of data sectors in disk image, should be 0x100</summary>
|
||||
const uint dataOffset = 0x100;
|
||||
/// <summary>Disk image file</summary>
|
||||
string dimImagePath;
|
||||
Filter dimImageFilter;
|
||||
byte[] comment;
|
||||
byte[] hdrId;
|
||||
DiskType dskType;
|
||||
@@ -98,9 +99,9 @@ namespace DiscImageChef.ImagePlugins
|
||||
ImageInfo.driveFirmwareRevision = null;
|
||||
}
|
||||
|
||||
public override bool IdentifyImage(string imagePath)
|
||||
public override bool IdentifyImage(Filter imageFilter)
|
||||
{
|
||||
FileStream stream = new FileStream(imagePath, FileMode.Open, FileAccess.Read);
|
||||
Stream stream = imageFilter.GetDataForkStream();
|
||||
stream.Seek(0, SeekOrigin.Begin);
|
||||
|
||||
if(stream.Length < dataOffset)
|
||||
@@ -114,14 +115,13 @@ namespace DiscImageChef.ImagePlugins
|
||||
stream.Read(hdrId, 0, 13);
|
||||
stream.Seek(0xC2, SeekOrigin.Begin);
|
||||
stream.Read(comment, 0, 60);
|
||||
stream.Close();
|
||||
|
||||
return HeaderID.SequenceEqual(hdrId);
|
||||
}
|
||||
|
||||
public override bool OpenImage(string imagePath)
|
||||
public override bool OpenImage(Filter imageFilter)
|
||||
{
|
||||
FileStream stream = new FileStream(imagePath, FileMode.Open, FileAccess.Read);
|
||||
Stream stream = imageFilter.GetDataForkStream();
|
||||
stream.Seek(0, SeekOrigin.Begin);
|
||||
|
||||
if(stream.Length < dataOffset)
|
||||
@@ -137,7 +137,6 @@ namespace DiscImageChef.ImagePlugins
|
||||
stream.Read(hdrId, 0, 13);
|
||||
stream.Seek(0xC2, SeekOrigin.Begin);
|
||||
stream.Read(comment, 0, 60);
|
||||
stream.Close();
|
||||
|
||||
if(!HeaderID.SequenceEqual(hdrId))
|
||||
return false;
|
||||
@@ -229,13 +228,12 @@ namespace DiscImageChef.ImagePlugins
|
||||
if(!string.IsNullOrEmpty(ImageInfo.imageComments))
|
||||
DicConsole.VerboseWriteLine("DIM comments: {0}", ImageInfo.imageComments);
|
||||
|
||||
dimImagePath = imagePath;
|
||||
dimImageFilter = imageFilter;
|
||||
|
||||
FileInfo fi = new FileInfo(imagePath);
|
||||
ImageInfo.imageSize = (ulong)diskSize;
|
||||
ImageInfo.imageCreationTime = fi.CreationTimeUtc;
|
||||
ImageInfo.imageLastModificationTime = fi.LastWriteTimeUtc;
|
||||
ImageInfo.imageName = Path.GetFileNameWithoutExtension(imagePath);
|
||||
ImageInfo.imageCreationTime = imageFilter.GetCreationTime();
|
||||
ImageInfo.imageLastModificationTime = imageFilter.GetLastWriteTime();
|
||||
ImageInfo.imageName = Path.GetFileNameWithoutExtension(imageFilter.GetFilename());
|
||||
ImageInfo.sectors = ImageInfo.imageSize / ImageInfo.sectorSize;
|
||||
ImageInfo.imageComments = StringHandlers.CToString(comment, Encoding.GetEncoding(932));
|
||||
ImageInfo.xmlMediaType = XmlMediaType.BlockMedia;
|
||||
@@ -328,14 +326,12 @@ namespace DiscImageChef.ImagePlugins
|
||||
|
||||
byte[] buffer = new byte[length * ImageInfo.sectorSize];
|
||||
|
||||
FileStream stream = new FileStream(dimImagePath, FileMode.Open, FileAccess.Read);
|
||||
Stream stream = dimImageFilter.GetDataForkStream();
|
||||
|
||||
stream.Seek((long)(dataOffset + sectorAddress * ImageInfo.sectorSize), SeekOrigin.Begin);
|
||||
|
||||
stream.Read(buffer, 0, (int)(length * ImageInfo.sectorSize));
|
||||
|
||||
stream.Close();
|
||||
|
||||
return buffer;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user