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

Read server statistics from database.

Browse Source
This commit is contained in:
Natalia Portillo
2018-12-22 05:00:30 +00:00
parent 47d4c697be
commit 7408db3881
3 changed files with 89 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/.idea.DiscImageChef/.idea/contentModel.xml generated
View File

@@ -1821,9 +1821,6 @@
<e p="Statistics.aspx.cs" t="Include" /> <e p="Statistics.aspx.cs" t="Include" />
<e p="Statistics.aspx.designer.cs" t="Include" /> <e p="Statistics.aspx.designer.cs" t="Include" />
<e p="TODO.aspx" t="Include" /> <e p="TODO.aspx" t="Include" />
<e p="Upload" t="Include">
<e p=".htaccess" t="Include" />
</e>
<e p="ViewReport.aspx" t="Include" /> <e p="ViewReport.aspx" t="Include" />
<e p="ViewReport.aspx.cs" t="Include" /> <e p="ViewReport.aspx.cs" t="Include" />
<e p="ViewReport.aspx.designer.cs" t="Include" /> <e p="ViewReport.aspx.designer.cs" t="Include" />

16
DiscImageChef.Server/Statistics.aspx
View File

@@ -197,11 +197,11 @@
<tr> <tr>
<td> <td>
<asp:Label runat="server" <asp:Label runat="server"
Text='<%# Eval("name") %>' /> Text='<%# Eval("Name") %>' />
</td> </td>
<td> <td>
<asp:Label runat="server" <asp:Label runat="server"
Text='<%# string.Format("{0}", Eval("Value")) %>' /> Text='<%# string.Format("{0}", Eval("Count")) %>' />
</td> </td>
</tr> </tr>
</ItemTemplate> </ItemTemplate>
@@ -223,11 +223,11 @@
<tr> <tr>
<td> <td>
<asp:Label runat="server" <asp:Label runat="server"
Text='<%# Eval("name") %>' /> Text='<%# Eval("Name") %>' />
</td> </td>
<td> <td>
<asp:Label runat="server" <asp:Label runat="server"
Text='<%# string.Format("{0}", Eval("value")) %>' /> Text='<%# string.Format("{0}", Eval("Count")) %>' />
</td> </td>
</tr> </tr>
</ItemTemplate> </ItemTemplate>
@@ -249,11 +249,11 @@
<tr> <tr>
<td> <td>
<asp:Label runat="server" <asp:Label runat="server"
Text='<%# Eval("name") %>' /> Text='<%# Eval("Name") %>' />
</td> </td>
<td> <td>
<asp:Label runat="server" <asp:Label runat="server"
Text='<%# string.Format("{0}", Eval("value")) %>' /> Text='<%# string.Format("{0}", Eval("Count")) %>' />
</td> </td>
</tr> </tr>
</ItemTemplate> </ItemTemplate>
@@ -275,11 +275,11 @@
<tr> <tr>
<td> <td>
<asp:Label runat="server" <asp:Label runat="server"
Text='<%# Eval("name") %>' /> Text='<%# Eval("Name") %>' />
</td> </td>
<td> <td>
<asp:Label runat="server" <asp:Label runat="server"
Text='<%# string.Format("{0}", Eval("value")) %>' /> Text='<%# string.Format("{0}", Eval("Count")) %>' />
</td> </td>
</tr> </tr>
</ItemTemplate> </ItemTemplate>

127
DiscImageChef.Server/Statistics.aspx.cs
View File

