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

Use SeparatedValueWriter, fix a couple things

Browse Source
This commit is contained in:
Matt Nadareski
2020-06-13 22:15:21 -07:00
parent c32bfc35f9
commit 35d0fab5e1
6 changed files with 292 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
SabreTools.Library/DatFiles/AttractMode.cs
View File

@@ -121,10 +121,13 @@ namespace SabreTools.Library.DatFiles
return false; return false;
} }
StreamWriter sw = new StreamWriter(fs, new UTF8Encoding(false)); SeparatedValueWriter svw = new SeparatedValueWriter(fs, new UTF8Encoding(false));
svw.Quotes = false;
svw.Separator = ";";
svw.VerifyFieldCount = true;
// Write out the header // Write out the header
WriteHeader(sw); WriteHeader(svw);
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
@@ -153,7 +156,7 @@ namespace SabreTools.Library.DatFiles
// If we have a new game, output the beginning of the new item // If we have a new game, output the beginning of the new item
if (lastgame == null || lastgame.ToLowerInvariant() != item.MachineName.ToLowerInvariant()) if (lastgame == null || lastgame.ToLowerInvariant() != item.MachineName.ToLowerInvariant())
WriteDatItem(sw, item, ignoreblanks); WriteDatItem(svw, item, ignoreblanks);
// If we have a "null" game (created by DATFromDir or something similar), log it to file // If we have a "null" game (created by DATFromDir or something similar), log it to file
if (item.ItemType == ItemType.Rom if (item.ItemType == ItemType.Rom
@@ -172,7 +175,7 @@ namespace SabreTools.Library.DatFiles
} }
Globals.Logger.Verbose($"File written!{Environment.NewLine}"); Globals.Logger.Verbose($"File written!{Environment.NewLine}");
sw.Dispose(); svw.Dispose();
fs.Dispose(); fs.Dispose();
} }
catch (Exception ex) catch (Exception ex)
@@ -187,31 +190,36 @@ namespace SabreTools.Library.DatFiles
/// <summary> /// <summary>
/// Write out DAT header using the supplied StreamWriter /// Write out DAT header using the supplied StreamWriter
/// </summary> /// </summary>
/// <param name="sw">StreamWriter to output to</param> /// <param name="svw">SeparatedValueWriter to output to</param>
/// <returns>True if the data was written, false on error</returns> /// <returns>True if the data was written, false on error</returns>
private bool WriteHeader(StreamWriter sw) private bool WriteHeader(SeparatedValueWriter svw)
{ {
try try
{ {
sw.Write("#Title;"); string[] headers = new string[]
sw.Write("Name;"); {
sw.Write("Emulator;"); "#Title",
sw.Write("CloneOf"); "Name",
sw.Write("Year;"); "Emulator",
sw.Write("Manufacturer;"); "CloneOf",
sw.Write("Category;"); "Year",
sw.Write("Players;"); "Manufacturer",
sw.Write("Rotation;"); "Category",
sw.Write("Control;"); "Players",
sw.Write("Status;"); "Rotation",
sw.Write("DisplayCount;"); "Control",
sw.Write("DisplayType;"); "Status",
sw.Write("AltRomname;"); "DisplayCount",
sw.Write("AltTitle;"); "DisplayType",
sw.Write("Extra;"); "AltRomname",
sw.Write("Buttons\n"); "AltTitle",
"Extra",
"Buttons",
};
sw.Flush(); svw.WriteHeader(headers);
svw.Flush();
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -225,11 +233,11 @@ namespace SabreTools.Library.DatFiles
/// <summary> /// <summary>
/// Write out Game start using the supplied StreamWriter /// Write out Game start using the supplied StreamWriter
/// </summary> /// </summary>
/// <param name="sw">StreamWriter to output to</param> /// <param name="svw">SeparatedValueWriter to output to</param>
/// <param name="datItem">DatItem object to be output</param> /// <param name="datItem">DatItem object to be output</param>
/// <param name="ignoreblanks">True if blank roms should be skipped on output, false otherwise (default)</param> /// <param name="ignoreblanks">True if blank roms should be skipped on output, false otherwise (default)</param>
/// <returns>True if the data was written, false on error</returns> /// <returns>True if the data was written, false on error</returns>
private bool WriteDatItem(StreamWriter sw, DatItem datItem, bool ignoreblanks = false) private bool WriteDatItem(SeparatedValueWriter svw, DatItem datItem, bool ignoreblanks = false)
{ {
// If we are in ignore blanks mode AND we have a blank (0-size) rom, skip // If we are in ignore blanks mode AND we have a blank (0-size) rom, skip
if (ignoreblanks && (datItem.ItemType == ItemType.Rom && (((Rom)datItem).Size == 0 || ((Rom)datItem).Size == -1))) if (ignoreblanks && (datItem.ItemType == ItemType.Rom && (((Rom)datItem).Size == 0 || ((Rom)datItem).Size == -1)))
@@ -243,25 +251,30 @@ namespace SabreTools.Library.DatFiles
// Pre-process the item name // Pre-process the item name
ProcessItemName(datItem, true); ProcessItemName(datItem, true);
sw.Write($"{datItem.GetField(Field.MachineName, ExcludeFields)};"); string[] fields = new string[]
sw.Write($"{datItem.GetField(Field.Description, ExcludeFields)};"); {
sw.Write($"{FileName};"); datItem.GetField(Field.MachineName, ExcludeFields),
sw.Write($"{datItem.GetField(Field.CloneOf, ExcludeFields)};"); datItem.GetField(Field.Description, ExcludeFields),
sw.Write($"{datItem.GetField(Field.Year, ExcludeFields)};"); FileName,
sw.Write($"{datItem.GetField(Field.Manufacturer, ExcludeFields)};"); datItem.GetField(Field.CloneOf, ExcludeFields),
sw.Write(";"); // $"{datItem.GetField(Field.Category, ExcludeFields)};"); datItem.GetField(Field.Year, ExcludeFields),
sw.Write(";"); // $"{datItem.GetField(Field.Players, ExcludeFields)};"); datItem.GetField(Field.Manufacturer, ExcludeFields),
sw.Write(";"); // $"{datItem.GetField(Field.Rotation, ExcludeFields)};"); string.Empty, // datItem.GetField(Field.Category, ExcludeFields)
sw.Write(";"); // $"{datItem.GetField(Field.Control, ExcludeFields)};"); string.Empty, // datItem.GetField(Field.Players, ExcludeFields)
sw.Write(";"); // $"{datItem.GetField(Field.Status, ExcludeFields)};"); string.Empty, // datItem.GetField(Field.Rotation, ExcludeFields)
sw.Write(";"); // $"{datItem.GetField(Field.DisplayCount, ExcludeFields)};"); string.Empty, // datItem.GetField(Field.Control, ExcludeFields)
sw.Write(";"); // $"{datItem.GetField(Field.DisplayType, ExcludeFields)};"); string.Empty, // datItem.GetField(Field.Status, ExcludeFields)
sw.Write(";"); // $"{datItem.GetField(Field.AltRomname, ExcludeFields)};"); string.Empty, // datItem.GetField(Field.DisplayCount, ExcludeFields)
sw.Write(";"); // $"{datItem.GetField(Field.AltTitle, ExcludeFields)};"); string.Empty, // datItem.GetField(Field.DisplayType, ExcludeFields)
sw.Write($"{datItem.GetField(Field.Comment, ExcludeFields)};"); string.Empty, // datItem.GetField(Field.AltRomname, ExcludeFields)
sw.Write(";"); // $"{datItem.GetField(Field.Buttons, ExcludeFields)};"); string.Empty, // datItem.GetField(Field.AltTitle, ExcludeFields)
datItem.GetField(Field.Comment, ExcludeFields),
string.Empty, // datItem.GetField(Field.Buttons, ExcludeFields)
};
sw.Flush(); svw.WriteValues(fields);
svw.Flush();
} }
catch (Exception ex) catch (Exception ex)
{ {

35
SabreTools.Library/DatFiles/EverdriveSmdb.cs
View File

@@ -105,7 +105,10 @@ namespace SabreTools.Library.DatFiles
return false; return false;
} }
StreamWriter sw = new StreamWriter(fs, new UTF8Encoding(false)); SeparatedValueWriter svw = new SeparatedValueWriter(fs, new UTF8Encoding(false));
svw.Quotes = false;
svw.Separator = "\t";
svw.VerifyFieldCount = true;
// Get a properly sorted set of keys // Get a properly sorted set of keys
List<string> keys = Keys; List<string> keys = Keys;
@@ -140,12 +143,12 @@ namespace SabreTools.Library.DatFiles
((Rom)item).Size = Constants.SizeZero; ((Rom)item).Size = Constants.SizeZero;
} }
WriteDatItem(sw, item, ignoreblanks); WriteDatItem(svw, item, ignoreblanks);
} }
} }
Globals.Logger.Verbose($"File written!{Environment.NewLine}"); Globals.Logger.Verbose($"File written!{Environment.NewLine}");
sw.Dispose(); svw.Dispose();
fs.Dispose(); fs.Dispose();
} }
catch (Exception ex) catch (Exception ex)
@@ -160,10 +163,10 @@ namespace SabreTools.Library.DatFiles
/// <summary> /// <summary>
/// Write out Game start using the supplied StreamWriter /// Write out Game start using the supplied StreamWriter
/// </summary> /// </summary>
/// <param name="sw">StreamWriter to output to</param> /// <param name="svw">SeparatedValueWriter to output to</param>
/// <param name="datItem">DatItem object to be output</param> /// <param name="datItem">DatItem object to be output</param>
/// <returns>True if the data was written, false on error</returns> /// <returns>True if the data was written, false on error</returns>
private bool WriteDatItem(StreamWriter sw, DatItem datItem, bool ignoreblanks = false) private bool WriteDatItem(SeparatedValueWriter svw, DatItem datItem, bool ignoreblanks = false)
{ {
// If we are in ignore blanks mode AND we have a blank (0-size) rom, skip // If we are in ignore blanks mode AND we have a blank (0-size) rom, skip
if (ignoreblanks && (datItem.ItemType == ItemType.Rom && ((datItem as Rom).Size == 0 || (datItem as Rom).Size == -1))) if (ignoreblanks && (datItem.ItemType == ItemType.Rom && ((datItem as Rom).Size == 0 || (datItem as Rom).Size == -1)))
@@ -182,17 +185,23 @@ namespace SabreTools.Library.DatFiles
{ {
case ItemType.Rom: case ItemType.Rom:
var rom = datItem as Rom; var rom = datItem as Rom;
sw.Write($"{rom.GetField(Field.SHA256, ExcludeFields)}\t");
sw.Write($"{rom.GetField(Field.MachineName, ExcludeFields)}/\t"); string[] fields = new string[]
sw.Write($"{rom.GetField(Field.Name, ExcludeFields)}\t"); {
sw.Write($"{rom.GetField(Field.SHA1, ExcludeFields)}\t"); rom.GetField(Field.SHA256, ExcludeFields),
sw.Write($"{rom.GetField(Field.MD5, ExcludeFields)}\t"); $"{rom.GetField(Field.MachineName, ExcludeFields)}/",
sw.Write($"{rom.GetField(Field.CRC, ExcludeFields)}"); rom.GetField(Field.Name, ExcludeFields),
sw.Write("\n"); rom.GetField(Field.SHA1, ExcludeFields),
rom.GetField(Field.MD5, ExcludeFields),
rom.GetField(Field.CRC, ExcludeFields),
};
svw.WriteValues(fields);
break; break;
} }
sw.Flush(); svw.Flush();
} }
catch (Exception ex) catch (Exception ex)
{ {

47
SabreTools.Library/DatFiles/Hashfile.cs
View File

@@ -121,7 +121,10 @@ namespace SabreTools.Library.DatFiles
return false; return false;
} }
StreamWriter sw = new StreamWriter(fs, new UTF8Encoding(false)); SeparatedValueWriter svw = new SeparatedValueWriter(fs, new UTF8Encoding(false));
svw.Quotes = false;
svw.Separator = " ";
svw.VerifyFieldCount = true;
// Get a properly sorted set of keys // Get a properly sorted set of keys
List<string> keys = Keys; List<string> keys = Keys;
@@ -154,12 +157,12 @@ namespace SabreTools.Library.DatFiles
} }
// Now, output the rom data // Now, output the rom data
WriteDatItem(sw, rom, ignoreblanks); WriteDatItem(svw, rom, ignoreblanks);
} }
} }
Globals.Logger.Verbose($"File written!{Environment.NewLine}"); Globals.Logger.Verbose($"File written!{Environment.NewLine}");
sw.Dispose(); svw.Dispose();
fs.Dispose(); fs.Dispose();
} }
catch (Exception ex) catch (Exception ex)
@@ -174,11 +177,11 @@ namespace SabreTools.Library.DatFiles
/// <summary> /// <summary>
/// Write out DatItem using the supplied StreamWriter /// Write out DatItem using the supplied StreamWriter
/// </summary> /// </summary>
/// <param name="sw">StreamWriter to output to</param> /// <param name="svw">SeparatedValueWriter to output to</param>
/// <param name="datItem">DatItem object to be output</param> /// <param name="datItem">DatItem object to be output</param>
/// <param name="ignoreblanks">True if blank roms should be skipped on output, false otherwise (default)</param> /// <param name="ignoreblanks">True if blank roms should be skipped on output, false otherwise (default)</param>
/// <returns>True if the data was written, false on error</returns> /// <returns>True if the data was written, false on error</returns>
private bool WriteDatItem(StreamWriter sw, DatItem datItem, bool ignoreblanks = false) private bool WriteDatItem(SeparatedValueWriter svw, DatItem datItem, bool ignoreblanks = false)
{ {
// If we are in ignore blanks mode AND we have a blank (0-size) rom, skip // If we are in ignore blanks mode AND we have a blank (0-size) rom, skip
if (ignoreblanks && (datItem.ItemType == ItemType.Rom && ((datItem as Rom).Size == 0 || (datItem as Rom).Size == -1))) if (ignoreblanks && (datItem.ItemType == ItemType.Rom && ((datItem as Rom).Size == 0 || (datItem as Rom).Size == -1)))
@@ -186,10 +189,8 @@ namespace SabreTools.Library.DatFiles
try try
{ {
// Pre-process the item name
ProcessItemName(datItem, true);
// Build the state based on excluded fields // Build the state based on excluded fields
string[] fields = new string[2];
switch (_hash) switch (_hash)
{ {
case Hash.CRC: case Hash.CRC:
@@ -197,11 +198,11 @@ namespace SabreTools.Library.DatFiles
{ {
case ItemType.Rom: case ItemType.Rom:
var rom = datItem as Rom; var rom = datItem as Rom;
fields[0] = string.Empty;
if (GameName) if (GameName)
sw.Write($"{rom.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}"); fields[0] = $"{rom.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}";
sw.Write($"{rom.GetField(Field.Name, ExcludeFields)}"); fields[0] += rom.GetField(Field.Name, ExcludeFields);
sw.Write($"{rom.GetField(Field.CRC, ExcludeFields)}"); fields[1] = rom.GetField(Field.CRC, ExcludeFields);
sw.Write("\n");
break; break;
} }
break; break;
@@ -218,26 +219,30 @@ namespace SabreTools.Library.DatFiles
{ {
case ItemType.Disk: case ItemType.Disk:
var disk = datItem as Disk; var disk = datItem as Disk;
sw.Write($"{disk.GetField(hashField, ExcludeFields)}"); fields[0] = disk.GetField(hashField, ExcludeFields);
fields[1] = string.Empty;
if (GameName) if (GameName)
sw.Write($"{disk.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}"); fields[1] = $"{disk.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}";
sw.Write($"{disk.GetField(Field.Name, ExcludeFields)}"); fields[1] += disk.GetField(Field.Name, ExcludeFields);
sw.Write("\n");
break; break;
case ItemType.Rom: case ItemType.Rom:
var rom = datItem as Rom; var rom = datItem as Rom;
sw.Write($"{rom.GetField(hashField, ExcludeFields)}"); fields[0] = rom.GetField(hashField, ExcludeFields);
fields[1] = string.Empty;
if (GameName) if (GameName)
sw.Write($"{rom.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}"); fields[1] = $"{rom.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}";
sw.Write($"{rom.GetField(Field.Name, ExcludeFields)}"); fields[1] += rom.GetField(Field.Name, ExcludeFields);
sw.Write("\n");
break; break;
} }
break; break;
} }
sw.Flush(); // If we had at least one field filled in
if (!string.IsNullOrEmpty(fields[0]) || !string.IsNullOrEmpty(fields[1]))
svw.WriteValues(fields);
svw.Flush();
} }
catch (Exception ex) catch (Exception ex)
{ {

129
SabreTools.Library/DatFiles/SeparatedValue.cs
View File

@@ -394,10 +394,13 @@ namespace SabreTools.Library.DatFiles
return false; return false;
} }
StreamWriter sw = new StreamWriter(fs, new UTF8Encoding(false)); SeparatedValueWriter svw = new SeparatedValueWriter(fs, new UTF8Encoding(false));
svw.Quotes = true;
svw.Separator = this._delim.ToString();
svw.VerifyFieldCount = true;
// Write out the header // Write out the header
WriteHeader(sw); WriteHeader(svw);
// Get a properly sorted set of keys // Get a properly sorted set of keys
List<string> keys = Keys; List<string> keys = Keys;
@@ -430,12 +433,12 @@ namespace SabreTools.Library.DatFiles
} }
// Now, output the rom data // Now, output the rom data
WriteDatItem(sw, rom, ignoreblanks); WriteDatItem(svw, rom, ignoreblanks);
} }
} }
Globals.Logger.Verbose("File written!" + Environment.NewLine); Globals.Logger.Verbose("File written!" + Environment.NewLine);
sw.Dispose(); svw.Dispose();
fs.Dispose(); fs.Dispose();
} }
catch (Exception ex) catch (Exception ex)
@@ -450,31 +453,36 @@ namespace SabreTools.Library.DatFiles
/// <summary> /// <summary>
/// Write out DAT header using the supplied StreamWriter /// Write out DAT header using the supplied StreamWriter
/// </summary> /// </summary>
/// <param name="sw">StreamWriter to output to</param> /// <param name="svw">SeparatedValueWriter to output to</param>
/// <returns>True if the data was written, false on error</returns> /// <returns>True if the data was written, false on error</returns>
private bool WriteHeader(StreamWriter sw) private bool WriteHeader(SeparatedValueWriter svw)
{ {
try try
{ {
sw.Write("\"File Name\"{_delim}"); string[] headers = new string[]
sw.Write("\"Internal Name\"{_delim}"); {
sw.Write("\"Description\"{_delim}"); "File Name",
sw.Write("\"Game Name\"{_delim}"); "Internal Name",
sw.Write("\"Game Description\"{_delim}"); "Description",
sw.Write("\"Type\"{_delim}\""); "Game Name",
sw.Write("\"Rom Name\"{_delim}"); "Game Description",
sw.Write("\"Disk Name\"{_delim}"); "Type",
sw.Write("\"Size\"{_delim}"); "Rom Name",
sw.Write("\"CRC\"{_delim}"); "Disk Name",
sw.Write("\"MD5\"{_delim}"); "Size",
//sw.Write("\"RIPEMD160\"{_delim}"); "CRC",
sw.Write("\"SHA1\"{_delim}"); "MD5",
sw.Write("\"SHA256\"{_delim}"); //"RIPEMD160",
//sw.Write("\"SHA384\"{_delim}"); "SHA1",
//sw.Write("\"SHA512\"{_delim}"); "SHA256",
sw.Write("\"Nodump\"\n"); //"SHA384",
//"SHA512",
"Nodump",
};
sw.Flush(); svw.WriteHeader(headers);
svw.Flush();
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -488,11 +496,11 @@ namespace SabreTools.Library.DatFiles
/// <summary> /// <summary>
/// Write out DatItem using the supplied StreamWriter /// Write out DatItem using the supplied StreamWriter
/// </summary> /// </summary>
/// <param name="sw">StreamWriter to output to</param> /// <param name="svw">SeparatedValueWriter to output to</param>
/// <param name="datItem">DatItem object to be output</param> /// <param name="datItem">DatItem object to be output</param>
/// <param name="ignoreblanks">True if blank roms should be skipped on output, false otherwise (default)</param> /// <param name="ignoreblanks">True if blank roms should be skipped on output, false otherwise (default)</param>
/// <returns>True if the data was written, false on error</returns> /// <returns>True if the data was written, false on error</returns>
private bool WriteDatItem(StreamWriter sw, DatItem datItem, bool ignoreblanks = false) private bool WriteDatItem(SeparatedValueWriter svw, DatItem datItem, bool ignoreblanks = false)
{ {
// If we are in ignore blanks mode AND we have a blank (0-size) rom, skip // If we are in ignore blanks mode AND we have a blank (0-size) rom, skip
if (ignoreblanks && (datItem.ItemType == ItemType.Rom && ((datItem as Rom).Size == 0 || (datItem as Rom).Size == -1))) if (ignoreblanks && (datItem.ItemType == ItemType.Rom && ((datItem as Rom).Size == 0 || (datItem as Rom).Size == -1)))
@@ -504,52 +512,55 @@ namespace SabreTools.Library.DatFiles
if (datItem.ItemType != ItemType.Disk && datItem.ItemType != ItemType.Rom) if (datItem.ItemType != ItemType.Disk && datItem.ItemType != ItemType.Rom)
return true; return true;
sw.Write(CreatePrefixPostfix(datItem, true)); // Build the state based on excluded fields
string[] fields = new string[14]; // 17;
sw.Write($"\"{FileName}\"{_delim}"); fields[0] = FileName;
sw.Write($"\"{Name}\"{_delim}"); fields[1] = Name;
sw.Write($"\"{Description}\"{_delim}"); fields[2] = Description;
sw.Write($"\"{datItem.GetField(Field.MachineName, ExcludeFields)}\"{_delim}"); fields[3] = datItem.GetField(Field.MachineName, ExcludeFields);
sw.Write($"\"{datItem.GetField(Field.Description, ExcludeFields)}\"{_delim}"); fields[4] = datItem.GetField(Field.Description, ExcludeFields);
switch (datItem.ItemType) switch (datItem.ItemType)
{ {
case ItemType.Disk: case ItemType.Disk:
var disk = datItem as Disk; var disk = datItem as Disk;
sw.Write($"\"disk\"{_delim}"); fields[5] = "disk";
sw.Write($"\"\"{_delim}"); fields[6] = string.Empty;
sw.Write($"\"{disk.GetField(Field.Name, ExcludeFields)}\"{_delim}"); fields[7] = disk.GetField(Field.Name, ExcludeFields);
sw.Write($"\"\"{_delim}"); fields[8] = string.Empty;
sw.Write($"\"\"{_delim}"); fields[9] = string.Empty;
sw.Write($"\"{disk.GetField(Field.MD5, ExcludeFields).ToLowerInvariant()}\"{_delim}"); fields[10] = disk.GetField(Field.MD5, ExcludeFields).ToLowerInvariant();
//sw.Write($"\"{disk.GetField(Field.RIPEMD160, ExcludeFields).ToLowerInvariant()}\"{_delim}"); //fields[11] = disk.GetField(Field.RIPEMD160, ExcludeFields).ToLowerInvariant();
sw.Write($"\"{disk.GetField(Field.SHA1, ExcludeFields).ToLowerInvariant()}\"{_delim}"); fields[11] = disk.GetField(Field.SHA1, ExcludeFields).ToLowerInvariant();
sw.Write($"\"{disk.GetField(Field.SHA256, ExcludeFields).ToLowerInvariant()}\"{_delim}"); fields[12] = disk.GetField(Field.SHA256, ExcludeFields).ToLowerInvariant();
//sw.Write($"\"{disk.GetField(Field.SHA384, ExcludeFields).ToLowerInvariant()}\"{_delim}"); //fields[13] = disk.GetField(Field.SHA384, ExcludeFields).ToLowerInvariant();
//sw.Write($"\"{disk.GetField(Field.SHA512, ExcludeFields).ToLowerInvariant()}\"{_delim}"); //fields[14] = disk.GetField(Field.SHA512, ExcludeFields).ToLowerInvariant();
sw.Write($"\"{disk.GetField(Field.Status, ExcludeFields)}\"{_delim}"); fields[13] = disk.GetField(Field.Status, ExcludeFields);
break; break;
case ItemType.Rom: case ItemType.Rom:
var rom = datItem as Rom; var rom = datItem as Rom;
sw.Write($"\"rom\"{_delim}"); fields[5] = "rom";
sw.Write($"\"{rom.GetField(Field.Name, ExcludeFields)}\"{_delim}"); fields[6] = rom.GetField(Field.Name, ExcludeFields);
sw.Write($"\"\"{_delim}"); fields[7] = string.Empty;
sw.Write($"\"{rom.GetField(Field.Size, ExcludeFields)}\"{_delim}"); fields[8] = rom.GetField(Field.Size, ExcludeFields);
sw.Write($"\"{rom.GetField(Field.CRC, ExcludeFields).ToLowerInvariant()}\"{_delim}"); fields[9] = rom.GetField(Field.CRC, ExcludeFields).ToLowerInvariant();
sw.Write($"\"{rom.GetField(Field.MD5, ExcludeFields).ToLowerInvariant()}\"{_delim}"); fields[10] = rom.GetField(Field.MD5, ExcludeFields).ToLowerInvariant();
//sw.Write($"\"{rom.GetField(Field.RIPEMD160, ExcludeFields).ToLowerInvariant()}\"{_delim}"); //fields[11] = rom.GetField(Field.RIPEMD160, ExcludeFields).ToLowerInvariant();
sw.Write($"\"{rom.GetField(Field.SHA1, ExcludeFields).ToLowerInvariant()}\"{_delim}"); fields[11] = rom.GetField(Field.SHA1, ExcludeFields).ToLowerInvariant();
sw.Write($"\"{rom.GetField(Field.SHA256, ExcludeFields).ToLowerInvariant()}\"{_delim}"); fields[12] = rom.GetField(Field.SHA256, ExcludeFields).ToLowerInvariant();
//sw.Write($"\"{rom.GetField(Field.SHA384, ExcludeFields).ToLowerInvariant()}\"{_delim}"); //fields[13] = rom.GetField(Field.SHA384, ExcludeFields).ToLowerInvariant();
//sw.Write($"\"{rom.GetField(Field.SHA512, ExcludeFields).ToLowerInvariant()}\"{_delim}"); //fields[14] = rom.GetField(Field.SHA512, ExcludeFields).ToLowerInvariant();
sw.Write($"\"{rom.GetField(Field.Status, ExcludeFields)}\"{_delim}"); fields[13] = rom.GetField(Field.Status, ExcludeFields);
break; break;
} }
sw.Write(CreatePrefixPostfix(datItem, false)); svw.WriteString(CreatePrefixPostfix(datItem, true));
svw.WriteValues(fields, false);
svw.WriteString(CreatePrefixPostfix(datItem, false));
svw.WriteLine();
sw.Flush(); svw.Flush();
} }
catch (Exception ex) catch (Exception ex)
{ {

145
SabreTools.Library/DatItems/DatItem.cs
View File

@@ -572,166 +572,191 @@ namespace SabreTools.Library.DatItems
if (excludeFields[(int)field]) if (excludeFields[(int)field])
return string.Empty; return string.Empty;
string fieldValue = null;
switch (field) switch (field)
{ {
case Field.Name: case Field.Name:
return this.Name; fieldValue = this.Name;
break;
case Field.PartName: case Field.PartName:
return this.PartName; fieldValue = this.PartName;
break;
case Field.PartInterface: case Field.PartInterface:
return this.PartInterface; fieldValue = this.PartInterface;
break;
case Field.Features: case Field.Features:
return string.Join(", ", this.Features.Select(f => $"{f.Item1}={f.Item2}")); fieldValue = string.Join(", ", (this.Features ?? new List<Tuple<string, string>>()).Select(f => $"{f.Item1}={f.Item2}"));
break;
case Field.AreaName: case Field.AreaName:
return this.AreaName; fieldValue = this.AreaName;
break;
case Field.AreaSize: case Field.AreaSize:
return this.AreaSize?.ToString() ?? string.Empty; fieldValue = this.AreaSize?.ToString();
break;
case Field.MachineName: case Field.MachineName:
return this.MachineName; fieldValue = this.MachineName;
break;
case Field.Comment: case Field.Comment:
return this.Comment; fieldValue = this.Comment;
break;
case Field.Description: case Field.Description:
return this.MachineDescription; fieldValue = this.MachineDescription;
break;
case Field.Year: case Field.Year:
return this.Year; fieldValue = this.Year;
break;
case Field.Manufacturer: case Field.Manufacturer:
return this.Manufacturer; fieldValue = this.Manufacturer;
break;
case Field.Publisher: case Field.Publisher:
return this.Publisher; fieldValue = this.Publisher;
break;
case Field.RomOf: case Field.RomOf:
return this.RomOf; fieldValue = this.RomOf;
break;
case Field.CloneOf: case Field.CloneOf:
return this.CloneOf; fieldValue = this.CloneOf;
break;
case Field.SampleOf: case Field.SampleOf:
return this.SampleOf; fieldValue = this.SampleOf;
break;
case Field.Supported: case Field.Supported:
return this.Supported?.ToString() ?? string.Empty; fieldValue = this.Supported?.ToString();
break;
case Field.SourceFile: case Field.SourceFile:
return this.SourceFile; fieldValue = this.SourceFile;
break;
case Field.Runnable: case Field.Runnable:
return this.Runnable?.ToString() ?? string.Empty; fieldValue = this.Runnable?.ToString();
break;
case Field.Board: case Field.Board:
return this.Board; fieldValue = this.Board;
break;
case Field.RebuildTo: case Field.RebuildTo:
return this.RebuildTo; fieldValue = this.RebuildTo;
break;
case Field.Devices: case Field.Devices:
return string.Join(", ", this.Devices); fieldValue = string.Join(", ", this.Devices ?? new List<string>());
break;
case Field.SlotOptions: case Field.SlotOptions:
return string.Join(", ", this.SlotOptions); fieldValue = string.Join(", ", this.SlotOptions ?? new List<string>());
break;
case Field.Infos: case Field.Infos:
return string.Join(", ", this.Infos.Select(i => $"{i.Item1}={i.Item2}")); fieldValue = string.Join(", ", (this.Infos ?? new List<Tuple<string, string>>()).Select(i => $"{i.Item1}={i.Item2}"));
break;
case Field.MachineType: case Field.MachineType:
return this.MachineType.ToString(); fieldValue = this.MachineType.ToString();
break;
case Field.Default: case Field.Default:
if (ItemType == ItemType.BiosSet) if (ItemType == ItemType.BiosSet)
return (this as BiosSet).Default?.ToString() ?? string.Empty; fieldValue = (this as BiosSet).Default?.ToString();
else if (ItemType == ItemType.Release) else if (ItemType == ItemType.Release)
return (this as Release).Default?.ToString() ?? string.Empty; fieldValue = (this as Release).Default?.ToString();
break; break;
case Field.BiosDescription: case Field.BiosDescription:
if (ItemType == ItemType.BiosSet) if (ItemType == ItemType.BiosSet)
return (this as BiosSet).Description; fieldValue = (this as BiosSet).Description;
break; break;
case Field.MD5: case Field.MD5:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).MD5; fieldValue = (this as Disk).MD5;
else if (ItemType == ItemType.Rom) else if (ItemType == ItemType.Rom)
return (this as Rom).MD5; fieldValue = (this as Rom).MD5;
break; break;
case Field.RIPEMD160: case Field.RIPEMD160:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).RIPEMD160; fieldValue = (this as Disk).RIPEMD160;
else if (ItemType == ItemType.Rom) else if (ItemType == ItemType.Rom)
return (this as Rom).RIPEMD160; fieldValue = (this as Rom).RIPEMD160;
break; break;
case Field.SHA1: case Field.SHA1:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).SHA1; fieldValue = (this as Disk).SHA1;
else if (ItemType == ItemType.Rom) else if (ItemType == ItemType.Rom)
return (this as Rom).SHA1; fieldValue = (this as Rom).SHA1;
break; break;
case Field.SHA256: case Field.SHA256:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).SHA256; fieldValue = (this as Disk).SHA256;
else if (ItemType == ItemType.Rom) else if (ItemType == ItemType.Rom)
return (this as Rom).SHA256; fieldValue = (this as Rom).SHA256;
break; break;
case Field.SHA384: case Field.SHA384:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).SHA384; fieldValue = (this as Disk).SHA384;
else if (ItemType == ItemType.Rom) else if (ItemType == ItemType.Rom)
return (this as Rom).SHA384; fieldValue = (this as Rom).SHA384;
break; break;
case Field.SHA512: case Field.SHA512:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).SHA512; fieldValue = (this as Disk).SHA512;
else if (ItemType == ItemType.Rom) else if (ItemType == ItemType.Rom)
return (this as Rom).SHA512; fieldValue = (this as Rom).SHA512;
break; break;
case Field.Merge: case Field.Merge:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).MergeTag; fieldValue = (this as Disk).MergeTag;
else if (ItemType == ItemType.Rom) else if (ItemType == ItemType.Rom)
return (this as Rom).MergeTag; fieldValue = (this as Rom).MergeTag;
break; break;
case Field.Region: case Field.Region:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).Region; fieldValue = (this as Disk).Region;
else if (ItemType == ItemType.Release) else if (ItemType == ItemType.Release)
return (this as Release).Region; fieldValue = (this as Release).Region;
else if (ItemType == ItemType.Rom) else if (ItemType == ItemType.Rom)
return (this as Rom).Region; fieldValue = (this as Rom).Region;
break; break;
case Field.Index: case Field.Index:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).Index; fieldValue = (this as Disk).Index;
break; break;
case Field.Writable: case Field.Writable:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).Writable?.ToString() ?? string.Empty; fieldValue = (this as Disk).Writable?.ToString();
break; break;
case Field.Optional: case Field.Optional:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).Optional?.ToString() ?? string.Empty; fieldValue = (this as Disk).Optional?.ToString();
else if (ItemType == ItemType.Rom) else if (ItemType == ItemType.Rom)
return (this as Rom).Optional?.ToString() ?? string.Empty; fieldValue = (this as Rom).Optional?.ToString();
break; break;
case Field.Status: case Field.Status:
if (ItemType == ItemType.Disk) if (ItemType == ItemType.Disk)
return (this as Disk).ItemStatus.ToString(); fieldValue = (this as Disk).ItemStatus.ToString();
else if (ItemType == ItemType.Rom) else if (ItemType == ItemType.Rom)
return (this as Rom).ItemStatus.ToString(); fieldValue = (this as Rom).ItemStatus.ToString();
break; break;
case Field.Language: case Field.Language:
if (ItemType == ItemType.Release) if (ItemType == ItemType.Release)
return (this as Release).Language; fieldValue = (this as Release).Language;
break; break;
case Field.Date: case Field.Date:
if (ItemType == ItemType.Release) if (ItemType == ItemType.Release)
return (this as Release).Date; fieldValue = (this as Release).Date;
else if (ItemType == ItemType.Rom) else if (ItemType == ItemType.Rom)
return (this as Rom).Date; fieldValue = (this as Rom).Date;
break; break;
case Field.Bios: case Field.Bios:
if (ItemType == ItemType.Rom) if (ItemType == ItemType.Rom)
return (this as Rom).Bios; fieldValue = (this as Rom).Bios;
break; break;
case Field.Size: case Field.Size:
if (ItemType == ItemType.Rom) if (ItemType == ItemType.Rom)
return (this as Rom).Size.ToString(); fieldValue = (this as Rom).Size.ToString();
break; break;
case Field.CRC: case Field.CRC:
if (ItemType == ItemType.Rom) if (ItemType == ItemType.Rom)
return (this as Rom).CRC; fieldValue = (this as Rom).CRC;
break; break;
case Field.Offset: case Field.Offset:
if (ItemType == ItemType.Rom) if (ItemType == ItemType.Rom)
return (this as Rom).Offset; fieldValue = (this as Rom).Offset;
break; break;
case Field.NULL: case Field.NULL:
@@ -739,7 +764,11 @@ namespace SabreTools.Library.DatItems
return string.Empty; return string.Empty;
} }
return string.Empty; // Make sure we don't return null
if (string.IsNullOrEmpty(fieldValue))
fieldValue = string.Empty;
return fieldValue;
} }
#endregion #endregion

