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

Added support for SD/MMC device reports. This makes it a first class

Browse Source 
citizen for #65
This commit is contained in:
Natalia Portillo
2017-09-29 15:36:15 +01:00
parent ee65b93d39
commit 54c525cb43
3 changed files with 103 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DiscImageChef.Server/ViewReport.aspx
View File

@@ -154,5 +154,23 @@
</ItemTemplate>
</asp:Repeater>
</div>
<div id="divMMC" runat="server">
<br/>
<b>MultiMediaCard device:</b><br/>
<asp:Repeater ID="repMMC" runat="server">
<ItemTemplate>
<%# Container.DataItem?.ToString() ?? string.Empty%><br/>
</ItemTemplate>
</asp:Repeater>
</div>
<div id="divSD" runat="server">
<br/>
<b>SecureDigital device:</b><br/>
<asp:Repeater ID="repSD" runat="server">
<ItemTemplate>
<%# Container.DataItem?.ToString() ?? string.Empty%><br/>
</ItemTemplate>
</asp:Repeater>
</div>
</body>
</html>

68
DiscImageChef.Server/ViewReport.aspx.cs
View File

@@ -407,6 +407,74 @@ namespace DiscImageChef.Server
else
divScsi.Visible = false;
if(report.MultiMediaCard != null)
{
List<string> mmcOneValue = new List<string>();
if(report.MultiMediaCard.CID != null)
{
mmcOneValue.Add(Decoders.MMC.Decoders.PrettifyCID(report.MultiMediaCard.CID).Replace("\n", "<br/>"));
mmcOneValue.Add("");
}
if(report.MultiMediaCard.CSD != null)
{
mmcOneValue.Add(Decoders.MMC.Decoders.PrettifyCSD(report.MultiMediaCard.CSD).Replace("\n", "<br/>"));
mmcOneValue.Add("");
}
if(report.MultiMediaCard.ExtendedCSD != null)
{
mmcOneValue.Add(Decoders.MMC.Decoders.PrettifyExtendedCSD(report.MultiMediaCard.ExtendedCSD).Replace("\n", "<br/>"));
mmcOneValue.Add("");
}
if(report.MultiMediaCard.OCR != null)
{
mmcOneValue.Add(Decoders.MMC.Decoders.PrettifyCSD(report.MultiMediaCard.OCR).Replace("\n", "<br/>"));
mmcOneValue.Add("");
}
repMMC.DataSource = mmcOneValue;
repMMC.DataBind();
}
else
divMMC.Visible = false;
if(report.SecureDigital != null)
{
List<string> sdOneValue = new List<string>();
if(report.SecureDigital.CID != null)
{
sdOneValue.Add(Decoders.SecureDigital.Decoders.PrettifyCID(report.SecureDigital.CID).Replace("\n", "<br/>"));
sdOneValue.Add("");
}
if(report.SecureDigital.CSD != null)
{
sdOneValue.Add(Decoders.SecureDigital.Decoders.PrettifyCSD(report.SecureDigital.CSD).Replace("\n", "<br/>"));
sdOneValue.Add("");
}
if(report.SecureDigital.SCR != null)
{
sdOneValue.Add(Decoders.SecureDigital.Decoders.PrettifySCR(report.SecureDigital.SCR).Replace("\n", "<br/>"));
sdOneValue.Add("");
}
if(report.SecureDigital.OCR != null)
{
sdOneValue.Add(Decoders.SecureDigital.Decoders.PrettifyCSD(report.SecureDigital.OCR).Replace("\n", "<br/>"));
sdOneValue.Add("");
}
repSD.DataSource = sdOneValue;
repSD.DataBind();
}
else
divSD.Visible = false;
if(removable && !sscMedia && testedMedia!=null)
{
List<string> mediaOneValue = new List<string>();

14
DiscImageChef.Server/ViewReport.aspx.designer.cs generated
View File

@@ -1,11 +1,11 @@
//------------------------------------------------------------------------------
// <autogenerated>
// <auto-generated>
// This code was generated by a tool.
// Mono Runtime Version: 4.0.30319.42000
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </autogenerated>
// </auto-generated>
//------------------------------------------------------------------------------
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;
}
}