@@ -39,10 +39,12 @@ using System.Threading;
using System.Web; using System.Web;
using System.Web.Hosting; using System.Web.Hosting;
using System.Web.UI; using System.Web.UI;
using System.Xml.Serialization;
using DiscImageChef.CommonTypes.Interop; using DiscImageChef.CommonTypes.Interop;
using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.CommonTypes.Metadata;
using DiscImageChef.Server.Models;
using OperatingSystem = DiscImageChef.Server.Models.OperatingSystem;
using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID;
using Version = DiscImageChef.Server.Models.Version;
namespace DiscImageChef.Server namespace DiscImageChef.Server
{ {
@@ -51,11 +53,12 @@ namespace DiscImageChef.Server
/// </summary> /// </summary>
public partial class Statistics : Page public partial class Statistics : Page
{ {
DicServerContext ctx = new DicServerContext();
List<DeviceItem> devices; List<DeviceItem> devices;
List<NameValueStats> operatingSystems; List<NameValueStats> operatingSystems;
List<MediaItem> realMedia; List<MediaItem> realMedia;
Stats statistics; //Stats statistics;
List<NameValueStats> versions; List<NameValueStats> versions;
List<MediaItem> virtualMedia; List<MediaItem> virtualMedia;
@@ -65,6 +68,7 @@ namespace DiscImageChef.Server
try try
{ {
/*
if(!File.Exists(Path.Combine(HostingEnvironment.MapPath("~") ?? throw new InvalidOperationException(), if(!File.Exists(Path.Combine(HostingEnvironment.MapPath("~") ?? throw new InvalidOperationException(),
"Statistics", "Statistics.xml"))) "Statistics", "Statistics.xml")))
{ {
@@ -84,17 +88,17 @@ namespace DiscImageChef.Server
WaitForFile(Path.Combine(HostingEnvironment.MapPath("~") ?? throw new InvalidOperationException(), "Statistics", "Statistics.xml"), WaitForFile(Path.Combine(HostingEnvironment.MapPath("~") ?? throw new InvalidOperationException(), "Statistics", "Statistics.xml"),
FileMode.Open, FileAccess.Read, FileShare.Read); FileMode.Open, FileAccess.Read, FileShare.Read);
statistics = (Stats)xs.Deserialize(fs); statistics = (Stats)xs.Deserialize(fs);
fs.Close(); fs.Close();*/
if(statistics.OperatingSystems != null) if(ctx.OperatingSystems.Any())
{ {
operatingSystems = new List<NameValueStats>(); operatingSystems = new List<NameValueStats>();
foreach(OsStats nvs in statistics.OperatingSystems) foreach(OperatingSystem nvs in ctx.OperatingSystems)
operatingSystems.Add(new NameValueStats operatingSystems.Add(new NameValueStats
{ {
name = name =
$"{DetectOS.GetPlatformName((PlatformID)Enum.Parse(typeof(PlatformID), nvs.name), nvs.version)}{(string.IsNullOrEmpty(nvs.version) ? "" : " ")}{nvs.version}", $"{DetectOS.GetPlatformName((PlatformID)Enum.Parse(typeof(PlatformID), nvs.Name), nvs.Version)}{(string.IsNullOrEmpty(nvs.Version) ? "" : " ")}{nvs.Version}",
Value = nvs.Value Value = nvs.Count
}); });
repOperatingSystems.DataSource = operatingSystems.OrderBy(os => os.name).ToList(); repOperatingSystems.DataSource = operatingSystems.OrderBy(os => os.name).ToList();
@@ -102,85 +106,107 @@ namespace DiscImageChef.Server
} }
else divOperatingSystems.Visible = false; else divOperatingSystems.Visible = false;
if(statistics.Versions != null) if(ctx.Versions.Any())
{ {
versions = new List<NameValueStats>(); versions = new List<NameValueStats>();
foreach(NameValueStats nvs in statistics.Versions) foreach(Version nvs in ctx.Versions)
versions.Add(nvs.name == "previous" versions.Add(new NameValueStats
? new NameValueStats {name = "Previous than 3.4.99.0", Value = nvs.Value} {
: nvs); name = nvs.Value == "previous" ? "Previous than 3.4.99.0" : nvs.Value,
Value = nvs.Count
});
repVersions.DataSource = versions.OrderBy(ver => ver.name).ToList(); repVersions.DataSource = versions.OrderBy(ver => ver.name).ToList();
repVersions.DataBind(); repVersions.DataBind();
} }
else divVersions.Visible = false; else divVersions.Visible = false;
if(statistics.Commands != null) if(ctx.Commands.Any())
{ {
lblAnalyze.Text = statistics.Commands.Analyze.ToString(); lblAnalyze.Text = ctx.Commands.FirstOrDefault(c => c.Name == "analyze")?.Count.ToString() ?? "0";
lblCompare.Text = statistics.Commands.Compare.ToString(); lblCompare.Text = ctx.Commands.FirstOrDefault(c => c.Name == "compare")?.Count.ToString() ?? "0";
lblChecksum.Text = statistics.Commands.Checksum.ToString(); lblChecksum.Text = ctx.Commands.FirstOrDefault(c => c.Name == "checksum")?.Count.ToString() ?? "0";
lblEntropy.Text = statistics.Commands.Entropy.ToString(); lblEntropy.Text = ctx.Commands.FirstOrDefault(c => c.Name == "entropy")?.Count.ToString() ?? "0";
lblVerify.Text = statistics.Commands.Verify.ToString(); lblVerify.Text = ctx.Commands.FirstOrDefault(c => c.Name == "verify")?.Count.ToString() ?? "0";
lblPrintHex.Text = statistics.Commands.PrintHex.ToString(); lblPrintHex.Text = ctx.Commands.FirstOrDefault(c => c.Name == "printhex")?.Count.ToString() ?? "0";
lblDecode.Text = statistics.Commands.Decode.ToString(); lblDecode.Text = ctx.Commands.FirstOrDefault(c => c.Name == "decode")?.Count.ToString() ?? "0";
lblDeviceInfo.Text = statistics.Commands.DeviceInfo.ToString(); lblDeviceInfo.Text = ctx.Commands.FirstOrDefault(c => c.Name == "device-info")?.Count.ToString() ??
lblMediaInfo.Text = statistics.Commands.MediaInfo.ToString(); "0";
lblMediaScan.Text = statistics.Commands.MediaScan.ToString(); lblMediaInfo.Text = ctx.Commands.FirstOrDefault(c => c.Name == "media-info")?.Count.ToString() ??
lblFormats.Text = statistics.Commands.Formats.ToString(); "0";
lblBenchmark.Text = statistics.Commands.Benchmark.ToString(); lblMediaScan.Text = ctx.Commands.FirstOrDefault(c => c.Name == "media-scan")?.Count.ToString() ??
lblCreateSidecar.Text = statistics.Commands.CreateSidecar.ToString(); "0";
lblDumpMedia.Text = statistics.Commands.DumpMedia.ToString(); lblFormats.Text = ctx.Commands.FirstOrDefault(c => c.Name == "formats")?.Count.ToString() ?? "0";
lblDeviceReport.Text = statistics.Commands.DeviceReport.ToString(); lblBenchmark.Text =
lblLs.Text = statistics.Commands.Ls.ToString(); ctx.Commands.FirstOrDefault(c => c.Name == "benchmark")?.Count.ToString() ?? "0";
lblExtractFiles.Text = statistics.Commands.ExtractFiles.ToString(); lblCreateSidecar.Text =
lblListDevices.Text = statistics.Commands.ListDevices.ToString(); ctx.Commands.FirstOrDefault(c => c.Name == "create-sidecar")?.Count.ToString() ?? "0";
lblListEncodings.Text = statistics.Commands.ListEncodings.ToString(); lblDumpMedia.Text = ctx.Commands.FirstOrDefault(c => c.Name == "dump-media")?.Count.ToString() ??
lblConvertImage.Text = statistics.Commands.ConvertImage.ToString(); "0";
lblImageInfo.Text = statistics.Commands.ImageInfo.ToString(); lblDeviceReport.Text =
ctx.Commands.FirstOrDefault(c => c.Name == "device-report")?.Count.ToString() ?? "0";
lblLs.Text = ctx.Commands.FirstOrDefault(c => c.Name == "ls")?.Count.ToString() ?? "0";
lblExtractFiles.Text =
ctx.Commands.FirstOrDefault(c => c.Name == "extract-files")?.Count.ToString() ?? "0";
lblListDevices.Text =
ctx.Commands.FirstOrDefault(c => c.Name == "list-devices")?.Count.ToString() ?? "0";
lblListEncodings.Text =
ctx.Commands.FirstOrDefault(c => c.Name == "list-encodings")?.Count.ToString() ?? "0";
lblConvertImage.Text =
ctx.Commands.FirstOrDefault(c => c.Name == "convert-image")?.Count.ToString() ?? "0";
lblImageInfo.Text = ctx.Commands.FirstOrDefault(c => c.Name == "image-info")?.Count.ToString() ??
"0";
} }
else divCommands.Visible = false; else divCommands.Visible = false;
if(statistics.Filters != null) if(ctx.Filters.Any())
{ {
repFilters.DataSource = statistics.Filters.OrderBy(filter => filter.name).ToList(); repFilters.DataSource = ctx.Filters.OrderBy(filter => filter.Name).ToList();
repFilters.DataBind(); repFilters.DataBind();
} }
else divFilters.Visible = false; else divFilters.Visible = false;
if(statistics.MediaImages != null) if(ctx.MediaFormats.Any())
{ {
repMediaImages.DataSource = statistics.MediaImages.OrderBy(filter => filter.name).ToList(); repMediaImages.DataSource = ctx.MediaFormats.OrderBy(filter => filter.Name).ToList();
repMediaImages.DataBind(); repMediaImages.DataBind();
} }
else divMediaImages.Visible = false; else divMediaImages.Visible = false;
if(statistics.Partitions != null) if(ctx.Partitions.Any())
{ {
repPartitions.DataSource = statistics.Partitions.OrderBy(filter => filter.name).ToList(); repPartitions.DataSource = ctx.Partitions.OrderBy(filter => filter.Name).ToList();
repPartitions.DataBind(); repPartitions.DataBind();
} }
else divPartitions.Visible = false; else divPartitions.Visible = false;
if(statistics.Filesystems != null) if(ctx.Filesystems.Any())
{ {
repFilesystems.DataSource = statistics.Filesystems.OrderBy(filter => filter.name).ToList(); repFilesystems.DataSource = ctx.Filesystems.OrderBy(filter => filter.Name).ToList();
repFilesystems.DataBind(); repFilesystems.DataBind();
} }
else divFilesystems.Visible = false; else divFilesystems.Visible = false;
if(statistics.Medias != null) if(ctx.Medias.Any())
{ {
realMedia = new List<MediaItem>(); realMedia = new List<MediaItem>();
virtualMedia = new List<MediaItem>(); virtualMedia = new List<MediaItem>();
foreach(MediaStats nvs in statistics.Medias) foreach(Media nvs in ctx.Medias)
try
{ {
MediaType MediaType
.MediaTypeToString((CommonTypes.MediaType)Enum.Parse(typeof(CommonTypes.MediaType), nvs.type), .MediaTypeToString((CommonTypes.MediaType)Enum.Parse(typeof(CommonTypes.MediaType), nvs.Type),
out string type, out string subtype); out string type, out string subtype);
if(nvs.real) realMedia.Add(new MediaItem {Type = type, SubType = subtype, Count = nvs.Value}); if(nvs.Real)
else virtualMedia.Add(new MediaItem {Type = type, SubType = subtype, Count = nvs.Value}); realMedia.Add(new MediaItem {Type = type, SubType = subtype, Count = nvs.Count});
else virtualMedia.Add(new MediaItem {Type = type, SubType = subtype, Count = nvs.Count});
}
catch
{
if(nvs.Real)
realMedia.Add(new MediaItem {Type = nvs.Type, SubType = null, Count = nvs.Count});
else virtualMedia.Add(new MediaItem {Type = nvs.Type, SubType = null, Count = nvs.Count});
} }
if(realMedia.Count > 0) if(realMedia.Count > 0)
@@ -205,10 +231,10 @@ namespace DiscImageChef.Server
divVirtualMedia.Visible = false; divVirtualMedia.Visible = false;
} }
if(statistics.Devices != null) if(ctx.DeviceStats != null)
{ {
devices = new List<DeviceItem>(); devices = new List<DeviceItem>();
foreach(DeviceStats device in statistics.Devices) foreach(DeviceStat device in ctx.DeviceStats)
{ {
string url; string url;
string xmlFile; string xmlFile;
@@ -249,7 +275,8 @@ namespace DiscImageChef.Server
Model = device.Model, Model = device.Model,
Revision = device.Revision, Revision = device.Revision,
Bus = device.Bus, Bus = device.Bus,
ReportLink = url == null ? "No" : $"<a href=\"{url}\" target=\"_blank\">Yes</a>" ReportLink =
url == null ? "No" : $"<a href=\"{url}\" target=\"_blank\">Yes</a>"
}); });
} }