New name please

This commit is contained in:
Matt Nadareski
2020-09-07 22:40:27 -07:00
parent f679aa46b9
commit 412759a2d7
8 changed files with 28 additions and 28 deletions

View File

@@ -86,9 +86,6 @@ namespace SabreTools.Library.DatFiles
case DatFormat.EverdriveSMDB:
return new EverdriveSMDB(baseDat);
case DatFormat.Json:
return new Json(baseDat);
case DatFormat.Listrom:
return new Listrom(baseDat);
@@ -139,9 +136,12 @@ namespace SabreTools.Library.DatFiles
case DatFormat.RomCenter:
return new RomCenter(baseDat);
case DatFormat.SabreDat:
case DatFormat.SabreDAT:
return new SabreDat(baseDat);
case DatFormat.SabreJSON:
return new SabreJSON(baseDat);
case DatFormat.SoftwareList:
return new SoftwareList(baseDat);

View File

@@ -790,9 +790,9 @@ namespace SabreTools.Library.DatFiles
#region .json
// JSON
if (DatFormat.HasFlag(DatFormat.Json))
if (DatFormat.HasFlag(DatFormat.SabreJSON))
{
outfileNames.Add(DatFormat.Json, CreateOutFileNamesHelper(outDir, ".json", overwrite));
outfileNames.Add(DatFormat.SabreJSON, CreateOutFileNamesHelper(outDir, ".json", overwrite));
usedExtensions.Add(".json");
}
@@ -981,16 +981,16 @@ namespace SabreTools.Library.DatFiles
}
// SabreDAT
if (DatFormat.HasFlag(DatFormat.SabreDat))
if (DatFormat.HasFlag(DatFormat.SabreDAT))
{
if (usedExtensions.Contains(".xml"))
{
outfileNames.Add(DatFormat.SabreDat, CreateOutFileNamesHelper(outDir, ".sd.xml", overwrite));
outfileNames.Add(DatFormat.SabreDAT, CreateOutFileNamesHelper(outDir, ".sd.xml", overwrite));
usedExtensions.Add(".sd.xml");
}
else
{
outfileNames.Add(DatFormat.SabreDat, CreateOutFileNamesHelper(outDir, ".xml", overwrite));
outfileNames.Add(DatFormat.SabreDAT, CreateOutFileNamesHelper(outDir, ".xml", overwrite));
usedExtensions.Add(".xml");
}
}

View File

@@ -36,9 +36,9 @@ namespace SabreTools.Library.DatFiles
OfflineList = 1 << 4,
/// <summary>
/// SabreDat XML
/// SabreDAT XML
/// </summary>
SabreDat = 1 << 5,
SabreDAT = 1 << 5,
/// <summary>
/// openMSX Software List XML
@@ -104,9 +104,9 @@ namespace SabreTools.Library.DatFiles
EverdriveSMDB = 1 << 16,
/// <summary>
/// JSON
/// SabreJSON
/// </summary>
Json = 1 << 17,
SabreJSON = 1 << 17,
#endregion

View File

@@ -13,15 +13,15 @@ using Newtonsoft.Json.Linq;
namespace SabreTools.Library.DatFiles
{
/// <summary>
/// Represents parsing and writing of a reference JSON DAT
/// Represents parsing and writing of a reference SabreJSON DAT
/// </summary>
internal class Json : DatFile
internal class SabreJSON : DatFile
{
/// <summary>
/// Constructor designed for casting a base DatFile
/// </summary>
/// <param name="datFile">Parent DatFile to copy from</param>
public Json(DatFile datFile)
public SabreJSON(DatFile datFile)
: base(datFile)
{
}

View File

@@ -74,7 +74,7 @@ namespace SabreTools.Library.IO
case "csv":
return DatFormat.CSV;
case "json":
return DatFormat.Json;
return DatFormat.SabreJSON;
case "md5":
return DatFormat.RedumpMD5;
#if NET_FRAMEWORK
@@ -148,7 +148,7 @@ namespace SabreTools.Library.IO
return DatFormat.SoftwareList;
else if (second.StartsWith("<!doctype sabredat"))
return DatFormat.SabreDat;
return DatFormat.SabreDAT;
else if ((second.StartsWith("<dat") && !second.StartsWith("<datafile"))
|| second.StartsWith("<?xml-stylesheet"))

View File

@@ -262,7 +262,7 @@ Options:
cmp, clrmamepro - ClrMamePro
csv - Standardized Comma-Separated Value
dc, doscenter - DOSCenter
json - JSON
json - SabreJSON
lr, listrom - MAME Listrom
lx, listxml - MAME Listxml
miss, missfile - GoodTools Missfile
@@ -271,7 +271,7 @@ Options:
ol, offlinelist - OfflineList XML
rc, romcenter - RomCenter
ripemd160 - RIPEMD160 (.NET Framework 4.8 only)
sd, sabredat - SabreDat XML
sd, sabredat - SabreDAT XML
sfv - SFV
sha1 - SHA1
sha256 - SHA256
@@ -634,7 +634,7 @@ Options:
cmp, clrmamepro - ClrMamePro
csv - Standardized Comma-Separated Value
dc, doscenter - DOSCenter
json - JSON
json - SabreJSON
lr, listrom - MAME Listrom
lx, listxml - MAME Listxml
miss, missfile - GoodTools Missfile
@@ -643,7 +643,7 @@ Options:
ol, offlinelist - OfflineList XML
rc, romcenter - RomCenter
ripemd160 - RIPEMD160 (.NET Framework 4.8 only)
sd, sabredat - SabreDat XML
sd, sabredat - SabreDAT XML
sfv - SFV
sha1 - SHA1
sha256 - SHA256
@@ -788,7 +788,7 @@ Options:
cmp, clrmamepro - ClrMamePro
csv - Standardized Comma-Separated Value
dc, doscenter - DOSCenter
json - JSON
json - SabreJSON
lr, listrom - MAME Listrom
lx, listxml - MAME Listxml
miss, missfile - GoodTools Missfile
@@ -797,7 +797,7 @@ Options:
ol, offlinelist - OfflineList XML
rc, romcenter - RomCenter
ripemd160 - RIPEMD160 (.NET Framework 4.8 only)
sd, sabredat - SabreDat XML
sd, sabredat - SabreDAT XML
sfv - SFV
sha1 - SHA1
sha256 - SHA256

View File

@@ -187,7 +187,7 @@ namespace SabreTools.Library.Tools
case "smdb":
return DatFormat.EverdriveSMDB;
case "json":
return DatFormat.Json;
return DatFormat.SabreJSON;
case "lr":
case "listrom":
return DatFormat.Listrom;
@@ -214,7 +214,7 @@ namespace SabreTools.Library.Tools
#endif
case "sd":
case "sabredat":
return DatFormat.SabreDat;
return DatFormat.SabreDAT;
case "sfv":
return DatFormat.RedumpSFV;
case "sha1":

View File

@@ -1741,7 +1741,7 @@ Possible values are:
cmp, clrmamepro - ClrMamePro
csv - Standardized Comma-Separated Value
dc, doscenter - DOSCenter
json - JSON
json - SabreJSON
lr, listrom - MAME Listrom
lx, listxml - MAME Listxml
miss, missfile - GoodTools Missfile
@@ -1754,7 +1754,7 @@ Possible values are:
ripemd160 - RIPEMD160"
#endif
+ @"
sd, sabredat - SabreDat XML
sd, sabredat - SabreDAT XML
sfv - SFV
sha1 - SHA1
sha256 - SHA256