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

Fix sending media formats statistics.

Browse Source
This commit is contained in:
Natalia Portillo
2020-07-12 14:53:42 +01:00
parent 9d54545f72
commit d8d3d9cc88
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Aaru.Core/Statistics.cs
View File

@@ -465,15 +465,13 @@ namespace Aaru.Core
foreach(DeviceStats device in allStats.Devices)
{
if(ctx.SeenDevices.Any(d => d.Manufacturer == device.Manufacturer &&
d.Model == device.Model &&
d.Revision == device.Revision &&
d.Bus == device.Bus))
d.Model == device.Model && d.Revision == device.Revision &&
d.Bus == device.Bus))
continue;
ctx.SeenDevices.Add(new DeviceStat
{
Bus = device.Bus, Manufacturer = device.Manufacturer,
Model = device.Model,
Bus = device.Bus, Manufacturer = device.Manufacturer, Model = device.Model,
Revision = device.Revision, Synchronized = true
});
}
@@ -615,7 +613,7 @@ namespace Aaru.Core
{
dto.MediaFormats = new List<NameValueStats>();
foreach(string nvs in ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).
foreach(string nvs in ctx.MediaFormats.Where(c => !c.Synchronized).Select(c => c.Name).
Distinct())
dto.MediaFormats.Add(new NameValueStats
{
@@ -967,8 +965,7 @@ namespace Aaru.Core
{
OperatingSystem existing =
ctx.OperatingSystems.FirstOrDefault(c => c.Synchronized && c.Name == osName &&
c.Version ==
osVersion) ??
c.Version == osVersion) ??
new OperatingSystem
{
Synchronized = true, Version = osVersion, Name = osName
@@ -1341,16 +1338,13 @@ namespace Aaru.Core
using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
if(ctx.SeenDevices.Any(d => d.Manufacturer == dev.Manufacturer &&
d.Model == dev.Model &&
d.Revision == dev.FirmwareRevision &&
d.Bus == deviceBus))
if(ctx.SeenDevices.Any(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model &&
d.Revision == dev.FirmwareRevision && d.Bus == deviceBus))
return;
ctx.SeenDevices.Add(new DeviceStat
{
Bus = deviceBus, Manufacturer = dev.Manufacturer, Model = dev.Model,
Revision = dev.FirmwareRevision,
Bus = deviceBus, Manufacturer = dev.Manufacturer, Model = dev.Model, Revision = dev.FirmwareRevision,
Synchronized = false
});