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;
}
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
WriteHeader(sw);
WriteHeader(svw);
// Write out each of the machines and roms
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 (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 (item.ItemType == ItemType.Rom
@@ -172,7 +175,7 @@ namespace SabreTools.Library.DatFiles
}
Globals.Logger.Verbose($"File written!{Environment.NewLine}");
sw.Dispose();
svw.Dispose();
fs.Dispose();
}
catch (Exception ex)
@@ -187,31 +190,36 @@ namespace SabreTools.Library.DatFiles
/// <summary>
/// Write out DAT header using the supplied StreamWriter
/// </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>
private bool WriteHeader(StreamWriter sw)
private bool WriteHeader(SeparatedValueWriter svw)
{
try
{
sw.Write("#Title;");
sw.Write("Name;");
sw.Write("Emulator;");
sw.Write("CloneOf");
sw.Write("Year;");
sw.Write("Manufacturer;");
sw.Write("Category;");
sw.Write("Players;");
sw.Write("Rotation;");
sw.Write("Control;");
sw.Write("Status;");
sw.Write("DisplayCount;");
sw.Write("DisplayType;");
sw.Write("AltRomname;");
sw.Write("AltTitle;");
sw.Write("Extra;");
sw.Write("Buttons\n");
string[] headers = new string[]
{
"#Title",
"Name",
"Emulator",
"CloneOf",
"Year",
"Manufacturer",
"Category",
"Players",
"Rotation",
"Control",
"Status",
"DisplayCount",
"DisplayType",
"AltRomname",
"AltTitle",
"Extra",
"Buttons",
};
sw.Flush();
svw.WriteHeader(headers);
svw.Flush();
}
catch (Exception ex)
{
@@ -225,11 +233,11 @@ namespace SabreTools.Library.DatFiles
/// <summary>
/// Write out Game start using the supplied StreamWriter
/// </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="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>
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 (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
ProcessItemName(datItem, true);
sw.Write($"{datItem.GetField(Field.MachineName, ExcludeFields)};");
sw.Write($"{datItem.GetField(Field.Description, ExcludeFields)};");
sw.Write($"{FileName};");
sw.Write($"{datItem.GetField(Field.CloneOf, ExcludeFields)};");
sw.Write($"{datItem.GetField(Field.Year, ExcludeFields)};");
sw.Write($"{datItem.GetField(Field.Manufacturer, ExcludeFields)};");
sw.Write(";"); // $"{datItem.GetField(Field.Category, ExcludeFields)};");
sw.Write(";"); // $"{datItem.GetField(Field.Players, ExcludeFields)};");
sw.Write(";"); // $"{datItem.GetField(Field.Rotation, ExcludeFields)};");
sw.Write(";"); // $"{datItem.GetField(Field.Control, ExcludeFields)};");
sw.Write(";"); // $"{datItem.GetField(Field.Status, ExcludeFields)};");
sw.Write(";"); // $"{datItem.GetField(Field.DisplayCount, ExcludeFields)};");
sw.Write(";"); // $"{datItem.GetField(Field.DisplayType, ExcludeFields)};");
sw.Write(";"); // $"{datItem.GetField(Field.AltRomname, ExcludeFields)};");
sw.Write(";"); // $"{datItem.GetField(Field.AltTitle, ExcludeFields)};");
sw.Write($"{datItem.GetField(Field.Comment, ExcludeFields)};");
sw.Write(";"); // $"{datItem.GetField(Field.Buttons, ExcludeFields)};");
string[] fields = new string[]
{
datItem.GetField(Field.MachineName, ExcludeFields),
datItem.GetField(Field.Description, ExcludeFields),
FileName,
datItem.GetField(Field.CloneOf, ExcludeFields),
datItem.GetField(Field.Year, ExcludeFields),
datItem.GetField(Field.Manufacturer, ExcludeFields),
string.Empty, // datItem.GetField(Field.Category, ExcludeFields)
string.Empty, // datItem.GetField(Field.Players, ExcludeFields)
string.Empty, // datItem.GetField(Field.Rotation, ExcludeFields)
string.Empty, // datItem.GetField(Field.Control, ExcludeFields)
string.Empty, // datItem.GetField(Field.Status, ExcludeFields)
string.Empty, // datItem.GetField(Field.DisplayCount, ExcludeFields)
string.Empty, // datItem.GetField(Field.DisplayType, ExcludeFields)
string.Empty, // datItem.GetField(Field.AltRomname, 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)
{

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

@@ -105,7 +105,10 @@ namespace SabreTools.Library.DatFiles
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
List<string> keys = Keys;
@@ -140,12 +143,12 @@ namespace SabreTools.Library.DatFiles
((Rom)item).Size = Constants.SizeZero;
}
WriteDatItem(sw, item, ignoreblanks);
WriteDatItem(svw, item, ignoreblanks);
}
}
Globals.Logger.Verbose($"File written!{Environment.NewLine}");
sw.Dispose();
svw.Dispose();
fs.Dispose();
}
catch (Exception ex)
@@ -160,10 +163,10 @@ namespace SabreTools.Library.DatFiles
/// <summary>
/// Write out Game start using the supplied StreamWriter
/// </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>
/// <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 (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:
var rom = datItem as Rom;
sw.Write($"{rom.GetField(Field.SHA256, ExcludeFields)}\t");
sw.Write($"{rom.GetField(Field.MachineName, ExcludeFields)}/\t");
sw.Write($"{rom.GetField(Field.Name, ExcludeFields)}\t");
sw.Write($"{rom.GetField(Field.SHA1, ExcludeFields)}\t");
sw.Write($"{rom.GetField(Field.MD5, ExcludeFields)}\t");
sw.Write($"{rom.GetField(Field.CRC, ExcludeFields)}");
sw.Write("\n");
string[] fields = new string[]
{
rom.GetField(Field.SHA256, ExcludeFields),
$"{rom.GetField(Field.MachineName, ExcludeFields)}/",
rom.GetField(Field.Name, ExcludeFields),
rom.GetField(Field.SHA1, ExcludeFields),
rom.GetField(Field.MD5, ExcludeFields),
rom.GetField(Field.CRC, ExcludeFields),
};
svw.WriteValues(fields);
break;
}
sw.Flush();
svw.Flush();
}
catch (Exception ex)
{

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

@@ -121,7 +121,10 @@ namespace SabreTools.Library.DatFiles
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
List<string> keys = Keys;
@@ -154,12 +157,12 @@ namespace SabreTools.Library.DatFiles
}
// Now, output the rom data
WriteDatItem(sw, rom, ignoreblanks);
WriteDatItem(svw, rom, ignoreblanks);
}
}
Globals.Logger.Verbose($"File written!{Environment.NewLine}");
sw.Dispose();
svw.Dispose();
fs.Dispose();
}
catch (Exception ex)
@@ -174,11 +177,11 @@ namespace SabreTools.Library.DatFiles
/// <summary>
/// Write out DatItem using the supplied StreamWriter
/// </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="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>
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 (ignoreblanks && (datItem.ItemType == ItemType.Rom && ((datItem as Rom).Size == 0 || (datItem as Rom).Size == -1)))
@@ -186,10 +189,8 @@ namespace SabreTools.Library.DatFiles
try
{
// Pre-process the item name
ProcessItemName(datItem, true);
// Build the state based on excluded fields
string[] fields = new string[2];
switch (_hash)
{
case Hash.CRC:
@@ -197,11 +198,11 @@ namespace SabreTools.Library.DatFiles
{
case ItemType.Rom:
var rom = datItem as Rom;
fields[0] = string.Empty;
if (GameName)
sw.Write($"{rom.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}");
sw.Write($"{rom.GetField(Field.Name, ExcludeFields)}");
sw.Write($"{rom.GetField(Field.CRC, ExcludeFields)}");
sw.Write("\n");
fields[0] = $"{rom.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}";
fields[0] += rom.GetField(Field.Name, ExcludeFields);
fields[1] = rom.GetField(Field.CRC, ExcludeFields);
break;
}
break;
@@ -218,26 +219,30 @@ namespace SabreTools.Library.DatFiles
{
case ItemType.Disk:
var disk = datItem as Disk;
sw.Write($"{disk.GetField(hashField, ExcludeFields)}");
fields[0] = disk.GetField(hashField, ExcludeFields);
fields[1] = string.Empty;
if (GameName)
sw.Write($"{disk.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}");
sw.Write($"{disk.GetField(Field.Name, ExcludeFields)}");
sw.Write("\n");
fields[1] = $"{disk.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}";
fields[1] += disk.GetField(Field.Name, ExcludeFields);
break;
case ItemType.Rom:
var rom = datItem as Rom;
sw.Write($"{rom.GetField(hashField, ExcludeFields)}");
fields[0] = rom.GetField(hashField, ExcludeFields);
fields[1] = string.Empty;
if (GameName)
sw.Write($"{rom.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}");
sw.Write($"{rom.GetField(Field.Name, ExcludeFields)}");
sw.Write("\n");
fields[1] = $"{rom.GetField(Field.MachineName, ExcludeFields)}{Path.DirectorySeparatorChar}";
fields[1] += rom.GetField(Field.Name, ExcludeFields);
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)
{

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

@@ -394,10 +394,13 @@ namespace SabreTools.Library.DatFiles
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
WriteHeader(sw);
WriteHeader(svw);
// Get a properly sorted set of keys
List<string> keys = Keys;
@@ -430,12 +433,12 @@ namespace SabreTools.Library.DatFiles
}
// Now, output the rom data
WriteDatItem(sw, rom, ignoreblanks);
WriteDatItem(svw, rom, ignoreblanks);
}
}
Globals.Logger.Verbose("File written!" + Environment.NewLine);
sw.Dispose();
svw.Dispose();
fs.Dispose();
}
catch (Exception ex)
@@ -450,31 +453,36 @@ namespace SabreTools.Library.DatFiles
/// <summary>
/// Write out DAT header using the supplied StreamWriter
/// </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>
private bool WriteHeader(StreamWriter sw)
private bool WriteHeader(SeparatedValueWriter svw)
{
try
{
sw.Write("\"File Name\"{_delim}");
sw.Write("\"Internal Name\"{_delim}");
sw.Write("\"Description\"{_delim}");
sw.Write("\"Game Name\"{_delim}");
sw.Write("\"Game Description\"{_delim}");
sw.Write("\"Type\"{_delim}\"");
sw.Write("\"Rom Name\"{_delim}");
sw.Write("\"Disk Name\"{_delim}");
sw.Write("\"Size\"{_delim}");
sw.Write("\"CRC\"{_delim}");
sw.Write("\"MD5\"{_delim}");
//sw.Write("\"RIPEMD160\"{_delim}");
sw.Write("\"SHA1\"{_delim}");
sw.Write("\"SHA256\"{_delim}");
//sw.Write("\"SHA384\"{_delim}");
//sw.Write("\"SHA512\"{_delim}");
sw.Write("\"Nodump\"\n");
string[] headers = new string[]
{
"File Name",
"Internal Name",
"Description",
"Game Name",
"Game Description",
"Type",
"Rom Name",
"Disk Name",
"Size",
"CRC",
"MD5",
//"RIPEMD160",
"SHA1",
"SHA256",
//"SHA384",
//"SHA512",
"Nodump",
};
sw.Flush();
svw.WriteHeader(headers);
svw.Flush();
}
catch (Exception ex)
{
@@ -488,11 +496,11 @@ namespace SabreTools.Library.DatFiles
/// <summary>
/// Write out DatItem using the supplied StreamWriter
/// </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="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>
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 (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)
return true;
sw.Write(CreatePrefixPostfix(datItem, true));
sw.Write($"\"{FileName}\"{_delim}");
sw.Write($"\"{Name}\"{_delim}");
sw.Write($"\"{Description}\"{_delim}");
sw.Write($"\"{datItem.GetField(Field.MachineName, ExcludeFields)}\"{_delim}");
sw.Write($"\"{datItem.GetField(Field.Description, ExcludeFields)}\"{_delim}");
// Build the state based on excluded fields
string[] fields = new string[14]; // 17;
fields[0] = FileName;
fields[1] = Name;
fields[2] = Description;
fields[3] = datItem.GetField(Field.MachineName, ExcludeFields);
fields[4] = datItem.GetField(Field.Description, ExcludeFields);
switch (datItem.ItemType)
{
case ItemType.Disk:
var disk = datItem as Disk;
sw.Write($"\"disk\"{_delim}");
sw.Write($"\"\"{_delim}");
sw.Write($"\"{disk.GetField(Field.Name, ExcludeFields)}\"{_delim}");
sw.Write($"\"\"{_delim}");
sw.Write($"\"\"{_delim}");
sw.Write($"\"{disk.GetField(Field.MD5, ExcludeFields).ToLowerInvariant()}\"{_delim}");
//sw.Write($"\"{disk.GetField(Field.RIPEMD160, ExcludeFields).ToLowerInvariant()}\"{_delim}");
sw.Write($"\"{disk.GetField(Field.SHA1, ExcludeFields).ToLowerInvariant()}\"{_delim}");
sw.Write($"\"{disk.GetField(Field.SHA256, ExcludeFields).ToLowerInvariant()}\"{_delim}");
//sw.Write($"\"{disk.GetField(Field.SHA384, ExcludeFields).ToLowerInvariant()}\"{_delim}");
//sw.Write($"\"{disk.GetField(Field.SHA512, ExcludeFields).ToLowerInvariant()}\"{_delim}");
sw.Write($"\"{disk.GetField(Field.Status, ExcludeFields)}\"{_delim}");
fields[5] = "disk";
fields[6] = string.Empty;
fields[7] = disk.GetField(Field.Name, ExcludeFields);
fields[8] = string.Empty;
fields[9] = string.Empty;
fields[10] = disk.GetField(Field.MD5, ExcludeFields).ToLowerInvariant();
//fields[11] = disk.GetField(Field.RIPEMD160, ExcludeFields).ToLowerInvariant();
fields[11] = disk.GetField(Field.SHA1, ExcludeFields).ToLowerInvariant();
fields[12] = disk.GetField(Field.SHA256, ExcludeFields).ToLowerInvariant();
//fields[13] = disk.GetField(Field.SHA384, ExcludeFields).ToLowerInvariant();
//fields[14] = disk.GetField(Field.SHA512, ExcludeFields).ToLowerInvariant();
fields[13] = disk.GetField(Field.Status, ExcludeFields);
break;
case ItemType.Rom:
var rom = datItem as Rom;
sw.Write($"\"rom\"{_delim}");
sw.Write($"\"{rom.GetField(Field.Name, ExcludeFields)}\"{_delim}");
sw.Write($"\"\"{_delim}");
sw.Write($"\"{rom.GetField(Field.Size, ExcludeFields)}\"{_delim}");
sw.Write($"\"{rom.GetField(Field.CRC, ExcludeFields).ToLowerInvariant()}\"{_delim}");
sw.Write($"\"{rom.GetField(Field.MD5, ExcludeFields).ToLowerInvariant()}\"{_delim}");
//sw.Write($"\"{rom.GetField(Field.RIPEMD160, ExcludeFields).ToLowerInvariant()}\"{_delim}");
sw.Write($"\"{rom.GetField(Field.SHA1, ExcludeFields).ToLowerInvariant()}\"{_delim}");
sw.Write($"\"{rom.GetField(Field.SHA256, ExcludeFields).ToLowerInvariant()}\"{_delim}");
//sw.Write($"\"{rom.GetField(Field.SHA384, ExcludeFields).ToLowerInvariant()}\"{_delim}");
//sw.Write($"\"{rom.GetField(Field.SHA512, ExcludeFields).ToLowerInvariant()}\"{_delim}");
sw.Write($"\"{rom.GetField(Field.Status, ExcludeFields)}\"{_delim}");
fields[5] = "rom";
fields[6] = rom.GetField(Field.Name, ExcludeFields);
fields[7] = string.Empty;
fields[8] = rom.GetField(Field.Size, ExcludeFields);
fields[9] = rom.GetField(Field.CRC, ExcludeFields).ToLowerInvariant();
fields[10] = rom.GetField(Field.MD5, ExcludeFields).ToLowerInvariant();
//fields[11] = rom.GetField(Field.RIPEMD160, ExcludeFields).ToLowerInvariant();
fields[11] = rom.GetField(Field.SHA1, ExcludeFields).ToLowerInvariant();
fields[12] = rom.GetField(Field.SHA256, ExcludeFields).ToLowerInvariant();
//fields[13] = rom.GetField(Field.SHA384, ExcludeFields).ToLowerInvariant();
//fields[14] = rom.GetField(Field.SHA512, ExcludeFields).ToLowerInvariant();
fields[13] = rom.GetField(Field.Status, ExcludeFields);
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)
{