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

Remove generation of current statistics XML file.

Browse Source
This commit is contained in:
Natalia Portillo
2018-12-21 04:27:58 +00:00
parent 8fb7ccffd6
commit 94a05d64a8
1 changed files with 1 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
DiscImageChef.Core/Statistics.cs
View File

@@ -33,7 +33,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Net; using System.Net;
using System.Threading; using System.Threading;
using System.Xml.Serialization; using System.Xml.Serialization;
@@ -58,10 +57,6 @@ namespace DiscImageChef.Core
/// </summary> /// </summary>
public static Stats AllStats; public static Stats AllStats;
/// <summary> /// <summary>
/// Contains statistics of current execution
/// </summary>
public static Stats CurrentStats;
/// <summary>
/// Statistics file semaphore /// Statistics file semaphore
/// </summary> /// </summary>
static bool submitStatsLock; static bool submitStatsLock;
@@ -83,7 +78,6 @@ namespace DiscImageChef.Core
Version = DetectOS.GetVersion() Version = DetectOS.GetVersion()
}); });
ctx.Versions.Add(new Version {Value = CommonTypes.Interop.Version.GetVersion(), Synchronized = false}); ctx.Versions.Add(new Version {Value = CommonTypes.Interop.Version.GetVersion(), Synchronized = false});
CurrentStats = new Stats();
XmlSerializer xs = new XmlSerializer(AllStats.GetType()); XmlSerializer xs = new XmlSerializer(AllStats.GetType());
StreamReader sr = new StreamReader(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml")); StreamReader sr = new StreamReader(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"));
AllStats = (Stats)xs.Deserialize(sr); AllStats = (Stats)xs.Deserialize(sr);
@@ -99,13 +93,8 @@ namespace DiscImageChef.Core
Version = DetectOS.GetVersion() Version = DetectOS.GetVersion()
}); });
ctx.Versions.Add(new Version {Value = CommonTypes.Interop.Version.GetVersion(), Synchronized = false}); ctx.Versions.Add(new Version {Value = CommonTypes.Interop.Version.GetVersion(), Synchronized = false});
CurrentStats = new Stats();
}
else
{
AllStats = null;
CurrentStats = null;
} }
else AllStats = null;
} }
/// <summary> /// <summary>
@@ -117,72 +106,12 @@ namespace DiscImageChef.Core
if(AllStats == null) return; if(AllStats == null) return;
if(AllStats.OperatingSystems != null)
{
long count = 0;
OsStats old = null;
foreach(OsStats nvs in AllStats.OperatingSystems.Where(nvs =>
nvs.name == DetectOS
.GetRealPlatformID().ToString() &&
nvs.version == DetectOS.GetVersion()))
{
count = nvs.Value + 1;
old = nvs;
break;
}
if(old != null) AllStats.OperatingSystems.Remove(old);
count++;
AllStats.OperatingSystems.Add(new OsStats
{
name = DetectOS.GetRealPlatformID().ToString(),
Value = count,
version = DetectOS.GetVersion()
});
}
else if(CurrentStats != null) AllStats.OperatingSystems = CurrentStats.OperatingSystems;
if(AllStats.Versions != null)
{
long count = 0;
NameValueStats old = null;
foreach(NameValueStats nvs in AllStats.Versions.Where(nvs => nvs.name == CommonTypes
.Interop.Version.GetVersion()))
{
count = nvs.Value + 1;
old = nvs;
break;
}
if(old != null) AllStats.Versions.Remove(old);
count++;
AllStats.Versions.Add(new NameValueStats
{
name = CommonTypes.Interop.Version.GetVersion(), Value = count
});
}
else if(CurrentStats != null) AllStats.Versions = CurrentStats.Versions;
FileStream fs = new FileStream(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"), FileStream fs = new FileStream(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"),
FileMode.Create); FileMode.Create);
XmlSerializer xs = new XmlSerializer(AllStats.GetType()); XmlSerializer xs = new XmlSerializer(AllStats.GetType());
xs.Serialize(fs, AllStats); xs.Serialize(fs, AllStats);
fs.Close(); fs.Close();
if(CurrentStats != null)
{
string partial = $"PartialStats_{DateTime.UtcNow:yyyyMMddHHmmssfff}.xml";
fs = new FileStream(Path.Combine(Settings.Settings.StatsPath, partial), FileMode.Create);
xs = new XmlSerializer(CurrentStats.GetType());
xs.Serialize(fs, CurrentStats);
fs.Close();
}
if(Settings.Settings.Current.Stats != null && Settings.Settings.Current.Stats.ShareStats) SubmitStats(); if(Settings.Settings.Current.Stats != null && Settings.Settings.Current.Stats.ShareStats) SubmitStats();
} }
@@ -312,43 +241,6 @@ namespace DiscImageChef.Core
if(Settings.Settings.Current.Stats == null || !Settings.Settings.Current.Stats.FilterStats) return; if(Settings.Settings.Current.Stats == null || !Settings.Settings.Current.Stats.FilterStats) return;
ctx.Filters.Add(new Filter {Name = filter, Synchronized = false}); ctx.Filters.Add(new Filter {Name = filter, Synchronized = false});
if(AllStats.Filters == null) AllStats.Filters = new List<NameValueStats>();
if(CurrentStats.Filters == null) CurrentStats.Filters = new List<NameValueStats>();
NameValueStats old = AllStats.Filters.FirstOrDefault(nvs => nvs.name == filter);
NameValueStats nw = new NameValueStats();
if(old != null)
{
nw.name = old.name;
nw.Value = old.Value + 1;
AllStats.Filters.Remove(old);
}
else
{
nw.name = filter;
nw.Value = 1;
}
AllStats.Filters.Add(nw);
old = CurrentStats.Filters.FirstOrDefault(nvs => nvs.name == filter);
nw = new NameValueStats();
if(old != null)
{
nw.name = old.name;
nw.Value = old.Value + 1;
CurrentStats.Filters.Remove(old);
}
else
{
nw.name = filter;
nw.Value = 1;
}
CurrentStats.Filters.Add(nw);
} }
/// <summary> /// <summary>
@@ -372,9 +264,6 @@ namespace DiscImageChef.Core
{ {
if(Settings.Settings.Current.Stats == null || !Settings.Settings.Current.Stats.DeviceStats) return; if(Settings.Settings.Current.Stats == null || !Settings.Settings.Current.Stats.DeviceStats) return;
if(AllStats.Devices == null) AllStats.Devices = new List<DeviceStats>();
if(CurrentStats.Devices == null) CurrentStats.Devices = new List<DeviceStats>();
string deviceBus; string deviceBus;
if(dev.IsUsb) deviceBus = "USB"; if(dev.IsUsb) deviceBus = "USB";
else if(dev.IsFireWire) deviceBus = "FireWire"; else if(dev.IsFireWire) deviceBus = "FireWire";