From 54c525cb439f090a44494988fb0089a6f62c3b55 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 29 Sep 2017 15:36:15 +0100 Subject: [PATCH] Added support for SD/MMC device reports. This makes it a first class citizen for #65 --- DiscImageChef.Server/ViewReport.aspx | 18 +++++ DiscImageChef.Server/ViewReport.aspx.cs | 68 +++++++++++++++++++ .../ViewReport.aspx.designer.cs | 26 ++++--- 3 files changed, 103 insertions(+), 9 deletions(-) diff --git a/DiscImageChef.Server/ViewReport.aspx b/DiscImageChef.Server/ViewReport.aspx index 19de8249..5036ce40 100644 --- a/DiscImageChef.Server/ViewReport.aspx +++ b/DiscImageChef.Server/ViewReport.aspx @@ -154,5 +154,23 @@ +
+
+ MultiMediaCard device:
+ + + <%# Container.DataItem?.ToString() ?? string.Empty%>
+
+
+
+
+
+ SecureDigital device:
+ + + <%# Container.DataItem?.ToString() ?? string.Empty%>
+
+
+
diff --git a/DiscImageChef.Server/ViewReport.aspx.cs b/DiscImageChef.Server/ViewReport.aspx.cs index 2668969d..ae21dc95 100644 --- a/DiscImageChef.Server/ViewReport.aspx.cs +++ b/DiscImageChef.Server/ViewReport.aspx.cs @@ -407,6 +407,74 @@ namespace DiscImageChef.Server else divScsi.Visible = false; + if(report.MultiMediaCard != null) + { + List mmcOneValue = new List(); + + if(report.MultiMediaCard.CID != null) + { + mmcOneValue.Add(Decoders.MMC.Decoders.PrettifyCID(report.MultiMediaCard.CID).Replace("\n", "
")); + mmcOneValue.Add(""); + } + + if(report.MultiMediaCard.CSD != null) + { + mmcOneValue.Add(Decoders.MMC.Decoders.PrettifyCSD(report.MultiMediaCard.CSD).Replace("\n", "
")); + mmcOneValue.Add(""); + } + + if(report.MultiMediaCard.ExtendedCSD != null) + { + mmcOneValue.Add(Decoders.MMC.Decoders.PrettifyExtendedCSD(report.MultiMediaCard.ExtendedCSD).Replace("\n", "
")); + mmcOneValue.Add(""); + } + + if(report.MultiMediaCard.OCR != null) + { + mmcOneValue.Add(Decoders.MMC.Decoders.PrettifyCSD(report.MultiMediaCard.OCR).Replace("\n", "
")); + mmcOneValue.Add(""); + } + + repMMC.DataSource = mmcOneValue; + repMMC.DataBind(); + } + else + divMMC.Visible = false; + + if(report.SecureDigital != null) + { + List sdOneValue = new List(); + + if(report.SecureDigital.CID != null) + { + sdOneValue.Add(Decoders.SecureDigital.Decoders.PrettifyCID(report.SecureDigital.CID).Replace("\n", "
")); + sdOneValue.Add(""); + } + + if(report.SecureDigital.CSD != null) + { + sdOneValue.Add(Decoders.SecureDigital.Decoders.PrettifyCSD(report.SecureDigital.CSD).Replace("\n", "
")); + sdOneValue.Add(""); + } + + if(report.SecureDigital.SCR != null) + { + sdOneValue.Add(Decoders.SecureDigital.Decoders.PrettifySCR(report.SecureDigital.SCR).Replace("\n", "
")); + sdOneValue.Add(""); + } + + if(report.SecureDigital.OCR != null) + { + sdOneValue.Add(Decoders.SecureDigital.Decoders.PrettifyCSD(report.SecureDigital.OCR).Replace("\n", "
")); + sdOneValue.Add(""); + } + + repSD.DataSource = sdOneValue; + repSD.DataBind(); + } + else + divSD.Visible = false; + if(removable && !sscMedia && testedMedia!=null) { List mediaOneValue = new List(); diff --git a/DiscImageChef.Server/ViewReport.aspx.designer.cs b/DiscImageChef.Server/ViewReport.aspx.designer.cs index 8a1f98d5..ffa3e3d4 100644 --- a/DiscImageChef.Server/ViewReport.aspx.designer.cs +++ b/DiscImageChef.Server/ViewReport.aspx.designer.cs @@ -1,12 +1,12 @@ -// ------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Mono Runtime Version: 4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ namespace DiscImageChef.Server { @@ -110,5 +110,13 @@ namespace DiscImageChef.Server { protected System.Web.UI.HtmlControls.HtmlGenericControl divTestedMedia; protected System.Web.UI.WebControls.Repeater repTestedMedia; + + protected System.Web.UI.HtmlControls.HtmlGenericControl divMMC; + + protected System.Web.UI.WebControls.Repeater repMMC; + + protected System.Web.UI.HtmlControls.HtmlGenericControl divSD; + + protected System.Web.UI.WebControls.Repeater repSD; } }