aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code styling.

Browse Source
This commit is contained in:
Natalia Portillo
2019-03-11 19:22:26 +00:00
parent e14c19279a
commit 7610f4f779
11 changed files with 142 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DiscImageChef.CommonTypes/Metadata/Resume.cs
View File

@@ -47,13 +47,17 @@ namespace DiscImageChef.CommonTypes.Metadata
[XmlRoot("DicResume", Namespace = "", IsNullable = false)] [XmlRoot("DicResume", Namespace = "", IsNullable = false)]
public class Resume public class Resume
{ {
[XmlElement(DataType = "dateTime")] public DateTime CreationDate; [XmlElement(DataType = "dateTime")]
[XmlElement(DataType = "dateTime")] public DateTime LastWriteDate; public DateTime CreationDate;
public bool Removable; [XmlElement(DataType = "dateTime")]
public ulong LastBlock; public DateTime LastWriteDate;
public ulong NextBlock; public bool Removable;
public ulong LastBlock;
public ulong NextBlock;
[XmlArrayItem("DumpTry")] public List<DumpHardwareType> Tries; [XmlArrayItem("DumpTry")]
[XmlArrayItem("Block")] public List<ulong> BadBlocks; public List<DumpHardwareType> Tries;
[XmlArrayItem("Block")]
public List<ulong> BadBlocks;
} }
} }

39
DiscImageChef.CommonTypes/Metadata/Statistics.cs
View File

@@ -142,34 +142,41 @@ namespace DiscImageChef.CommonTypes.Metadata
public class ChecksumStats public class ChecksumStats
{ {
[XmlAttribute] public string algorithm; [XmlAttribute]
[XmlText] public double Value; public string algorithm;
[XmlText]
public double Value;
} }
public class BenchmarkStats public class BenchmarkStats
{ {
public double All; public double All;
[XmlElement("Checksum")] public List<ChecksumStats> Checksum; [XmlElement("Checksum")]
public double Entropy; public List<ChecksumStats> Checksum;
public long MaxMemory; public double Entropy;
public long MinMemory; public long MaxMemory;
public double Sequential; public long MinMemory;
public double Sequential;
} }
public class MediaStats public class MediaStats
{ {
[XmlAttribute] public bool real; [XmlAttribute]
[XmlAttribute] public string type; public bool real;
[XmlText] public long Value; [XmlAttribute]
public string type;
[XmlText]
public long Value;
} }
public class DeviceStats public class DeviceStats
{ {
[XmlIgnore] public bool ManufacturerSpecified; [XmlIgnore]
public string Manufacturer { get; set; } public bool ManufacturerSpecified;
public string Model { get; set; } public string Manufacturer { get; set; }
public string Revision { get; set; } public string Model { get; set; }
public string Bus { get; set; } public string Revision { get; set; }
public string Bus { get; set; }
} }
public class NameValueStats public class NameValueStats

18
DiscImageChef.CommonTypes/Structs/Filesystems.cs
View File

@@ -247,13 +247,19 @@ namespace DiscImageChef.CommonTypes.Structs
[StructLayout(LayoutKind.Explicit)] [StructLayout(LayoutKind.Explicit)]
public struct FileSystemId public struct FileSystemId
{ {
[FieldOffset(0)] public bool IsInt; [FieldOffset(0)]
[FieldOffset(1)] public bool IsLong; public bool IsInt;
[FieldOffset(2)] public bool IsGuid; [FieldOffset(1)]
public bool IsLong;
[FieldOffset(2)]
public bool IsGuid;
[FieldOffset(3)] public uint Serial32; [FieldOffset(3)]
[FieldOffset(3)] public ulong Serial64; public uint Serial32;
[FieldOffset(3)] public Guid uuid; [FieldOffset(3)]
public ulong Serial64;
[FieldOffset(3)]
public Guid uuid;
} }
/// <summary> /// <summary>

1
DiscImageChef.Core/Statistics.cs
View File

@@ -812,7 +812,6 @@ namespace DiscImageChef.Core
#endif #endif
} }
IEnumerable<string> statsFiles = IEnumerable<string> statsFiles =
Directory.EnumerateFiles(Settings.Settings.StatsPath, "PartialStats_*.xml", Directory.EnumerateFiles(Settings.Settings.StatsPath, "PartialStats_*.xml",
SearchOption.TopDirectoryOnly); SearchOption.TopDirectoryOnly);

6
DiscImageChef.Devices/Enums.cs
View File

