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

🎨Converted all plugin types to interfaces.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-26 06:05:12 +00:00
parent a002253fa4
commit f66a0bdd42
295 changed files with 9499 additions and 10414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
DiscImageChef/Commands/Compare.cs
View File

@@ -50,9 +50,9 @@ namespace DiscImageChef.Commands
DicConsole.DebugWriteLine("Compare command", "--input2={0}", options.InputFile2);
FiltersList filtersList = new FiltersList();
Filter inputFilter1 = filtersList.GetFilter(options.InputFile1);
IFilter inputFilter1 = filtersList.GetFilter(options.InputFile1);
filtersList = new FiltersList();
Filter inputFilter2 = filtersList.GetFilter(options.InputFile2);
IFilter inputFilter2 = filtersList.GetFilter(options.InputFile2);
if(inputFilter1 == null)
{
@@ -66,8 +66,8 @@ namespace DiscImageChef.Commands
return;
}
ImagePlugin input1Format = ImageFormat.Detect(inputFilter1);
ImagePlugin input2Format = ImageFormat.Detect(inputFilter2);
IMediaImage input1Format = ImageFormat.Detect(inputFilter1);
IMediaImage input2Format = ImageFormat.Detect(inputFilter2);
if(input1Format == null)
{
@@ -77,7 +77,7 @@ namespace DiscImageChef.Commands
if(options.Verbose)
DicConsole.VerboseWriteLine("Input file 1 format identified by {0} ({1}).", input1Format.Name,
input1Format.PluginUuid);
input1Format.Id);
else DicConsole.WriteLine("Input file 1 format identified by {0}.", input1Format.Name);
if(input2Format == null)
@@ -88,7 +88,7 @@ namespace DiscImageChef.Commands
if(options.Verbose)
DicConsole.VerboseWriteLine("Input file 2 format identified by {0} ({1}).", input2Format.Name,
input2Format.PluginUuid);
input2Format.Id);
else DicConsole.WriteLine("Input file 2 format identified by {0}.", input2Format.Name);
input1Format.OpenImage(inputFilter1);
@@ -96,8 +96,8 @@ namespace DiscImageChef.Commands
Core.Statistics.AddMediaFormat(input1Format.ImageFormat);
Core.Statistics.AddMediaFormat(input2Format.ImageFormat);
Core.Statistics.AddMedia(input1Format.ImageInfo.MediaType, false);
Core.Statistics.AddMedia(input2Format.ImageInfo.MediaType, false);
Core.Statistics.AddMedia(input1Format.Info.MediaType, false);
Core.Statistics.AddMedia(input2Format.Info.MediaType, false);
Core.Statistics.AddFilter(inputFilter1.Name);
Core.Statistics.AddFilter(inputFilter2.Name);
@@ -125,7 +125,7 @@ namespace DiscImageChef.Commands
Dictionary<MediaTagType, byte[]> image1DiskTags = new Dictionary<MediaTagType, byte[]>();
Dictionary<MediaTagType, byte[]> image2DiskTags = new Dictionary<MediaTagType, byte[]>();
image1Info.HasPartitions = input1Format.ImageInfo.HasPartitions;
image1Info.HasPartitions = input1Format.Info.HasPartitions;
#pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
try { image1Sessions = input1Format.Sessions; }
catch
@@ -134,29 +134,29 @@ namespace DiscImageChef.Commands
}
#pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
image1Info.HasSessions |= image1Sessions.Count > 0;
image1Info.ImageSize = input1Format.ImageInfo.ImageSize;
image1Info.Sectors = input1Format.ImageInfo.Sectors;
image1Info.SectorSize = input1Format.ImageInfo.SectorSize;
image1Info.CreationTime = input1Format.ImageInfo.CreationTime;
image1Info.LastModificationTime = input1Format.ImageInfo.LastModificationTime;
image1Info.MediaType = input1Format.ImageInfo.MediaType;
image1Info.Version = input1Format.ImageInfo.Version;
image1Info.Application = input1Format.ImageInfo.Application;
image1Info.ApplicationVersion = input1Format.ImageInfo.ApplicationVersion;
image1Info.Creator = input1Format.ImageInfo.Creator;
image1Info.MediaTitle = input1Format.ImageInfo.MediaTitle;
image1Info.Comments = input1Format.ImageInfo.Comments;
image1Info.MediaManufacturer = input1Format.ImageInfo.MediaManufacturer;
image1Info.MediaModel = input1Format.ImageInfo.MediaModel;
image1Info.MediaSerialNumber = input1Format.ImageInfo.MediaSerialNumber;
image1Info.MediaBarcode = input1Format.ImageInfo.MediaBarcode;
image1Info.MediaPartNumber = input1Format.ImageInfo.MediaPartNumber;
image1Info.MediaSequence = input1Format.ImageInfo.MediaSequence;
image1Info.LastMediaSequence = input1Format.ImageInfo.LastMediaSequence;
image1Info.DriveManufacturer = input1Format.ImageInfo.DriveManufacturer;
image1Info.DriveModel = input1Format.ImageInfo.DriveModel;
image1Info.DriveSerialNumber = input1Format.ImageInfo.DriveSerialNumber;
image1Info.DriveFirmwareRevision = input1Format.ImageInfo.DriveFirmwareRevision;
image1Info.ImageSize = input1Format.Info.ImageSize;
image1Info.Sectors = input1Format.Info.Sectors;
image1Info.SectorSize = input1Format.Info.SectorSize;
image1Info.CreationTime = input1Format.Info.CreationTime;
image1Info.LastModificationTime = input1Format.Info.LastModificationTime;
image1Info.MediaType = input1Format.Info.MediaType;
image1Info.Version = input1Format.Info.Version;
image1Info.Application = input1Format.Info.Application;
image1Info.ApplicationVersion = input1Format.Info.ApplicationVersion;
image1Info.Creator = input1Format.Info.Creator;
image1Info.MediaTitle = input1Format.Info.MediaTitle;
image1Info.Comments = input1Format.Info.Comments;
image1Info.MediaManufacturer = input1Format.Info.MediaManufacturer;
image1Info.MediaModel = input1Format.Info.MediaModel;
image1Info.MediaSerialNumber = input1Format.Info.MediaSerialNumber;
image1Info.MediaBarcode = input1Format.Info.MediaBarcode;
image1Info.MediaPartNumber = input1Format.Info.MediaPartNumber;
image1Info.MediaSequence = input1Format.Info.MediaSequence;
image1Info.LastMediaSequence = input1Format.Info.LastMediaSequence;
image1Info.DriveManufacturer = input1Format.Info.DriveManufacturer;
image1Info.DriveModel = input1Format.Info.DriveModel;
image1Info.DriveSerialNumber = input1Format.Info.DriveSerialNumber;
image1Info.DriveFirmwareRevision = input1Format.Info.DriveFirmwareRevision;
foreach(MediaTagType disktag in Enum.GetValues(typeof(MediaTagType)))
{
try
@@ -172,7 +172,7 @@ namespace DiscImageChef.Commands
#pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
}
image2Info.HasPartitions = input2Format.ImageInfo.HasPartitions;
image2Info.HasPartitions = input2Format.Info.HasPartitions;
#pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
try { image2Sessions = input2Format.Sessions; }
catch
@@ -181,29 +181,29 @@ namespace DiscImageChef.Commands
}
#pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
image2Info.HasSessions |= image2Sessions.Count > 0;
image2Info.ImageSize = input2Format.ImageInfo.ImageSize;
image2Info.Sectors = input2Format.ImageInfo.Sectors;
image2Info.SectorSize = input2Format.ImageInfo.SectorSize;
image2Info.CreationTime = input2Format.ImageInfo.CreationTime;
image2Info.LastModificationTime = input2Format.ImageInfo.LastModificationTime;
image2Info.MediaType = input2Format.ImageInfo.MediaType;
image2Info.Version = input2Format.ImageInfo.Version;
image2Info.Application = input2Format.ImageInfo.Application;
image2Info.ApplicationVersion = input2Format.ImageInfo.ApplicationVersion;
image2Info.Creator = input2Format.ImageInfo.Creator;
image2Info.MediaTitle = input2Format.ImageInfo.MediaTitle;
image2Info.Comments = input2Format.ImageInfo.Comments;
image2Info.MediaManufacturer = input2Format.ImageInfo.MediaManufacturer;
image2Info.MediaModel = input2Format.ImageInfo.MediaModel;
image2Info.MediaSerialNumber = input2Format.ImageInfo.MediaSerialNumber;
image2Info.MediaBarcode = input2Format.ImageInfo.MediaBarcode;
image2Info.MediaPartNumber = input2Format.ImageInfo.MediaPartNumber;
image2Info.MediaSequence = input2Format.ImageInfo.MediaSequence;
image2Info.LastMediaSequence = input2Format.ImageInfo.LastMediaSequence;
image2Info.DriveManufacturer = input2Format.ImageInfo.DriveManufacturer;
image2Info.DriveModel = input2Format.ImageInfo.DriveModel;
image2Info.DriveSerialNumber = input2Format.ImageInfo.DriveSerialNumber;
image2Info.DriveFirmwareRevision = input2Format.ImageInfo.DriveFirmwareRevision;
image2Info.ImageSize = input2Format.Info.ImageSize;
image2Info.Sectors = input2Format.Info.Sectors;
image2Info.SectorSize = input2Format.Info.SectorSize;
image2Info.CreationTime = input2Format.Info.CreationTime;
image2Info.LastModificationTime = input2Format.Info.LastModificationTime;
image2Info.MediaType = input2Format.Info.MediaType;
image2Info.Version = input2Format.Info.Version;
image2Info.Application = input2Format.Info.Application;
image2Info.ApplicationVersion = input2Format.Info.ApplicationVersion;
image2Info.Creator = input2Format.Info.Creator;
image2Info.MediaTitle = input2Format.Info.MediaTitle;
image2Info.Comments = input2Format.Info.Comments;
image2Info.MediaManufacturer = input2Format.Info.MediaManufacturer;
image2Info.MediaModel = input2Format.Info.MediaModel;
image2Info.MediaSerialNumber = input2Format.Info.MediaSerialNumber;
image2Info.MediaBarcode = input2Format.Info.MediaBarcode;
image2Info.MediaPartNumber = input2Format.Info.MediaPartNumber;
image2Info.MediaSequence = input2Format.Info.MediaSequence;
image2Info.LastMediaSequence = input2Format.Info.LastMediaSequence;
image2Info.DriveManufacturer = input2Format.Info.DriveManufacturer;
image2Info.DriveModel = input2Format.Info.DriveModel;
image2Info.DriveSerialNumber = input2Format.Info.DriveSerialNumber;
image2Info.DriveFirmwareRevision = input2Format.Info.DriveFirmwareRevision;
foreach(MediaTagType disktag in Enum.GetValues(typeof(MediaTagType)))
{
try