33
SabreTools.Library/Tools/SeparatedValueWriter.cs
View File

@@ -72,7 +72,7 @@ namespace SabreTools.Library.Tools
/// <summary> /// <summary>
/// Write a value row /// Write a value row
/// </summary> /// </summary>
public void WriteValues(object[] values) public void WriteValues(object[] values, bool newline = true)
{ {
// If the writer can't be used, we error // If the writer can't be used, we error
if (sw == null || !sw.BaseStream.CanWrite) if (sw == null || !sw.BaseStream.CanWrite)
@@ -106,7 +106,7 @@ namespace SabreTools.Library.Tools
if (Quotes) if (Quotes)
sw.Write("\""); sw.Write("\"");
sw.Write(value.ToString()); sw.Write(value?.ToString() ?? string.Empty);
if (Quotes) if (Quotes)
sw.Write("\""); sw.Write("\"");
@@ -125,10 +125,35 @@ namespace SabreTools.Library.Tools
} }
} }
// Add a newline // Add a newline, if needed
if (newline)
sw.WriteLine(); sw.WriteLine();
}
// Flush the buffer /// <summary>
/// Write a generic string
/// </summary>
public void WriteString(string value)
{
if (string.IsNullOrEmpty(value))
return;
sw.Write(value);
}
/// <summary>
/// Write a newline
/// </summary>
public void WriteLine()
{
sw.WriteLine();
}
/// <summary>
/// Flush the underlying writer
/// </summary>
public void Flush()
{
sw.Flush(); sw.Flush();
} }