diff --git a/SabreTools.Helper/Tools/DatTools.cs b/SabreTools.Helper/Tools/DatTools.cs index 060c04c9..38cd9eb0 100644 --- a/SabreTools.Helper/Tools/DatTools.cs +++ b/SabreTools.Helper/Tools/DatTools.cs @@ -1540,12 +1540,6 @@ namespace SabreTools.Helper // 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); - // If we're trimming, apply it to the userData now - if (trim) - { - - } - // Modify the Dictionary if necessary and output the results if (diff && !cascade) { @@ -1871,7 +1865,10 @@ namespace SabreTools.Helper /// /// Output non-cascading diffs /// + /// Output directory to write the DATs to /// Main DatData to draw information from + /// List of inputs to write out from + /// Logging object for console and file output public static void DiffNoCascade(string outdir, Dat userData, List inputs, Logger logger) { DateTime start = DateTime.Now; @@ -1999,8 +1996,12 @@ namespace SabreTools.Helper /// /// Output cascading diffs /// + /// Output directory to write the DATs to + /// True if cascaded diffs are outputted in-place, false otherwise /// Main DatData to draw information from + /// List of inputs to write out from /// Dat headers used optionally + /// Logging object for console and file output public static void DiffCascade(string outdir, bool inplace, Dat userData, List inputs, List datHeaders, Logger logger) { string post = ""; @@ -2087,8 +2088,11 @@ namespace SabreTools.Helper /// /// Output user defined merge /// + /// Output directory to write the DATs to + /// List of inputs to write out from /// Main DatData to draw information from /// Dat headers used optionally + /// Logging object for console and file output public static void MergeNoDiff(string outdir, Dat userData, List inputs, List datHeaders, Logger logger) { // 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); + } } } } diff --git a/SabreTools/Partials/SabreTools_Inits.cs b/SabreTools/Partials/SabreTools_Inits.cs index dc30465e..5e1df839 100644 --- a/SabreTools/Partials/SabreTools_Inits.cs +++ b/SabreTools/Partials/SabreTools_Inits.cs @@ -253,6 +253,10 @@ namespace SabreTools if (merge || diff) { // Get the values that will be used + if (date == "") + { + date = DateTime.Now.ToString("yyyy-MM-dd"); + } if (name == "") { name = (diff ? "DiffDAT" : "MergeDAT") + (superdat ? "-SuperDAT" : "") + (dedup ? "-deduped" : "");