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

* TODO:

Browse Source 
* 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:
Natalia Portillo
2016-09-05 17:37:31 +01:00
parent e4c4b2572f
commit 71af0eda23
62 changed files with 2600 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

198
DiscImageChef.DiscImages/BlindWrite4.cs
View File

@@ -39,6 +39,7 @@ using System.Text;
using DiscImageChef.Console;
using System.Runtime.InteropServices;
using System.Globalization;
using DiscImageChef.Filters;
namespace DiscImageChef.ImagePlugins
{
@@ -74,6 +75,8 @@ namespace DiscImageChef.ImagePlugins
public string volumeIdentifier;
public string systemIdentifier;
public string comments;
public Filter dataFilter;
public Filter subchannelFilter;
public string dataFile;
public string subchannelFile;
}
@@ -175,8 +178,8 @@ namespace DiscImageChef.ImagePlugins
Dictionary<uint, ulong> offsetmap;
List<Partition> partitions;
List<Session> sessions;
string dataFile, subFile;
FileStream imageStream;
Filter dataFilter, subFilter;
Stream imageStream;
Dictionary<uint, byte> trackFlags;
#endregion Internal variables
@@ -205,9 +208,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 < 19)
return false;
@@ -215,14 +218,12 @@ namespace DiscImageChef.ImagePlugins
byte[] signature = new byte[19];
stream.Read(signature, 0, 19);
stream.Close();
return BW4_Signature.SequenceEqual(signature);
}
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 < 19)
return false;
@@ -303,8 +304,10 @@ namespace DiscImageChef.ImagePlugins
DicConsole.DebugWriteLine("BlindWrite4 plugin", "header.comments = {0}", header.comments);
DicConsole.DebugWriteLine("BlindWrite4 plugin", "header.trackDescriptors = {0}", header.trackDescriptors);
DicConsole.DebugWriteLine("BlindWrite4 plugin", "header.dataFileLength = {0}", header.dataFileLength);
DicConsole.DebugWriteLine("BlindWrite4 plugin", "header.dataFilter = {0}", header.dataFilter);
DicConsole.DebugWriteLine("BlindWrite4 plugin", "header.dataFile = {0}", header.dataFile);
DicConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFileLength = {0}", header.subchannelFileLength);
DicConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFilter = {0}", header.subchannelFilter);
DicConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFile = {0}", header.subchannelFile);
DicConsole.DebugWriteLine("BlindWrite4 plugin", "header.unknown2 = {0}", header.unknown2);
DicConsole.DebugWriteLine("BlindWrite4 plugin", "header.unknown3 = {0}", header.unknown3);
@@ -536,32 +539,40 @@ namespace DiscImageChef.ImagePlugins
bwTracks.Add(track);
}
FiltersList filtersList = new FiltersList();
if(!string.IsNullOrEmpty(header.dataFile))
{
while(true)
{
dataFile = header.dataFile;
if(File.Exists(dataFile))
dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.dataFile));
if(dataFilter != null)
break;
dataFile = header.dataFile.ToLower(CultureInfo.CurrentCulture);
if(File.Exists(dataFile))
dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.dataFile.ToLower(CultureInfo.CurrentCulture)));
if(dataFilter != null)
break;
dataFile = header.dataFile.ToUpper(CultureInfo.CurrentCulture);
if(File.Exists(dataFile))
dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.dataFile.ToUpper(CultureInfo.CurrentCulture)));
if(dataFilter != null)
break;
dataFile = header.dataFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last();
if(File.Exists(dataFile))
dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.dataFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last()));
if(dataFilter != null)
break;
dataFile = header.dataFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToLower(CultureInfo.CurrentCulture);
if(File.Exists(dataFile))
dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.dataFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToLower(CultureInfo.CurrentCulture)));
if(dataFilter != null)
break;
dataFile = header.dataFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToUpper(CultureInfo.CurrentCulture);
if(File.Exists(dataFile))
dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.dataFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToUpper(CultureInfo.CurrentCulture)));
if(dataFilter != null)
break;
throw new ArgumentException(string.Format("Data file {0} not found", header.dataFile));
@@ -570,35 +581,42 @@ namespace DiscImageChef.ImagePlugins
else
throw new ArgumentException("Unable to find data file");
if(!string.IsNullOrEmpty(header.dataFile))
if(!string.IsNullOrEmpty(header.subchannelFile))
{
do
{
subFile = header.subchannelFile;
if(File.Exists(subFile))
subFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.subchannelFile));
if(subFilter != null)
break;
subFile = header.subchannelFile.ToLower(CultureInfo.CurrentCulture);
if(File.Exists(subFile))
subFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.subchannelFile.ToLower(CultureInfo.CurrentCulture)));
if(subFilter != null)
break;
subFile = header.subchannelFile.ToUpper(CultureInfo.CurrentCulture);
if(File.Exists(subFile))
subFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.subchannelFile.ToUpper(CultureInfo.CurrentCulture)));
if(subFilter != null)
break;
subFile = header.subchannelFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last();
if(File.Exists(subFile))
subFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.subchannelFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last()));
if(subFilter != null)
break;
subFile = header.subchannelFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToLower(CultureInfo.CurrentCulture);
if(File.Exists(subFile))
subFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.subchannelFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToLower(CultureInfo.CurrentCulture)));
if(subFilter != null)
break;
subFile = header.subchannelFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToUpper(CultureInfo.CurrentCulture);
if(File.Exists(subFile))
subFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.subchannelFile.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToUpper(CultureInfo.CurrentCulture)));
if(subFilter != null)
break;
subFile = null;
subFilter = null;
break;
}
while(true);
}
@@ -621,37 +639,42 @@ namespace DiscImageChef.ImagePlugins
{
do
{
track.TrackFile = bwTrack.filename;
if(File.Exists(track.TrackFile))
track.TrackFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
bwTrack.filename));
if(track.TrackFilter != null)
break;
track.TrackFile = bwTrack.filename.ToLower(CultureInfo.CurrentCulture);
if(File.Exists(track.TrackFile))
track.TrackFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
bwTrack.filename.ToLower(CultureInfo.CurrentCulture)));
if(track.TrackFilter != null)
break;
track.TrackFile = bwTrack.filename.ToUpper(CultureInfo.CurrentCulture);
if(File.Exists(track.TrackFile))
track.TrackFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
bwTrack.filename.ToUpper(CultureInfo.CurrentCulture)));
if(track.TrackFilter != null)
break;
track.TrackFile = bwTrack.filename.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last();
if(File.Exists(track.TrackFile))
track.TrackFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
bwTrack.filename.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last()));
if(track.TrackFilter != null)
break;
track.TrackFile = bwTrack.filename.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToLower(CultureInfo.CurrentCulture);
if(File.Exists(track.TrackFile))
track.TrackFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
bwTrack.filename.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToLower(CultureInfo.CurrentCulture)));
if(track.TrackFilter != null)
break;
track.TrackFile = bwTrack.filename.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToUpper(CultureInfo.CurrentCulture);
if(File.Exists(track.TrackFile))
break;
track.TrackFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
bwTrack.filename.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToUpper(CultureInfo.CurrentCulture)));
track.TrackFile = dataFile;
track.TrackFilter = dataFilter;
}
while(true);
}
else
track.TrackFile = dataFile;
track.TrackFilter = dataFilter;
track.TrackFile = dataFilter.GetFilename();
track.TrackFileOffset = bwTrack.offset;
if(bwTrack.pregap > 0)
track.TrackFileOffset += (ulong)(bwTrack.startSector - bwTrack.pregap) * 2352;
@@ -663,9 +686,10 @@ namespace DiscImageChef.ImagePlugins
if(track.TrackSession > maxSession)
maxSession = track.TrackSession;
track.TrackStartSector = (ulong)bwTrack.startSector;
track.TrackSubchannelFile = subFile;
track.TrackSubchannelFilter = subFilter;
track.TrackSubchannelFile = subFilter.GetFilename();
track.TrackSubchannelOffset = track.TrackStartSector / 96;
if(!string.IsNullOrEmpty(track.TrackSubchannelFile) && bwTrack.subchannel > 0)
if(subFilter != null && bwTrack.subchannel > 0)
{
track.TrackSubchannelType = TrackSubchannelType.Packed;
if(!ImageInfo.readableSectorTags.Contains(SectorTagType.CDSectorSubchannel))
@@ -790,10 +814,9 @@ namespace DiscImageChef.ImagePlugins
ImageInfo.imageApplicationVersion = "4";
ImageInfo.imageVersion = "4";
FileInfo fi = new FileInfo(dataFile);
ImageInfo.imageSize = (ulong)fi.Length;
ImageInfo.imageCreationTime = fi.CreationTimeUtc;
ImageInfo.imageLastModificationTime = fi.LastWriteTimeUtc;
ImageInfo.imageSize = (ulong)dataFilter.GetDataForkLength();
ImageInfo.imageCreationTime = dataFilter.GetCreationTime();
ImageInfo.imageLastModificationTime = dataFilter.GetLastWriteTime();
ImageInfo.xmlMediaType = XmlMediaType.OpticalDisc;
bool data = false;
@@ -1002,25 +1025,22 @@ namespace DiscImageChef.ImagePlugins
byte[] buffer = new byte[sector_size * length];
imageStream = new FileStream(_track.TrackFile, FileMode.Open, FileAccess.Read);
using(BinaryReader br = new BinaryReader(imageStream))
imageStream = _track.TrackFilter.GetDataForkStream();
BinaryReader br = new BinaryReader(imageStream);
br.BaseStream.Seek((long)_track.TrackFileOffset + (long)(sectorAddress * (sector_offset + sector_size + sector_skip)), SeekOrigin.Begin);
if(sector_offset == 0 && sector_skip == 0)
buffer = br.ReadBytes((int)(sector_size * length));
else
{
br.BaseStream.Seek((long)_track.TrackFileOffset + (long)(sectorAddress * (sector_offset + sector_size + sector_skip)), SeekOrigin.Begin);
if(sector_offset == 0 && sector_skip == 0)
buffer = br.ReadBytes((int)(sector_size * length));
else
for(int i = 0; i < length; i++)
{
for(int i = 0; i < length; i++)
{
byte[] sector;
br.BaseStream.Seek(sector_offset, SeekOrigin.Current);
sector = br.ReadBytes((int)sector_size);
br.BaseStream.Seek(sector_skip, SeekOrigin.Current);
Array.Copy(sector, 0, buffer, i * sector_size, sector_size);
}
byte[] sector;
br.BaseStream.Seek(sector_offset, SeekOrigin.Current);
sector = br.ReadBytes((int)sector_size);
br.BaseStream.Seek(sector_skip, SeekOrigin.Current);
Array.Copy(sector, 0, buffer, i * sector_size, sector_size);
}
}
imageStream.Close();
return buffer;
}
@@ -1175,25 +1195,22 @@ namespace DiscImageChef.ImagePlugins
byte[] buffer = new byte[sector_size * length];
imageStream = new FileStream(_track.TrackFile, FileMode.Open, FileAccess.Read);
using(BinaryReader br = new BinaryReader(imageStream))
imageStream = _track.TrackFilter.GetDataForkStream();
BinaryReader br = new BinaryReader(imageStream);
br.BaseStream.Seek((long)_track.TrackFileOffset + (long)(sectorAddress * (sector_offset + sector_size + sector_skip)), SeekOrigin.Begin);
if(sector_offset == 0 && sector_skip == 0)
buffer = br.ReadBytes((int)(sector_size * length));
else
{
br.BaseStream.Seek((long)_track.TrackFileOffset + (long)(sectorAddress * (sector_offset + sector_size + sector_skip)), SeekOrigin.Begin);
if(sector_offset == 0 && sector_skip == 0)
buffer = br.ReadBytes((int)(sector_size * length));
else
for(int i = 0; i < length; i++)
{
for(int i = 0; i < length; i++)
{
byte[] sector;
br.BaseStream.Seek(sector_offset, SeekOrigin.Current);
sector = br.ReadBytes((int)sector_size);
br.BaseStream.Seek(sector_skip, SeekOrigin.Current);
Array.Copy(sector, 0, buffer, i * sector_size, sector_size);
}
byte[] sector;
br.BaseStream.Seek(sector_offset, SeekOrigin.Current);
sector = br.ReadBytes((int)sector_size);
br.BaseStream.Seek(sector_skip, SeekOrigin.Current);
Array.Copy(sector, 0, buffer, i * sector_size, sector_size);
}
}
imageStream.Close();
return buffer;
}
@@ -1271,13 +1288,10 @@ namespace DiscImageChef.ImagePlugins
byte[] buffer = new byte[sector_size * length];
imageStream = new FileStream(_track.TrackFile, FileMode.Open, FileAccess.Read);
using(BinaryReader br = new BinaryReader(imageStream))
{
br.BaseStream.Seek((long)_track.TrackFileOffset + (long)(sectorAddress * (sector_offset + sector_size + sector_skip)), SeekOrigin.Begin);
buffer = br.ReadBytes((int)(sector_size * length));
}
imageStream.Close();
imageStream = _track.TrackFilter.GetDataForkStream();
BinaryReader br = new BinaryReader(imageStream);
br.BaseStream.Seek((long)_track.TrackFileOffset + (long)(sectorAddress * (sector_offset + sector_size + sector_skip)), SeekOrigin.Begin);
buffer = br.ReadBytes((int)(sector_size * length));
return buffer;
}