diff --git a/SabreTools.Helper/Data/Structs.cs b/SabreTools.Helper/Data/Structs.cs index 002fb0d9..1bd5b025 100644 --- a/SabreTools.Helper/Data/Structs.cs +++ b/SabreTools.Helper/Data/Structs.cs @@ -164,7 +164,7 @@ namespace SabreTools.Helper public string AddExt; public bool GameName; public bool Romba; - public bool? TSV; // true for tab-deliminated output, false for comma-deliminated output + public bool? XSV; // true for tab-deliminated output, false for comma-deliminated output // Statistical data related to the DAT public long RomCount; @@ -207,7 +207,7 @@ namespace SabreTools.Helper AddExt = this.AddExt, GameName = this.GameName, Romba = this.Romba, - TSV = this.TSV, + XSV = this.XSV, RomCount = this.RomCount, DiskCount = this.DiskCount, TotalSize = this.TotalSize, @@ -250,7 +250,7 @@ namespace SabreTools.Helper AddExt = this.AddExt, GameName = this.GameName, Romba = this.Romba, - TSV = this.TSV, + XSV = this.XSV, }; } } diff --git a/SabreTools.Helper/Tools/DatTools.cs b/SabreTools.Helper/Tools/DatTools.cs index eb42e4b8..3497fce4 100644 --- a/SabreTools.Helper/Tools/DatTools.cs +++ b/SabreTools.Helper/Tools/DatTools.cs @@ -1690,7 +1690,7 @@ namespace SabreTools.Helper if (System.IO.File.Exists(inputFileName)) { logger.User("Processing \"" + Path.GetFileName(inputFileName) + "\""); - datdata = Parse(inputFileName, 0, 0, datdata, logger, true, clean, softlist, keepext:(datdata.TSV != null)); + datdata = Parse(inputFileName, 0, 0, datdata, logger, true, clean, softlist, keepext:(datdata.XSV != null)); datdata = Filter(datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger); // If the extension matches, append ".new" to the filename @@ -1715,7 +1715,7 @@ namespace SabreTools.Helper logger.User("Processing \"" + Path.GetFullPath(file).Remove(0, inputFileName.Length) + "\""); Dat innerDatdata = (Dat)datdata.Clone(); innerDatdata.Files = null; - innerDatdata = Parse(file, 0, 0, innerDatdata, logger, true, clean, keepext:(datdata.TSV != null)); + innerDatdata = Parse(file, 0, 0, innerDatdata, logger, true, clean, keepext:(datdata.XSV != null)); innerDatdata = Filter(innerDatdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger); // If the extension matches, append ".new" to the filename diff --git a/SabreTools.Helper/Tools/Output.cs b/SabreTools.Helper/Tools/Output.cs index f2ab1516..74c8517a 100644 --- a/SabreTools.Helper/Tools/Output.cs +++ b/SabreTools.Helper/Tools/Output.cs @@ -193,12 +193,12 @@ namespace SabreTools.Helper ")\n"; break; case OutputFormat.MissFile: - if (datdata.TSV == true) + if (datdata.XSV == true) { header = "\"File Name\"\t\"Internal Name\"\t\"Description\"\t\"Game Name\"\t\"Game Description\"\t\"Type\"\t\"" + "Rom Name\"\t\"Disk Name\"\t\"Size\"\t\"CRC\"\t\"MD5\"\t\"SHA1\"\t\"Nodump\"\n"; } - else if (datdata.TSV == false) + else if (datdata.XSV == false) { header = "\"File Name\",\"Internal Name\",\"Description\",\"Game Name\",\"Game Description\",\"Type\",\"" + "Rom Name\",\"Disk Name\",\"Size\",\"CRC\",\"MD5\",\"SHA1\",\"Nodump\"\n"; @@ -450,7 +450,7 @@ namespace SabreTools.Helper } } // If we're in TSV mode, similarly the state is consistent - else if (datdata.TSV == true) + else if (datdata.XSV == true) { string inline = "\"" + datdata.FileName + "\"\t\"" + datdata.Name + "\"\t\"" + datdata.Description + "\"\t\"" + rom.Machine + "\"\t\"" + rom.Machine + "\"\t\"" + rom.Type.ToString().ToLowerInvariant() + "\"\t\"" + (rom.Type == ItemType.Rom ? rom.Name : "") + "\"\t\"" + (rom.Type == ItemType.Disk ? rom.Name : "") + "\"\t\"" + rom.HashData.Size + "\"\t\"" + @@ -458,7 +458,7 @@ namespace SabreTools.Helper state += pre + inline + post + "\n"; } // If we're in CSV mode, similarly the state is consistent - else if (datdata.TSV == false) + else if (datdata.XSV == false) { string inline = "\"" + datdata.FileName + "\",\"" + datdata.Name + "\",\"" + datdata.Description + "\",\"" + rom.Machine + "\",\"" + rom.Machine + "\",\"" + rom.Type.ToString().ToLowerInvariant() + "\",\"" + (rom.Type == ItemType.Rom ? rom.Name : "") + "\",\"" + (rom.Type == ItemType.Disk ? rom.Name : "") + "\",\"" + rom.HashData.Size + "\",\"" + diff --git a/SabreTools/Partials/SabreTools_Inits.cs b/SabreTools/Partials/SabreTools_Inits.cs index c7405fc8..3e33583f 100644 --- a/SabreTools/Partials/SabreTools_Inits.cs +++ b/SabreTools/Partials/SabreTools_Inits.cs @@ -315,7 +315,7 @@ namespace SabreTools AddExt = addext, GameName = datprefix, Romba = romba, - TSV = tsv, + XSV = tsv, }; if (outputCMP)