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.DiscImages.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-22 06:55:04 +00:00
parent e87e058a11
commit 0ad9da7b3a
48 changed files with 2851 additions and 3069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
DiscImageChef.DiscImages/Partimage.cs
View File

@@ -39,6 +39,7 @@ using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using Extents;
#pragma warning disable 649
namespace DiscImageChef.DiscImages
{
@@ -253,7 +254,7 @@ namespace DiscImageChef.DiscImages
Dictionary<ulong, byte[]> sectorCache;
const uint MAX_CACHE_SIZE = 16777216;
uint maxCachedSectors = MAX_CACHE_SIZE / 512;
const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
ExtentsULong extents;
Dictionary<ulong, ulong> extentsOff;
@@ -262,26 +263,28 @@ namespace DiscImageChef.DiscImages
{
Name = "Partimage disk image";
PluginUuid = new Guid("AAFDB99D-2B77-49EA-831C-C9BB58C68C95");
ImageInfo = new ImageInfo();
ImageInfo.ReadableSectorTags = new List<SectorTagType>();
ImageInfo.ReadableMediaTags = new List<MediaTagType>();
ImageInfo.ImageHasPartitions = false;
ImageInfo.ImageHasSessions = false;
ImageInfo.ImageApplication = "Partimage";
ImageInfo.ImageApplicationVersion = null;
ImageInfo.ImageCreator = null;
ImageInfo.ImageComments = null;
ImageInfo.MediaManufacturer = null;
ImageInfo.MediaModel = null;
ImageInfo.MediaSerialNumber = null;
ImageInfo.MediaBarcode = null;
ImageInfo.MediaPartNumber = null;
ImageInfo.MediaSequence = 0;
ImageInfo.LastMediaSequence = 0;
ImageInfo.DriveManufacturer = null;
ImageInfo.DriveModel = null;
ImageInfo.DriveSerialNumber = null;
ImageInfo.DriveFirmwareRevision = null;
ImageInfo = new ImageInfo
{
ReadableSectorTags = new List<SectorTagType>(),
ReadableMediaTags = new List<MediaTagType>(),
ImageHasPartitions = false,
ImageHasSessions = false,
ImageApplication = "Partimage",
ImageApplicationVersion = null,
ImageCreator = null,
ImageComments = null,
MediaManufacturer = null,
MediaModel = null,
MediaSerialNumber = null,
MediaBarcode = null,
MediaPartNumber = null,
MediaSequence = 0,
LastMediaSequence = 0,
DriveManufacturer = null,
DriveModel = null,
DriveSerialNumber = null,
DriveFirmwareRevision = null
};
}
public override bool IdentifyImage(Filter imageFilter)
@@ -570,9 +573,7 @@ namespace DiscImageChef.DiscImages
if((bitmap[sectorAddress / 8] & (1 << (int)(sectorAddress % 8))) == 0) return new byte[ImageInfo.SectorSize];
byte[] sector;
if(sectorCache.TryGetValue(sectorAddress, out sector)) return sector;
if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
ulong blockOff = BlockOffset(sectorAddress);
@@ -589,7 +590,7 @@ namespace DiscImageChef.DiscImages
imageStream.Seek(imageOff, SeekOrigin.Begin);
imageStream.Read(sector, 0, (int)ImageInfo.SectorSize);
if(sectorCache.Count > maxCachedSectors)
if(sectorCache.Count > MAX_CACHED_SECTORS)
{
System.Console.WriteLine("Cache cleared");
sectorCache.Clear();