mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Code cleanup.
This commit is contained in:
@@ -60,8 +60,8 @@ namespace DiscImageChef.Server.Controllers
|
||||
|
||||
try
|
||||
{
|
||||
Stats newStats = new Stats();
|
||||
HttpRequest request = HttpContext.Current.Request;
|
||||
Stats newStats = new Stats();
|
||||
HttpRequest request = HttpContext.Current.Request;
|
||||
|
||||
XmlSerializer xs = new XmlSerializer(newStats.GetType());
|
||||
newStats = (Stats)xs.Deserialize(request.InputStream);
|
||||
@@ -83,52 +83,55 @@ namespace DiscImageChef.Server.Controllers
|
||||
}
|
||||
|
||||
Stats oldStats = new Stats();
|
||||
xs = new XmlSerializer(oldStats.GetType());
|
||||
xs = new XmlSerializer(oldStats.GetType());
|
||||
oldStats = (Stats)xs.Deserialize(fs);
|
||||
|
||||
if(newStats.Commands != null)
|
||||
if(oldStats.Commands == null) oldStats.Commands = newStats.Commands;
|
||||
if(oldStats.Commands == null)
|
||||
oldStats.Commands = newStats.Commands;
|
||||
else
|
||||
{
|
||||
oldStats.Commands.Analyze += newStats.Commands.Analyze;
|
||||
oldStats.Commands.Benchmark += newStats.Commands.Benchmark;
|
||||
oldStats.Commands.Checksum += newStats.Commands.Checksum;
|
||||
oldStats.Commands.Compare += newStats.Commands.Compare;
|
||||
oldStats.Commands.Analyze += newStats.Commands.Analyze;
|
||||
oldStats.Commands.Benchmark += newStats.Commands.Benchmark;
|
||||
oldStats.Commands.Checksum += newStats.Commands.Checksum;
|
||||
oldStats.Commands.Compare += newStats.Commands.Compare;
|
||||
oldStats.Commands.CreateSidecar += newStats.Commands.CreateSidecar;
|
||||
oldStats.Commands.Decode += newStats.Commands.Decode;
|
||||
oldStats.Commands.DeviceInfo += newStats.Commands.DeviceInfo;
|
||||
oldStats.Commands.DeviceReport += newStats.Commands.DeviceReport;
|
||||
oldStats.Commands.DumpMedia += newStats.Commands.DumpMedia;
|
||||
oldStats.Commands.Entropy += newStats.Commands.Entropy;
|
||||
oldStats.Commands.Formats += newStats.Commands.Formats;
|
||||
oldStats.Commands.MediaInfo += newStats.Commands.MediaInfo;
|
||||
oldStats.Commands.MediaScan += newStats.Commands.MediaScan;
|
||||
oldStats.Commands.PrintHex += newStats.Commands.PrintHex;
|
||||
oldStats.Commands.Verify += newStats.Commands.Verify;
|
||||
oldStats.Commands.Ls += newStats.Commands.Ls;
|
||||
oldStats.Commands.ExtractFiles += newStats.Commands.ExtractFiles;
|
||||
oldStats.Commands.ListDevices += newStats.Commands.ListDevices;
|
||||
oldStats.Commands.Decode += newStats.Commands.Decode;
|
||||
oldStats.Commands.DeviceInfo += newStats.Commands.DeviceInfo;
|
||||
oldStats.Commands.DeviceReport += newStats.Commands.DeviceReport;
|
||||
oldStats.Commands.DumpMedia += newStats.Commands.DumpMedia;
|
||||
oldStats.Commands.Entropy += newStats.Commands.Entropy;
|
||||
oldStats.Commands.Formats += newStats.Commands.Formats;
|
||||
oldStats.Commands.MediaInfo += newStats.Commands.MediaInfo;
|
||||
oldStats.Commands.MediaScan += newStats.Commands.MediaScan;
|
||||
oldStats.Commands.PrintHex += newStats.Commands.PrintHex;
|
||||
oldStats.Commands.Verify += newStats.Commands.Verify;
|
||||
oldStats.Commands.Ls += newStats.Commands.Ls;
|
||||
oldStats.Commands.ExtractFiles += newStats.Commands.ExtractFiles;
|
||||
oldStats.Commands.ListDevices += newStats.Commands.ListDevices;
|
||||
oldStats.Commands.ListEncodings += newStats.Commands.ListEncodings;
|
||||
oldStats.Commands.ConvertImage += newStats.Commands.ConvertImage;
|
||||
oldStats.Commands.ImageInfo += newStats.Commands.ImageInfo;
|
||||
oldStats.Commands.ConvertImage += newStats.Commands.ConvertImage;
|
||||
oldStats.Commands.ImageInfo += newStats.Commands.ImageInfo;
|
||||
}
|
||||
|
||||
if(newStats.OperatingSystems != null)
|
||||
if(oldStats.OperatingSystems == null) oldStats.OperatingSystems = newStats.OperatingSystems;
|
||||
if(oldStats.OperatingSystems == null)
|
||||
oldStats.OperatingSystems = newStats.OperatingSystems;
|
||||
else
|
||||
foreach(OsStats newNvs in newStats.OperatingSystems)
|
||||
{
|
||||
OsStats removeNvs = null;
|
||||
OsStats addNvs = null;
|
||||
OsStats addNvs = null;
|
||||
|
||||
foreach(OsStats oldNvs in
|
||||
oldStats.OperatingSystems.Where(oldNvs => oldNvs.name == newNvs.name &&
|
||||
oldNvs.version == newNvs.version))
|
||||
foreach(OsStats oldNvs in oldStats.OperatingSystems.Where(oldNvs =>
|
||||
oldNvs.name == newNvs.name &&
|
||||
oldNvs.version ==
|
||||
newNvs.version))
|
||||
{
|
||||
addNvs = new OsStats
|
||||
{
|
||||
name = oldNvs.name,
|
||||
Value = oldNvs.Value + newNvs.Value,
|
||||
name = oldNvs.name,
|
||||
Value = oldNvs.Value + newNvs.Value,
|
||||
version = oldNvs.version
|
||||
};
|
||||
removeNvs = oldNvs;
|
||||
@@ -149,14 +152,14 @@ namespace DiscImageChef.Server.Controllers
|
||||
else
|
||||
{
|
||||
OsStats removeNvs = null;
|
||||
OsStats addNvs = null;
|
||||
OsStats addNvs = null;
|
||||
|
||||
foreach(OsStats oldNvs in oldStats.OperatingSystems.Where(oldNvs => oldNvs.name == "Linux"))
|
||||
{
|
||||
addNvs = new OsStats
|
||||
{
|
||||
name = oldNvs.name,
|
||||
Value = oldNvs.Value + 1,
|
||||
name = oldNvs.name,
|
||||
Value = oldNvs.Value + 1,
|
||||
version = oldNvs.version
|
||||
};
|
||||
removeNvs = oldNvs;
|
||||
@@ -173,17 +176,22 @@ namespace DiscImageChef.Server.Controllers
|
||||
}
|
||||
|
||||
if(newStats.Versions != null)
|
||||
if(oldStats.Versions == null) oldStats.Versions = newStats.Versions;
|
||||
if(oldStats.Versions == null)
|
||||
oldStats.Versions = newStats.Versions;
|
||||
else
|
||||
foreach(NameValueStats newNvs in newStats.Versions)
|
||||
{
|
||||
NameValueStats removeNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
|
||||
foreach(NameValueStats oldNvs in
|
||||
oldStats.Versions.Where(oldNvs => oldNvs.name == newNvs.name))
|
||||
{
|
||||
addNvs = new NameValueStats {name = oldNvs.name, Value = oldNvs.Value + newNvs.Value};
|
||||
addNvs = new NameValueStats
|
||||
{
|
||||
name = oldNvs.name,
|
||||
Value = oldNvs.Value + newNvs.Value
|
||||
};
|
||||
removeNvs = oldNvs;
|
||||
break;
|
||||
}
|
||||
@@ -203,11 +211,11 @@ namespace DiscImageChef.Server.Controllers
|
||||
else
|
||||
{
|
||||
NameValueStats removeNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
|
||||
foreach(NameValueStats oldNvs in oldStats.Versions.Where(oldNvs => oldNvs.name == "previous"))
|
||||
{
|
||||
addNvs = new NameValueStats {name = oldNvs.name, Value = oldNvs.Value + 1};
|
||||
addNvs = new NameValueStats {name = oldNvs.name, Value = oldNvs.Value + 1};
|
||||
removeNvs = oldNvs;
|
||||
break;
|
||||
}
|
||||
@@ -222,17 +230,22 @@ namespace DiscImageChef.Server.Controllers
|
||||
}
|
||||
|
||||
if(newStats.Filesystems != null)
|
||||
if(oldStats.Filesystems == null) oldStats.Filesystems = newStats.Filesystems;
|
||||
if(oldStats.Filesystems == null)
|
||||
oldStats.Filesystems = newStats.Filesystems;
|
||||
else
|
||||
foreach(NameValueStats newNvs in newStats.Filesystems)
|
||||
{
|
||||
NameValueStats removeNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
|
||||
foreach(NameValueStats oldNvs in
|
||||
oldStats.Filesystems.Where(oldNvs => oldNvs.name == newNvs.name))
|
||||
{
|
||||
addNvs = new NameValueStats {name = oldNvs.name, Value = oldNvs.Value + newNvs.Value};
|
||||
addNvs = new NameValueStats
|
||||
{
|
||||
name = oldNvs.name,
|
||||
Value = oldNvs.Value + newNvs.Value
|
||||
};
|
||||
removeNvs = oldNvs;
|
||||
break;
|
||||
}
|
||||
@@ -246,17 +259,22 @@ namespace DiscImageChef.Server.Controllers
|
||||
}
|
||||
|
||||
if(newStats.Partitions != null)
|
||||
if(oldStats.Partitions == null) oldStats.Partitions = newStats.Partitions;
|
||||
if(oldStats.Partitions == null)
|
||||
oldStats.Partitions = newStats.Partitions;
|
||||
else
|
||||
foreach(NameValueStats newNvs in newStats.Partitions)
|
||||
{
|
||||
NameValueStats removeNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
|
||||
foreach(NameValueStats oldNvs in
|
||||
oldStats.Partitions.Where(oldNvs => oldNvs.name == newNvs.name))
|
||||
{
|
||||
addNvs = new NameValueStats {name = oldNvs.name, Value = oldNvs.Value + newNvs.Value};
|
||||
addNvs = new NameValueStats
|
||||
{
|
||||
name = oldNvs.name,
|
||||
Value = oldNvs.Value + newNvs.Value
|
||||
};
|
||||
removeNvs = oldNvs;
|
||||
break;
|
||||
}
|
||||
@@ -270,17 +288,22 @@ namespace DiscImageChef.Server.Controllers
|
||||
}
|
||||
|
||||
if(newStats.MediaImages != null)
|
||||
if(oldStats.MediaImages == null) oldStats.MediaImages = newStats.MediaImages;
|
||||
if(oldStats.MediaImages == null)
|
||||
oldStats.MediaImages = newStats.MediaImages;
|
||||
else
|
||||
foreach(NameValueStats newNvs in newStats.MediaImages)
|
||||
{
|
||||
NameValueStats removeNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
|
||||
foreach(NameValueStats oldNvs in
|
||||
oldStats.MediaImages.Where(oldNvs => oldNvs.name == newNvs.name))
|
||||
{
|
||||
addNvs = new NameValueStats {name = oldNvs.name, Value = oldNvs.Value + newNvs.Value};
|
||||
addNvs = new NameValueStats
|
||||
{
|
||||
name = oldNvs.name,
|
||||
Value = oldNvs.Value + newNvs.Value
|
||||
};
|
||||
removeNvs = oldNvs;
|
||||
break;
|
||||
}
|
||||
@@ -294,17 +317,22 @@ namespace DiscImageChef.Server.Controllers
|
||||
}
|
||||
|
||||
if(newStats.Filters != null)
|
||||
if(oldStats.Filters == null) oldStats.Filters = newStats.Filters;
|
||||
if(oldStats.Filters == null)
|
||||
oldStats.Filters = newStats.Filters;
|
||||
else
|
||||
foreach(NameValueStats newNvs in newStats.Filters)
|
||||
{
|
||||
NameValueStats removeNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
NameValueStats addNvs = null;
|
||||
|
||||
foreach(NameValueStats oldNvs in
|
||||
oldStats.Filters.Where(oldNvs => oldNvs.name == newNvs.name))
|
||||
{
|
||||
addNvs = new NameValueStats {name = oldNvs.name, Value = oldNvs.Value + newNvs.Value};
|
||||
addNvs = new NameValueStats
|
||||
{
|
||||
name = oldNvs.name,
|
||||
Value = oldNvs.Value + newNvs.Value
|
||||
};
|
||||
removeNvs = oldNvs;
|
||||
break;
|
||||
}
|
||||
@@ -318,35 +346,38 @@ namespace DiscImageChef.Server.Controllers
|
||||
}
|
||||
|
||||
if(newStats.Devices != null)
|
||||
if(oldStats.Devices == null) oldStats.Devices = newStats.Devices;
|
||||
if(oldStats.Devices == null)
|
||||
oldStats.Devices = newStats.Devices;
|
||||
else
|
||||
foreach(DeviceStats newDev in from newDev in newStats.Devices
|
||||
let found =
|
||||
oldStats.Devices.Any(oldDev =>
|
||||
oldDev.Manufacturer ==
|
||||
newDev.Manufacturer &&
|
||||
oldDev.Model == newDev.Model &&
|
||||
newDev.Manufacturer &&
|
||||
oldDev.Model == newDev.Model &&
|
||||
oldDev.Revision == newDev.Revision &&
|
||||
oldDev.Bus == newDev.Bus)
|
||||
oldDev.Bus == newDev.Bus)
|
||||
where !found
|
||||
select newDev) oldStats.Devices.Add(newDev);
|
||||
select newDev)
|
||||
oldStats.Devices.Add(newDev);
|
||||
|
||||
if(newStats.Medias != null)
|
||||
if(oldStats.Medias == null) oldStats.Medias = newStats.Medias;
|
||||
if(oldStats.Medias == null)
|
||||
oldStats.Medias = newStats.Medias;
|
||||
else
|
||||
foreach(MediaStats newMstat in newStats.Medias)
|
||||
{
|
||||
MediaStats removeMstat = null;
|
||||
MediaStats addMstat = null;
|
||||
MediaStats addMstat = null;
|
||||
|
||||
foreach(MediaStats oldMstat in
|
||||
oldStats.Medias.Where(oldMstat => oldMstat.real == newMstat.real &&
|
||||
oldMstat.type == newMstat.type))
|
||||
foreach(MediaStats oldMstat in oldStats.Medias.Where(oldMstat =>
|
||||
oldMstat.real == newMstat.real &&
|
||||
oldMstat.type == newMstat.type))
|
||||
{
|
||||
addMstat = new MediaStats
|
||||
{
|
||||
real = oldMstat.real,
|
||||
type = oldMstat.type,
|
||||
real = oldMstat.real,
|
||||
type = oldMstat.type,
|
||||
Value = oldMstat.Value + newMstat.Value
|
||||
};
|
||||
removeMstat = oldMstat;
|
||||
@@ -362,40 +393,42 @@ namespace DiscImageChef.Server.Controllers
|
||||
}
|
||||
|
||||
if(newStats.MediaScan != null)
|
||||
if(oldStats.MediaScan == null) oldStats.MediaScan = newStats.MediaScan;
|
||||
if(oldStats.MediaScan == null)
|
||||
oldStats.MediaScan = newStats.MediaScan;
|
||||
else
|
||||
{
|
||||
if(oldStats.MediaScan.Sectors == null) oldStats.MediaScan.Sectors = newStats.MediaScan.Sectors;
|
||||
else
|
||||
{
|
||||
oldStats.MediaScan.Sectors.Correct = newStats.MediaScan.Sectors.Correct;
|
||||
oldStats.MediaScan.Sectors.Error = newStats.MediaScan.Sectors.Error;
|
||||
oldStats.MediaScan.Sectors.Total = newStats.MediaScan.Sectors.Total;
|
||||
oldStats.MediaScan.Sectors.Correct = newStats.MediaScan.Sectors.Correct;
|
||||
oldStats.MediaScan.Sectors.Error = newStats.MediaScan.Sectors.Error;
|
||||
oldStats.MediaScan.Sectors.Total = newStats.MediaScan.Sectors.Total;
|
||||
oldStats.MediaScan.Sectors.Unverifiable = newStats.MediaScan.Sectors.Unverifiable;
|
||||
}
|
||||
|
||||
if(oldStats.MediaScan.Times == null) oldStats.MediaScan.Times = newStats.MediaScan.Times;
|
||||
else
|
||||
{
|
||||
oldStats.MediaScan.Times.LessThan10ms = newStats.MediaScan.Times.LessThan10ms;
|
||||
oldStats.MediaScan.Times.LessThan10ms = newStats.MediaScan.Times.LessThan10ms;
|
||||
oldStats.MediaScan.Times.LessThan150ms = newStats.MediaScan.Times.LessThan150ms;
|
||||
oldStats.MediaScan.Times.LessThan3ms = newStats.MediaScan.Times.LessThan3ms;
|
||||
oldStats.MediaScan.Times.LessThan3ms = newStats.MediaScan.Times.LessThan3ms;
|
||||
oldStats.MediaScan.Times.LessThan500ms = newStats.MediaScan.Times.LessThan500ms;
|
||||
oldStats.MediaScan.Times.LessThan50ms = newStats.MediaScan.Times.LessThan50ms;
|
||||
oldStats.MediaScan.Times.LessThan50ms = newStats.MediaScan.Times.LessThan50ms;
|
||||
oldStats.MediaScan.Times.MoreThan500ms = newStats.MediaScan.Times.MoreThan500ms;
|
||||
}
|
||||
}
|
||||
|
||||
if(newStats.Verify != null)
|
||||
if(oldStats.Verify == null) oldStats.Verify = newStats.Verify;
|
||||
if(oldStats.Verify == null)
|
||||
oldStats.Verify = newStats.Verify;
|
||||
else
|
||||
{
|
||||
if(oldStats.Verify.Sectors == null) oldStats.Verify.Sectors = newStats.Verify.Sectors;
|
||||
else
|
||||
{
|
||||
oldStats.Verify.Sectors.Correct = newStats.Verify.Sectors.Correct;
|
||||
oldStats.Verify.Sectors.Error = newStats.Verify.Sectors.Error;
|
||||
oldStats.Verify.Sectors.Total = newStats.Verify.Sectors.Total;
|
||||
oldStats.Verify.Sectors.Correct = newStats.Verify.Sectors.Correct;
|
||||
oldStats.Verify.Sectors.Error = newStats.Verify.Sectors.Error;
|
||||
oldStats.Verify.Sectors.Total = newStats.Verify.Sectors.Total;
|
||||
oldStats.Verify.Sectors.Unverifiable = newStats.Verify.Sectors.Unverifiable;
|
||||
}
|
||||
|
||||
@@ -404,7 +437,7 @@ namespace DiscImageChef.Server.Controllers
|
||||
else
|
||||
{
|
||||
oldStats.Verify.MediaImages.Correct = newStats.Verify.MediaImages.Correct;
|
||||
oldStats.Verify.MediaImages.Failed = newStats.Verify.MediaImages.Failed;
|
||||
oldStats.Verify.MediaImages.Failed = newStats.Verify.MediaImages.Failed;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -413,7 +446,7 @@ namespace DiscImageChef.Server.Controllers
|
||||
.ThenBy(device => device.Model).ThenBy(device => device.Revision)
|
||||
.ThenBy(device => device.Bus).ToList();
|
||||
|
||||
Random rng = new Random();
|
||||
Random rng = new Random();
|
||||
string filename = $"BackupStats_{DateTime.UtcNow:yyyyMMddHHmmssfff}_{rng.Next()}.xml";
|
||||
while(File.Exists(Path.Combine(HostingEnvironment.MapPath("~"), "Statistics", filename)))
|
||||
filename = $"BackupStats_{DateTime.UtcNow:yyyyMMddHHmmssfff}_{rng.Next()}.xml";
|
||||
@@ -435,10 +468,10 @@ namespace DiscImageChef.Server.Controllers
|
||||
}
|
||||
catch(Exception ex)
|
||||
{
|
||||
#if DEBUG
|
||||
#if DEBUG
|
||||
System.Console.WriteLine("{0} {1}", ex.Message, ex.InnerException);
|
||||
throw;
|
||||
#else
|
||||
#else
|
||||
response.Content = new StringContent("error", System.Text.Encoding.UTF8, "text/plain");
|
||||
return response;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user