diff --git a/CdOffsetDto.cs b/CdOffsetDto.cs
index e71b77e69..6acf0c19e 100644
--- a/CdOffsetDto.cs
+++ b/CdOffsetDto.cs
@@ -32,37 +32,36 @@
using Aaru.CommonTypes.Metadata;
-namespace Aaru.Dto
+namespace Aaru.Dto;
+
+///
+///
+/// DTO from a CD drive read offset
+///
+public class CdOffsetDto : CdOffset
{
- ///
///
- /// DTO from a CD drive read offset
+ /// Build an empty DTO
///
- public class CdOffsetDto : CdOffset
+ public CdOffsetDto() {}
+
+ ///
+ /// Build a DTO using the specified offset and database ID
+ ///
+ /// CD reading offset
+ /// Database ID
+ public CdOffsetDto(CdOffset offset, int id)
{
- ///
- /// Build an empty DTO
- ///
- public CdOffsetDto() {}
-
- ///
- /// Build a DTO using the specified offset and database ID
- ///
- /// CD reading offset
- /// Database ID
- public CdOffsetDto(CdOffset offset, int id)
- {
- Manufacturer = offset.Manufacturer;
- Model = offset.Model;
- Offset = offset.Offset;
- Submissions = offset.Submissions;
- Agreement = offset.Agreement;
- Id = id;
- }
-
- ///
- /// Database ID
- ///
- public int Id { get; set; }
+ Manufacturer = offset.Manufacturer;
+ Model = offset.Model;
+ Offset = offset.Offset;
+ Submissions = offset.Submissions;
+ Agreement = offset.Agreement;
+ Id = id;
}
+
+ ///
+ /// Database ID
+ ///
+ public int Id { get; set; }
}
\ No newline at end of file
diff --git a/DeviceDto.cs b/DeviceDto.cs
index 4b2049042..1fe59007b 100644
--- a/DeviceDto.cs
+++ b/DeviceDto.cs
@@ -35,244 +35,243 @@ using Aaru.CommonTypes.Metadata;
// ReSharper disable VirtualMemberCallInConstructor
-namespace Aaru.Dto
+namespace Aaru.Dto;
+
+///
+/// DTO for known device
+///
+public class DeviceDto : DeviceReportV2
{
///
- /// DTO for known device
+ /// Build an empty DTO
///
- public class DeviceDto : DeviceReportV2
+ public DeviceDto() {}
+
+ ///
+ /// Build a DTO from a device report
+ ///
+ /// Device report
+ public DeviceDto(DeviceReportV2 report)
{
- ///
- /// Build an empty DTO
- ///
- public DeviceDto() {}
+ ATA = report.ATA;
+ ATAPI = report.ATAPI;
+ CompactFlash = report.CompactFlash;
+ FireWire = report.FireWire;
+ MultiMediaCard = report.MultiMediaCard;
+ PCMCIA = report.PCMCIA;
+ SCSI = report.SCSI;
+ SecureDigital = report.SecureDigital;
+ USB = report.USB;
+ Manufacturer = report.Manufacturer;
+ Model = report.Model;
+ Revision = report.Revision;
+ Type = report.Type;
+ GdRomSwapDiscCapabilities = report.GdRomSwapDiscCapabilities;
+ }
- ///
- /// Build a DTO from a device report
- ///
- /// Device report
- public DeviceDto(DeviceReportV2 report)
+ ///
+ /// Build a DTO from a device report with the specified parameters
+ ///
+ /// Device report
+ /// Database ID
+ /// Optimal number of blocks for read
+ /// Can read GD-ROM using swap trick?
+ public DeviceDto(DeviceReportV2 report, int id, int optimalMultipleSectorsRead, bool? canReadGdRomUsingSwapDisc)
+ {
+ ATA = report.ATA;
+ ATAPI = report.ATAPI;
+ CompactFlash = report.CompactFlash;
+ FireWire = report.FireWire;
+ MultiMediaCard = report.MultiMediaCard;
+ PCMCIA = report.PCMCIA;
+ SCSI = report.SCSI;
+ SecureDigital = report.SecureDigital;
+ USB = report.USB;
+ Manufacturer = report.Manufacturer;
+ Model = report.Model;
+ Revision = report.Revision;
+ Type = report.Type;
+ GdRomSwapDiscCapabilities = report.GdRomSwapDiscCapabilities;
+
+ if(ATA != null)
{
- ATA = report.ATA;
- ATAPI = report.ATAPI;
- CompactFlash = report.CompactFlash;
- FireWire = report.FireWire;
- MultiMediaCard = report.MultiMediaCard;
- PCMCIA = report.PCMCIA;
- SCSI = report.SCSI;
- SecureDigital = report.SecureDigital;
- USB = report.USB;
- Manufacturer = report.Manufacturer;
- Model = report.Model;
- Revision = report.Revision;
- Type = report.Type;
- GdRomSwapDiscCapabilities = report.GdRomSwapDiscCapabilities;
+ ATA.Identify = null;
+ ATA.ReadCapabilities = ClearBinaries(ATA.ReadCapabilities);
+
+ if(ATA.RemovableMedias != null)
+ {
+ TestedMedia[] medias = ATA.RemovableMedias.ToArray();
+ ATA.RemovableMedias = new List();
+
+ foreach(TestedMedia media in medias)
+ ATA.RemovableMedias.Add(ClearBinaries(media));
+ }
}
- ///
- /// Build a DTO from a device report with the specified parameters
- ///
- /// Device report
- /// Database ID
- /// Optimal number of blocks for read
- /// Can read GD-ROM using swap trick?
- public DeviceDto(DeviceReportV2 report, int id, int optimalMultipleSectorsRead, bool? canReadGdRomUsingSwapDisc)
+ if(ATAPI != null)
{
- ATA = report.ATA;
- ATAPI = report.ATAPI;
- CompactFlash = report.CompactFlash;
- FireWire = report.FireWire;
- MultiMediaCard = report.MultiMediaCard;
- PCMCIA = report.PCMCIA;
- SCSI = report.SCSI;
- SecureDigital = report.SecureDigital;
- USB = report.USB;
- Manufacturer = report.Manufacturer;
- Model = report.Model;
- Revision = report.Revision;
- Type = report.Type;
- GdRomSwapDiscCapabilities = report.GdRomSwapDiscCapabilities;
+ ATAPI.Identify = null;
+ ATAPI.ReadCapabilities = ClearBinaries(ATAPI.ReadCapabilities);
- if(ATA != null)
+ if(ATAPI.RemovableMedias != null)
{
- ATA.Identify = null;
- ATA.ReadCapabilities = ClearBinaries(ATA.ReadCapabilities);
+ TestedMedia[] medias = ATAPI.RemovableMedias.ToArray();
+ ATAPI.RemovableMedias = new List();
- if(ATA.RemovableMedias != null)
- {
- TestedMedia[] medias = ATA.RemovableMedias.ToArray();
- ATA.RemovableMedias = new List();
-
- foreach(TestedMedia media in medias)
- ATA.RemovableMedias.Add(ClearBinaries(media));
- }
+ foreach(TestedMedia media in medias)
+ ATAPI.RemovableMedias.Add(ClearBinaries(media));
}
-
- if(ATAPI != null)
- {
- ATAPI.Identify = null;
- ATAPI.ReadCapabilities = ClearBinaries(ATAPI.ReadCapabilities);
-
- if(ATAPI.RemovableMedias != null)
- {
- TestedMedia[] medias = ATAPI.RemovableMedias.ToArray();
- ATAPI.RemovableMedias = new List();
-
- foreach(TestedMedia media in medias)
- ATAPI.RemovableMedias.Add(ClearBinaries(media));
- }
- }
-
- if(PCMCIA != null)
- {
- PCMCIA.AdditionalInformation = null;
- PCMCIA.CIS = null;
- }
-
- MultiMediaCard = null;
- SecureDigital = null;
-
- if(SCSI != null)
- {
- SCSI.EVPDPages = null;
- SCSI.InquiryData = null;
- SCSI.ModeSense6Data = null;
- SCSI.ModeSense10Data = null;
- SCSI.ModeSense6CurrentData = null;
- SCSI.ModeSense10CurrentData = null;
- SCSI.ModeSense6ChangeableData = null;
- SCSI.ModeSense10ChangeableData = null;
- SCSI.ReadCapabilities = ClearBinaries(SCSI.ReadCapabilities);
-
- if(SCSI.ModeSense != null)
- {
- SCSI.ModeSense.BlockDescriptors = null;
- SCSI.ModeSense.ModePages = null;
- }
-
- if(SCSI.RemovableMedias != null)
- {
- TestedMedia[] medias = SCSI.RemovableMedias.ToArray();
- SCSI.RemovableMedias = new List();
-
- foreach(TestedMedia media in medias)
- SCSI.RemovableMedias.Add(ClearBinaries(media));
- }
-
- if(SCSI.MultiMediaDevice != null)
- {
- SCSI.MultiMediaDevice.ModeSense2AData = null;
-
- if(SCSI.MultiMediaDevice.Features != null)
- SCSI.MultiMediaDevice.Features.BinaryData = null;
-
- if(SCSI.MultiMediaDevice.TestedMedia != null)
- {
- TestedMedia[] medias = SCSI.MultiMediaDevice.TestedMedia.ToArray();
- SCSI.MultiMediaDevice.TestedMedia = new List();
-
- foreach(TestedMedia media in medias)
- SCSI.MultiMediaDevice.TestedMedia.Add(ClearBinaries(media));
- }
- }
-
- SCSI.SequentialDevice = null;
- }
-
- if(USB != null)
- USB.Descriptors = null;
-
- Id = id;
- OptimalMultipleSectorsRead = optimalMultipleSectorsRead;
- CanReadGdRomUsingSwapDisc = canReadGdRomUsingSwapDisc;
}
- ///
- /// Optimal maximum number of transfer blocks to read
- ///
- public int OptimalMultipleSectorsRead { get; set; }
-
- ///
- /// Can read GD-ROM using disc swap trick?
- ///
- public bool? CanReadGdRomUsingSwapDisc { get; set; }
-
- ///
- /// Database ID
- ///
- public new int Id { get; set; }
-
- static TestedMedia ClearBinaries(TestedMedia media)
+ if(PCMCIA != null)
{
- if(media is null)
- return null;
-
- media.AdipData = null;
- media.AtipData = null;
- media.BluBcaData = null;
- media.BluDdsData = null;
- media.BluDiData = null;
- media.BluPacData = null;
- media.BluSaiData = null;
- media.C2PointersData = null;
- media.CmiData = null;
- media.CorrectedSubchannelData = null;
- media.CorrectedSubchannelWithC2Data = null;
- media.DcbData = null;
- media.DmiData = null;
- media.DvdAacsData = null;
- media.DvdBcaData = null;
- media.DvdDdsData = null;
- media.DvdLayerData = null;
- media.DvdSaiData = null;
- media.EmbossedPfiData = null;
- media.FullTocData = null;
- media.HdCmiData = null;
- media.HLDTSTReadRawDVDData = null;
- media.IdentifyData = null;
- media.LeadInData = null;
- media.LeadOutData = null;
- media.ModeSense6Data = null;
- media.ModeSense10Data = null;
- media.NecReadCddaData = null;
- media.PfiData = null;
- media.PioneerReadCddaData = null;
- media.PioneerReadCddaMsfData = null;
- media.PlextorReadCddaData = null;
- media.PlextorReadRawDVDData = null;
- media.PmaData = null;
- media.PQSubchannelData = null;
- media.PQSubchannelWithC2Data = null;
- media.PriData = null;
- media.Read6Data = null;
- media.Read10Data = null;
- media.Read12Data = null;
- media.Read16Data = null;
- media.ReadCdData = null;
- media.ReadCdFullData = null;
- media.ReadCdMsfData = null;
- media.ReadCdMsfFullData = null;
- media.ReadDmaData = null;
- media.ReadDmaLba48Data = null;
- media.ReadDmaLbaData = null;
- media.ReadDmaRetryData = null;
- media.ReadLba48Data = null;
- media.ReadLbaData = null;
- media.ReadLong10Data = null;
- media.ReadLong16Data = null;
- media.ReadLongData = null;
- media.ReadLongLbaData = null;
- media.ReadLongRetryData = null;
- media.ReadLongRetryLbaData = null;
- media.ReadRetryLbaData = null;
- media.ReadSectorsData = null;
- media.ReadSectorsRetryData = null;
- media.RWSubchannelData = null;
- media.RWSubchannelWithC2Data = null;
- media.TocData = null;
- media.Track1PregapData = null;
-
- return media;
+ PCMCIA.AdditionalInformation = null;
+ PCMCIA.CIS = null;
}
+
+ MultiMediaCard = null;
+ SecureDigital = null;
+
+ if(SCSI != null)
+ {
+ SCSI.EVPDPages = null;
+ SCSI.InquiryData = null;
+ SCSI.ModeSense6Data = null;
+ SCSI.ModeSense10Data = null;
+ SCSI.ModeSense6CurrentData = null;
+ SCSI.ModeSense10CurrentData = null;
+ SCSI.ModeSense6ChangeableData = null;
+ SCSI.ModeSense10ChangeableData = null;
+ SCSI.ReadCapabilities = ClearBinaries(SCSI.ReadCapabilities);
+
+ if(SCSI.ModeSense != null)
+ {
+ SCSI.ModeSense.BlockDescriptors = null;
+ SCSI.ModeSense.ModePages = null;
+ }
+
+ if(SCSI.RemovableMedias != null)
+ {
+ TestedMedia[] medias = SCSI.RemovableMedias.ToArray();
+ SCSI.RemovableMedias = new List();
+
+ foreach(TestedMedia media in medias)
+ SCSI.RemovableMedias.Add(ClearBinaries(media));
+ }
+
+ if(SCSI.MultiMediaDevice != null)
+ {
+ SCSI.MultiMediaDevice.ModeSense2AData = null;
+
+ if(SCSI.MultiMediaDevice.Features != null)
+ SCSI.MultiMediaDevice.Features.BinaryData = null;
+
+ if(SCSI.MultiMediaDevice.TestedMedia != null)
+ {
+ TestedMedia[] medias = SCSI.MultiMediaDevice.TestedMedia.ToArray();
+ SCSI.MultiMediaDevice.TestedMedia = new List();
+
+ foreach(TestedMedia media in medias)
+ SCSI.MultiMediaDevice.TestedMedia.Add(ClearBinaries(media));
+ }
+ }
+
+ SCSI.SequentialDevice = null;
+ }
+
+ if(USB != null)
+ USB.Descriptors = null;
+
+ Id = id;
+ OptimalMultipleSectorsRead = optimalMultipleSectorsRead;
+ CanReadGdRomUsingSwapDisc = canReadGdRomUsingSwapDisc;
+ }
+
+ ///
+ /// Optimal maximum number of transfer blocks to read
+ ///
+ public int OptimalMultipleSectorsRead { get; set; }
+
+ ///
+ /// Can read GD-ROM using disc swap trick?
+ ///
+ public bool? CanReadGdRomUsingSwapDisc { get; set; }
+
+ ///
+ /// Database ID
+ ///
+ public new int Id { get; set; }
+
+ static TestedMedia ClearBinaries(TestedMedia media)
+ {
+ if(media is null)
+ return null;
+
+ media.AdipData = null;
+ media.AtipData = null;
+ media.BluBcaData = null;
+ media.BluDdsData = null;
+ media.BluDiData = null;
+ media.BluPacData = null;
+ media.BluSaiData = null;
+ media.C2PointersData = null;
+ media.CmiData = null;
+ media.CorrectedSubchannelData = null;
+ media.CorrectedSubchannelWithC2Data = null;
+ media.DcbData = null;
+ media.DmiData = null;
+ media.DvdAacsData = null;
+ media.DvdBcaData = null;
+ media.DvdDdsData = null;
+ media.DvdLayerData = null;
+ media.DvdSaiData = null;
+ media.EmbossedPfiData = null;
+ media.FullTocData = null;
+ media.HdCmiData = null;
+ media.HLDTSTReadRawDVDData = null;
+ media.IdentifyData = null;
+ media.LeadInData = null;
+ media.LeadOutData = null;
+ media.ModeSense6Data = null;
+ media.ModeSense10Data = null;
+ media.NecReadCddaData = null;
+ media.PfiData = null;
+ media.PioneerReadCddaData = null;
+ media.PioneerReadCddaMsfData = null;
+ media.PlextorReadCddaData = null;
+ media.PlextorReadRawDVDData = null;
+ media.PmaData = null;
+ media.PQSubchannelData = null;
+ media.PQSubchannelWithC2Data = null;
+ media.PriData = null;
+ media.Read6Data = null;
+ media.Read10Data = null;
+ media.Read12Data = null;
+ media.Read16Data = null;
+ media.ReadCdData = null;
+ media.ReadCdFullData = null;
+ media.ReadCdMsfData = null;
+ media.ReadCdMsfFullData = null;
+ media.ReadDmaData = null;
+ media.ReadDmaLba48Data = null;
+ media.ReadDmaLbaData = null;
+ media.ReadDmaRetryData = null;
+ media.ReadLba48Data = null;
+ media.ReadLbaData = null;
+ media.ReadLong10Data = null;
+ media.ReadLong16Data = null;
+ media.ReadLongData = null;
+ media.ReadLongLbaData = null;
+ media.ReadLongRetryData = null;
+ media.ReadLongRetryLbaData = null;
+ media.ReadRetryLbaData = null;
+ media.ReadSectorsData = null;
+ media.ReadSectorsRetryData = null;
+ media.RWSubchannelData = null;
+ media.RWSubchannelWithC2Data = null;
+ media.TocData = null;
+ media.Track1PregapData = null;
+
+ return media;
}
}
\ No newline at end of file
diff --git a/UsbProductDto.cs b/UsbProductDto.cs
index c104b7257..8c8ab6306 100644
--- a/UsbProductDto.cs
+++ b/UsbProductDto.cs
@@ -30,28 +30,27 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.Dto
+namespace Aaru.Dto;
+
+///
+/// DTO for USB product field
+///
+public class UsbProductDto
{
///
- /// DTO for USB product field
+ /// Database ID
///
- public class UsbProductDto
- {
- ///
- /// Database ID
- ///
- public int Id { get; set; }
- ///
- /// Product ID
- ///
- public ushort ProductId { get; set; }
- ///
- /// Product name
- ///
- public string Product { get; set; }
- ///
- /// Vendor ID
- ///
- public ushort VendorId { get; set; }
- }
+ public int Id { get; set; }
+ ///
+ /// Product ID
+ ///
+ public ushort ProductId { get; set; }
+ ///
+ /// Product name
+ ///
+ public string Product { get; set; }
+ ///
+ /// Vendor ID
+ ///
+ public ushort VendorId { get; set; }
}
\ No newline at end of file
diff --git a/UsbVendorDto.cs b/UsbVendorDto.cs
index 3c2c58a6c..99f603acd 100644
--- a/UsbVendorDto.cs
+++ b/UsbVendorDto.cs
@@ -30,20 +30,19 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.Dto
+namespace Aaru.Dto;
+
+///
+/// DTO for USB vendor field
+///
+public class UsbVendorDto
{
///
- /// DTO for USB vendor field
+ /// Vendor ID
///
- public class UsbVendorDto
- {
- ///
- /// Vendor ID
- ///
- public ushort VendorId { get; set; }
- ///
- /// Vendor
- ///
- public string Vendor { get; set; }
- }
+ public ushort VendorId { get; set; }
+ ///
+ /// Vendor
+ ///
+ public string Vendor { get; set; }
}
\ No newline at end of file