From 2743b1d61f15ea484ffb6d93513dd08fa1e2ebba Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 8 Feb 2019 15:21:25 -0800 Subject: [PATCH] [AttractMode] Fix file write --- SabreTools.Library/DatFiles/AttractMode.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/SabreTools.Library/DatFiles/AttractMode.cs b/SabreTools.Library/DatFiles/AttractMode.cs index 1b554b25..7e2f379e 100644 --- a/SabreTools.Library/DatFiles/AttractMode.cs +++ b/SabreTools.Library/DatFiles/AttractMode.cs @@ -112,8 +112,9 @@ namespace SabreTools.Library.DatFiles /// Create and open an output file for writing direct from a dictionary /// /// Name of the file to write to + /// True if blank roms should be skipped on output, false otherwise (default) /// True if the DAT was written correctly, false otherwise - public bool WriteToFile(string outfile) + public override bool WriteToFile(string outfile, bool ignoreblanks = false) { try { @@ -160,7 +161,7 @@ namespace SabreTools.Library.DatFiles // If we have a new game, output the beginning of the new item if (lastgame == null || lastgame.ToLowerInvariant() != item.MachineName.ToLowerInvariant()) { - WriteStartGame(sw, item); + WriteDatItem(sw, item, ignoreblanks); } // If we have a "null" game (created by DATFromDir or something similar), log it to file @@ -221,9 +222,18 @@ namespace SabreTools.Library.DatFiles /// /// StreamWriter to output to /// DatItem object to be output + /// True if blank roms should be skipped on output, false otherwise (default) /// True if the data was written, false on error - private bool WriteStartGame(StreamWriter sw, DatItem rom) + private bool WriteDatItem(StreamWriter sw, DatItem rom, bool ignoreblanks = false) { + // If we are in ignore blanks mode AND we have a blank (0-size) rom, skip + if (ignoreblanks + && (rom.ItemType == ItemType.Rom + && (((Rom)rom).Size == 0 || ((Rom)rom).Size == -1))) + { + return true; + } + try { // No game should start with a path separator