From 3b8a6c344db879c2a11379b72be860de17c11fd6 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 20 Jan 2019 22:24:15 +0000 Subject: [PATCH] Move image and sector verification methods to new interfaces. --- DiscImageChef.CommonTypes.csproj | 2 + Interfaces/IMediaImage.cs | 23 ---------- Interfaces/IOpticalMediaImage.cs | 2 +- Interfaces/IVerifiableImage.cs | 50 +++++++++++++++++++++ Interfaces/IVerifiableSectorsImage.cs | 63 +++++++++++++++++++++++++++ 5 files changed, 116 insertions(+), 24 deletions(-) create mode 100644 Interfaces/IVerifiableImage.cs create mode 100644 Interfaces/IVerifiableSectorsImage.cs diff --git a/DiscImageChef.CommonTypes.csproj b/DiscImageChef.CommonTypes.csproj index 03d3dafbf..7800e7082 100644 --- a/DiscImageChef.CommonTypes.csproj +++ b/DiscImageChef.CommonTypes.csproj @@ -74,6 +74,8 @@ + + diff --git a/Interfaces/IMediaImage.cs b/Interfaces/IMediaImage.cs index 16ff53c39..b02a10e6f 100644 --- a/Interfaces/IMediaImage.cs +++ b/Interfaces/IMediaImage.cs @@ -135,28 +135,5 @@ namespace DiscImageChef.CommonTypes.Interfaces /// Starting sector address (LBA). /// How many sectors to read. byte[] ReadSectorsLong(ulong sectorAddress, uint length); - - /// - /// Verifies a sector. - /// - /// True if correct, false if incorrect, null if uncheckable. - /// Sector address (LBA). - bool? VerifySector(ulong sectorAddress); - - /// - /// Verifies several sectors. - /// - /// True if all are correct, false if any is incorrect, null if any is uncheckable. - /// Starting sector address (LBA). - /// How many sectors to read. - /// List of incorrect sectors - /// List of uncheckable sectors - bool? VerifySectors(ulong sectorAddress, uint length, out List failingLbas, out List unknownLbas); - - /// - /// Verifies media image internal checksum. - /// - /// True if correct, false if incorrect, null if there is no internal checksum available - bool? VerifyMediaImage(); } } \ No newline at end of file diff --git a/Interfaces/IOpticalMediaImage.cs b/Interfaces/IOpticalMediaImage.cs index a99beab79..7cb50c838 100644 --- a/Interfaces/IOpticalMediaImage.cs +++ b/Interfaces/IOpticalMediaImage.cs @@ -45,7 +45,7 @@ namespace DiscImageChef.CommonTypes.Interfaces /// /// Abstract class to implement disk image reading plugins. /// - public interface IOpticalMediaImage : IMediaImage, IPartitionableMediaImage + public interface IOpticalMediaImage : IMediaImage, IPartitionableMediaImage, IVerifiableSectorsImage { /// /// Gets the disc track extents (start, length). diff --git a/Interfaces/IVerifiableImage.cs b/Interfaces/IVerifiableImage.cs new file mode 100644 index 000000000..af6d77eda --- /dev/null +++ b/Interfaces/IVerifiableImage.cs @@ -0,0 +1,50 @@ +// /*************************************************************************** +// The Disc Image Chef +// ---------------------------------------------------------------------------- +// +// Filename : IVerifiableImage.cs +// Author(s) : Natalia Portillo +// +// Component : Disc image plugins. +// +// --[ Description ] ---------------------------------------------------------- +// +// Defines interface to be implemented by image plugins that can verify the +// image itself. +// +// --[ License ] -------------------------------------------------------------- +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// ---------------------------------------------------------------------------- +// Copyright © 2011-2019 Natalia Portillo +// ****************************************************************************/ + +namespace DiscImageChef.CommonTypes.Interfaces +{ + public interface IVerifiableImage + { + /// + /// Verifies media image internal checksum. + /// + /// True if correct, false if incorrect, null if there is no internal checksum available + bool? VerifyMediaImage(); + } +} \ No newline at end of file diff --git a/Interfaces/IVerifiableSectorsImage.cs b/Interfaces/IVerifiableSectorsImage.cs new file mode 100644 index 000000000..f9da0d59a --- /dev/null +++ b/Interfaces/IVerifiableSectorsImage.cs @@ -0,0 +1,63 @@ +// /*************************************************************************** +// The Disc Image Chef +// ---------------------------------------------------------------------------- +// +// Filename : IVerifiableSectorsImage.cs +// Author(s) : Natalia Portillo +// +// Component : Disc image plugins. +// +// --[ Description ] ---------------------------------------------------------- +// +// Defines interface to be implemented by image plugins that can verify the +// sectors contained in the image. +// +// --[ License ] -------------------------------------------------------------- +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// ---------------------------------------------------------------------------- +// Copyright © 2011-2019 Natalia Portillo +// ****************************************************************************/ + +using System.Collections.Generic; + +namespace DiscImageChef.CommonTypes.Interfaces +{ + public interface IVerifiableSectorsImage + { + /// + /// Verifies a sector. + /// + /// True if correct, false if incorrect, null if uncheckable. + /// Sector address (LBA). + bool? VerifySector(ulong sectorAddress); + + /// + /// Verifies several sectors. + /// + /// True if all are correct, false if any is incorrect, null if any is uncheckable. + /// Starting sector address (LBA). + /// How many sectors to read. + /// List of incorrect sectors + /// List of uncheckable sectors + bool? VerifySectors(ulong sectorAddress, uint length, out List failingLbas, out List unknownLbas); + } +} \ No newline at end of file