aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sort variables.

Browse Source
This commit is contained in:
Natalia Portillo
2019-11-03 05:18:04 +00:00
parent 0a56a240f2
commit 559b22af82
1 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
DiscImageChef.Server/Controllers/StatsController.cs
View File

@@ -52,17 +52,12 @@ namespace DiscImageChef.Server.Controllers
/// <summary>Renders a page with statistics, list of media type, devices, etc</summary> /// <summary>Renders a page with statistics, list of media type, devices, etc</summary>
public class StatsController : Controller public class StatsController : Controller
{ {
readonly IWebHostEnvironment _environment;
readonly DicServerContext ctx; readonly DicServerContext ctx;
List<DeviceItem> devices; readonly IWebHostEnvironment env;
List<NameValueStats> operatingSystems;
List<MediaItem> realMedia;
List<NameValueStats> versions;
List<MediaItem> virtualMedia;
public StatsController(IWebHostEnvironment environment, DicServerContext context) public StatsController(IWebHostEnvironment environment, DicServerContext context)
{ {
_environment = environment; env = environment;
ctx = context; ctx = context;
} }
@@ -72,9 +67,7 @@ namespace DiscImageChef.Server.Controllers
try try
{ {
if( if(System.IO.File.Exists(Path.Combine(env.ContentRootPath ?? throw new InvalidOperationException(),
System.IO.File.
Exists(Path.Combine(_environment.ContentRootPath ?? throw new InvalidOperationException(),
"Statistics", "Statistics.xml"))) "Statistics", "Statistics.xml")))
try try
{ {
@@ -83,7 +76,7 @@ namespace DiscImageChef.Server.Controllers
var xs = new XmlSerializer(statistics.GetType()); var xs = new XmlSerializer(statistics.GetType());
FileStream fs = FileStream fs =
WaitForFile(Path.Combine(_environment.ContentRootPath ?? throw new InvalidOperationException(), "Statistics", "Statistics.xml"), WaitForFile(Path.Combine(env.ContentRootPath ?? 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);
@@ -91,8 +84,7 @@ namespace DiscImageChef.Server.Controllers
StatsConverter.Convert(statistics); StatsConverter.Convert(statistics);
System.IO.File. System.IO.File.Delete(Path.Combine(env.ContentRootPath ?? throw new InvalidOperationException(),
Delete(Path.Combine(_environment.ContentRootPath ?? throw new InvalidOperationException(),
"Statistics", "Statistics.xml")); "Statistics", "Statistics.xml"));
} }
catch(XmlException) catch(XmlException)
@@ -102,7 +94,7 @@ namespace DiscImageChef.Server.Controllers
if(ctx.OperatingSystems.Any()) if(ctx.OperatingSystems.Any())
{ {
operatingSystems = new List<NameValueStats>(); List<NameValueStats> operatingSystems = new List<NameValueStats>();
foreach(OperatingSystem nvs in ctx.OperatingSystems) foreach(OperatingSystem nvs in ctx.OperatingSystems)
operatingSystems.Add(new NameValueStats operatingSystems.Add(new NameValueStats
@@ -117,7 +109,7 @@ namespace DiscImageChef.Server.Controllers
if(ctx.Versions.Any()) if(ctx.Versions.Any())
{ {
versions = new List<NameValueStats>(); List<NameValueStats> versions = new List<NameValueStats>();
foreach(Version nvs in ctx.Versions) foreach(Version nvs in ctx.Versions)
versions.Add(new NameValueStats versions.Add(new NameValueStats
@@ -145,8 +137,8 @@ namespace DiscImageChef.Server.Controllers
if(ctx.Medias.Any()) if(ctx.Medias.Any())
{ {
realMedia = new List<MediaItem>(); List<MediaItem> realMedia = new List<MediaItem>();
virtualMedia = new List<MediaItem>(); List<MediaItem> virtualMedia = new List<MediaItem>();
foreach(Media nvs in ctx.Medias) foreach(Media nvs in ctx.Medias)
try try
@@ -191,7 +183,7 @@ namespace DiscImageChef.Server.Controllers
if(ctx.DeviceStats.Any()) if(ctx.DeviceStats.Any())
{ {
devices = new List<DeviceItem>(); List<DeviceItem> devices = new List<DeviceItem>();
foreach(DeviceStat device in ctx.DeviceStats.ToList()) foreach(DeviceStat device in ctx.DeviceStats.ToList())
{ {
@@ -212,14 +204,14 @@ namespace DiscImageChef.Server.Controllers
xmlFile = xmlFile.Replace('/', '_').Replace('\\', '_').Replace('?', '_'); xmlFile = xmlFile.Replace('/', '_').Replace('\\', '_').Replace('?', '_');
if(System.IO.File.Exists(Path.Combine(_environment.ContentRootPath, "Reports", xmlFile))) if(System.IO.File.Exists(Path.Combine(env.ContentRootPath, "Reports", xmlFile)))
{ {
var deviceReport = new DeviceReport(); var deviceReport = new DeviceReport();
var xs = new XmlSerializer(deviceReport.GetType()); var xs = new XmlSerializer(deviceReport.GetType());
FileStream fs = FileStream fs =
WaitForFile(Path.Combine(_environment.ContentRootPath ?? throw new InvalidOperationException(), "Reports", xmlFile), WaitForFile(Path.Combine(env.ContentRootPath ?? throw new InvalidOperationException(), "Reports", xmlFile),
FileMode.Open, FileAccess.Read, FileShare.Read); FileMode.Open, FileAccess.Read, FileShare.Read);
deviceReport = (DeviceReport)xs.Deserialize(fs); deviceReport = (DeviceReport)xs.Deserialize(fs);
@@ -231,7 +223,7 @@ namespace DiscImageChef.Server.Controllers
ctx.SaveChanges(); ctx.SaveChanges();
System.IO.File. System.IO.File.
Delete(Path.Combine(_environment.ContentRootPath ?? throw new InvalidOperationException(), Delete(Path.Combine(env.ContentRootPath ?? throw new InvalidOperationException(),
"Reports", xmlFile)); "Reports", xmlFile));
} }
@@ -582,11 +574,11 @@ namespace DiscImageChef.Server.Controllers
public IActionResult GetDevicesByManufacturerData() public IActionResult GetDevicesByManufacturerData()
{ {
List<Device> devs = ctx.Devices.Where(d => d.Manufacturer != null && d.Manufacturer != "").ToList(); List<Device> devices = ctx.Devices.Where(d => d.Manufacturer != null && d.Manufacturer != "").ToList();
var data = devs.Select(d => d.Manufacturer.ToLowerInvariant()).Distinct().Select(manufacturer => new var data = devices.Select(d => d.Manufacturer.ToLowerInvariant()).Distinct().Select(manufacturer => new
{ {
manufacturer, manufacturerCount = devs.Count(d => d.Manufacturer?.ToLowerInvariant() == manufacturer) manufacturer, manufacturerCount = devices.Count(d => d.Manufacturer?.ToLowerInvariant() == manufacturer)
}).Select(t => new }).Select(t => new
{ {
Name = t.manufacturer, Count = t.manufacturerCount Name = t.manufacturer, Count = t.manufacturerCount