@@ -3473,7 +3473,8 @@ namespace DiscImageChef.Devices
/// Reads data stream from device, starting at given address, until a <see cref="StopTransmission" /> follows (ADTC, /// Reads data stream from device, starting at given address, until a <see cref="StopTransmission" /> follows (ADTC,
/// R1) /// R1)
/// </summary> /// </summary>
[Obsolete] ReadDatUntilStop = 11, [Obsolete]
ReadDatUntilStop = 11,
/// <summary> /// <summary>
/// Terminates a read/write stream/multiple block operation (AC, R1 / R1b) /// Terminates a read/write stream/multiple block operation (AC, R1 / R1b)
/// </summary> /// </summary>
@@ -3521,7 +3522,8 @@ namespace DiscImageChef.Devices
/// <summary> /// <summary>
/// Writes data stream from host until a <see cref="StopTransmission" /> follows (ADTC, R1) /// Writes data stream from host until a <see cref="StopTransmission" /> follows (ADTC, R1)
/// </summary> /// </summary>
[Obsolete] WriteDatUntilStop = 20, [Obsolete]
WriteDatUntilStop = 20,
#endregion Class 3 MMC Commands (Stream write) #endregion Class 3 MMC Commands (Stream write)
#region Class 4 MMC Commands (Block-oriented write) #region Class 4 MMC Commands (Block-oriented write)

36
DiscImageChef.Devices/FreeBSD/Structs.cs
View File

