claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup and overhaul (#21)

Browse Source 
* Syntax cleanup

* More minor cleanup, use Linq

* Fix broken features by using correct values

* Feature flags the same

* Features are modular

* No AlphaFS, more .NET versions

* Fix appveyor

* Put back identifiers, for some reason

* String interpolation, modernization

* Better use of GetField

* XmlTextWriter to remove possible issues

* Fix header for OpenMSX
This commit is contained in:
Matt Nadareski
2020-06-10 22:37:19 -07:00
committed by GitHub
parent f01e47444c
commit 4ad77d6be6
75 changed files with 6945 additions and 7249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SabreTools.Library/Reports/BaseReport.cs
View File

@@ -1,17 +1,9 @@
using System;
using System.IO;
using SabreTools.Library.DatFiles;
using SabreTools.Library.Tools;
#if MONO
using System.IO;
#else
using Alphaleonis.Win32.Filesystem;
using Stream = System.IO.Stream;
using StreamWriter = System.IO.StreamWriter;
#endif
namespace SabreTools.Library.Reports
{
/// <summary>
@@ -51,9 +43,7 @@ namespace SabreTools.Library.Reports
_datFile = datfile;
if (!stream.CanWrite)
{
throw new ArgumentException(nameof(stream));
}
_writer = new StreamWriter(stream);
_baddumpCol = baddumpCol;

43
SabreTools.Library/Reports/Html.cs
View File

@@ -1,18 +1,11 @@
using System;
using System.IO;
using System.Linq;
using System.Net;
using SabreTools.Library.DatFiles;
using SabreTools.Library.Tools;
#if MONO
using System.IO;
#else
using Alphaleonis.Win32.Filesystem;
using Stream = System.IO.Stream;
#endif
namespace SabreTools.Library.Reports
{
/// <summary>
@@ -52,19 +45,19 @@ namespace SabreTools.Library.Reports
public override void Write(long game = -1)
{
string line = "\t\t\t<tr" + (_datFile.FileName.StartsWith("DIR: ")
? " class=\"dir\"><td>" + WebUtility.HtmlEncode(_datFile.FileName.Remove(0, 5))
: "><td>" + WebUtility.HtmlEncode(_datFile.FileName)) + "</td>"
+ "<td align=\"right\">" + Utilities.GetBytesReadable(_datFile.TotalSize) + "</td>"
+ "<td align=\"right\">" + (game == -1 ? _datFile.Keys.Count() : game) + "</td>"
+ "<td align=\"right\">" + _datFile.RomCount + "</td>"
+ "<td align=\"right\">" + _datFile.DiskCount + "</td>"
+ "<td align=\"right\">" + _datFile.CRCCount + "</td>"
+ "<td align=\"right\">" + _datFile.MD5Count + "</td>"
+ "<td align=\"right\">" + _datFile.RIPEMD160Count + "</td>"
+ "<td align=\"right\">" + _datFile.SHA1Count + "</td>"
+ "<td align=\"right\">" + _datFile.SHA256Count + "</td>"
+ (_baddumpCol ? "<td align=\"right\">" + _datFile.BaddumpCount + "</td>" : "")
+ (_nodumpCol ? "<td align=\"right\">" + _datFile.NodumpCount + "</td>" : "")
? $" class=\"dir\"><td>{WebUtility.HtmlEncode(_datFile.FileName.Remove(0, 5))}"
: $"><td>{WebUtility.HtmlEncode(_datFile.FileName)}") + "</td>"
+ $"<td align=\"right\">{Utilities.GetBytesReadable(_datFile.TotalSize)}</td>"
+ $"<td align=\"right\">{(game == -1 ? _datFile.Keys.Count() : game)}</td>"
+ $"<td align=\"right\">{_datFile.RomCount}</td>"
+ $"<td align=\"right\">{_datFile.DiskCount}</td>"
+ $"<td align=\"right\">{_datFile.CRCCount}</td>"
+ $"<td align=\"right\">{_datFile.MD5Count}</td>"
+ $"<td align=\"right\">{_datFile.RIPEMD160Count}</td>"
+ $"<td align=\"right\">{_datFile.SHA1Count}</td>"
+ $"<td align=\"right\">{_datFile.SHA256Count}</td>"
+ (_baddumpCol ? $"<td align=\"right\">{_datFile.BaddumpCount}</td>" : string.Empty)
+ (_nodumpCol ? $"<td align=\"right\">{_datFile.NodumpCount}</td>" : string.Empty)
+ "</tr>\n";
_writer.Write(line);
_writer.Flush();
@@ -93,7 +86,7 @@ namespace SabreTools.Library.Reports
</header>
<body>
<h2>DAT Statistics Report (" + DateTime.Now.ToShortDateString() + @")</h2>
<table border=""1"" cellpadding=""5"" cellspacing=""0"">
<table border=string.Empty1string.Empty cellpadding=string.Empty5string.Empty cellspacing=string.Empty0string.Empty>
");
_writer.Flush();
@@ -106,9 +99,9 @@ namespace SabreTools.Library.Reports
/// </summary>
public override void WriteMidHeader()
{
_writer.Write(@" <tr bgcolor=""gray""><th>File Name</th><th align=""right"">Total Size</th><th align=""right"">Games</th><th align=""right"">Roms</th>"
+ @"<th align=""right"">Disks</th><th align=""right"">&#35; with CRC</th><th align=""right"">&#35; with MD5</th><th align=""right"">&#35; with SHA-1</th><th align=""right"">&#35; with SHA-256</th>"
+ (_baddumpCol ? "<th class=\".right\">Baddumps</th>" : "") + (_nodumpCol ? "<th class=\".right\">Nodumps</th>" : "") + "</tr>\n");
_writer.Write(@" <tr bgcolor=string.Emptygraystring.Empty><th>File Name</th><th align=string.Emptyrightstring.Empty>Total Size</th><th align=string.Emptyrightstring.Empty>Games</th><th align=string.Emptyrightstring.Empty>Roms</th>"
+ @"<th align=string.Emptyrightstring.Empty>Disks</th><th align=string.Emptyrightstring.Empty>&#35; with CRC</th><th align=string.Emptyrightstring.Empty>&#35; with MD5</th><th align=string.Emptyrightstring.Empty>&#35; with SHA-1</th><th align=string.Emptyrightstring.Empty>&#35; with SHA-256</th>"
+ (_baddumpCol ? "<th class=\".right\">Baddumps</th>" : string.Empty) + (_nodumpCol ? "<th class=\".right\">Nodumps</th>" : string.Empty) + "</tr>\n");
_writer.Flush();
}

17
SabreTools.Library/Reports/SeparatedValue.cs
View File

@@ -1,15 +1,8 @@
using System.Linq;
using System.IO;
using System.Linq;
using SabreTools.Library.DatFiles;
#if MONO
using System.IO;
#else
using Alphaleonis.Win32.Filesystem;
using Stream = System.IO.Stream;
#endif
namespace SabreTools.Library.Reports
{
/// <summary>
@@ -65,8 +58,8 @@ namespace SabreTools.Library.Reports
+ "\"" + _datFile.SHA256Count + "\"{0}"
+ "\"" + _datFile.SHA384Count + "\"{0}"
+ "\"" + _datFile.SHA512Count + "\""
+ (_baddumpCol ? "{0}\"" + _datFile.BaddumpCount + "\"" : "")
+ (_nodumpCol ? "{0}\"" + _datFile.BaddumpCount + "\"" : "")
+ (_baddumpCol ? "{0}\"" + _datFile.BaddumpCount + "\"" : string.Empty)
+ (_nodumpCol ? "{0}\"" + _datFile.BaddumpCount + "\"" : string.Empty)
+ "\n", _separator);
_writer.Write(line);
@@ -79,7 +72,7 @@ namespace SabreTools.Library.Reports
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));
+ (_baddumpCol ? "{0}\"BadDumps\"" : string.Empty) + (_nodumpCol ? "{0}\"Nodumps\"" : string.Empty) + "\n", _separator));
_writer.Flush();
}

16
SabreTools.Library/Reports/Textfile.cs
View File

@@ -1,16 +1,9 @@
using System.Linq;
using System.IO;
using System.Linq;
using SabreTools.Library.DatFiles;
using SabreTools.Library.Tools;
#if MONO
using System.IO;
#else
using Alphaleonis.Win32.Filesystem;
using Stream = System.IO.Stream;
#endif
namespace SabreTools.Library.Reports
{
/// <summary>
@@ -63,13 +56,10 @@ namespace SabreTools.Library.Reports
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";