[Stats, DatFile] Merge Stats into DatFile

Since statistics are something that is supposed to be inherent to Dats, this makes the most sense being inside of DatFile
This commit is contained in:
Matt Nadareski
2016-09-22 17:00:34 -07:00
parent c17744984c
commit 0ed44d0b45
5 changed files with 158 additions and 172 deletions

View File

@@ -2370,6 +2370,161 @@ namespace SabreTools.Helper
#endregion
#region Statistics
/// <summary>
/// Recalculate the statistics for the Dat
/// </summary>
public void RecalculateStats()
{
// Wipe out any stats already there
RomCount = 0;
DiskCount = 0;
TotalSize = 0;
CRCCount = 0;
MD5Count = 0;
SHA1Count = 0;
NodumpCount = 0;
// If we have a blank Dat in any way, return
if (this == null || Files == null || Files.Count == 0)
{
return;
}
// Loop through and add
foreach (List<DatItem> roms in Files.Values)
{
foreach (Rom rom in roms)
{
RomCount += (rom.Type == ItemType.Rom ? 1 : 0);
DiskCount += (rom.Type == ItemType.Disk ? 1 : 0);
TotalSize += (rom.ItemStatus == ItemStatus.Nodump ? 0 : rom.Size);
CRCCount += (String.IsNullOrEmpty(rom.CRC) ? 0 : 1);
MD5Count += (String.IsNullOrEmpty(rom.MD5) ? 0 : 1);
SHA1Count += (String.IsNullOrEmpty(rom.SHA1) ? 0 : 1);
}
}
}
/// <summary>
/// Output the stats for the Dat in a human-readable format
/// </summary>
/// <param name="logger">Logger object for file and console writing</param>
/// <param name="recalculate">True if numbers should be recalculated for the DAT, false otherwise (default)</param>
/// <param name="game">Number of games to use, -1 means recalculate games (default)</param>
public void OutputStats(Logger logger, bool recalculate = false, long game = -1)
{
// If we're supposed to recalculate the statistics, do so
if (recalculate)
{
RecalculateStats();
}
SortedDictionary<string, List<DatItem>> newroms = DatFile.BucketByGame(Files, false, true, logger, false);
if (TotalSize < 0)
{
TotalSize = Int64.MaxValue + TotalSize;
}
logger.User(" Uncompressed size: " + Style.GetBytesReadable(TotalSize) + @"
Games found: " + (game == -1 ? newroms.Count : game) + @"
Roms found: " + RomCount + @"
Disks found: " + DiskCount + @"
Roms with CRC: " + CRCCount + @"
Roms with MD5: " + MD5Count + @"
Roms with SHA-1: " + SHA1Count + @"
Roms with Nodump status: " + NodumpCount + @"
");
}
/// <summary>
/// Output the stats for a list of input dats as files in a human-readable format
/// </summary>
/// <param name="inputs">List of input files and folders</param>
/// <param name="single">True if single DAT stats are output, false otherwise</param>
/// <param name="logger">Logger object for file and console output</param>
public static void OutputStats(List<string> inputs, bool single, Logger logger)
{
// Make sure we have all files
List<string> newinputs = new List<string>();
foreach (string input in inputs)
{
if (File.Exists(input))
{
newinputs.Add(input);
}
if (Directory.Exists(input))
{
foreach (string file in Directory.GetFiles(input, "*", SearchOption.AllDirectories))
{
newinputs.Add(file);
}
}
}
// Init all total variables
long totalSize = 0;
long totalGame = 0;
long totalRom = 0;
long totalDisk = 0;
long totalCRC = 0;
long totalMD5 = 0;
long totalSHA1 = 0;
long totalNodump = 0;
/// Now process each of the input files
foreach (string filename in newinputs)
{
logger.Log("Beginning stat collection for '" + filename + "'");
List<string> games = new List<string>();
DatFile datdata = new DatFile();
Parse(filename, 0, 0, ref datdata, logger);
SortedDictionary<string, List<DatItem>> newroms = BucketByGame(datdata.Files, false, true, logger, false);
// Output single DAT stats (if asked)
if (single)
{
logger.User(@"\nFor file '" + filename + @"':
--------------------------------------------------");
datdata.OutputStats(logger);
}
else
{
logger.User("Adding stats for file '" + filename + "'\n");
}
// Add single DAT stats to totals
totalSize += datdata.TotalSize;
totalGame += newroms.Count;
totalRom += datdata.RomCount;
totalDisk += datdata.DiskCount;
totalCRC += datdata.CRCCount;
totalMD5 += datdata.MD5Count;
totalSHA1 += datdata.SHA1Count;
totalNodump += datdata.NodumpCount;
}
// Output total DAT stats
if (!single) { logger.User(""); }
DatFile totaldata = new DatFile
{
TotalSize = totalSize,
RomCount = totalRom,
DiskCount = totalDisk,
CRCCount = totalCRC,
MD5Count = totalMD5,
SHA1Count = totalSHA1,
NodumpCount = totalNodump,
};
logger.User(@"For ALL DATs found
--------------------------------------------------");
totaldata.OutputStats(logger, game: totalGame);
logger.User(@"
Please check the log folder if the stats scrolled offscreen");
}
#endregion
#region Bucketing
/// <summary>
@@ -3110,7 +3265,7 @@ namespace SabreTools.Helper
// Output initial statistics, for kicks
if (stats)
{
Stats.OutputStats(datdata, logger, (datdata.RomCount + datdata.DiskCount == 0));
datdata.OutputStats(logger, (datdata.RomCount + datdata.DiskCount == 0));
}
// Bucket roms by game name and optionally dedupe

View File

@@ -264,7 +264,7 @@ namespace SabreTools.Helper
_logger.ClearBeneath(Constants.HeaderHeight);
Console.SetCursorPosition(0, Constants.HeaderHeight + 1);
_logger.User("Stats of the matched ROMs:");
Stats.OutputStats(_matched, _logger, true);
_matched.OutputStats(_logger, true);
// Now output the fixdat based on the original input if asked
if (_updateDat)

View File

@@ -1,150 +0,0 @@
using System;
using System.Collections.Generic;
namespace SabreTools.Helper
{
/// <summary>
/// Get statistics on one or more DAT files
/// </summary>
public class Stats
{
// Private instance variables
private List<String> _inputs;
private bool _single;
private Logger _logger;
/// <summary>
/// Create a new UncompressedSize object
/// </summary>
/// <param name="inputs">List of files and folders to parse</param>
/// <param name="single">True if single DAT stats are output, false otherwise</param>
/// <param name="logger">Logger object for file and console output</param>
public Stats(List<String> inputs, bool single, Logger logger)
{
_inputs = inputs;
_single = single;
_logger = logger;
}
/// <summary>
/// Output all requested statistics
/// </summary>
/// <returns>True if output succeeded, false otherwise</returns>
public bool Process()
{
// Init all total variables
long totalSize = 0;
long totalGame = 0;
long totalRom = 0;
long totalDisk = 0;
long totalCRC = 0;
long totalMD5 = 0;
long totalSHA1 = 0;
long totalNodump = 0;
/// Now process each of the input files
foreach (string filename in _inputs)
{
_logger.Log("Beginning stat collection for '" + filename + "'");
List<String> games = new List<String>();
DatFile datdata = new DatFile();
DatFile.Parse(filename, 0, 0, ref datdata, _logger);
SortedDictionary<string, List<DatItem>> newroms = DatFile.BucketByGame(datdata.Files, false, true, _logger, false);
// Output single DAT stats (if asked)
if (_single)
{
_logger.User(@"\nFor file '" + filename + @"':
--------------------------------------------------");
OutputStats(datdata, _logger);
}
else
{
_logger.User("Adding stats for file '" + filename + "'\n");
}
// Add single DAT stats to totals
totalSize += datdata.TotalSize;
totalGame += newroms.Count;
totalRom += datdata.RomCount;
totalDisk += datdata.DiskCount;
totalCRC += datdata.CRCCount;
totalMD5 += datdata.MD5Count;
totalSHA1 += datdata.SHA1Count;
totalNodump += datdata.NodumpCount;
}
// Output total DAT stats
if (!_single) { _logger.User(""); }
DatFile totaldata = new DatFile
{
TotalSize = totalSize,
RomCount = totalRom,
DiskCount = totalDisk,
CRCCount = totalCRC,
MD5Count = totalMD5,
SHA1Count = totalSHA1,
NodumpCount = totalNodump,
};
_logger.User(@"For ALL DATs found
--------------------------------------------------");
OutputStats(totaldata, _logger, game:totalGame);
_logger.User(@"
Please check the log folder if the stats scrolled offscreen");
return true;
}
/// <summary>
/// Output the stats in a human-readable format
/// </summary>
/// <param name="datdata">DatData object to read stats from</param>
/// <param name="logger">Logger object for file and console writing</param>
/// <param name="recalculate">True if numbers should be recalculated for the DAT, false otherwise (default)</param>
/// <param name="game">Number of games to use, -1 means recalculate games (default)</param>
public static void OutputStats(DatFile datdata, Logger logger, bool recalculate = false, long game = -1)
{
if (recalculate)
{
// Wipe out any stats already there
datdata.RomCount = 0;
datdata.DiskCount = 0;
datdata.TotalSize = 0;
datdata.CRCCount = 0;
datdata.MD5Count = 0;
datdata.SHA1Count = 0;
datdata.NodumpCount = 0;
// Loop through and add
foreach (List<DatItem> roms in datdata.Files.Values)
{
foreach (Rom rom in roms)
{
datdata.RomCount += (rom.Type == ItemType.Rom ? 1 : 0);
datdata.DiskCount += (rom.Type == ItemType.Disk ? 1 : 0);
datdata.TotalSize += (rom.ItemStatus == ItemStatus.Nodump ? 0 : rom.Size);
datdata.CRCCount += (String.IsNullOrEmpty(rom.CRC) ? 0 : 1);
datdata.MD5Count += (String.IsNullOrEmpty(rom.MD5) ? 0 : 1);
datdata.SHA1Count += (String.IsNullOrEmpty(rom.SHA1) ? 0 : 1);
datdata.NodumpCount += (rom.ItemStatus == ItemStatus.Nodump ? 1 : 0);
}
}
}
SortedDictionary<string, List<DatItem>> newroms = DatFile.BucketByGame(datdata.Files, false, true, logger, false);
if (datdata.TotalSize < 0)
{
datdata.TotalSize = Int64.MaxValue + datdata.TotalSize;
}
logger.User(" Uncompressed size: " + Style.GetBytesReadable(datdata.TotalSize) + @"
Games found: " + (game == -1 ? newroms.Count : game) + @"
Roms found: " + datdata.RomCount + @"
Disks found: " + datdata.DiskCount + @"
Roms with CRC: " + datdata.CRCCount + @"
Roms with MD5: " + datdata.MD5Count + @"
Roms with SHA-1: " + datdata.SHA1Count + @"
Roms with Nodump status: " + datdata.NodumpCount + @"
");
}
}
}

View File

@@ -141,7 +141,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Mappings\Mappings.cs" />
<Compile Include="Data\Structs.cs" />
<Compile Include="Objects\Stats.cs" />
<Compile Include="Tools\Style.cs" />
<Compile Include="Data\Build.cs" />
</ItemGroup>

View File

@@ -262,26 +262,8 @@ namespace SabreTools
/// <param name="single">True to show individual DAT statistics, false otherwise</param>
private static void InitStats(List<string> inputs, bool single)
{
List<string> newinputs = new List<string>();
foreach (string input in inputs)
{
if (File.Exists(input))
{
newinputs.Add(input);
}
if (Directory.Exists(input))
{
foreach (string file in Directory.GetFiles(input, "*", SearchOption.AllDirectories))
{
newinputs.Add(file);
}
}
}
Logger statlog = new Logger(true, "stats.txt");
Stats stats = new Stats(newinputs, single, statlog);
stats.Process();
DatFile.OutputStats(inputs, single, statlog);
statlog.Close(true);
}