From 7d5b951399d518f518f77719ed40ceeb0ba47b1b Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 27 Nov 2018 01:42:25 +0000 Subject: [PATCH] Use List instead of Array in device report. --- Metadata/DeviceReportV2.cs | 97 +++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/Metadata/DeviceReportV2.cs b/Metadata/DeviceReportV2.cs index 99491ee..28f3f72 100644 --- a/Metadata/DeviceReportV2.cs +++ b/Metadata/DeviceReportV2.cs @@ -37,6 +37,7 @@ // ****************************************************************************/ using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using DiscImageChef.CommonTypes.Enums; using DiscImageChef.Decoders.ATA; @@ -96,10 +97,10 @@ namespace DiscImageChef.CommonTypes.Metadata { public Identify.IdentifyDevice? IdentifyDevice; [JsonIgnore] - public int Id { get; set; } - public byte[] Identify { get; set; } - public TestedMedia ReadCapabilities { get; set; } - public TestedMedia[] RemovableMedias { get; set; } + public int Id { get; set; } + public byte[] Identify { get; set; } + public TestedMedia ReadCapabilities { get; set; } + public List RemovableMedias { get; set; } } public class Chs @@ -115,33 +116,33 @@ namespace DiscImageChef.CommonTypes.Metadata { public Inquiry.SCSIInquiry? Inquiry; [JsonIgnore] - public int Id { get; set; } - public byte[] InquiryData { get; set; } - public ScsiPage[] EVPDPages { get; set; } - public bool SupportsModeSense6 { get; set; } - public bool SupportsModeSense10 { get; set; } - public bool SupportsModeSubpages { get; set; } - public ScsiMode ModeSense { get; set; } - public Mmc MultiMediaDevice { get; set; } - public TestedMedia ReadCapabilities { get; set; } - public TestedMedia[] RemovableMedias { get; set; } - public Ssc SequentialDevice { get; set; } - public byte[] ModeSense6Data { get; set; } - public byte[] ModeSense10Data { get; set; } + public int Id { get; set; } + public byte[] InquiryData { get; set; } + public List EVPDPages { get; set; } + public bool SupportsModeSense6 { get; set; } + public bool SupportsModeSense10 { get; set; } + public bool SupportsModeSubpages { get; set; } + public ScsiMode ModeSense { get; set; } + public Mmc MultiMediaDevice { get; set; } + public TestedMedia ReadCapabilities { get; set; } + public List RemovableMedias { get; set; } + public Ssc SequentialDevice { get; set; } + public byte[] ModeSense6Data { get; set; } + public byte[] ModeSense10Data { get; set; } } public class ScsiMode { [JsonIgnore] - public int Id { get; set; } - public byte? MediumType { get; set; } - public bool WriteProtected { get; set; } - public BlockDescriptor[] BlockDescriptors { get; set; } - public byte? Speed { get; set; } - public byte? BufferedMode { get; set; } - public bool BlankCheckEnabled { get; set; } - public bool DPOandFUA { get; set; } - public ScsiPage[] ModePages { get; set; } + public int Id { get; set; } + public byte? MediumType { get; set; } + public bool WriteProtected { get; set; } + public List BlockDescriptors { get; set; } + public byte? Speed { get; set; } + public byte? BufferedMode { get; set; } + public bool BlankCheckEnabled { get; set; } + public bool DPOandFUA { get; set; } + public List ModePages { get; set; } } public class BlockDescriptor @@ -168,7 +169,7 @@ namespace DiscImageChef.CommonTypes.Metadata public int Id { get; set; } public Modes.ModePage_2A ModeSense2A { get; set; } public MmcFeatures Features { get; set; } - public TestedMedia[] TestedMedia { get; set; } + public List TestedMedia { get; set; } } public class MmcFeatures @@ -407,24 +408,24 @@ namespace DiscImageChef.CommonTypes.Metadata public uint? MaxBlockLength { get; set; } public uint? MinBlockLength { get; set; } - public SupportedDensity[] SupportedDensities { get; set; } - public SscSupportedMedia[] SupportedMediaTypes { get; set; } - public TestedSequentialMedia[] TestedMedia { get; set; } + public List SupportedDensities { get; set; } + public List SupportedMediaTypes { get; set; } + public List TestedMedia { get; set; } } public class TestedSequentialMedia { [JsonIgnore] - public int Id { get; set; } - public bool? CanReadMediaSerial { get; set; } - public byte? Density { get; set; } - public string Manufacturer { get; set; } - public bool MediaIsRecognized { get; set; } - public byte? MediumType { get; set; } - public string MediumTypeName { get; set; } - public string Model { get; set; } - public SupportedDensity[] SupportedDensities { get; set; } - public SscSupportedMedia[] SupportedMediaTypes { get; set; } + public int Id { get; set; } + public bool? CanReadMediaSerial { get; set; } + public byte? Density { get; set; } + public string Manufacturer { get; set; } + public bool MediaIsRecognized { get; set; } + public byte? MediumType { get; set; } + public string MediumTypeName { get; set; } + public string Model { get; set; } + public List SupportedDensities { get; set; } + public List SupportedMediaTypes { get; set; } public byte[] ModeSense6Data { get; set; } public byte[] ModeSense10Data { get; set; } @@ -457,14 +458,14 @@ namespace DiscImageChef.CommonTypes.Metadata public class SscSupportedMedia { [JsonIgnore] - public int Id { get; set; } - public byte MediumType { get; set; } - public DensityCode[] DensityCodes { get; set; } - public ushort Width { get; set; } - public ushort Length { get; set; } - public string Organization { get; set; } - public string Name { get; set; } - public string Description { get; set; } + public int Id { get; set; } + public byte MediumType { get; set; } + public List DensityCodes { get; set; } + public ushort Width { get; set; } + public ushort Length { get; set; } + public string Organization { get; set; } + public string Name { get; set; } + public string Description { get; set; } } public class DensityCode