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 statistics uploading.

Browse Source
This commit is contained in:
Natalia Portillo
2019-01-05 16:58:13 +00:00
parent ffb7f95e58
commit bbedcfe843
1 changed files with 157 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
DiscImageChef.Core/Statistics.cs
View File

@@ -458,6 +458,11 @@ namespace DiscImageChef.Core
Thread submitThread = new Thread(() =>
{
DicContext ctx = DicContext.Create(Settings.Settings.LocalDbPath);
try
{
if(submitStatsLock) return;
submitStatsLock = true;
if(ctx.Commands.Any(c => !c.Synchronized) || ctx.Filesystems.Any(c => !c.Synchronized) ||
ctx.Filters.Any(c => !c.Synchronized) || ctx.MediaFormats.Any(c => !c.Synchronized) ||
@@ -470,7 +475,8 @@ namespace DiscImageChef.Core
if(ctx.Commands.Any(c => !c.Synchronized))
{
dto.Commands = new List<NameValueStats>();
foreach(string nvs in ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
foreach(string nvs in
ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
dto.Commands.Add(new NameValueStats
{
name = nvs,
@@ -482,8 +488,8 @@ namespace DiscImageChef.Core
if(ctx.Filesystems.Any(c => !c.Synchronized))
{
dto.Filesystems = new List<NameValueStats>();
foreach(string nvs in ctx.Filesystems.Where(c => !c.Synchronized).Select(c => c.Name).Distinct()
)
foreach(string nvs in
ctx.Filesystems.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
dto.Filesystems.Add(new NameValueStats
{
name = nvs,
@@ -495,18 +501,21 @@ namespace DiscImageChef.Core
if(ctx.Filters.Any(c => !c.Synchronized))
{
dto.Filters = new List<NameValueStats>();
foreach(string nvs in ctx.Filters.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
foreach(string nvs in ctx.Filters.Where(c => !c.Synchronized).Select(c => c.Name).Distinct()
)
dto.Filters.Add(new NameValueStats
{
name = nvs,
Value = ctx.Filters.LongCount(c => !c.Synchronized && c.Name == nvs)
Value = ctx.Filters.LongCount(c => !c.Synchronized &&
c.Name == nvs)
});
}
if(ctx.MediaFormats.Any(c => !c.Synchronized))
{
dto.MediaFormats = new List<NameValueStats>();
foreach(string nvs in ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
foreach(string nvs in
ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
dto.MediaFormats.Add(new NameValueStats
{
name = nvs,
@@ -518,7 +527,8 @@ namespace DiscImageChef.Core
if(ctx.Partitions.Any(c => !c.Synchronized))
{
dto.Partitions = new List<NameValueStats>();
foreach(string nvs in ctx.Partitions.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
foreach(string nvs in
ctx.Partitions.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
dto.Partitions.Add(new NameValueStats
{
name = nvs,
@@ -530,7 +540,8 @@ namespace DiscImageChef.Core
if(ctx.Versions.Any(c => !c.Synchronized))
{
dto.Versions = new List<NameValueStats>();
foreach(string nvs in ctx.Versions.Where(c => !c.Synchronized).Select(c => c.Value).Distinct())
foreach(string nvs in
ctx.Versions.Where(c => !c.Synchronized).Select(c => c.Value).Distinct())
dto.Versions.Add(new NameValueStats
{
name = nvs,
@@ -542,7 +553,8 @@ namespace DiscImageChef.Core
if(ctx.Medias.Any(c => !c.Synchronized))
{
dto.Medias = new List<MediaStats>();
foreach(string media in ctx.Medias.Where(c => !c.Synchronized).Select(c => c.Type).Distinct())
foreach(string media in ctx.Medias.Where(c => !c.Synchronized).Select(c => c.Type)
.Distinct())
{
if(ctx.Medias.Any(c => !c.Synchronized && c.Type == media && c.Real))
dto.Medias.Add(new MediaStats
@@ -580,11 +592,12 @@ namespace DiscImageChef.Core
if(ctx.OperatingSystems.Any(c => !c.Synchronized))
{
dto.OperatingSystems = new List<OsStats>();
foreach(string osName in ctx.OperatingSystems.Where(c => !c.Synchronized).Select(c => c.Name)
.Distinct())
foreach(string osName in ctx.OperatingSystems.Where(c => !c.Synchronized)
.Select(c => c.Name).Distinct())
{
foreach(string osVersion in
ctx.OperatingSystems.Where(c => !c.Synchronized && c.Name == osName)
foreach(string osVersion in ctx
.OperatingSystems
.Where(c => !c.Synchronized && c.Name == osName)
.Select(c => c.Version).Distinct())
dto.OperatingSystems.Add(new OsStats
{
@@ -602,8 +615,6 @@ namespace DiscImageChef.Core
}
}
try
{
#if DEBUG
System.Console.WriteLine("Uploading statistics");
#else
@@ -784,6 +795,9 @@ namespace DiscImageChef.Core
osVersion));
}
}
ctx.SaveChanges();
}
}
catch(WebException)
{
@@ -793,14 +807,11 @@ namespace DiscImageChef.Core
catch
{
#if DEBUG
submitStatsLock = false;
if(Debugger.IsAttached) throw;
#endif
}
}
if(submitStatsLock) return;
submitStatsLock = true;
IEnumerable<string> statsFiles =
Directory.EnumerateFiles(Settings.Settings.StatsPath, "PartialStats_*.xml",