| " + HttpUtility.HtmlEncode(_datFile.FileName.Remove(0, 5))
+ : "> | " + HttpUtility.HtmlEncode(_datFile.FileName)) + " | "
+ + "" + Style.GetBytesReadable(_datFile.TotalSize) + " | "
+ + "" + (game == -1 ? _datFile.Keys.Count() : game) + " | "
+ + "" + _datFile.RomCount + " | "
+ + "" + _datFile.DiskCount + " | "
+ + "" + _datFile.CRCCount + " | "
+ + "" + _datFile.MD5Count + " | "
+ + "" + _datFile.SHA1Count + " | "
+ + "" + _datFile.SHA256Count + " | "
+ + (_baddumpCol ? "" + _datFile.BaddumpCount + " | " : "")
+ + (_nodumpCol ? "" + _datFile.NodumpCount + " | " : "")
+ + "\n";
+ _writer.Write(line);
+ _writer.Flush();
+ }
+
+ ///
+ /// Write out the header to the stream, if any exists
+ ///
+ public override void WriteStatsHeader()
+ {
+ _writer.Write(@"
+
+
+ DAT Statistics Report
+
+
+
+ DAT Statistics Report (" + DateTime.Now.ToShortDateString() + @")
+
+");
+ _writer.Flush();
+
+ // Now write the mid header for those who need it
+ WriteStatsMidHeader();
+ }
+
+ ///
+ /// Write out the mid-header to the stream, if any exists
+ ///
+ public override void WriteStatsMidHeader()
+ {
+ _writer.Write(@" | File Name | Total Size | Games | Roms | "
++ @"Disks | # with CRC | # with MD5 | # with SHA-1 | # with SHA-256 | "
++ (_baddumpCol ? "Baddumps | " : "") + (_nodumpCol ? "Nodumps | " : "") + "
|---|
\n");
+ _writer.Flush();
+ }
+
+ ///
+ /// Write out the separator to the stream, if any exists
+ ///
+ public override void WriteStatsMidSeparator()
+ {
+ _writer.Write(" |
\n");
+ _writer.Flush();
+ }
+
+ ///
+ /// Write out the footer-separator to the stream, if any exists
+ ///
+ public override void WriteStatsFooterSeparator()
+ {
+ _writer.Write(" |
\n");
+ _writer.Flush();
+ }
+
+ ///
+ /// Write out the footer to the stream, if any exists
+ ///
+ public override void WriteStatsFooter()
+ {
+ _writer.Write(@"
+
+
+");
+ _writer.Flush();
+ }
+ }
+}
diff --git a/SabreTools.Library/Reports/SeparatedValue.cs b/SabreTools.Library/Reports/SeparatedValue.cs
new file mode 100644
index 00000000..d138ebd3
--- /dev/null
+++ b/SabreTools.Library/Reports/SeparatedValue.cs
@@ -0,0 +1,124 @@
+using System.Linq;
+
+using SabreTools.Library.DatFiles;
+
+#if MONO
+using System.IO;
+#else
+using Alphaleonis.Win32.Filesystem;
+
+using FileStream = System.IO.FileStream;
+using IOException = System.IO.IOException;
+using MemoryStream = System.IO.MemoryStream;
+using SearchOption = System.IO.SearchOption;
+using SeekOrigin = System.IO.SeekOrigin;
+using Stream = System.IO.Stream;
+using StreamWriter = System.IO.StreamWriter;
+#endif
+
+namespace SabreTools.Library.Reports
+{
+ ///
+ /// Separated-Value report format
+ ///
+ public class SeparatedValue : BaseReport
+ {
+ private char _separator;
+
+ ///
+ /// Create a new report from the input DatFile and the filename
+ ///
+ /// DatFile to write out statistics for
+ /// Name of the file to write out to
+ /// Separator character to use in output
+ /// True if baddumps should be included in output, false otherwise
+ /// True if nodumps should be included in output, false otherwise
+ public SeparatedValue(DatFile datfile, string filename, char separator, bool baddumpCol = false, bool nodumpCol = false)
+ : base(datfile, filename, baddumpCol, nodumpCol)
+ {
+ _separator = separator;
+ }
+
+ ///
+ /// Create a new report from the input DatFile and the stream
+ ///
+ /// DatFile to write out statistics for
+ /// Output stream to write to
+ /// Separator character to use in output
+ /// True if baddumps should be included in output, false otherwise
+ /// True if nodumps should be included in output, false otherwise
+ public SeparatedValue(DatFile datfile, Stream stream, char separator, bool baddumpCol = false, bool nodumpCol = false)
+ : base(datfile, stream, baddumpCol, nodumpCol)
+ {
+ _separator = separator;
+ }
+
+ ///
+ /// Write the report to file
+ ///
+ /// Number of games to use, -1 means use the number of keys
+ public override void Write(long game = -1)
+ {
+ string line = string.Format("\"" + _datFile.FileName + "\"{0}"
+ + "\"" + _datFile.TotalSize + "\"{0}"
+ + "\"" + (game == -1 ? _datFile.Keys.Count() : game) + "\"{0}"
+ + "\"" + _datFile.RomCount + "\"{0}"
+ + "\"" + _datFile.DiskCount + "\"{0}"
+ + "\"" + _datFile.CRCCount + "\"{0}"
+ + "\"" + _datFile.MD5Count + "\"{0}"
+ + "\"" + _datFile.SHA1Count + "\"{0}"
+ + "\"" + _datFile.SHA256Count + "\"{0}"
+ + "\"" + _datFile.SHA384Count + "\"{0}"
+ + "\"" + _datFile.SHA512Count + "\""
+ + (_baddumpCol ? "{0}\"" + _datFile.BaddumpCount + "\"" : "")
+ + (_nodumpCol ? "{0}\"" + _datFile.BaddumpCount + "\"" : "")
+ + "\n", _separator);
+
+ _writer.Write(line);
+ _writer.Flush();
+ }
+
+ ///
+ /// Write out the header to the stream, if any exists
+ ///
+ public override void WriteStatsHeader()
+ {
+ _writer.Write(string.Format("\"File Name\"{0}\"Total Size\"{0}\"Games\"{0}\"Roms\"{0}\"Disks\"{0}\"# with CRC\"{0}\"# with MD5\"{0}\"# with SHA-1\"{0}\"# with SHA-256\""
+ + (_baddumpCol ? "{0}\"BadDumps\"" : "") + (_nodumpCol ? "{0}\"Nodumps\"" : "") + "\n", _separator));
+ _writer.Flush();
+ }
+
+ ///
+ /// Write out the mid-header to the stream, if any exists
+ ///
+ public override void WriteStatsMidHeader()
+ {
+ // This call is a no-op for separated value formats
+ }
+
+ ///
+ /// Write out the separator to the stream, if any exists
+ ///
+ public override void WriteStatsMidSeparator()
+ {
+ // This call is a no-op for separated value formats
+ }
+
+ ///
+ /// Write out the footer-separator to the stream, if any exists
+ ///
+ public override void WriteStatsFooterSeparator()
+ {
+ _writer.Write("\n");
+ _writer.Flush();
+ }
+
+ ///
+ /// Write out the footer to the stream, if any exists
+ ///
+ public override void WriteStatsFooter()
+ {
+ // This call is a no-op for separated value formats
+ }
+ }
+}
diff --git a/SabreTools.Library/Reports/Textfile.cs b/SabreTools.Library/Reports/Textfile.cs
new file mode 100644
index 00000000..fd1fbf82
--- /dev/null
+++ b/SabreTools.Library/Reports/Textfile.cs
@@ -0,0 +1,126 @@
+using System.Linq;
+
+using SabreTools.Library.DatFiles;
+using SabreTools.Library.Tools;
+
+#if MONO
+using System.IO;
+#else
+using Alphaleonis.Win32.Filesystem;
+
+using FileStream = System.IO.FileStream;
+using IOException = System.IO.IOException;
+using MemoryStream = System.IO.MemoryStream;
+using SearchOption = System.IO.SearchOption;
+using SeekOrigin = System.IO.SeekOrigin;
+using Stream = System.IO.Stream;
+using StreamWriter = System.IO.StreamWriter;
+#endif
+
+namespace SabreTools.Library.Reports
+{
+ ///
+ /// Textfile report format
+ ///
+ public class Textfile : BaseReport
+ {
+ ///
+ /// Create a new report from the input DatFile and the filename
+ ///
+ /// DatFile to write out statistics for
+ /// Name of the file to write out to
+ /// True if baddumps should be included in output, false otherwise
+ /// True if nodumps should be included in output, false otherwise
+ public Textfile(DatFile datfile, string filename, bool baddumpCol = false, bool nodumpCol = false)
+ : base(datfile, filename, baddumpCol, nodumpCol)
+ {
+ }
+
+ ///
+ /// Create a new report from the input DatFile and the stream
+ ///
+ /// DatFile to write out statistics for
+ /// Output stream to write to
+ /// True if baddumps should be included in output, false otherwise
+ /// True if nodumps should be included in output, false otherwise
+ public Textfile(DatFile datfile, Stream stream, bool baddumpCol = false, bool nodumpCol = false)
+ : base(datfile, stream, baddumpCol, nodumpCol)
+ {
+ }
+
+ ///
+ /// Write the report to file
+ ///
+ /// Number of games to use, -1 means use the number of keys
+ public override void Write(long game = -1)
+ {
+ string line = @"'" + _datFile.FileName + @"':
+--------------------------------------------------
+ Uncompressed size: " + Style.GetBytesReadable(_datFile.TotalSize) + @"
+ Games found: " + (game == -1 ? _datFile.Keys.Count() : game) + @"
+ Roms found: " + _datFile.RomCount + @"
+ Disks found: " + _datFile.DiskCount + @"
+ Roms with CRC: " + _datFile.CRCCount + @"
+ Roms with SHA-1: " + _datFile.SHA1Count + @"
+ Roms with SHA-256: " + _datFile.SHA256Count + @"
+ Roms with SHA-384: " + _datFile.SHA384Count + @"
+ Roms with SHA-512: " + _datFile.SHA512Count + "\n";
+
+ if (_baddumpCol)
+ {
+ line += " Roms with BadDump status: " + _datFile.BaddumpCount + "\n";
+ }
+ if (_nodumpCol)
+ {
+ line += " Roms with Nodump status: " + _datFile.NodumpCount + "\n";
+ }
+
+ // For spacing between DATs
+ line += "\n\n";
+
+ _writer.Write(line);
+ _writer.Flush();
+ }
+
+ ///
+ /// Write out the header to the stream, if any exists
+ ///
+ public override void WriteStatsHeader()
+ {
+ // This call is a no-op for textfile output
+ }
+
+ ///
+ /// Write out the mid-header to the stream, if any exists
+ ///
+ public override void WriteStatsMidHeader()
+ {
+ // This call is a no-op for textfile output
+ }
+
+ ///
+ /// Write out the separator to the stream, if any exists
+ ///
+ public override void WriteStatsMidSeparator()
+ {
+ // This call is a no-op for textfile output
+ }
+
+ ///
+ /// Write out the footer-separator to the stream, if any exists
+ ///
+ public override void WriteStatsFooterSeparator()
+ {
+ _writer.Write("\n");
+ _writer.Flush();
+ }
+
+ ///
+ /// Write out the footer to the stream, if any exists
+ ///
+ public override void WriteStatsFooter()
+ {
+ // This call is a no-op for textfile output
+ }
+ }
+}
diff --git a/SabreTools.Library/SabreTools.Library.csproj b/SabreTools.Library/SabreTools.Library.csproj
index fd4819a9..ca65b2cb 100644
--- a/SabreTools.Library/SabreTools.Library.csproj
+++ b/SabreTools.Library/SabreTools.Library.csproj
@@ -175,6 +175,10 @@
+
+
+
+
diff --git a/SabreTools.Library/Tools/Style.cs b/SabreTools.Library/Tools/Style.cs
index 221c7949..71b979f0 100644
--- a/SabreTools.Library/Tools/Style.cs
+++ b/SabreTools.Library/Tools/Style.cs
@@ -331,9 +331,9 @@ namespace SabreTools.Library.Tools
/// StatDatFormat to get the extension for
/// Name of the input file to use
/// Dictionary of output formats mapped to file names
- public static Dictionary CreateOutStatsNames(string outDir, StatDatFormat statDatFormat, string reportName, bool overwrite = true)
+ public static Dictionary CreateOutStatsNames(string outDir, StatReportFormat statDatFormat, string reportName, bool overwrite = true)
{
- Dictionary output = new Dictionary();
+ Dictionary output = new Dictionary();
// First try to create the output directory if we need to
if (!Directory.Exists(outDir))
@@ -348,21 +348,21 @@ namespace SabreTools.Library.Tools
}
// For each output format, get the appropriate stream writer
- if ((statDatFormat & StatDatFormat.None) != 0)
+ if ((statDatFormat & StatReportFormat.None) != 0)
{
- output.Add(StatDatFormat.None, CreateOutStatsNamesHelper(outDir, ".txt", reportName, overwrite));
+ output.Add(StatReportFormat.None, CreateOutStatsNamesHelper(outDir, ".txt", reportName, overwrite));
}
- if ((statDatFormat & StatDatFormat.CSV) != 0)
+ if ((statDatFormat & StatReportFormat.CSV) != 0)
{
- output.Add(StatDatFormat.CSV, CreateOutStatsNamesHelper(outDir, ".csv", reportName, overwrite));
+ output.Add(StatReportFormat.CSV, CreateOutStatsNamesHelper(outDir, ".csv", reportName, overwrite));
}
- if ((statDatFormat & StatDatFormat.HTML) != 0)
+ if ((statDatFormat & StatReportFormat.HTML) != 0)
{
- output.Add(StatDatFormat.HTML, CreateOutStatsNamesHelper(outDir, ".html", reportName, overwrite));
+ output.Add(StatReportFormat.HTML, CreateOutStatsNamesHelper(outDir, ".html", reportName, overwrite));
}
- if ((statDatFormat & StatDatFormat.TSV) != 0)
+ if ((statDatFormat & StatReportFormat.TSV) != 0)
{
- output.Add(StatDatFormat.TSV, CreateOutStatsNamesHelper(outDir, ".tsv", reportName, overwrite));
+ output.Add(StatReportFormat.TSV, CreateOutStatsNamesHelper(outDir, ".tsv", reportName, overwrite));
}
return output;
diff --git a/SabreTools/SabreTools.Help.cs b/SabreTools/SabreTools.Help.cs
index 3a870ef6..1caf42bc 100644
--- a/SabreTools/SabreTools.Help.cs
+++ b/SabreTools/SabreTools.Help.cs
@@ -738,10 +738,15 @@ namespace SabreTools
FeatureType.Flag,
null));
stats.AddFeature("tsv", new Feature(
- new List() { "-tsv", "--csv" },
+ new List() { "-tsv", "--tsv" },
"Output in Tab-Separated Value format",
FeatureType.Flag,
null));
+ stats.AddFeature("text", new Feature(
+ new List() { "-txt", "--text" },
+ "Output in generic text format",
+ FeatureType.Flag,
+ null));
// Create the Type Split feature
Feature typeSplit = new Feature(
diff --git a/SabreTools/SabreTools.Inits.cs b/SabreTools/SabreTools.Inits.cs
index 7468bee6..7e0cf358 100644
--- a/SabreTools/SabreTools.Inits.cs
+++ b/SabreTools/SabreTools.Inits.cs
@@ -404,7 +404,7 @@ namespace SabreTools
/// True if nodumps should be included in output, false otherwise
/// Set the statistics output format to use
private static void InitStats(List inputs, string filename, string outDir, bool single, bool baddumpCol, bool nodumpCol,
- StatDatFormat statDatFormat)
+ StatReportFormat statDatFormat)
{
DatFile.OutputStats(inputs, filename, outDir, single, baddumpCol, nodumpCol, statDatFormat);
}
diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs
index da737365..c63dbab0 100644
--- a/SabreTools/SabreTools.cs
+++ b/SabreTools/SabreTools.cs
@@ -128,7 +128,7 @@ namespace SabreTools
OutputFormat outputFormat = OutputFormat.Folder;
SkipFileType skipFileType = SkipFileType.None;
SplitType splitType = SplitType.None;
- StatDatFormat statDatFormat = 0x0;
+ StatReportFormat statDatFormat = 0x0;
UpdateMode updateMode = UpdateMode.None;
// User inputs
@@ -293,6 +293,10 @@ namespace SabreTools
case "--against":
updateMode |= UpdateMode.DiffAgainst;
break;
+ case "-as":
+ case "--all-stats":
+ statDatFormat = StatReportFormat.All;
+ break;
case "-b":
case "--bare":
removeDateFromAutomaticName = true;
@@ -323,7 +327,7 @@ namespace SabreTools
break;
case "-csv":
case "--csv":
- statDatFormat |= StatDatFormat.CSV;
+ statDatFormat |= StatReportFormat.CSV;
break;
case "-dan":
case "--desc-name":
@@ -391,7 +395,7 @@ namespace SabreTools
break;
case "-html":
case "--html":
- statDatFormat |= StatDatFormat.HTML;
+ statDatFormat |= StatReportFormat.HTML;
break;
case "-ic":
case "--ignore-chd":
@@ -631,12 +635,16 @@ namespace SabreTools
break;
case "-tsv":
case "--tsv":
- statDatFormat |= StatDatFormat.TSV;
+ statDatFormat |= StatReportFormat.TSV;
break;
case "-txz":
case "--txz":
outputFormat = OutputFormat.TorrentXZ;
break;
+ case "-txt":
+ case "--text":
+ statDatFormat |= StatReportFormat.None;
+ break;
case "-tzip":
case "--tzip":
outputFormat = OutputFormat.TorrentZip;