diff --git a/DiscImageChef.Core/Devices/Dumping/ATA.cs b/DiscImageChef.Core/Devices/Dumping/ATA.cs index 3a432e685..4b16bf18b 100644 --- a/DiscImageChef.Core/Devices/Dumping/ATA.cs +++ b/DiscImageChef.Core/Devices/Dumping/ATA.cs @@ -482,7 +482,7 @@ namespace DiscImageChef.Core.Devices.Dumping IMediaImage imageFormat = ImageFormat.Detect(inputFilter); PartitionType[] xmlFileSysInfo = null; - try { if(!imageFormat.OpenImage(inputFilter)) imageFormat = null; } + try { if(!imageFormat.Open(inputFilter)) imageFormat = null; } catch { imageFormat = null; } if(imageFormat != null) diff --git a/DiscImageChef.Core/Devices/Dumping/SBC.cs b/DiscImageChef.Core/Devices/Dumping/SBC.cs index 07959e1dd..cd9710f4f 100644 --- a/DiscImageChef.Core/Devices/Dumping/SBC.cs +++ b/DiscImageChef.Core/Devices/Dumping/SBC.cs @@ -606,7 +606,7 @@ namespace DiscImageChef.Core.Devices.Dumping IMediaImage imageFormat = ImageFormat.Detect(inputFilter); PartitionType[] xmlFileSysInfo = null; - try { if(!imageFormat.OpenImage(inputFilter)) imageFormat = null; } + try { if(!imageFormat.Open(inputFilter)) imageFormat = null; } catch { imageFormat = null; } if(imageFormat != null) diff --git a/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs b/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs index a4749cd8d..1cdc9ef5f 100644 --- a/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs +++ b/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs @@ -464,7 +464,7 @@ namespace DiscImageChef.Core.Devices.Dumping IMediaImage imageFormat = ImageFormat.Detect(inputFilter); PartitionType[] xmlFileSysInfo = null; - try { if(!imageFormat.OpenImage(inputFilter)) imageFormat = null; } + try { if(!imageFormat.Open(inputFilter)) imageFormat = null; } catch { imageFormat = null; } if(imageFormat != null) diff --git a/DiscImageChef.Core/Devices/Dumping/XGD.cs b/DiscImageChef.Core/Devices/Dumping/XGD.cs index cde46f547..1d1ebf0a0 100644 --- a/DiscImageChef.Core/Devices/Dumping/XGD.cs +++ b/DiscImageChef.Core/Devices/Dumping/XGD.cs @@ -806,7 +806,7 @@ namespace DiscImageChef.Core.Devices.Dumping IMediaImage imageFormat = ImageFormat.Detect(inputFilter); PartitionType[] xmlFileSysInfo = null; - try { if(!imageFormat.OpenImage(inputFilter)) imageFormat = null; } + try { if(!imageFormat.Open(inputFilter)) imageFormat = null; } catch { imageFormat = null; } if(imageFormat != null) diff --git a/DiscImageChef.Core/ImageFormat.cs b/DiscImageChef.Core/ImageFormat.cs index d13792737..b8fc73d31 100644 --- a/DiscImageChef.Core/ImageFormat.cs +++ b/DiscImageChef.Core/ImageFormat.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Core try { DicConsole.DebugWriteLine("Format detection", "Trying plugin {0}", imageplugin.Name); - if(!imageplugin.IdentifyImage(imageFilter)) continue; + if(!imageplugin.Identify(imageFilter)) continue; imageFormat = imageplugin; break; @@ -84,7 +84,7 @@ namespace DiscImageChef.Core try { DicConsole.DebugWriteLine("Format detection", "Trying plugin {0}", imageplugin.Name); - if(!imageplugin.IdentifyImage(imageFilter)) continue; + if(!imageplugin.Identify(imageFilter)) continue; imageFormat = imageplugin; break; diff --git a/DiscImageChef.Core/Sidecar/AudioMedia.cs b/DiscImageChef.Core/Sidecar/AudioMedia.cs index c8d2f88b7..ca0759fec 100644 --- a/DiscImageChef.Core/Sidecar/AudioMedia.cs +++ b/DiscImageChef.Core/Sidecar/AudioMedia.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Core Checksums = imgChecksums.ToArray(), Image = new ImageType { - format = image.ImageFormat, + format = image.Format, offset = 0, offsetSpecified = true, Value = Path.GetFileName(imagePath) diff --git a/DiscImageChef.Core/Sidecar/BlockMedia.cs b/DiscImageChef.Core/Sidecar/BlockMedia.cs index 1b8b3fd24..c1ada6cba 100644 --- a/DiscImageChef.Core/Sidecar/BlockMedia.cs +++ b/DiscImageChef.Core/Sidecar/BlockMedia.cs @@ -71,7 +71,7 @@ namespace DiscImageChef.Core Checksums = imgChecksums.ToArray(), Image = new ImageType { - format = image.ImageFormat, + format = image.Format, offset = 0, offsetSpecified = true, Value = Path.GetFileName(imagePath) @@ -542,9 +542,9 @@ namespace DiscImageChef.Core ZZZNoFilter scpFilter = new ZZZNoFilter(); scpFilter.Open(scpFilePath); - if(image.Info.Heads <= 2 && scpImage.IdentifyImage(scpFilter)) + if(image.Info.Heads <= 2 && scpImage.Identify(scpFilter)) { - try { scpImage.OpenImage(scpFilter); } + try { scpImage.Open(scpFilter); } catch(NotImplementedException) { } if(image.Info.Heads == 2 && scpImage.Header.heads == 0 || image.Info.Heads == 1 && @@ -563,7 +563,7 @@ namespace DiscImageChef.Core Head = t % image.Info.Heads, Image = new ImageType { - format = scpImage.ImageFormat, + format = scpImage.Format, Value = Path.GetFileName(scpFilePath), offset = scpImage.Header.offsets[t] } @@ -631,9 +631,9 @@ namespace DiscImageChef.Core KryoFlux kfImage = new KryoFlux(); ZZZNoFilter kfFilter = new ZZZNoFilter(); kfFilter.Open(kfFile); - if(image.Info.Heads <= 2 && kfImage.IdentifyImage(kfFilter)) + if(image.Info.Heads <= 2 && kfImage.Identify(kfFilter)) { - try { kfImage.OpenImage(kfFilter); } + try { kfImage.Open(kfFilter); } catch(NotImplementedException) { } if(kfImage.Info.Heads == image.Info.Heads) @@ -651,7 +651,7 @@ namespace DiscImageChef.Core Head = kvp.Key % image.Info.Heads, Image = new ImageType { - format = kfImage.ImageFormat, + format = kfImage.Format, Value = kfDir ? Path .Combine(Path.GetFileName(Path.GetDirectoryName(kvp.Value.GetBasePath())), @@ -706,9 +706,9 @@ namespace DiscImageChef.Core ZZZNoFilter dfiFilter = new ZZZNoFilter(); dfiFilter.Open(dfiFilePath); - if(!dfiImage.IdentifyImage(dfiFilter)) return; + if(!dfiImage.Identify(dfiFilter)) return; - try { dfiImage.OpenImage(dfiFilter); } + try { dfiImage.Open(dfiFilter); } catch(NotImplementedException) { } if(image.Info.Heads == dfiImage.Info.Heads) @@ -724,7 +724,7 @@ namespace DiscImageChef.Core { Cylinder = t / image.Info.Heads, Head = t % image.Info.Heads, - Image = new ImageType {format = dfiImage.ImageFormat, Value = Path.GetFileName(dfiFilePath)} + Image = new ImageType {format = dfiImage.Format, Value = Path.GetFileName(dfiFilePath)} }; if(dfiBlockTrackType.Cylinder < image.Info.Cylinders) diff --git a/DiscImageChef.Core/Sidecar/LinearMedia.cs b/DiscImageChef.Core/Sidecar/LinearMedia.cs index 11603121c..6a287f2fa 100644 --- a/DiscImageChef.Core/Sidecar/LinearMedia.cs +++ b/DiscImageChef.Core/Sidecar/LinearMedia.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Core Checksums = imgChecksums.ToArray(), Image = new ImageType { - format = image.ImageFormat, + format = image.Format, offset = 0, offsetSpecified = true, Value = Path.GetFileName(imagePath) diff --git a/DiscImageChef.Core/Sidecar/OpticalDisc.cs b/DiscImageChef.Core/Sidecar/OpticalDisc.cs index 3820cadff..49a0e3267 100644 --- a/DiscImageChef.Core/Sidecar/OpticalDisc.cs +++ b/DiscImageChef.Core/Sidecar/OpticalDisc.cs @@ -68,7 +68,7 @@ namespace DiscImageChef.Core Checksums = imgChecksums.ToArray(), Image = new ImageType { - format = image.ImageFormat, + format = image.Format, offset = 0, offsetSpecified = true, Value = Path.GetFileName(imagePath) diff --git a/DiscImageChef.DiscImages/Alcohol120.cs b/DiscImageChef.DiscImages/Alcohol120.cs index 1074991f3..b72781c88 100644 --- a/DiscImageChef.DiscImages/Alcohol120.cs +++ b/DiscImageChef.DiscImages/Alcohol120.cs @@ -97,7 +97,7 @@ namespace DiscImageChef.DiscImages public string Name => "Alcohol 120% Media Descriptor Structure"; public Guid Id => new Guid("A78FBEBA-0307-4915-BDE3-B8A3B57F843F"); - public string ImageFormat => "Alcohol 120% Media Descriptor Structure"; + public string Format => "Alcohol 120% Media Descriptor Structure"; public List Partitions => partitions; @@ -156,7 +156,7 @@ namespace DiscImageChef.DiscImages public List Sessions => sessions; - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -172,7 +172,7 @@ namespace DiscImageChef.DiscImages return header.signature == "MEDIA DESCRIPTO"; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/Anex86.cs b/DiscImageChef.DiscImages/Anex86.cs index 921dbf7ed..18189a128 100644 --- a/DiscImageChef.DiscImages/Anex86.cs +++ b/DiscImageChef.DiscImages/Anex86.cs @@ -78,7 +78,7 @@ namespace DiscImageChef.DiscImages public string Name => "Anex86 Disk Image"; public Guid Id => new Guid("0410003E-6E7B-40E6-9328-BA5651ADF6B7"); - public string ImageFormat => "Anex86 disk image"; + public string Format => "Anex86 disk image"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -89,7 +89,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -118,7 +118,7 @@ namespace DiscImageChef.DiscImages fdihdr.dskSize == fdihdr.bps * fdihdr.spt * fdihdr.heads * fdihdr.cylinders; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/Apple2MG.cs b/DiscImageChef.DiscImages/Apple2MG.cs index 5ab9005df..0ac54f81f 100644 --- a/DiscImageChef.DiscImages/Apple2MG.cs +++ b/DiscImageChef.DiscImages/Apple2MG.cs @@ -120,7 +120,7 @@ namespace DiscImageChef.DiscImages public string Name => "Apple 2IMG"; public Guid Id => new Guid("CBAF8824-BA5F-415F-953A-19A03519B2D1"); - public string ImageFormat => "Apple 2IMG"; + public string Format => "Apple 2IMG"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -131,7 +131,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -165,7 +165,7 @@ namespace DiscImageChef.DiscImages return creatoroff + creatorsize <= stream.Length; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/AppleDOS.cs b/DiscImageChef.DiscImages/AppleDOS.cs index f211b784b..6e951fc62 100644 --- a/DiscImageChef.DiscImages/AppleDOS.cs +++ b/DiscImageChef.DiscImages/AppleDOS.cs @@ -77,7 +77,7 @@ namespace DiscImageChef.DiscImages public string Name => "Apple ][ Interleaved Disk Image"; public Guid Id => new Guid("A5828AC0-62C9-4304-81D4-EFD4AAE47360"); - public string ImageFormat => extension == ".po" + public string Format => extension == ".po" ? "Apple ][ Interleaved Disk Image (ProDOS order)" : "Apple ][ Interleaved Disk Image (DOS order)"; @@ -87,14 +87,14 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { extension = Path.GetExtension(imageFilter.GetFilename())?.ToLower(); return imageFilter.GetDataForkLength() == 143360 && (extension == ".po" || extension == ".do"); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/AppleNIB.cs b/DiscImageChef.DiscImages/AppleNIB.cs index 2caf1d17b..f63697598 100644 --- a/DiscImageChef.DiscImages/AppleNIB.cs +++ b/DiscImageChef.DiscImages/AppleNIB.cs @@ -96,7 +96,7 @@ namespace DiscImageChef.DiscImages public string Name => "Apple NIB"; public Guid Id => new Guid("AE171AE8-6747-49CC-B861-9D450B7CD42E"); - public string ImageFormat => "Apple nibbles"; + public string Format => "Apple nibbles"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -107,7 +107,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -120,7 +120,7 @@ namespace DiscImageChef.DiscImages return Apple2.IsApple2GCR(test); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/Apridisk.cs b/DiscImageChef.DiscImages/Apridisk.cs index bd0a12b33..59a02db39 100644 --- a/DiscImageChef.DiscImages/Apridisk.cs +++ b/DiscImageChef.DiscImages/Apridisk.cs @@ -91,7 +91,7 @@ namespace DiscImageChef.DiscImages public string Name => "ACT Apricot Disk Image"; public Guid Id => new Guid("43408CF3-6DB3-449F-A779-2B0E497C5B14"); - public string ImageFormat => "ACT Apricot disk image"; + public string Format => "ACT Apricot disk image"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -102,7 +102,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -115,7 +115,7 @@ namespace DiscImageChef.DiscImages return sigB.SequenceEqual(signature); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/BLU.cs b/DiscImageChef.DiscImages/BLU.cs index 997760a2f..8651e7132 100644 --- a/DiscImageChef.DiscImages/BLU.cs +++ b/DiscImageChef.DiscImages/BLU.cs @@ -83,7 +83,7 @@ namespace DiscImageChef.DiscImages public string Name => "Basic Lisa Utility"; public Guid Id => new Guid("A153E2F8-4235-432D-9A7F-20807B0BCD74"); - public string ImageFormat => "Basic Lisa Utility"; + public string Format => "Basic Lisa Utility"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -94,7 +94,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -117,7 +117,7 @@ namespace DiscImageChef.DiscImages return (tmpHdr.BytesPerBlock & 0xFE00) == 0x200; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/BlindWrite4.cs b/DiscImageChef.DiscImages/BlindWrite4.cs index b2afd396d..a6271f1a2 100644 --- a/DiscImageChef.DiscImages/BlindWrite4.cs +++ b/DiscImageChef.DiscImages/BlindWrite4.cs @@ -93,7 +93,7 @@ namespace DiscImageChef.DiscImages public string Name => "BlindWrite 4"; public Guid Id => new Guid("664568B2-15D4-4E64-8A7A-20BDA8B8386F"); - public string ImageFormat => "BlindWrite 4 TOC file"; + public string Format => "BlindWrite 4 TOC file"; public List Partitions => partitions; @@ -101,7 +101,7 @@ namespace DiscImageChef.DiscImages public List Sessions => sessions; - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -113,7 +113,7 @@ namespace DiscImageChef.DiscImages return bw4Signature.SequenceEqual(signature); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/BlindWrite5.cs b/DiscImageChef.DiscImages/BlindWrite5.cs index 1ed4b5edd..843c0569a 100644 --- a/DiscImageChef.DiscImages/BlindWrite5.cs +++ b/DiscImageChef.DiscImages/BlindWrite5.cs @@ -111,7 +111,7 @@ namespace DiscImageChef.DiscImages public string Name => "BlindWrite 5"; public Guid Id => new Guid("9CB7A381-0509-4F9F-B801-3F65434BC3EE"); - public string ImageFormat => "BlindWrite 5 TOC file"; + public string Format => "BlindWrite 5 TOC file"; public List Partitions => partitions; @@ -119,7 +119,7 @@ namespace DiscImageChef.DiscImages public List Sessions => sessions; - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -135,7 +135,7 @@ namespace DiscImageChef.DiscImages return bw5Signature.SequenceEqual(signature) && bw5Footer.SequenceEqual(footer); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/CDRDAO.cs b/DiscImageChef.DiscImages/CDRDAO.cs index c52523a53..5ddda0bf1 100644 --- a/DiscImageChef.DiscImages/CDRDAO.cs +++ b/DiscImageChef.DiscImages/CDRDAO.cs @@ -141,7 +141,7 @@ namespace DiscImageChef.DiscImages public string Name => "CDRDAO tocfile"; public Guid Id => new Guid("04D7BA12-1BE8-44D4-97A4-1B48A505463E"); - public string ImageFormat => "CDRDAO tocfile"; + public string Format => "CDRDAO tocfile"; public List Partitions => partitions; @@ -193,7 +193,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new NotImplementedException(); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { try { @@ -248,7 +248,7 @@ namespace DiscImageChef.DiscImages } } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { if(imageFilter == null) return false; diff --git a/DiscImageChef.DiscImages/CDRWin.cs b/DiscImageChef.DiscImages/CDRWin.cs index 98e2497a4..0c2c5d101 100644 --- a/DiscImageChef.DiscImages/CDRWin.cs +++ b/DiscImageChef.DiscImages/CDRWin.cs @@ -208,7 +208,7 @@ namespace DiscImageChef.DiscImages public string Name => "CDRWin cuesheet"; public Guid Id => new Guid("664568B2-15D4-4E64-8A7A-20BDA8B8386F"); - public string ImageFormat => "CDRWin CUESheet"; + public string Format => "CDRWin CUESheet"; public List Partitions => partitions; @@ -262,7 +262,7 @@ namespace DiscImageChef.DiscImages public List Sessions => discimage.Sessions; // Due to .cue format, this method must parse whole file, ignoring errors (those will be thrown by OpenImage()). - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { cdrwinFilter = imageFilter; @@ -323,7 +323,7 @@ namespace DiscImageChef.DiscImages } } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { if(imageFilter == null) return false; diff --git a/DiscImageChef.DiscImages/CHD.cs b/DiscImageChef.DiscImages/CHD.cs index feb9ff7c0..8d0c96275 100644 --- a/DiscImageChef.DiscImages/CHD.cs +++ b/DiscImageChef.DiscImages/CHD.cs @@ -165,7 +165,7 @@ namespace DiscImageChef.DiscImages public string Name => "MAME Compressed Hunks of Data"; public Guid Id => new Guid("0D50233A-08BD-47D4-988B-27EAA0358597"); - public string ImageFormat => "Compressed Hunks of Data"; + public string Format => "Compressed Hunks of Data"; public List Partitions { @@ -203,7 +203,7 @@ namespace DiscImageChef.DiscImages } } - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -213,7 +213,7 @@ namespace DiscImageChef.DiscImages return chdTag.SequenceEqual(magic); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -1055,7 +1055,7 @@ namespace DiscImageChef.DiscImages break; // "IDNT" case HARD_DISK_IDENT_METADATA: - Identify.IdentifyDevice? idnt = Identify.Decode(meta); + Identify.IdentifyDevice? idnt = Decoders.ATA.Identify.Decode(meta); if(idnt.HasValue) { imageInfo.MediaManufacturer = idnt.Value.MediaManufacturer; diff --git a/DiscImageChef.DiscImages/CPCDSK.cs b/DiscImageChef.DiscImages/CPCDSK.cs index b922a7b85..0bc93ae8d 100644 --- a/DiscImageChef.DiscImages/CPCDSK.cs +++ b/DiscImageChef.DiscImages/CPCDSK.cs @@ -111,7 +111,7 @@ namespace DiscImageChef.DiscImages public string Name => "CPCEMU Disk-File and Extended CPC Disk-File"; public Guid Id => new Guid("724B16CC-ADB9-492E-BA07-CAEEC1012B16"); - public string ImageFormat => extended ? "CPCEMU Extended disk image" : "CPCEMU disk image"; + public string Format => extended ? "CPCEMU Extended disk image" : "CPCEMU disk image"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -122,7 +122,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -143,7 +143,7 @@ namespace DiscImageChef.DiscImages du54Id.SequenceEqual(header.magic); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/CisCopy.cs b/DiscImageChef.DiscImages/CisCopy.cs index 908f1217c..063278252 100644 --- a/DiscImageChef.DiscImages/CisCopy.cs +++ b/DiscImageChef.DiscImages/CisCopy.cs @@ -90,7 +90,7 @@ namespace DiscImageChef.DiscImages public string Name => "CisCopy Disk Image (DC-File)"; public Guid Id => new Guid("EDF20CC7-6012-49E2-9E92-663A53E42130"); - public string ImageFormat => "CisCopy"; + public string Format => "CisCopy"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -102,7 +102,7 @@ namespace DiscImageChef.DiscImages throw new FeatureUnsupportedImageException("Feature not supported by image format"); public ImageInfo Info => imageInfo; - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -172,7 +172,7 @@ namespace DiscImageChef.DiscImages return true; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/CloneCD.cs b/DiscImageChef.DiscImages/CloneCD.cs index f58e9ce84..38063222e 100644 --- a/DiscImageChef.DiscImages/CloneCD.cs +++ b/DiscImageChef.DiscImages/CloneCD.cs @@ -121,7 +121,7 @@ namespace DiscImageChef.DiscImages public string Name => "CloneCD"; public Guid Id => new Guid("EE9C2975-2E79-427A-8EE9-F86F19165784"); - public string ImageFormat => "CloneCD"; + public string Format => "CloneCD"; public List Partitions => partitions; @@ -129,7 +129,7 @@ namespace DiscImageChef.DiscImages public List Sessions => sessions; - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { ccdFilter = imageFilter; @@ -176,7 +176,7 @@ namespace DiscImageChef.DiscImages } } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { if(imageFilter == null) return false; diff --git a/DiscImageChef.DiscImages/CopyQM.cs b/DiscImageChef.DiscImages/CopyQM.cs index bccec32eb..7a1aec586 100644 --- a/DiscImageChef.DiscImages/CopyQM.cs +++ b/DiscImageChef.DiscImages/CopyQM.cs @@ -128,7 +128,7 @@ namespace DiscImageChef.DiscImages public string Name => "Sydex CopyQM"; public Guid Id => new Guid("147E927D-3A92-4E0C-82CD-142F5A4FA76D"); - public string ImageFormat => "Sydex CopyQM"; + public string Format => "Sydex CopyQM"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -139,7 +139,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -153,7 +153,7 @@ namespace DiscImageChef.DiscImages return magic == COPYQM_MAGIC && hdr[0x02] == COPYQM_MARK && 133 + hdr[0x6F] < stream.Length; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/D88.cs b/DiscImageChef.DiscImages/D88.cs index 60f068705..b07397033 100644 --- a/DiscImageChef.DiscImages/D88.cs +++ b/DiscImageChef.DiscImages/D88.cs @@ -86,7 +86,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("669EDC77-EC41-4720-A88C-49C38CFFBAA0"); public ImageInfo Info => imageInfo; - public string ImageFormat => "D88 disk image"; + public string Format => "D88 disk image"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -97,7 +97,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -144,7 +144,7 @@ namespace DiscImageChef.DiscImages return counter > 0; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/DART.cs b/DiscImageChef.DiscImages/DART.cs index b362847b1..671875c27 100644 --- a/DiscImageChef.DiscImages/DART.cs +++ b/DiscImageChef.DiscImages/DART.cs @@ -120,7 +120,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("B3E06BF8-F98D-4F9B-BBE2-342C373BAF3E"); public ImageInfo Info => imageInfo; - public string ImageFormat => "Apple Disk Archival/Retrieval Tool"; + public string Format => "Apple Disk Archival/Retrieval Tool"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -131,7 +131,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); @@ -182,7 +182,7 @@ namespace DiscImageChef.DiscImages return stream.Length <= expectedMaxSize; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); diff --git a/DiscImageChef.DiscImages/DIM.cs b/DiscImageChef.DiscImages/DIM.cs index db616b983..4735a7c65 100644 --- a/DiscImageChef.DiscImages/DIM.cs +++ b/DiscImageChef.DiscImages/DIM.cs @@ -85,7 +85,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88"); public ImageInfo Info => imageInfo; - public string ImageFormat => "DIM disk image"; + public string Format => "DIM disk image"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -96,7 +96,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -115,7 +115,7 @@ namespace DiscImageChef.DiscImages return headerId.SequenceEqual(hdrId); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/DiscFerret.cs b/DiscImageChef.DiscImages/DiscFerret.cs index 23ff3a9ab..3748f3798 100644 --- a/DiscImageChef.DiscImages/DiscFerret.cs +++ b/DiscImageChef.DiscImages/DiscFerret.cs @@ -86,7 +86,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("70EA7B9B-5323-42EB-9B40-8DDA37C5EB4D"); public ImageInfo Info => imageInfo; - public string ImageFormat => "DiscFerret"; + public string Format => "DiscFerret"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -97,7 +97,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { byte[] magicB = new byte[4]; Stream stream = imageFilter.GetDataForkStream(); @@ -107,7 +107,7 @@ namespace DiscImageChef.DiscImages return magic == DFI_MAGIC || magic == DFI_MAGIC2; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { byte[] magicB = new byte[4]; Stream stream = imageFilter.GetDataForkStream(); diff --git a/DiscImageChef.DiscImages/DiscJuggler.cs b/DiscImageChef.DiscImages/DiscJuggler.cs index 571e44986..98546974b 100644 --- a/DiscImageChef.DiscImages/DiscJuggler.cs +++ b/DiscImageChef.DiscImages/DiscJuggler.cs @@ -82,7 +82,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("2444DBC6-CD35-424C-A227-39B0C4DB01B2"); public ImageInfo Info => imageInfo; - public string ImageFormat => "DiscJuggler"; + public string Format => "DiscJuggler"; public List Partitions => partitions; @@ -90,7 +90,7 @@ namespace DiscImageChef.DiscImages public List Sessions => sessions; - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { imageStream = imageFilter.GetDataForkStream(); @@ -120,7 +120,7 @@ namespace DiscImageChef.DiscImages return descriptor[2] <= 99; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { imageStream = imageFilter.GetDataForkStream(); diff --git a/DiscImageChef.DiscImages/DiskCopy42.cs b/DiscImageChef.DiscImages/DiskCopy42.cs index 5235f15de..ab8a1dc12 100644 --- a/DiscImageChef.DiscImages/DiskCopy42.cs +++ b/DiscImageChef.DiscImages/DiskCopy42.cs @@ -138,7 +138,7 @@ namespace DiscImageChef.DiscImages }; } - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -219,7 +219,7 @@ namespace DiscImageChef.DiscImages return false; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -717,7 +717,7 @@ namespace DiscImageChef.DiscImages return buffer; } - public string ImageFormat => "Apple DiskCopy 4.2"; + public string Format => "Apple DiskCopy 4.2"; public byte[] ReadDiskTag(MediaTagType tag) { diff --git a/DiscImageChef.DiscImages/DriDiskCopy.cs b/DiscImageChef.DiscImages/DriDiskCopy.cs index d812ae460..3bb9168b0 100644 --- a/DiscImageChef.DiscImages/DriDiskCopy.cs +++ b/DiscImageChef.DiscImages/DriDiskCopy.cs @@ -83,7 +83,7 @@ namespace DiscImageChef.DiscImages public string Name => "Digital Research DiskCopy"; public Guid Id => new Guid("9F0BE551-8BAB-4038-8B5A-691F1BF5FFF3"); - public string ImageFormat => "Digital Research DiskCopy"; + public string Format => "Digital Research DiskCopy"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -94,7 +94,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); @@ -149,7 +149,7 @@ namespace DiscImageChef.DiscImages return tmpFooter.bpb.sectors * tmpFooter.bpb.bps + Marshal.SizeOf(tmpFooter) == stream.Length; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); diff --git a/DiscImageChef.DiscImages/GDI.cs b/DiscImageChef.DiscImages/GDI.cs index 962d565cf..56a31f2c1 100644 --- a/DiscImageChef.DiscImages/GDI.cs +++ b/DiscImageChef.DiscImages/GDI.cs @@ -86,7 +86,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("281ECBF2-D2A7-414C-8497-1A33F6DCB2DD"); public ImageInfo Info => imageInfo; - public string ImageFormat => "Dreamcast GDI image"; + public string Format => "Dreamcast GDI image"; public List Partitions => partitions; @@ -128,7 +128,7 @@ namespace DiscImageChef.DiscImages public List Sessions => discimage.Sessions; // Due to .gdi format, this method must parse whole file, ignoring errors (those will be thrown by OpenImage()). - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { try { @@ -190,7 +190,7 @@ namespace DiscImageChef.DiscImages } } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { if(imageFilter == null) return false; diff --git a/DiscImageChef.DiscImages/HDCopy.cs b/DiscImageChef.DiscImages/HDCopy.cs index 8184ace28..df5521c69 100644 --- a/DiscImageChef.DiscImages/HDCopy.cs +++ b/DiscImageChef.DiscImages/HDCopy.cs @@ -128,7 +128,7 @@ namespace DiscImageChef.DiscImages public string Name => "HD-Copy disk image"; public Guid Id => new Guid("8D57483F-71A5-42EC-9B87-66AEC439C792"); - public string ImageFormat => "HD-Copy image"; + public string Format => "HD-Copy image"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -138,7 +138,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -174,7 +174,7 @@ namespace DiscImageChef.DiscImages return true; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/IMD.cs b/DiscImageChef.DiscImages/IMD.cs index 19e7657c2..3a9fd6866 100644 --- a/DiscImageChef.DiscImages/IMD.cs +++ b/DiscImageChef.DiscImages/IMD.cs @@ -83,7 +83,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("0D67162E-38A3-407D-9B1A-CF40080A48CB"); public ImageInfo Info => imageInfo; - public string ImageFormat => "IMageDisk"; + public string Format => "IMageDisk"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -94,7 +94,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -109,7 +109,7 @@ namespace DiscImageChef.DiscImages return hm.Success; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/IMediaImage.cs b/DiscImageChef.DiscImages/IMediaImage.cs index e1af5952d..0a0a0fb04 100644 --- a/DiscImageChef.DiscImages/IMediaImage.cs +++ b/DiscImageChef.DiscImages/IMediaImage.cs @@ -53,7 +53,7 @@ namespace DiscImageChef.DiscImages /// Gets the image format. /// /// The image format. - string ImageFormat { get; } + string Format { get; } /// /// Gets an array partitions. Typically only useful for optical disc /// images where each track and index means a different partition, as @@ -77,14 +77,14 @@ namespace DiscImageChef.DiscImages /// /// true, if image was identified, false otherwise. /// Image filter. - bool IdentifyImage(IFilter imageFilter); + bool Identify(IFilter imageFilter); /// /// Opens the image. /// /// true, if image was opened, false otherwise. /// Image filter. - bool OpenImage(IFilter imageFilter); + bool Open(IFilter imageFilter); /// /// Reads a disk tag. diff --git a/DiscImageChef.DiscImages/KryoFlux.cs b/DiscImageChef.DiscImages/KryoFlux.cs index 7270c6740..d58e726f0 100644 --- a/DiscImageChef.DiscImages/KryoFlux.cs +++ b/DiscImageChef.DiscImages/KryoFlux.cs @@ -92,7 +92,7 @@ namespace DiscImageChef.DiscImages }; } - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { OobBlock header = new OobBlock(); Stream stream = imageFilter.GetDataForkStream(); @@ -122,7 +122,7 @@ namespace DiscImageChef.DiscImages footer.blockId == BlockIds.Oob && footer.blockType == OobTypes.EOF && footer.length == 0x0D0D; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { OobBlock header = new OobBlock(); Stream stream = imageFilter.GetDataForkStream(); @@ -352,7 +352,7 @@ namespace DiscImageChef.DiscImages throw new NotImplementedException("Flux decoding is not yet implemented."); } - public string ImageFormat => "KryoFlux STREAM"; + public string Format => "KryoFlux STREAM"; public bool? VerifySector(ulong sectorAddress) { diff --git a/DiscImageChef.DiscImages/MaxiDisk.cs b/DiscImageChef.DiscImages/MaxiDisk.cs index 4b36c2b74..df8ac7131 100644 --- a/DiscImageChef.DiscImages/MaxiDisk.cs +++ b/DiscImageChef.DiscImages/MaxiDisk.cs @@ -76,7 +76,7 @@ namespace DiscImageChef.DiscImages public string Name => "MAXI Disk image"; public Guid Id => new Guid("D27D924A-7034-466E-ADE1-B81EF37E469E"); - public string ImageFormat => "MAXI Disk"; + public string Format => "MAXI Disk"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -87,7 +87,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); @@ -132,7 +132,7 @@ namespace DiscImageChef.DiscImages return expectedFileSize == stream.Length; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); diff --git a/DiscImageChef.DiscImages/NDIF.cs b/DiscImageChef.DiscImages/NDIF.cs index 9dbf553d8..abe558436 100644 --- a/DiscImageChef.DiscImages/NDIF.cs +++ b/DiscImageChef.DiscImages/NDIF.cs @@ -125,7 +125,7 @@ namespace DiscImageChef.DiscImages public string Name => "Apple New Disk Image Format"; public Guid Id => new Guid("5A7FF7D8-491E-458D-8674-5B5EADBECC24"); - public string ImageFormat => "Apple New Disk Image Format"; + public string Format => "Apple New Disk Image Format"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -136,7 +136,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { if(!imageFilter.HasResourceFork() || imageFilter.GetResourceForkLength() == 0) return false; @@ -154,7 +154,7 @@ namespace DiscImageChef.DiscImages return false; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { if(!imageFilter.HasResourceFork() || imageFilter.GetResourceForkLength() == 0) return false; diff --git a/DiscImageChef.DiscImages/NHDr0.cs b/DiscImageChef.DiscImages/NHDr0.cs index fe22e6f62..9b670bbda 100644 --- a/DiscImageChef.DiscImages/NHDr0.cs +++ b/DiscImageChef.DiscImages/NHDr0.cs @@ -83,7 +83,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("6ECACD0A-8F4D-4465-8815-AEA000D370E3"); public ImageInfo Info => imageInfo; - public string ImageFormat => "NHDr0 disk image"; + public string Format => "NHDr0 disk image"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -94,7 +94,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -128,7 +128,7 @@ namespace DiscImageChef.DiscImages return true; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/Nero.cs b/DiscImageChef.DiscImages/Nero.cs index 25776cf5b..584aa11fa 100644 --- a/DiscImageChef.DiscImages/Nero.cs +++ b/DiscImageChef.DiscImages/Nero.cs @@ -140,7 +140,7 @@ namespace DiscImageChef.DiscImages } // Due to .cue format, this method must parse whole file, ignoring errors (those will be thrown by OpenImage()). - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { imageStream = imageFilter.GetDataForkStream(); BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian; @@ -171,7 +171,7 @@ namespace DiscImageChef.DiscImages return footerV1.ChunkId == NERO_FOOTER_V1 && footerV1.FirstChunkOffset < (ulong)imageStream.Length; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { try { @@ -1516,7 +1516,7 @@ namespace DiscImageChef.DiscImages return buffer; } - public string ImageFormat => "Nero Burning ROM"; + public string Format => "Nero Burning ROM"; public List Partitions => imagePartitions; diff --git a/DiscImageChef.DiscImages/Parallels.cs b/DiscImageChef.DiscImages/Parallels.cs index de3a8bd8a..d27e6d1e9 100644 --- a/DiscImageChef.DiscImages/Parallels.cs +++ b/DiscImageChef.DiscImages/Parallels.cs @@ -99,7 +99,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("E314DE35-C103-48A3-AD36-990F68523C46"); public ImageInfo Info => imageInfo; - public string ImageFormat => "Parallels"; + public string Format => "Parallels"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -110,7 +110,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -128,7 +128,7 @@ namespace DiscImageChef.DiscImages return parallelsMagic.SequenceEqual(pHdr.magic) || parallelsExtMagic.SequenceEqual(pHdr.magic); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/PartClone.cs b/DiscImageChef.DiscImages/PartClone.cs index 4cd39eed5..d57f849a2 100644 --- a/DiscImageChef.DiscImages/PartClone.cs +++ b/DiscImageChef.DiscImages/PartClone.cs @@ -95,7 +95,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("AB1D7518-B548-4099-A4E2-C29C53DDE0C3"); public ImageInfo Info => imageInfo; - public string ImageFormat => "PartClone"; + public string Format => "PartClone"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -106,7 +106,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -131,7 +131,7 @@ namespace DiscImageChef.DiscImages return partCloneMagic.SequenceEqual(pHdr.magic) && biTmAgIc.SequenceEqual(bitmagic); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/Partimage.cs b/DiscImageChef.DiscImages/Partimage.cs index db5e9f438..81068a9f7 100644 --- a/DiscImageChef.DiscImages/Partimage.cs +++ b/DiscImageChef.DiscImages/Partimage.cs @@ -124,7 +124,7 @@ namespace DiscImageChef.DiscImages public string Name => "Partimage disk image"; public Guid Id => new Guid("AAFDB99D-2B77-49EA-831C-C9BB58C68C95"); - public string ImageFormat => "Partimage"; + public string Format => "Partimage"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -135,7 +135,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -153,7 +153,7 @@ namespace DiscImageChef.DiscImages return partimageMagic.SequenceEqual(cVolumeHeader.magic); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/QCOW.cs b/DiscImageChef.DiscImages/QCOW.cs index 4f778be2b..27e520a7b 100644 --- a/DiscImageChef.DiscImages/QCOW.cs +++ b/DiscImageChef.DiscImages/QCOW.cs @@ -110,7 +110,7 @@ namespace DiscImageChef.DiscImages public string Name => "QEMU Copy-On-Write disk image"; public Guid Id => new Guid("A5C35765-9FE2-469D-BBBF-ACDEBDB7B954"); - public string ImageFormat => "QEMU Copy-On-Write"; + public string Format => "QEMU Copy-On-Write"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -121,7 +121,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -135,7 +135,7 @@ namespace DiscImageChef.DiscImages return qHdr.magic == QCOW_MAGIC && qHdr.version == QCOW_VERSION; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/QCOW2.cs b/DiscImageChef.DiscImages/QCOW2.cs index 8fcd9862e..dec72fb47 100644 --- a/DiscImageChef.DiscImages/QCOW2.cs +++ b/DiscImageChef.DiscImages/QCOW2.cs @@ -125,7 +125,7 @@ namespace DiscImageChef.DiscImages public string Name => "QEMU Copy-On-Write disk image v2"; public Guid Id => new Guid("F20107CB-95B3-4398-894B-975261F1E8C5"); - public string ImageFormat => "QEMU Copy-On-Write"; + public string Format => "QEMU Copy-On-Write"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -136,7 +136,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -153,7 +153,7 @@ namespace DiscImageChef.DiscImages return qHdr.magic == QCOW_MAGIC && (qHdr.version == QCOW_VERSION2 || qHdr.version == QCOW_VERSION3); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/QED.cs b/DiscImageChef.DiscImages/QED.cs index dadba8284..9046cbc82 100644 --- a/DiscImageChef.DiscImages/QED.cs +++ b/DiscImageChef.DiscImages/QED.cs @@ -122,7 +122,7 @@ namespace DiscImageChef.DiscImages public string Name => "QEMU Enhanced Disk image"; public Guid Id => new Guid("B9DBB155-A69A-4C10-BF91-96BF431B9BB6"); - public string ImageFormat => "QEMU Enhanced Disk"; + public string Format => "QEMU Enhanced Disk"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -133,7 +133,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -151,7 +151,7 @@ namespace DiscImageChef.DiscImages return qHdr.magic == QED_MAGIC; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/RayDIM.cs b/DiscImageChef.DiscImages/RayDIM.cs index c10edc2bb..f1fce0224 100644 --- a/DiscImageChef.DiscImages/RayDIM.cs +++ b/DiscImageChef.DiscImages/RayDIM.cs @@ -79,7 +79,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("F541F4E7-C1E3-4A2D-B07F-D863E87AB961"); public ImageInfo Info => imageInfo; - public string ImageFormat => "Ray Arachelian's Disk IMage"; + public string Format => "Ray Arachelian's Disk IMage"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -90,7 +90,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); @@ -123,7 +123,7 @@ namespace DiscImageChef.DiscImages return sm.Success; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); diff --git a/DiscImageChef.DiscImages/RsIde.cs b/DiscImageChef.DiscImages/RsIde.cs index 22b25c7fe..16e217fde 100644 --- a/DiscImageChef.DiscImages/RsIde.cs +++ b/DiscImageChef.DiscImages/RsIde.cs @@ -81,7 +81,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("47C3E78D-2BE2-4BA5-AA6B-FEE27C86FC65"); public ImageInfo Info => imageInfo; - public string ImageFormat => "RS-IDE disk image"; + public string Format => "RS-IDE disk image"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -92,7 +92,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -103,7 +103,7 @@ namespace DiscImageChef.DiscImages return magic.SequenceEqual(signature); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/SaveDskF.cs b/DiscImageChef.DiscImages/SaveDskF.cs index 51226b9ab..a64d37b8a 100644 --- a/DiscImageChef.DiscImages/SaveDskF.cs +++ b/DiscImageChef.DiscImages/SaveDskF.cs @@ -83,7 +83,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("288CE058-1A51-4034-8C45-5A256CAE1461"); public ImageInfo Info => imageInfo; - public string ImageFormat => "IBM SaveDskF"; + public string Format => "IBM SaveDskF"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -94,7 +94,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -114,7 +114,7 @@ namespace DiscImageChef.DiscImages header.commentOffset < stream.Length && header.dataOffset < stream.Length; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/SuperCardPro.cs b/DiscImageChef.DiscImages/SuperCardPro.cs index 1e892a839..de66af3b9 100644 --- a/DiscImageChef.DiscImages/SuperCardPro.cs +++ b/DiscImageChef.DiscImages/SuperCardPro.cs @@ -151,7 +151,7 @@ namespace DiscImageChef.DiscImages public string Name => "SuperCardPro"; public Guid Id => new Guid("C5D3182E-1D45-4767-A205-E6E5C83444DC"); - public string ImageFormat => "SuperCardPro"; + public string Format => "SuperCardPro"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -162,7 +162,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Header = new ScpHeader(); Stream stream = imageFilter.GetDataForkStream(); @@ -180,7 +180,7 @@ namespace DiscImageChef.DiscImages return scpSignature.SequenceEqual(Header.signature); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Header = new ScpHeader(); scpStream = imageFilter.GetDataForkStream(); diff --git a/DiscImageChef.DiscImages/T98.cs b/DiscImageChef.DiscImages/T98.cs index 8580dd872..19dbef243 100644 --- a/DiscImageChef.DiscImages/T98.cs +++ b/DiscImageChef.DiscImages/T98.cs @@ -75,7 +75,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("0410003E-6E7B-40E6-9328-BA5651ADF6B7"); public ImageInfo Info => imageInfo; - public string ImageFormat => "T98 disk image"; + public string Format => "T98 disk image"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -86,7 +86,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -107,7 +107,7 @@ namespace DiscImageChef.DiscImages return stream.Length == cylinders * 8 * 33 * 256 + 256; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/TeleDisk.cs b/DiscImageChef.DiscImages/TeleDisk.cs index b29992087..5bfed4a8e 100644 --- a/DiscImageChef.DiscImages/TeleDisk.cs +++ b/DiscImageChef.DiscImages/TeleDisk.cs @@ -154,7 +154,7 @@ namespace DiscImageChef.DiscImages public string Name => "Sydex TeleDisk"; public Guid Id => new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88"); - public string ImageFormat => "Sydex TeleDisk"; + public string Format => "Sydex TeleDisk"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -165,7 +165,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { header = new TeleDiskHeader(); byte[] headerBytes = new byte[12]; @@ -221,7 +221,7 @@ namespace DiscImageChef.DiscImages header.DriveType == DRIVE_TYPE_8_INCH; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { header = new TeleDiskHeader(); byte[] headerBytes = new byte[12]; diff --git a/DiscImageChef.DiscImages/UDIF.cs b/DiscImageChef.DiscImages/UDIF.cs index ca9b54ae1..76eac0f74 100644 --- a/DiscImageChef.DiscImages/UDIF.cs +++ b/DiscImageChef.DiscImages/UDIF.cs @@ -120,7 +120,7 @@ namespace DiscImageChef.DiscImages public string Name => "Apple Universal Disk Image Format"; public Guid Id => new Guid("5BEB9002-CF3D-429C-8E06-9A96F49203FF"); - public string ImageFormat => "Apple Universal Disk Image Format"; + public string Format => "Apple Universal Disk Image Format"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -131,7 +131,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); @@ -155,7 +155,7 @@ namespace DiscImageChef.DiscImages return footer.signature == UDIF_SIGNATURE; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); diff --git a/DiscImageChef.DiscImages/UkvFdi.cs b/DiscImageChef.DiscImages/UkvFdi.cs index bd4752e5d..604a1c152 100644 --- a/DiscImageChef.DiscImages/UkvFdi.cs +++ b/DiscImageChef.DiscImages/UkvFdi.cs @@ -79,7 +79,7 @@ namespace DiscImageChef.DiscImages public string Name => "Spectrum Floppy Disk Image"; public Guid Id => new Guid("DADFC9B2-67C1-42A3-B124-825528163FC0"); - public string ImageFormat => "Spectrum floppy disk image"; + public string Format => "Spectrum floppy disk image"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -91,7 +91,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -110,7 +110,7 @@ namespace DiscImageChef.DiscImages return hdr.magic.SequenceEqual(signature); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/VDI.cs b/DiscImageChef.DiscImages/VDI.cs index ebba08724..a39c5c85a 100644 --- a/DiscImageChef.DiscImages/VDI.cs +++ b/DiscImageChef.DiscImages/VDI.cs @@ -94,7 +94,7 @@ namespace DiscImageChef.DiscImages public string Name => "VirtualBox Disk Image"; public Guid Id => new Guid("E314DE35-C103-48A3-AD36-990F68523C46"); - public string ImageFormat => "VDI"; + public string Format => "VDI"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -105,7 +105,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -123,7 +123,7 @@ namespace DiscImageChef.DiscImages return vHdr.magic == VDI_MAGIC; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/VHD.cs b/DiscImageChef.DiscImages/VHD.cs index f7b716ae4..fa43e8889 100644 --- a/DiscImageChef.DiscImages/VHD.cs +++ b/DiscImageChef.DiscImages/VHD.cs @@ -227,7 +227,7 @@ namespace DiscImageChef.DiscImages public string Name => "VirtualPC"; public Guid Id => new Guid("8014d88f-64cd-4484-9441-7635c632958a"); - public string ImageFormat + public string Format { get { @@ -250,7 +250,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream imageStream = imageFilter.GetDataForkStream(); ulong headerCookie; @@ -273,7 +273,7 @@ namespace DiscImageChef.DiscImages return headerCookie == IMAGE_COOKIE || footerCookie == IMAGE_COOKIE; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream imageStream = imageFilter.GetDataForkStream(); byte[] header = new byte[512]; @@ -785,11 +785,11 @@ namespace DiscImageChef.DiscImages if (!plugins.ImagePluginsList.TryGetValue(Name.ToLower(), out parentImage)) throw new SystemException("(VirtualPC plugin): Unable to open myself");*/ - if(!parentImage.IdentifyImage(parentFilter)) + if(!parentImage.Identify(parentFilter)) throw new ImageNotSupportedException("(VirtualPC plugin): Parent image is not a Virtual PC disk image"); - if(!parentImage.OpenImage(parentFilter)) + if(!parentImage.Open(parentFilter)) throw new ImageNotSupportedException("(VirtualPC plugin): Cannot open parent disk image"); // While specification says that parent and child disk images should contain UUID relationship diff --git a/DiscImageChef.DiscImages/VHDX.cs b/DiscImageChef.DiscImages/VHDX.cs index a094cfeac..f954f23e3 100644 --- a/DiscImageChef.DiscImages/VHDX.cs +++ b/DiscImageChef.DiscImages/VHDX.cs @@ -161,7 +161,7 @@ namespace DiscImageChef.DiscImages public string Name => "Microsoft VHDX"; public Guid Id => new Guid("536B141B-D09C-4799-AB70-34631286EB9D"); - public string ImageFormat => "VHDX"; + public string Format => "VHDX"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -172,7 +172,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -190,7 +190,7 @@ namespace DiscImageChef.DiscImages return vhdxId.signature == VHDX_SIGNATURE; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -416,7 +416,7 @@ namespace DiscImageChef.DiscImages { parentFilter = new FiltersList().GetFilter(Path.Combine(imageFilter.GetParentFolder(), entryValue)); - if(parentFilter != null && parentImage.OpenImage(parentFilter)) + if(parentFilter != null && parentImage.Open(parentFilter)) { parentWorks = true; break; @@ -430,7 +430,7 @@ namespace DiscImageChef.DiscImages { parentFilter = new FiltersList().GetFilter(Path.Combine(imageFilter.GetParentFolder(), relEntry)); - if(parentFilter == null || !parentImage.OpenImage(parentFilter)) continue; + if(parentFilter == null || !parentImage.Open(parentFilter)) continue; parentWorks = true; break; @@ -452,7 +452,7 @@ namespace DiscImageChef.DiscImages { parentFilter = new FiltersList().GetFilter(Path.Combine(imageFilter.GetParentFolder(), entryValue)); - if(parentFilter == null || !parentImage.OpenImage(parentFilter)) continue; + if(parentFilter == null || !parentImage.Open(parentFilter)) continue; parentWorks = true; break; diff --git a/DiscImageChef.DiscImages/VMware.cs b/DiscImageChef.DiscImages/VMware.cs index eb72c7eb8..08533b83d 100644 --- a/DiscImageChef.DiscImages/VMware.cs +++ b/DiscImageChef.DiscImages/VMware.cs @@ -155,7 +155,7 @@ namespace DiscImageChef.DiscImages public string Name => "VMware disk image"; public Guid Id => new Guid("E314DE35-C103-48A3-AD36-990F68523C46"); - public string ImageFormat => "VMware"; + public string Format => "VMware"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -166,7 +166,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); @@ -209,7 +209,7 @@ namespace DiscImageChef.DiscImages return ddfMagicBytes.SequenceEqual(ddfMagic); } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); @@ -618,7 +618,7 @@ namespace DiscImageChef.DiscImages parentImage = new VMware(); - if(!parentImage.OpenImage(parentFilter)) throw new Exception($"Cannot open parent \"{parentName}\"."); + if(!parentImage.Open(parentFilter)) throw new Exception($"Cannot open parent \"{parentName}\"."); } sectorCache = new Dictionary(); diff --git a/DiscImageChef.DiscImages/Virtual98.cs b/DiscImageChef.DiscImages/Virtual98.cs index ccaecff6c..b38187ce6 100644 --- a/DiscImageChef.DiscImages/Virtual98.cs +++ b/DiscImageChef.DiscImages/Virtual98.cs @@ -83,7 +83,7 @@ namespace DiscImageChef.DiscImages public string Name => "Virtual98 Disk Image"; public Guid Id => new Guid("C0CDE13D-04D0-4913-8740-AFAA44D0A107"); - public string ImageFormat => "Virtual98 disk image"; + public string Format => "Virtual98 disk image"; public List Partitions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); @@ -94,7 +94,7 @@ namespace DiscImageChef.DiscImages public List Sessions => throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); @@ -129,7 +129,7 @@ namespace DiscImageChef.DiscImages return true; } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/ZZZRawImage.cs b/DiscImageChef.DiscImages/ZZZRawImage.cs index eaf9af946..5e3497d5a 100644 --- a/DiscImageChef.DiscImages/ZZZRawImage.cs +++ b/DiscImageChef.DiscImages/ZZZRawImage.cs @@ -78,7 +78,7 @@ namespace DiscImageChef.DiscImages public Guid Id => new Guid("12345678-AAAA-BBBB-CCCC-123456789000"); public ImageInfo Info => imageInfo; - public string ImageFormat => "Raw disk image (sector by sector copy)"; + public string Format => "Raw disk image (sector by sector copy)"; public List Tracks { @@ -148,7 +148,7 @@ namespace DiscImageChef.DiscImages } } - public bool IdentifyImage(IFilter imageFilter) + public bool Identify(IFilter imageFilter) { // Check if file is not multiple of 512 if(imageFilter.GetDataForkLength() % 512 == 0) return true; @@ -187,7 +187,7 @@ namespace DiscImageChef.DiscImages } } - public bool OpenImage(IFilter imageFilter) + public bool Open(IFilter imageFilter) { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); diff --git a/DiscImageChef.Tests/Devices/IomegaJaz.cs b/DiscImageChef.Tests/Devices/IomegaJaz.cs index 4b6d366c5..e964a4bf4 100644 --- a/DiscImageChef.Tests/Devices/IomegaJaz.cs +++ b/DiscImageChef.Tests/Devices/IomegaJaz.cs @@ -54,7 +54,7 @@ namespace DiscImageChef.Tests.Devices IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); diff --git a/DiscImageChef.Tests/Devices/LS120.cs b/DiscImageChef.Tests/Devices/LS120.cs index ab9ee4e81..d1db3700a 100644 --- a/DiscImageChef.Tests/Devices/LS120.cs +++ b/DiscImageChef.Tests/Devices/LS120.cs @@ -54,7 +54,7 @@ namespace DiscImageChef.Tests.Devices IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); diff --git a/DiscImageChef.Tests/Devices/PocketZip.cs b/DiscImageChef.Tests/Devices/PocketZip.cs index 1d5216dbd..3faf51fee 100644 --- a/DiscImageChef.Tests/Devices/PocketZip.cs +++ b/DiscImageChef.Tests/Devices/PocketZip.cs @@ -54,7 +54,7 @@ namespace DiscImageChef.Tests.Devices IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/ADFS.cs b/DiscImageChef.Tests/Filesystems/ADFS.cs index a82d4e41c..4707bf0bc 100644 --- a/DiscImageChef.Tests/Filesystems/ADFS.cs +++ b/DiscImageChef.Tests/Filesystems/ADFS.cs @@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/AFFS.cs b/DiscImageChef.Tests/Filesystems/AFFS.cs index a7d7a7b6d..e863b6e5e 100644 --- a/DiscImageChef.Tests/Filesystems/AFFS.cs +++ b/DiscImageChef.Tests/Filesystems/AFFS.cs @@ -64,7 +64,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -112,7 +112,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -163,7 +163,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -223,7 +223,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/AFFS2.cs b/DiscImageChef.Tests/Filesystems/AFFS2.cs index 79e2afa12..e06fbf832 100644 --- a/DiscImageChef.Tests/Filesystems/AFFS2.cs +++ b/DiscImageChef.Tests/Filesystems/AFFS2.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/AFS.cs b/DiscImageChef.Tests/Filesystems/AFS.cs index 8fec50a10..83d57200c 100644 --- a/DiscImageChef.Tests/Filesystems/AFS.cs +++ b/DiscImageChef.Tests/Filesystems/AFS.cs @@ -76,7 +76,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -126,7 +126,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/AOFS.cs b/DiscImageChef.Tests/Filesystems/AOFS.cs index 33619607b..d88aacc15 100644 --- a/DiscImageChef.Tests/Filesystems/AOFS.cs +++ b/DiscImageChef.Tests/Filesystems/AOFS.cs @@ -64,7 +64,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -112,7 +112,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -163,7 +163,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -215,7 +215,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/Atheos.cs b/DiscImageChef.Tests/Filesystems/Atheos.cs index 51b08f27b..4676b28fa 100644 --- a/DiscImageChef.Tests/Filesystems/Atheos.cs +++ b/DiscImageChef.Tests/Filesystems/Atheos.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/BeFS.cs b/DiscImageChef.Tests/Filesystems/BeFS.cs index 427a759a2..73945dba5 100644 --- a/DiscImageChef.Tests/Filesystems/BeFS.cs +++ b/DiscImageChef.Tests/Filesystems/BeFS.cs @@ -66,7 +66,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -117,7 +117,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -169,7 +169,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -221,7 +221,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/COHERENT.cs b/DiscImageChef.Tests/Filesystems/COHERENT.cs index 77b76f7d7..dddeaddd9 100644 --- a/DiscImageChef.Tests/Filesystems/COHERENT.cs +++ b/DiscImageChef.Tests/Filesystems/COHERENT.cs @@ -71,7 +71,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -121,7 +121,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/DTFS.cs b/DiscImageChef.Tests/Filesystems/DTFS.cs index e4eb8c730..45a5ccc8a 100644 --- a/DiscImageChef.Tests/Filesystems/DTFS.cs +++ b/DiscImageChef.Tests/Filesystems/DTFS.cs @@ -72,7 +72,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -122,7 +122,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/EAFS.cs b/DiscImageChef.Tests/Filesystems/EAFS.cs index a28264424..830e3a933 100644 --- a/DiscImageChef.Tests/Filesystems/EAFS.cs +++ b/DiscImageChef.Tests/Filesystems/EAFS.cs @@ -76,7 +76,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -126,7 +126,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/F2FS.cs b/DiscImageChef.Tests/Filesystems/F2FS.cs index d6726f9e7..9d7ff0fed 100644 --- a/DiscImageChef.Tests/Filesystems/F2FS.cs +++ b/DiscImageChef.Tests/Filesystems/F2FS.cs @@ -63,7 +63,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); IPartition parts = new MBR(); diff --git a/DiscImageChef.Tests/Filesystems/FAT12.cs b/DiscImageChef.Tests/Filesystems/FAT12.cs index 8b1dfe61f..dda539ce6 100644 --- a/DiscImageChef.Tests/Filesystems/FAT12.cs +++ b/DiscImageChef.Tests/Filesystems/FAT12.cs @@ -1713,7 +1713,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -1764,7 +1764,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -1818,7 +1818,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -1940,7 +1940,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/FAT16.cs b/DiscImageChef.Tests/Filesystems/FAT16.cs index 39b8252d7..1001d5d8d 100644 --- a/DiscImageChef.Tests/Filesystems/FAT16.cs +++ b/DiscImageChef.Tests/Filesystems/FAT16.cs @@ -120,7 +120,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -171,7 +171,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -225,7 +225,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -279,7 +279,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -403,7 +403,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -448,7 +448,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/FAT32.cs b/DiscImageChef.Tests/Filesystems/FAT32.cs index 81edd0048..b91a9f38d 100644 --- a/DiscImageChef.Tests/Filesystems/FAT32.cs +++ b/DiscImageChef.Tests/Filesystems/FAT32.cs @@ -64,7 +64,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -118,7 +118,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -206,7 +206,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/HAMMER.cs b/DiscImageChef.Tests/Filesystems/HAMMER.cs index 3a3e90e5f..1e36e7a4e 100644 --- a/DiscImageChef.Tests/Filesystems/HAMMER.cs +++ b/DiscImageChef.Tests/Filesystems/HAMMER.cs @@ -63,7 +63,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/HFS.cs b/DiscImageChef.Tests/Filesystems/HFS.cs index d8e18daf4..bc1de15aa 100644 --- a/DiscImageChef.Tests/Filesystems/HFS.cs +++ b/DiscImageChef.Tests/Filesystems/HFS.cs @@ -76,7 +76,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -165,7 +165,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -222,7 +222,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -276,7 +276,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -327,7 +327,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus.cs b/DiscImageChef.Tests/Filesystems/HFSPlus.cs index e01a4bdb2..f4a599b63 100644 --- a/DiscImageChef.Tests/Filesystems/HFSPlus.cs +++ b/DiscImageChef.Tests/Filesystems/HFSPlus.cs @@ -98,7 +98,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -152,7 +152,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -219,7 +219,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/HFSX.cs b/DiscImageChef.Tests/Filesystems/HFSX.cs index d9a85ebca..70a64017c 100644 --- a/DiscImageChef.Tests/Filesystems/HFSX.cs +++ b/DiscImageChef.Tests/Filesystems/HFSX.cs @@ -72,7 +72,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -126,7 +126,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -185,7 +185,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/HPFS.cs b/DiscImageChef.Tests/Filesystems/HPFS.cs index 942df209b..f86998d82 100644 --- a/DiscImageChef.Tests/Filesystems/HPFS.cs +++ b/DiscImageChef.Tests/Filesystems/HPFS.cs @@ -83,7 +83,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/HTFS.cs b/DiscImageChef.Tests/Filesystems/HTFS.cs index 2f32b0eed..39bd2a9bf 100644 --- a/DiscImageChef.Tests/Filesystems/HTFS.cs +++ b/DiscImageChef.Tests/Filesystems/HTFS.cs @@ -72,7 +72,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -122,7 +122,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/ISO9660.cs b/DiscImageChef.Tests/Filesystems/ISO9660.cs index 3c92bea7f..69dab307c 100644 --- a/DiscImageChef.Tests/Filesystems/ISO9660.cs +++ b/DiscImageChef.Tests/Filesystems/ISO9660.cs @@ -123,7 +123,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/JFS2.cs b/DiscImageChef.Tests/Filesystems/JFS2.cs index 5865925d9..1fe382f13 100644 --- a/DiscImageChef.Tests/Filesystems/JFS2.cs +++ b/DiscImageChef.Tests/Filesystems/JFS2.cs @@ -63,7 +63,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/LisaFS.cs b/DiscImageChef.Tests/Filesystems/LisaFS.cs index 5ad1f9547..405dcf7ab 100644 --- a/DiscImageChef.Tests/Filesystems/LisaFS.cs +++ b/DiscImageChef.Tests/Filesystems/LisaFS.cs @@ -88,7 +88,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new DiskCopy42(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/Locus.cs b/DiscImageChef.Tests/Filesystems/Locus.cs index e4b159127..7547a3463 100644 --- a/DiscImageChef.Tests/Filesystems/Locus.cs +++ b/DiscImageChef.Tests/Filesystems/Locus.cs @@ -65,7 +65,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/MFS.cs b/DiscImageChef.Tests/Filesystems/MFS.cs index fb8518b22..9e3cdd6a2 100644 --- a/DiscImageChef.Tests/Filesystems/MFS.cs +++ b/DiscImageChef.Tests/Filesystems/MFS.cs @@ -72,7 +72,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/MINIX.cs b/DiscImageChef.Tests/Filesystems/MINIX.cs index 000c1ee2d..6ef6bbb80 100644 --- a/DiscImageChef.Tests/Filesystems/MINIX.cs +++ b/DiscImageChef.Tests/Filesystems/MINIX.cs @@ -67,7 +67,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -111,7 +111,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -165,7 +165,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -209,7 +209,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -263,7 +263,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -307,7 +307,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/NILFS2.cs b/DiscImageChef.Tests/Filesystems/NILFS2.cs index 41ff87238..1d9839754 100644 --- a/DiscImageChef.Tests/Filesystems/NILFS2.cs +++ b/DiscImageChef.Tests/Filesystems/NILFS2.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/NTFS.cs b/DiscImageChef.Tests/Filesystems/NTFS.cs index 845d23fbd..51f5bb22a 100644 --- a/DiscImageChef.Tests/Filesystems/NTFS.cs +++ b/DiscImageChef.Tests/Filesystems/NTFS.cs @@ -64,7 +64,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -126,7 +126,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/PFS3.cs b/DiscImageChef.Tests/Filesystems/PFS3.cs index 6cfd016de..bca5b5b8c 100644 --- a/DiscImageChef.Tests/Filesystems/PFS3.cs +++ b/DiscImageChef.Tests/Filesystems/PFS3.cs @@ -64,7 +64,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/ProDOS.cs b/DiscImageChef.Tests/Filesystems/ProDOS.cs index 71c3c9b18..9dae6a441 100644 --- a/DiscImageChef.Tests/Filesystems/ProDOS.cs +++ b/DiscImageChef.Tests/Filesystems/ProDOS.cs @@ -70,7 +70,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/QNX4.cs b/DiscImageChef.Tests/Filesystems/QNX4.cs index babc4821c..40423365b 100644 --- a/DiscImageChef.Tests/Filesystems/QNX4.cs +++ b/DiscImageChef.Tests/Filesystems/QNX4.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -104,7 +104,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/ReFS.cs b/DiscImageChef.Tests/Filesystems/ReFS.cs index daaaa69a4..d42b18ca8 100644 --- a/DiscImageChef.Tests/Filesystems/ReFS.cs +++ b/DiscImageChef.Tests/Filesystems/ReFS.cs @@ -64,7 +64,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/Reiser3.cs b/DiscImageChef.Tests/Filesystems/Reiser3.cs index 793b4c10e..596fc023c 100644 --- a/DiscImageChef.Tests/Filesystems/Reiser3.cs +++ b/DiscImageChef.Tests/Filesystems/Reiser3.cs @@ -60,7 +60,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/Reiser4.cs b/DiscImageChef.Tests/Filesystems/Reiser4.cs index 88a19a62b..646fd7642 100644 --- a/DiscImageChef.Tests/Filesystems/Reiser4.cs +++ b/DiscImageChef.Tests/Filesystems/Reiser4.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/SFS.cs b/DiscImageChef.Tests/Filesystems/SFS.cs index a3dbf895f..a5f4e8b45 100644 --- a/DiscImageChef.Tests/Filesystems/SFS.cs +++ b/DiscImageChef.Tests/Filesystems/SFS.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -113,7 +113,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -164,7 +164,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/SysV.cs b/DiscImageChef.Tests/Filesystems/SysV.cs index f156c4552..da98be2e8 100644 --- a/DiscImageChef.Tests/Filesystems/SysV.cs +++ b/DiscImageChef.Tests/Filesystems/SysV.cs @@ -77,7 +77,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -128,7 +128,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -181,7 +181,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/UDF.cs b/DiscImageChef.Tests/Filesystems/UDF.cs index 00b479970..2f723f0a0 100644 --- a/DiscImageChef.Tests/Filesystems/UDF.cs +++ b/DiscImageChef.Tests/Filesystems/UDF.cs @@ -102,7 +102,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); IFilesystem fs = new UDF(); diff --git a/DiscImageChef.Tests/Filesystems/UFS.cs b/DiscImageChef.Tests/Filesystems/UFS.cs index 4ea971795..33820a664 100644 --- a/DiscImageChef.Tests/Filesystems/UFS.cs +++ b/DiscImageChef.Tests/Filesystems/UFS.cs @@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -133,7 +133,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -227,7 +227,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -286,7 +286,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -345,7 +345,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -398,7 +398,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -451,7 +451,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/UNIXBFS.cs b/DiscImageChef.Tests/Filesystems/UNIXBFS.cs index 5c4451418..852580b06 100644 --- a/DiscImageChef.Tests/Filesystems/UNIXBFS.cs +++ b/DiscImageChef.Tests/Filesystems/UNIXBFS.cs @@ -70,7 +70,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -115,7 +115,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -167,7 +167,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/XENIX.cs b/DiscImageChef.Tests/Filesystems/XENIX.cs index 146cdfcc9..c9d9e018a 100644 --- a/DiscImageChef.Tests/Filesystems/XENIX.cs +++ b/DiscImageChef.Tests/Filesystems/XENIX.cs @@ -72,7 +72,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); @@ -122,7 +122,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/XFS.cs b/DiscImageChef.Tests/Filesystems/XFS.cs index ae8006168..9d75a20cd 100644 --- a/DiscImageChef.Tests/Filesystems/XFS.cs +++ b/DiscImageChef.Tests/Filesystems/XFS.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/Xia.cs b/DiscImageChef.Tests/Filesystems/Xia.cs index bcc4a0fa0..261812c83 100644 --- a/DiscImageChef.Tests/Filesystems/Xia.cs +++ b/DiscImageChef.Tests/Filesystems/Xia.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/ZFS.cs b/DiscImageChef.Tests/Filesystems/ZFS.cs index c979bb65c..4a9e227c8 100644 --- a/DiscImageChef.Tests/Filesystems/ZFS.cs +++ b/DiscImageChef.Tests/Filesystems/ZFS.cs @@ -61,7 +61,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); IFilesystem fs = new ZFS(); diff --git a/DiscImageChef.Tests/Filesystems/btrfs.cs b/DiscImageChef.Tests/Filesystems/btrfs.cs index 1bc46d3a2..636bdd6d1 100644 --- a/DiscImageChef.Tests/Filesystems/btrfs.cs +++ b/DiscImageChef.Tests/Filesystems/btrfs.cs @@ -63,7 +63,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); IPartition parts = new MBR(); diff --git a/DiscImageChef.Tests/Filesystems/exFAT.cs b/DiscImageChef.Tests/Filesystems/exFAT.cs index 4894dee5d..badfc50d0 100644 --- a/DiscImageChef.Tests/Filesystems/exFAT.cs +++ b/DiscImageChef.Tests/Filesystems/exFAT.cs @@ -62,7 +62,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -113,7 +113,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); @@ -164,7 +164,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); diff --git a/DiscImageChef.Tests/Filesystems/ext2.cs b/DiscImageChef.Tests/Filesystems/ext2.cs index bdb1bd38c..59c5d7bed 100644 --- a/DiscImageChef.Tests/Filesystems/ext2.cs +++ b/DiscImageChef.Tests/Filesystems/ext2.cs @@ -73,7 +73,7 @@ namespace DiscImageChef.Tests.Filesystems IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); IPartition parts = new MBR(); diff --git a/DiscImageChef.Tests/Images/2MG.cs b/DiscImageChef.Tests/Images/2MG.cs index a697da1c8..6036ac3f3 100644 --- a/DiscImageChef.Tests/Images/2MG.cs +++ b/DiscImageChef.Tests/Images/2MG.cs @@ -69,7 +69,7 @@ namespace DiscImageChef.Tests.Images IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new DiscImages.Apple2Mg(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); diff --git a/DiscImageChef.Tests/Images/Anex86.cs b/DiscImageChef.Tests/Images/Anex86.cs index e0b388ada..d42decbf0 100644 --- a/DiscImageChef.Tests/Images/Anex86.cs +++ b/DiscImageChef.Tests/Images/Anex86.cs @@ -73,7 +73,7 @@ namespace DiscImageChef.Tests.Images IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new DiscImages.Anex86(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); diff --git a/DiscImageChef.Tests/Images/CisCopy.cs b/DiscImageChef.Tests/Images/CisCopy.cs index f9ee58b58..3fad17d25 100644 --- a/DiscImageChef.Tests/Images/CisCopy.cs +++ b/DiscImageChef.Tests/Images/CisCopy.cs @@ -87,7 +87,7 @@ namespace DiscImageChef.Tests.Images IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new DiscImages.CisCopy(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); diff --git a/DiscImageChef.Tests/Images/CopyQM.cs b/DiscImageChef.Tests/Images/CopyQM.cs index 233f78fbe..b6dc1be4e 100644 --- a/DiscImageChef.Tests/Images/CopyQM.cs +++ b/DiscImageChef.Tests/Images/CopyQM.cs @@ -71,7 +71,7 @@ namespace DiscImageChef.Tests.Images IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new DiscImages.CopyQm(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); diff --git a/DiscImageChef.Tests/Images/D88.cs b/DiscImageChef.Tests/Images/D88.cs index b17993551..e84fdb930 100644 --- a/DiscImageChef.Tests/Images/D88.cs +++ b/DiscImageChef.Tests/Images/D88.cs @@ -89,7 +89,7 @@ namespace DiscImageChef.Tests.Images IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new DiscImages.D88(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); diff --git a/DiscImageChef.Tests/Images/DART.cs b/DiscImageChef.Tests/Images/DART.cs index d35a5eb4d..9f4c0bef3 100644 --- a/DiscImageChef.Tests/Images/DART.cs +++ b/DiscImageChef.Tests/Images/DART.cs @@ -70,7 +70,7 @@ namespace DiscImageChef.Tests.Images IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new DiscImages.D88(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); diff --git a/DiscImageChef.Tests/Images/DiskCopy42.cs b/DiscImageChef.Tests/Images/DiskCopy42.cs index 1fe1c1316..a1c2448e5 100644 --- a/DiscImageChef.Tests/Images/DiskCopy42.cs +++ b/DiscImageChef.Tests/Images/DiskCopy42.cs @@ -90,7 +90,7 @@ namespace DiscImageChef.Tests.Images IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new DiscImages.DiskCopy42(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); diff --git a/DiscImageChef.Tests/Partitions/Acorn.cs b/DiscImageChef.Tests/Partitions/Acorn.cs index 22aec9521..fb16b7847 100644 --- a/DiscImageChef.Tests/Partitions/Acorn.cs +++ b/DiscImageChef.Tests/Partitions/Acorn.cs @@ -102,7 +102,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef.Tests/Partitions/AppleMap.cs b/DiscImageChef.Tests/Partitions/AppleMap.cs index 92fcdfbb9..bf54cd5bc 100644 --- a/DiscImageChef.Tests/Partitions/AppleMap.cs +++ b/DiscImageChef.Tests/Partitions/AppleMap.cs @@ -2006,7 +2006,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef.Tests/Partitions/Atari.cs b/DiscImageChef.Tests/Partitions/Atari.cs index 6e79a273a..c34c37a76 100644 --- a/DiscImageChef.Tests/Partitions/Atari.cs +++ b/DiscImageChef.Tests/Partitions/Atari.cs @@ -318,7 +318,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef.Tests/Partitions/BSD.cs b/DiscImageChef.Tests/Partitions/BSD.cs index dd301fad0..03a6f4fb1 100644 --- a/DiscImageChef.Tests/Partitions/BSD.cs +++ b/DiscImageChef.Tests/Partitions/BSD.cs @@ -393,7 +393,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef.Tests/Partitions/GPT.cs b/DiscImageChef.Tests/Partitions/GPT.cs index 987a087f6..ef885e737 100644 --- a/DiscImageChef.Tests/Partitions/GPT.cs +++ b/DiscImageChef.Tests/Partitions/GPT.cs @@ -160,7 +160,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef.Tests/Partitions/MBR.cs b/DiscImageChef.Tests/Partitions/MBR.cs index e5d8531db..44a38dbbd 100644 --- a/DiscImageChef.Tests/Partitions/MBR.cs +++ b/DiscImageChef.Tests/Partitions/MBR.cs @@ -1946,7 +1946,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef.Tests/Partitions/MINIX.cs b/DiscImageChef.Tests/Partitions/MINIX.cs index 6d3bff60c..b2086feba 100644 --- a/DiscImageChef.Tests/Partitions/MINIX.cs +++ b/DiscImageChef.Tests/Partitions/MINIX.cs @@ -101,7 +101,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef.Tests/Partitions/PC98.cs b/DiscImageChef.Tests/Partitions/PC98.cs index f4e0f210b..b59dc39a4 100644 --- a/DiscImageChef.Tests/Partitions/PC98.cs +++ b/DiscImageChef.Tests/Partitions/PC98.cs @@ -380,7 +380,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new T98(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef.Tests/Partitions/RDB.cs b/DiscImageChef.Tests/Partitions/RDB.cs index f875d798b..f730833bc 100644 --- a/DiscImageChef.Tests/Partitions/RDB.cs +++ b/DiscImageChef.Tests/Partitions/RDB.cs @@ -230,7 +230,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef.Tests/Partitions/SGI.cs b/DiscImageChef.Tests/Partitions/SGI.cs index f9e641d3f..b97fc7741 100644 --- a/DiscImageChef.Tests/Partitions/SGI.cs +++ b/DiscImageChef.Tests/Partitions/SGI.cs @@ -223,7 +223,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef.Tests/Partitions/Sun.cs b/DiscImageChef.Tests/Partitions/Sun.cs index 6df7d511d..5045ff902 100644 --- a/DiscImageChef.Tests/Partitions/Sun.cs +++ b/DiscImageChef.Tests/Partitions/Sun.cs @@ -152,7 +152,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef.Tests/Partitions/VTOC.cs b/DiscImageChef.Tests/Partitions/VTOC.cs index 1ba531f16..49ebc45d2 100644 --- a/DiscImageChef.Tests/Partitions/VTOC.cs +++ b/DiscImageChef.Tests/Partitions/VTOC.cs @@ -201,7 +201,7 @@ namespace DiscImageChef.Tests.Partitions IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new Vdi(); - Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(true, image.Open(filter), testfiles[i]); List partitions = Core.Partitions.GetAll(image); Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]); for(int j = 0; j < partitions.Count; j++) diff --git a/DiscImageChef/Commands/Analyze.cs b/DiscImageChef/Commands/Analyze.cs index 2cb816e14..61e5d85cc 100644 --- a/DiscImageChef/Commands/Analyze.cs +++ b/DiscImageChef/Commands/Analyze.cs @@ -96,7 +96,7 @@ namespace DiscImageChef.Commands try { - if(!imageFormat.OpenImage(inputFilter)) + if(!imageFormat.Open(inputFilter)) { DicConsole.WriteLine("Unable to open image format"); DicConsole.WriteLine("No error given"); @@ -110,7 +110,7 @@ namespace DiscImageChef.Commands DicConsole.DebugWriteLine("Analyze command", "Image identifies disk type as {0}.", imageFormat.Info.MediaType); - Core.Statistics.AddMediaFormat(imageFormat.ImageFormat); + Core.Statistics.AddMediaFormat(imageFormat.Format); Core.Statistics.AddMedia(imageFormat.Info.MediaType, false); Core.Statistics.AddFilter(inputFilter.Name); } diff --git a/DiscImageChef/Commands/Checksum.cs b/DiscImageChef/Commands/Checksum.cs index 141ed978d..73871ae2a 100644 --- a/DiscImageChef/Commands/Checksum.cs +++ b/DiscImageChef/Commands/Checksum.cs @@ -81,8 +81,8 @@ namespace DiscImageChef.Commands return; } - inputFormat.OpenImage(inputFilter); - Core.Statistics.AddMediaFormat(inputFormat.ImageFormat); + inputFormat.Open(inputFilter); + Core.Statistics.AddMediaFormat(inputFormat.Format); Core.Statistics.AddMedia(inputFormat.Info.MediaType, false); Core.Statistics.AddFilter(inputFilter.Name); EnableChecksum enabledChecksums = new EnableChecksum(); diff --git a/DiscImageChef/Commands/Compare.cs b/DiscImageChef/Commands/Compare.cs index 192c30045..c47de930e 100644 --- a/DiscImageChef/Commands/Compare.cs +++ b/DiscImageChef/Commands/Compare.cs @@ -91,11 +91,11 @@ namespace DiscImageChef.Commands input2Format.Id); else DicConsole.WriteLine("Input file 2 format identified by {0}.", input2Format.Name); - input1Format.OpenImage(inputFilter1); - input2Format.OpenImage(inputFilter2); + input1Format.Open(inputFilter1); + input2Format.Open(inputFilter2); - Core.Statistics.AddMediaFormat(input1Format.ImageFormat); - Core.Statistics.AddMediaFormat(input2Format.ImageFormat); + Core.Statistics.AddMediaFormat(input1Format.Format); + Core.Statistics.AddMediaFormat(input2Format.Format); Core.Statistics.AddMedia(input1Format.Info.MediaType, false); Core.Statistics.AddMedia(input2Format.Info.MediaType, false); Core.Statistics.AddFilter(inputFilter1.Name); diff --git a/DiscImageChef/Commands/CreateSidecar.cs b/DiscImageChef/Commands/CreateSidecar.cs index 0eca236c7..5e87cce1e 100644 --- a/DiscImageChef/Commands/CreateSidecar.cs +++ b/DiscImageChef/Commands/CreateSidecar.cs @@ -104,7 +104,7 @@ namespace DiscImageChef.Commands try { - if(!imageFormat.OpenImage(inputFilter)) + if(!imageFormat.Open(inputFilter)) { DicConsole.WriteLine("Unable to open image format"); DicConsole.WriteLine("No error given"); @@ -120,7 +120,7 @@ namespace DiscImageChef.Commands return; } - Core.Statistics.AddMediaFormat(imageFormat.ImageFormat); + Core.Statistics.AddMediaFormat(imageFormat.Format); Core.Statistics.AddFilter(inputFilter.Name); CICMMetadataType sidecar = diff --git a/DiscImageChef/Commands/Decode.cs b/DiscImageChef/Commands/Decode.cs index 73a47d68d..a20868259 100644 --- a/DiscImageChef/Commands/Decode.cs +++ b/DiscImageChef/Commands/Decode.cs @@ -70,8 +70,8 @@ namespace DiscImageChef.Commands return; } - inputFormat.OpenImage(inputFilter); - Core.Statistics.AddMediaFormat(inputFormat.ImageFormat); + inputFormat.Open(inputFilter); + Core.Statistics.AddMediaFormat(inputFormat.Format); Core.Statistics.AddMedia(inputFormat.Info.MediaType, false); Core.Statistics.AddFilter(inputFilter.Name); diff --git a/DiscImageChef/Commands/Entropy.cs b/DiscImageChef/Commands/Entropy.cs index 10435c0db..dca993465 100644 --- a/DiscImageChef/Commands/Entropy.cs +++ b/DiscImageChef/Commands/Entropy.cs @@ -69,8 +69,8 @@ namespace DiscImageChef.Commands return; } - inputFormat.OpenImage(inputFilter); - Core.Statistics.AddMediaFormat(inputFormat.ImageFormat); + inputFormat.Open(inputFilter); + Core.Statistics.AddMediaFormat(inputFormat.Format); Core.Statistics.AddMedia(inputFormat.Info.MediaType, false); Core.Statistics.AddFilter(inputFilter.Name); double entropy = 0; diff --git a/DiscImageChef/Commands/ExtractFiles.cs b/DiscImageChef/Commands/ExtractFiles.cs index 8c58241b6..8889a311d 100644 --- a/DiscImageChef/Commands/ExtractFiles.cs +++ b/DiscImageChef/Commands/ExtractFiles.cs @@ -106,7 +106,7 @@ namespace DiscImageChef.Commands try { - if(!imageFormat.OpenImage(inputFilter)) + if(!imageFormat.Open(inputFilter)) { DicConsole.WriteLine("Unable to open image format"); DicConsole.WriteLine("No error given"); @@ -121,7 +121,7 @@ namespace DiscImageChef.Commands DicConsole.DebugWriteLine("Extract-Files command", "Image identifies disk type as {0}.", imageFormat.Info.MediaType); - Core.Statistics.AddMediaFormat(imageFormat.ImageFormat); + Core.Statistics.AddMediaFormat(imageFormat.Format); Core.Statistics.AddMedia(imageFormat.Info.MediaType, false); Core.Statistics.AddFilter(inputFilter.Name); } diff --git a/DiscImageChef/Commands/Ls.cs b/DiscImageChef/Commands/Ls.cs index 59f5e3c8b..e3215898b 100644 --- a/DiscImageChef/Commands/Ls.cs +++ b/DiscImageChef/Commands/Ls.cs @@ -94,7 +94,7 @@ namespace DiscImageChef.Commands try { - if(!imageFormat.OpenImage(inputFilter)) + if(!imageFormat.Open(inputFilter)) { DicConsole.WriteLine("Unable to open image format"); DicConsole.WriteLine("No error given"); @@ -108,7 +108,7 @@ namespace DiscImageChef.Commands DicConsole.DebugWriteLine("Ls command", "Image identifies disk type as {0}.", imageFormat.Info.MediaType); - Core.Statistics.AddMediaFormat(imageFormat.ImageFormat); + Core.Statistics.AddMediaFormat(imageFormat.Format); Core.Statistics.AddMedia(imageFormat.Info.MediaType, false); Core.Statistics.AddFilter(inputFilter.Name); } diff --git a/DiscImageChef/Commands/PrintHex.cs b/DiscImageChef/Commands/PrintHex.cs index ccc6817ea..768efeafc 100644 --- a/DiscImageChef/Commands/PrintHex.cs +++ b/DiscImageChef/Commands/PrintHex.cs @@ -66,7 +66,7 @@ namespace DiscImageChef.Commands return; } - inputFormat.OpenImage(inputFilter); + inputFormat.Open(inputFilter); for(ulong i = 0; i < options.Length; i++) { diff --git a/DiscImageChef/Commands/Verify.cs b/DiscImageChef/Commands/Verify.cs index 4a9e4ddcb..26860ad7b 100644 --- a/DiscImageChef/Commands/Verify.cs +++ b/DiscImageChef/Commands/Verify.cs @@ -66,8 +66,8 @@ namespace DiscImageChef.Commands return; } - inputFormat.OpenImage(inputFilter); - Core.Statistics.AddMediaFormat(inputFormat.ImageFormat); + inputFormat.Open(inputFilter); + Core.Statistics.AddMediaFormat(inputFormat.Format); Core.Statistics.AddMedia(inputFormat.Info.MediaType, false); Core.Statistics.AddFilter(inputFilter.Name);