diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs index 105d38f7..78699f66 100644 --- a/SabreTools.Library/DatFiles/DatFile.cs +++ b/SabreTools.Library/DatFiles/DatFile.cs @@ -5738,7 +5738,7 @@ namespace SabreTools.Library.DatFiles } // Write the header, if any - reports.ForEach(report => report.WriteStatsHeader()); + reports.ForEach(report => report.WriteHeader()); // Init all total variables DatStats totalStats = new DatStats(); @@ -5759,7 +5759,7 @@ namespace SabreTools.Library.DatFiles if (lastdir != null && thisdir != lastdir) { // Output separator if needed - reports.ForEach(report => report.WriteStatsMidSeparator()); + reports.ForEach(report => report.WriteMidSeparator()); DatFile lastdirdat = new DatFile { @@ -5772,10 +5772,10 @@ namespace SabreTools.Library.DatFiles reports.ForEach(report => report.Write(game: dirStats.GameCount)); // Write the mid-footer, if any - reports.ForEach(report => report.WriteStatsFooterSeparator()); + reports.ForEach(report => report.WriteFooterSeparator()); // Write the header, if any - reports.ForEach(report => report.WriteStatsMidHeader()); + reports.ForEach(report => report.WriteMidHeader()); // Reset the directory stats dirStats.Reset(); @@ -5809,7 +5809,7 @@ namespace SabreTools.Library.DatFiles } // Output the directory stats one last time - reports.ForEach(report => report.WriteStatsMidSeparator()); + reports.ForEach(report => report.WriteMidSeparator()); if (single) { @@ -5825,10 +5825,10 @@ namespace SabreTools.Library.DatFiles } // Write the mid-footer, if any - reports.ForEach(report => report.WriteStatsFooterSeparator()); + reports.ForEach(report => report.WriteFooterSeparator()); // Write the header, if any - reports.ForEach(report => report.WriteStatsMidHeader()); + reports.ForEach(report => report.WriteMidHeader()); // Reset the directory stats dirStats.Reset(); @@ -5845,7 +5845,7 @@ namespace SabreTools.Library.DatFiles reports.ForEach(report => report.Write(totalStats.GameCount)); // Output footer if needed - reports.ForEach(report => report.WriteStatsFooter()); + reports.ForEach(report => report.WriteFooter()); Globals.Logger.User(@" Please check the log folder if the stats scrolled offscreen", false); diff --git a/SabreTools.Library/Reports/BaseReport.cs b/SabreTools.Library/Reports/BaseReport.cs index 1548408c..f26bd9f8 100644 --- a/SabreTools.Library/Reports/BaseReport.cs +++ b/SabreTools.Library/Reports/BaseReport.cs @@ -78,26 +78,26 @@ namespace SabreTools.Library.Reports /// /// Write out the header to the stream, if any exists /// - public abstract void WriteStatsHeader(); + public abstract void WriteHeader(); /// /// Write out the mid-header to the stream, if any exists /// - public abstract void WriteStatsMidHeader(); + public abstract void WriteMidHeader(); /// /// Write out the separator to the stream, if any exists /// - public abstract void WriteStatsMidSeparator(); + public abstract void WriteMidSeparator(); /// /// Write out the footer-separator to the stream, if any exists /// - public abstract void WriteStatsFooterSeparator(); + public abstract void WriteFooterSeparator(); /// /// Write out the footer to the stream, if any exists /// - public abstract void WriteStatsFooter(); + public abstract void WriteFooter(); } } diff --git a/SabreTools.Library/Reports/Html.cs b/SabreTools.Library/Reports/Html.cs index fdd35536..0a96e823 100644 --- a/SabreTools.Library/Reports/Html.cs +++ b/SabreTools.Library/Reports/Html.cs @@ -72,7 +72,7 @@ namespace SabreTools.Library.Reports /// /// Write out the header to the stream, if any exists /// - public override void WriteStatsHeader() + public override void WriteHeader() { _writer.Write(@" @@ -97,13 +97,13 @@ namespace SabreTools.Library.Reports _writer.Flush(); // Now write the mid header for those who need it - WriteStatsMidHeader(); + WriteMidHeader(); } /// /// Write out the mid-header to the stream, if any exists /// - public override void WriteStatsMidHeader() + public override void WriteMidHeader() { _writer.Write(@" File NameTotal SizeGamesRoms" + @"Disks# with CRC# with MD5# with SHA-1# with SHA-256" @@ -114,7 +114,7 @@ namespace SabreTools.Library.Reports /// /// Write out the separator to the stream, if any exists /// - public override void WriteStatsMidSeparator() + public override void WriteMidSeparator() { _writer.Write(" /// Write out the footer-separator to the stream, if any exists /// - public override void WriteStatsFooterSeparator() + public override void WriteFooterSeparator() { _writer.Write(" /// Write out the footer to the stream, if any exists /// - public override void WriteStatsFooter() + public override void WriteFooter() { _writer.Write(@" diff --git a/SabreTools.Library/Reports/SeparatedValue.cs b/SabreTools.Library/Reports/SeparatedValue.cs index 41dcbc59..3b386fc1 100644 --- a/SabreTools.Library/Reports/SeparatedValue.cs +++ b/SabreTools.Library/Reports/SeparatedValue.cs @@ -75,7 +75,7 @@ namespace SabreTools.Library.Reports /// /// Write out the header to the stream, if any exists /// - public override void WriteStatsHeader() + public override void WriteHeader() { _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)); @@ -85,7 +85,7 @@ namespace SabreTools.Library.Reports /// /// Write out the mid-header to the stream, if any exists /// - public override void WriteStatsMidHeader() + public override void WriteMidHeader() { // This call is a no-op for separated value formats } @@ -93,7 +93,7 @@ namespace SabreTools.Library.Reports /// /// Write out the separator to the stream, if any exists /// - public override void WriteStatsMidSeparator() + public override void WriteMidSeparator() { // This call is a no-op for separated value formats } @@ -101,7 +101,7 @@ namespace SabreTools.Library.Reports /// /// Write out the footer-separator to the stream, if any exists /// - public override void WriteStatsFooterSeparator() + public override void WriteFooterSeparator() { _writer.Write("\n"); _writer.Flush(); @@ -110,7 +110,7 @@ namespace SabreTools.Library.Reports /// /// Write out the footer to the stream, if any exists /// - public override void WriteStatsFooter() + public override void WriteFooter() { // This call is a no-op for separated value formats } diff --git a/SabreTools.Library/Reports/Textfile.cs b/SabreTools.Library/Reports/Textfile.cs index 4dc3a7d6..3d491fbb 100644 --- a/SabreTools.Library/Reports/Textfile.cs +++ b/SabreTools.Library/Reports/Textfile.cs @@ -79,7 +79,7 @@ namespace SabreTools.Library.Reports /// /// Write out the header to the stream, if any exists /// - public override void WriteStatsHeader() + public override void WriteHeader() { // This call is a no-op for textfile output } @@ -87,7 +87,7 @@ namespace SabreTools.Library.Reports /// /// Write out the mid-header to the stream, if any exists /// - public override void WriteStatsMidHeader() + public override void WriteMidHeader() { // This call is a no-op for textfile output } @@ -95,7 +95,7 @@ namespace SabreTools.Library.Reports /// /// Write out the separator to the stream, if any exists /// - public override void WriteStatsMidSeparator() + public override void WriteMidSeparator() { // This call is a no-op for textfile output } @@ -103,7 +103,7 @@ namespace SabreTools.Library.Reports /// /// Write out the footer-separator to the stream, if any exists /// - public override void WriteStatsFooterSeparator() + public override void WriteFooterSeparator() { _writer.Write("\n"); _writer.Flush(); @@ -112,7 +112,7 @@ namespace SabreTools.Library.Reports /// /// Write out the footer to the stream, if any exists /// - public override void WriteStatsFooter() + public override void WriteFooter() { // This call is a no-op for textfile output }