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

Corrected handling of partially dumped disks.

Browse Source
This commit is contained in:
Natalia Portillo
2017-08-16 15:44:50 +01:00
parent 98c28c8bef
commit f292939664
2 changed files with 71 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
DiscImageChef.DiscImages/CopyQM.cs
View File

@@ -293,20 +293,20 @@ namespace DiscImageChef.ImagePlugins
} }
// In case there is omitted data // In case there is omitted data
long sectors = (header.sectorsPerTrack) * header.heads * header.imageCylinders; long sectors = (header.sectorsPerTrack) * header.heads * header.totalCylinders;
byte[] filling = new byte[(sectors * header.sectorSize) - decodedImage.Length]; byte[] filling = new byte[(sectors * header.sectorSize) - decodedImage.Length];
if(filling.Length > 0) if(filling.Length > 0)
{ {
ArrayHelpers.ArrayFill(filling, header.mediaType); ArrayHelpers.ArrayFill(filling, (byte)0xF6);
decodedImage.Write(filling, 0, filling.Length); decodedImage.Write(filling, 0, filling.Length);
} }
/*
FileStream debugStream = new FileStream("debug.img", FileMode.CreateNew, FileAccess.ReadWrite); FileStream debugStream = new FileStream("debug.img", FileMode.CreateNew, FileAccess.ReadWrite);
debugStream.Write(decodedImage.ToArray(), 0, (int)decodedImage.Length); debugStream.Write(decodedImage.ToArray(), 0, (int)decodedImage.Length);
debugStream.Close(); debugStream.Close();
*/
int sum = 0; int sum = 0;
for(int i = 0; i < hdr.Length - 1; i++) for(int i = 0; i < hdr.Length - 1; i++)
@@ -321,77 +321,77 @@ namespace DiscImageChef.ImagePlugins
ImageInfo.imageLastModificationTime = ImageInfo.imageCreationTime; ImageInfo.imageLastModificationTime = ImageInfo.imageCreationTime;
ImageInfo.imageName = header.volumeLabel; ImageInfo.imageName = header.volumeLabel;
ImageInfo.imageSize = (ulong)(stream.Length - 133 - header.commentLength); ImageInfo.imageSize = (ulong)(stream.Length - 133 - header.commentLength);
ImageInfo.sectors = (ulong)(decodedImage.Length / header.sectorSize); ImageInfo.sectors = (ulong)sectors;
ImageInfo.sectorSize = header.sectorSize; ImageInfo.sectorSize = header.sectorSize;
switch(header.drive) switch(header.drive)
{ {
case COPYQM_525HD: case COPYQM_525HD:
if(header.heads == 2 && header.imageCylinders == 80 && header.sectorsPerTrack == 15 && header.sectorSize == 512) if(header.heads == 2 && header.totalCylinders == 80 && header.sectorsPerTrack == 15 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DOS_525_HD; ImageInfo.mediaType = MediaType.DOS_525_HD;
else if(header.heads == 2 && header.imageCylinders == 80 && header.sectorsPerTrack == 16 && header.sectorSize == 256) else if(header.heads == 2 && header.totalCylinders == 80 && header.sectorsPerTrack == 16 && header.sectorSize == 256)
ImageInfo.mediaType = MediaType.ACORN_525_DS_DD; ImageInfo.mediaType = MediaType.ACORN_525_DS_DD;
else if(header.heads == 1 && header.imageCylinders == 80 && header.sectorsPerTrack == 16 && header.sectorSize == 256) else if(header.heads == 1 && header.totalCylinders == 80 && header.sectorsPerTrack == 16 && header.sectorSize == 256)
ImageInfo.mediaType = MediaType.ACORN_525_SS_DD_80; ImageInfo.mediaType = MediaType.ACORN_525_SS_DD_80;
else if(header.heads == 1 && header.imageCylinders == 80 && header.sectorsPerTrack == 10 && header.sectorSize == 256) else if(header.heads == 1 && header.totalCylinders == 80 && header.sectorsPerTrack == 10 && header.sectorSize == 256)
ImageInfo.mediaType = MediaType.ACORN_525_SS_SD_80; ImageInfo.mediaType = MediaType.ACORN_525_SS_SD_80;
else if(header.heads == 2 && header.imageCylinders == 80 && header.sectorsPerTrack == 8 && header.sectorSize == 1024) else if(header.heads == 2 && header.totalCylinders == 80 && header.sectorsPerTrack == 8 && header.sectorSize == 1024)
ImageInfo.mediaType = MediaType.NEC_525_HD; ImageInfo.mediaType = MediaType.NEC_525_HD;
else if(header.heads == 2 && header.imageCylinders == 77 && header.sectorsPerTrack == 8 && header.sectorSize == 1024) else if(header.heads == 2 && header.totalCylinders == 77 && header.sectorsPerTrack == 8 && header.sectorSize == 1024)
ImageInfo.mediaType = MediaType.SHARP_525; ImageInfo.mediaType = MediaType.SHARP_525;
else else
goto case COPYQM_525DD; goto case COPYQM_525DD;
break; break;
case COPYQM_525DD: case COPYQM_525DD:
if(header.heads == 1 && header.imageCylinders == 40 && header.sectorsPerTrack == 8 && header.sectorSize == 512) if(header.heads == 1 && header.totalCylinders == 40 && header.sectorsPerTrack == 8 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DOS_525_SS_DD_8; ImageInfo.mediaType = MediaType.DOS_525_SS_DD_8;
else if(header.heads == 1 && header.imageCylinders == 40 && header.sectorsPerTrack == 9 && header.sectorSize == 512) else if(header.heads == 1 && header.totalCylinders == 40 && header.sectorsPerTrack == 9 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DOS_525_SS_DD_9; ImageInfo.mediaType = MediaType.DOS_525_SS_DD_9;
else if(header.heads == 2 && header.imageCylinders == 40 && header.sectorsPerTrack == 8 && header.sectorSize == 512) else if(header.heads == 2 && header.totalCylinders == 40 && header.sectorsPerTrack == 8 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DOS_525_DS_DD_8; ImageInfo.mediaType = MediaType.DOS_525_DS_DD_8;
else if(header.heads == 2 && header.imageCylinders == 40 && header.sectorsPerTrack == 9 && header.sectorSize == 512) else if(header.heads == 2 && header.totalCylinders == 40 && header.sectorsPerTrack == 9 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DOS_525_DS_DD_9; ImageInfo.mediaType = MediaType.DOS_525_DS_DD_9;
else if(header.heads == 1 && header.imageCylinders == 40 && header.sectorsPerTrack == 18 && header.sectorSize == 128) else if(header.heads == 1 && header.totalCylinders == 40 && header.sectorsPerTrack == 18 && header.sectorSize == 128)
ImageInfo.mediaType = MediaType.ATARI_525_SD; ImageInfo.mediaType = MediaType.ATARI_525_SD;
else if(header.heads == 1 && header.imageCylinders == 40 && header.sectorsPerTrack == 26 && header.sectorSize == 128) else if(header.heads == 1 && header.totalCylinders == 40 && header.sectorsPerTrack == 26 && header.sectorSize == 128)
ImageInfo.mediaType = MediaType.ATARI_525_ED; ImageInfo.mediaType = MediaType.ATARI_525_ED;
else if(header.heads == 1 && header.imageCylinders == 40 && header.sectorsPerTrack == 18 && header.sectorSize == 256) else if(header.heads == 1 && header.totalCylinders == 40 && header.sectorsPerTrack == 18 && header.sectorSize == 256)
ImageInfo.mediaType = MediaType.ATARI_525_DD; ImageInfo.mediaType = MediaType.ATARI_525_DD;
else else
ImageInfo.mediaType = MediaType.Unknown; ImageInfo.mediaType = MediaType.Unknown;
break; break;
case COPYQM_35ED: case COPYQM_35ED:
if(header.heads == 2 && header.imageCylinders == 80 && header.sectorsPerTrack == 36 && header.sectorSize == 512) if(header.heads == 2 && header.totalCylinders == 80 && header.sectorsPerTrack == 36 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DOS_35_ED; ImageInfo.mediaType = MediaType.DOS_35_ED;
else else
goto case COPYQM_35HD; goto case COPYQM_35HD;
break; break;
case COPYQM_35HD: case COPYQM_35HD:
if(header.heads == 2 && header.imageCylinders == 80 && header.sectorsPerTrack == 18 && header.sectorSize == 512) if(header.heads == 2 && header.totalCylinders == 80 && header.sectorsPerTrack == 18 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DOS_35_HD; ImageInfo.mediaType = MediaType.DOS_35_HD;
else if(header.heads == 2 && header.imageCylinders == 80 && header.sectorsPerTrack == 21 && header.sectorSize == 512) else if(header.heads == 2 && header.totalCylinders == 80 && header.sectorsPerTrack == 21 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DMF; ImageInfo.mediaType = MediaType.DMF;
else if(header.heads == 2 && header.imageCylinders == 82 && header.sectorsPerTrack == 21 && header.sectorSize == 512) else if(header.heads == 2 && header.totalCylinders == 82 && header.sectorsPerTrack == 21 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DMF_82; ImageInfo.mediaType = MediaType.DMF_82;
else if(header.heads == 2 && header.imageCylinders == 80 && header.sectorsPerTrack == 8 && header.sectorSize == 1024) else if(header.heads == 2 && header.totalCylinders == 80 && header.sectorsPerTrack == 8 && header.sectorSize == 1024)
ImageInfo.mediaType = MediaType.NEC_35_HD_8; ImageInfo.mediaType = MediaType.NEC_35_HD_8;
else if(header.heads == 2 && header.imageCylinders == 80 && header.sectorsPerTrack == 15 && header.sectorSize == 512) else if(header.heads == 2 && header.totalCylinders == 80 && header.sectorsPerTrack == 15 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.NEC_35_HD_15; ImageInfo.mediaType = MediaType.NEC_35_HD_15;
else else
goto case COPYQM_35DD; goto case COPYQM_35DD;
break; break;
case COPYQM_35DD: case COPYQM_35DD:
if(header.heads == 2 && header.imageCylinders == 80 && header.sectorsPerTrack == 9 && header.sectorSize == 512) if(header.heads == 2 && header.totalCylinders == 80 && header.sectorsPerTrack == 9 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DOS_35_DS_DD_9; ImageInfo.mediaType = MediaType.DOS_35_DS_DD_9;
else if(header.heads == 2 && header.imageCylinders == 80 && header.sectorsPerTrack == 8 && header.sectorSize == 512) else if(header.heads == 2 && header.totalCylinders == 80 && header.sectorsPerTrack == 8 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DOS_35_DS_DD_8; ImageInfo.mediaType = MediaType.DOS_35_DS_DD_8;
if(header.heads == 1 && header.imageCylinders == 80 && header.sectorsPerTrack == 9 && header.sectorSize == 512) if(header.heads == 1 && header.totalCylinders == 80 && header.sectorsPerTrack == 9 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DOS_35_SS_DD_9; ImageInfo.mediaType = MediaType.DOS_35_SS_DD_9;
else if(header.heads == 1 && header.imageCylinders == 80 && header.sectorsPerTrack == 8 && header.sectorSize == 512) else if(header.heads == 1 && header.totalCylinders == 80 && header.sectorsPerTrack == 8 && header.sectorSize == 512)
ImageInfo.mediaType = MediaType.DOS_35_SS_DD_8; ImageInfo.mediaType = MediaType.DOS_35_SS_DD_8;
else if(header.heads == 2 && header.imageCylinders == 80 && header.sectorsPerTrack == 5 && header.sectorSize == 1024) else if(header.heads == 2 && header.totalCylinders == 80 && header.sectorsPerTrack == 5 && header.sectorSize == 1024)
ImageInfo.mediaType = MediaType.ACORN_35_DS_DD; ImageInfo.mediaType = MediaType.ACORN_35_DS_DD;
else if(header.heads == 2 && header.imageCylinders == 77 && header.sectorsPerTrack == 8 && header.sectorSize == 1024) else if(header.heads == 2 && header.totalCylinders == 77 && header.sectorsPerTrack == 8 && header.sectorSize == 1024)
ImageInfo.mediaType = MediaType.SHARP_35; ImageInfo.mediaType = MediaType.SHARP_35;
else else
ImageInfo.mediaType = MediaType.Unknown; ImageInfo.mediaType = MediaType.Unknown;

41
DiscImageChef.Filesystems/RBF.cs Normal file
View File

@@ -0,0 +1,41 @@
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : RBF.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// Component : Component
//
// --[ Description ] ----------------------------------------------------------
//
// Description
//
// --[ License ] --------------------------------------------------------------
//
// This library is free software; you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as
// published by the Free Software Foundation; either version 2.1 of the
// License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2011-2017 Natalia Portillo
// ****************************************************************************/
using System;
namespace DiscImageChef.Filesystems
{
public class RBF
{
public RBF()
{
}
}
}