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

[DatTools, SabreTools] Small fixes; cleanup

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-20 16:23:55 -07:00
parent fb78529b93
commit fc6923c804
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
SabreTools.Helper/Tools/DatTools.cs
View File

@@ -1540,12 +1540,6 @@ namespace SabreTools.Helper
// If we want to filter, apply it to the userData now // If we want to filter, apply it to the userData now
userData = Filter(userData, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger); userData = Filter(userData, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger);
// If we're trimming, apply it to the userData now
if (trim)
{
}
// Modify the Dictionary if necessary and output the results // Modify the Dictionary if necessary and output the results
if (diff && !cascade) if (diff && !cascade)
{ {
@@ -1871,7 +1865,10 @@ namespace SabreTools.Helper
/// <summary> /// <summary>
/// Output non-cascading diffs /// Output non-cascading diffs
/// </summary> /// </summary>
/// <param name="outdir">Output directory to write the DATs to</param>
/// <param name="userData">Main DatData to draw information from</param> /// <param name="userData">Main DatData to draw information from</param>
/// <param name="inputs">List of inputs to write out from</param>
/// <param name="logger">Logging object for console and file output</param>
public static void DiffNoCascade(string outdir, Dat userData, List<string> inputs, Logger logger) public static void DiffNoCascade(string outdir, Dat userData, List<string> inputs, Logger logger)
{ {
DateTime start = DateTime.Now; DateTime start = DateTime.Now;
@@ -1999,8 +1996,12 @@ namespace SabreTools.Helper
/// <summary> /// <summary>
/// Output cascading diffs /// Output cascading diffs
/// </summary> /// </summary>
/// <param name="outdir">Output directory to write the DATs to</param>
/// <param name="inplace">True if cascaded diffs are outputted in-place, false otherwise</param>
/// <param name="userData">Main DatData to draw information from</param> /// <param name="userData">Main DatData to draw information from</param>
/// <param name="inputs">List of inputs to write out from</param>
/// <param name="datHeaders">Dat headers used optionally</param> /// <param name="datHeaders">Dat headers used optionally</param>
/// <param name="logger">Logging object for console and file output</param>
public static void DiffCascade(string outdir, bool inplace, Dat userData, List<string> inputs, List<Dat> datHeaders, Logger logger) public static void DiffCascade(string outdir, bool inplace, Dat userData, List<string> inputs, List<Dat> datHeaders, Logger logger)
{ {
string post = ""; string post = "";
@@ -2087,8 +2088,11 @@ namespace SabreTools.Helper
/// <summary> /// <summary>
/// Output user defined merge /// Output user defined merge
/// </summary> /// </summary>
/// <param name="outdir">Output directory to write the DATs to</param>
/// <param name="inputs">List of inputs to write out from</param>
/// <param name="userData">Main DatData to draw information from</param> /// <param name="userData">Main DatData to draw information from</param>
/// <param name="datHeaders">Dat headers used optionally</param> /// <param name="datHeaders">Dat headers used optionally</param>
/// <param name="logger">Logging object for console and file output</param>
public static void MergeNoDiff(string outdir, Dat userData, List<string> inputs, List<Dat> datHeaders, Logger logger) public static void MergeNoDiff(string outdir, Dat userData, List<string> inputs, List<Dat> datHeaders, Logger logger)
{ {
// If we're in SuperDAT mode, prefix all games with their respective DATs // If we're in SuperDAT mode, prefix all games with their respective DATs
@@ -2113,7 +2117,11 @@ namespace SabreTools.Helper
} }
} }
Output.WriteDatfile(userData, outdir, logger); // Output a DAT only if there are roms
if (userData.Roms.Count != 0)
{
Output.WriteDatfile(userData, outdir, logger);
}
} }
} }
} }

4
SabreTools/Partials/SabreTools_Inits.cs
View File

@@ -253,6 +253,10 @@ namespace SabreTools
if (merge || diff) if (merge || diff)
{ {
// Get the values that will be used // Get the values that will be used
if (date == "")
{
date = DateTime.Now.ToString("yyyy-MM-dd");
}
if (name == "") if (name == "")
{ {
name = (diff ? "DiffDAT" : "MergeDAT") + (superdat ? "-SuperDAT" : "") + (dedup ? "-deduped" : ""); name = (diff ? "DiffDAT" : "MergeDAT") + (superdat ? "-SuperDAT" : "") + (dedup ? "-deduped" : "");