mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Added support for SD/MMC device reports. This makes it a first class
citizen for #65
This commit is contained in:
@@ -154,5 +154,23 @@
|
|||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
</asp:Repeater>
|
</asp:Repeater>
|
||||||
</div>
|
</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>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -407,6 +407,74 @@ namespace DiscImageChef.Server
|
|||||||
else
|
else
|
||||||
divScsi.Visible = false;
|
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)
|
if(removable && !sscMedia && testedMedia!=null)
|
||||||
{
|
{
|
||||||
List<string> mediaOneValue = new List<string>();
|
List<string> mediaOneValue = new List<string>();
|
||||||
|
|||||||
26
DiscImageChef.Server/ViewReport.aspx.designer.cs
generated
26
DiscImageChef.Server/ViewReport.aspx.designer.cs
generated
@@ -1,12 +1,12 @@
|
|||||||
// ------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <autogenerated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 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
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
// the code is regenerated.
|
// the code is regenerated.
|
||||||
// </autogenerated>
|
// </auto-generated>
|
||||||
// ------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
namespace DiscImageChef.Server {
|
namespace DiscImageChef.Server {
|
||||||
|
|
||||||
@@ -110,5 +110,13 @@ namespace DiscImageChef.Server {
|
|||||||
protected System.Web.UI.HtmlControls.HtmlGenericControl divTestedMedia;
|
protected System.Web.UI.HtmlControls.HtmlGenericControl divTestedMedia;
|
||||||
|
|
||||||
protected System.Web.UI.WebControls.Repeater repTestedMedia;
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user