@@ -140,10 +140,14 @@ namespace DiscImageChef.Devices.FreeBSD
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
struct CamqEntry struct CamqEntry
{ {
[FieldOffset(0)] public ListEntry le; [FieldOffset(0)]
[FieldOffset(0)] public SlistEntry sle; public ListEntry le;
[FieldOffset(0)] public TailqEntry tqe; [FieldOffset(0)]
[FieldOffset(0)] public StailqEntry stqe; public SlistEntry sle;
[FieldOffset(0)]
public TailqEntry tqe;
[FieldOffset(0)]
public StailqEntry stqe;
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
@@ -540,8 +544,10 @@ namespace DiscImageChef.Devices.FreeBSD
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
struct DeviceMatchPatternData struct DeviceMatchPatternData
{ {
[FieldOffset(0)] public ScsiStaticInquiryPattern inq_pat; [FieldOffset(0)]
[FieldOffset(0)] public DeviceIdMatchPattern devid_pat; public ScsiStaticInquiryPattern inq_pat;
[FieldOffset(0)]
public DeviceIdMatchPattern devid_pat;
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
@@ -573,9 +579,12 @@ namespace DiscImageChef.Devices.FreeBSD
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
struct MatchPattern struct MatchPattern
{ {
[FieldOffset(0)] public PeriphMatchPattern periph_pattern; [FieldOffset(0)]
[FieldOffset(0)] public DeviceMatchPattern device_pattern; public PeriphMatchPattern periph_pattern;
[FieldOffset(0)] public BusMatchPattern bus_pattern; [FieldOffset(0)]
public DeviceMatchPattern device_pattern;
[FieldOffset(0)]
public BusMatchPattern bus_pattern;
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
@@ -695,9 +704,12 @@ namespace DiscImageChef.Devices.FreeBSD
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
struct MatchResult struct MatchResult
{ {
[FieldOffset(0)] public PeriphMatchResult periph_result; [FieldOffset(0)]
[FieldOffset(0)] public DeviceMatchResult device_result; public PeriphMatchResult periph_result;
[FieldOffset(0)] public BusMatchResult bus_result; [FieldOffset(0)]
public DeviceMatchResult device_result;
[FieldOffset(0)]
public BusMatchResult bus_result;
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]

92
DiscImageChef.Devices/Windows/Structs.cs
View File

@@ -41,18 +41,19 @@ namespace DiscImageChef.Devices.Windows
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
struct ScsiPassThroughDirect struct ScsiPassThroughDirect
{ {
public ushort Length; public ushort Length;
public byte ScsiStatus; public byte ScsiStatus;
public byte PathId; public byte PathId;
public byte TargetId; public byte TargetId;
public byte Lun; public byte Lun;
public byte CdbLength; public byte CdbLength;
public byte SenseInfoLength; public byte SenseInfoLength;
[MarshalAs(UnmanagedType.U1)] public ScsiIoctlDirection DataIn; [MarshalAs(UnmanagedType.U1)]
public uint DataTransferLength; public ScsiIoctlDirection DataIn;
public uint TimeOutValue; public uint DataTransferLength;
public IntPtr DataBuffer; public uint TimeOutValue;
public uint SenseInfoOffset; public IntPtr DataBuffer;
public uint SenseInfoOffset;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
public byte[] Cdb; public byte[] Cdb;
} }
@@ -76,7 +77,8 @@ namespace DiscImageChef.Devices.Windows
/// <summary> /// <summary>
/// Indicates transfer direction and kind of operation /// Indicates transfer direction and kind of operation
/// </summary> /// </summary>
[MarshalAs(UnmanagedType.U2)] public AtaFlags AtaFlags; [MarshalAs(UnmanagedType.U2)]
public AtaFlags AtaFlags;
/// <summary> /// <summary>
/// Indicates IDE port or bus, set by driver /// Indicates IDE port or bus, set by driver
/// </summary> /// </summary>
@@ -134,27 +136,39 @@ namespace DiscImageChef.Devices.Windows
struct AtaTaskFile struct AtaTaskFile
{ {
// Fields for commands sent // Fields for commands sent
[FieldOffset(0)] public byte Features; [FieldOffset(0)]
[FieldOffset(6)] public byte Command; public byte Features;
[FieldOffset(6)]
public byte Command;
// Fields on command return // Fields on command return
[FieldOffset(0)] public byte Error; [FieldOffset(0)]
[FieldOffset(6)] public byte Status; public byte Error;
[FieldOffset(6)]
public byte Status;
// Common fields // Common fields
[FieldOffset(1)] public byte SectorCount; [FieldOffset(1)]
[FieldOffset(2)] public byte SectorNumber; public byte SectorCount;
[FieldOffset(3)] public byte CylinderLow; [FieldOffset(2)]
[FieldOffset(4)] public byte CylinderHigh; public byte SectorNumber;
[FieldOffset(5)] public byte DeviceHead; [FieldOffset(3)]
[FieldOffset(7)] public byte Reserved; public byte CylinderLow;
[FieldOffset(4)]
public byte CylinderHigh;
[FieldOffset(5)]
public byte DeviceHead;
[FieldOffset(7)]
public byte Reserved;
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
struct StoragePropertyQuery struct StoragePropertyQuery
{ {
[MarshalAs(UnmanagedType.U4)] public StoragePropertyId PropertyId; [MarshalAs(UnmanagedType.U4)]
[MarshalAs(UnmanagedType.U4)] public StorageQueryType QueryType; public StoragePropertyId PropertyId;
[MarshalAs(UnmanagedType.U4)]
public StorageQueryType QueryType;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
public byte[] AdditionalParameters; public byte[] AdditionalParameters;
} }
@@ -170,19 +184,21 @@ namespace DiscImageChef.Devices.Windows
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
struct StorageDeviceDescriptor struct StorageDeviceDescriptor
{ {
public uint Version; public uint Version;
public uint Size; public uint Size;
public byte DeviceType; public byte DeviceType;
public byte DeviceTypeModifier; public byte DeviceTypeModifier;
[MarshalAs(UnmanagedType.U1)] public bool RemovableMedia; [MarshalAs(UnmanagedType.U1)]
[MarshalAs(UnmanagedType.U1)] public bool CommandQueueing; public bool RemovableMedia;
public int VendorIdOffset; [MarshalAs(UnmanagedType.U1)]
public int ProductIdOffset; public bool CommandQueueing;
public int ProductRevisionOffset; public int VendorIdOffset;
public int SerialNumberOffset; public int ProductIdOffset;
public StorageBusType BusType; public int ProductRevisionOffset;
public uint RawPropertiesLength; public int SerialNumberOffset;
public byte[] RawDeviceProperties; public StorageBusType BusType;
public uint RawPropertiesLength;
public byte[] RawDeviceProperties;
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]

10
DiscImageChef.Filesystems/ISO9660/Structs/Joliet.cs
View File

@@ -41,16 +41,18 @@ namespace DiscImageChef.Filesystems.ISO9660
{ {
DecodedVolumeDescriptor decodedVD = new DecodedVolumeDescriptor DecodedVolumeDescriptor decodedVD = new DecodedVolumeDescriptor
{ {
SystemIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.system_id).Replace('\u0000', ' ').TrimEnd(), SystemIdentifier =
VolumeIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.volume_id).Replace('\u0000', ' ').TrimEnd(), Encoding.BigEndianUnicode.GetString(jolietvd.system_id).Replace('\u0000', ' ').TrimEnd(),
VolumeIdentifier =
Encoding.BigEndianUnicode.GetString(jolietvd.volume_id).Replace('\u0000', ' ').TrimEnd(),
VolumeSetIdentifier = VolumeSetIdentifier =
Encoding.BigEndianUnicode.GetString(jolietvd.volume_set_id).Replace('\u0000', ' ').TrimEnd(), Encoding.BigEndianUnicode.GetString(jolietvd.volume_set_id).Replace('\u0000', ' ').TrimEnd(),
PublisherIdentifier = PublisherIdentifier =
Encoding.BigEndianUnicode.GetString(jolietvd.publisher_id).Replace('\u0000', ' ').TrimEnd(), Encoding.BigEndianUnicode.GetString(jolietvd.publisher_id).Replace('\u0000', ' ').TrimEnd(),
DataPreparerIdentifier = DataPreparerIdentifier =
Encoding.BigEndianUnicode.GetString(jolietvd.preparer_id).Replace('\u0000', ' ').TrimEnd(), Encoding.BigEndianUnicode.GetString(jolietvd.preparer_id).Replace('\u0000', ' ').TrimEnd(),
ApplicationIdentifier = ApplicationIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.application_id)
Encoding.BigEndianUnicode.GetString(jolietvd.application_id).Replace('\u0000', ' ').TrimEnd() .Replace('\u0000', ' ').TrimEnd()
}; };
if(jolietvd.creation_date[0] < 0x31 || jolietvd.creation_date[0] > 0x39) if(jolietvd.creation_date[0] < 0x31 || jolietvd.creation_date[0] > 0x39)

10
DiscImageChef.Filters/LZip.cs
View File

@@ -126,9 +126,8 @@ namespace DiscImageChef.Filters
dataStream.Read(tmp, 0, 8); dataStream.Read(tmp, 0, 8);
decompressedSize = BitConverter.ToInt64(tmp, 0); decompressedSize = BitConverter.ToInt64(tmp, 0);
dataStream.Seek(0, SeekOrigin.Begin); dataStream.Seek(0, SeekOrigin.Begin);
innerStream = innerStream = new ForcedSeekStream<LZipStream>(decompressedSize, dataStream, CompressionMode.Decompress);
new ForcedSeekStream<LZipStream>(decompressedSize, dataStream, CompressionMode.Decompress); opened = true;
opened = true;
} }
public void Open(string path) public void Open(string path)
@@ -144,9 +143,8 @@ namespace DiscImageChef.Filters
dataStream.Read(tmp, 0, 8); dataStream.Read(tmp, 0, 8);
decompressedSize = BitConverter.ToInt64(tmp, 0); decompressedSize = BitConverter.ToInt64(tmp, 0);
dataStream.Seek(0, SeekOrigin.Begin); dataStream.Seek(0, SeekOrigin.Begin);
innerStream = innerStream = new ForcedSeekStream<LZipStream>(decompressedSize, dataStream, CompressionMode.Decompress);
new ForcedSeekStream<LZipStream>(decompressedSize, dataStream, CompressionMode.Decompress); opened = true;
opened = true;
} }
public DateTime GetCreationTime() => creationTime; public DateTime GetCreationTime() => creationTime;

5
DiscImageChef.Filters/OffsetStream.cs
View File

@@ -33,6 +33,7 @@
using System; using System;
using System.IO; using System.IO;
using Microsoft.Win32.SafeHandles; using Microsoft.Win32.SafeHandles;
#if !NETSTANDARD2_0 #if !NETSTANDARD2_0
using System.Security.AccessControl; using System.Security.AccessControl;
#endif #endif
@@ -386,7 +387,7 @@ namespace DiscImageChef.Filters
if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number."); if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
streamStart = start; streamStart = start;
streamEnd = end; streamEnd = end;
baseStream = new FileStream(path, mode, rights, share, bufferSize, options); baseStream = new FileStream(path, mode, rights, share, bufferSize, options);
@@ -402,7 +403,7 @@ namespace DiscImageChef.Filters
if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number."); if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
streamStart = start; streamStart = start;
streamEnd = end; streamEnd = end;
baseStream = new FileStream(path, mode, rights, share, bufferSize, options, fileSecurity); baseStream = new FileStream(path, mode, rights, share, bufferSize, options, fileSecurity);

5
DiscImageChef/Commands/Entropy.cs
View File

@@ -152,10 +152,7 @@ namespace DiscImageChef.Commands
} }
} }
if(!wholeDisc) if(!wholeDisc) return (int)ErrorNumber.NoError;
{
return (int)ErrorNumber.NoError;
}
EntropyResults entropy = entropyCalculator.CalculateMediaEntropy(duplicatedSectors); EntropyResults entropy = entropyCalculator.CalculateMediaEntropy(duplicatedSectors);