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

Better shorthand, change internal naming

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-07 22:57:44 -07:00
parent 308de8dd73
commit e34f50c464
9 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SabreTools.Library/DatFiles/DatFile.cs
View File

@@ -136,12 +136,12 @@ namespace SabreTools.Library.DatFiles
case DatFormat.RomCenter:
return new RomCenter(baseDat);
case DatFormat.SabreDAT:
return new SabreDat(baseDat);
case DatFormat.SabreJSON:
return new SabreJSON(baseDat);
case DatFormat.SabreXML:
return new SabreXML(baseDat);
case DatFormat.SoftwareList:
return new SoftwareList(baseDat);

6
SabreTools.Library/DatFiles/DatHeader.cs
View File

@@ -981,16 +981,16 @@ namespace SabreTools.Library.DatFiles
}
// SabreDAT
if (DatFormat.HasFlag(DatFormat.SabreDAT))
if (DatFormat.HasFlag(DatFormat.SabreXML))
{
if (usedExtensions.Contains(".xml"))
{
outfileNames.Add(DatFormat.SabreDAT, CreateOutFileNamesHelper(outDir, ".sd.xml", overwrite));
outfileNames.Add(DatFormat.SabreXML, CreateOutFileNamesHelper(outDir, ".sd.xml", overwrite));
usedExtensions.Add(".sd.xml");
}
else
{
outfileNames.Add(DatFormat.SabreDAT, CreateOutFileNamesHelper(outDir, ".xml", overwrite));
outfileNames.Add(DatFormat.SabreXML, CreateOutFileNamesHelper(outDir, ".xml", overwrite));
usedExtensions.Add(".xml");
}
}

4
SabreTools.Library/DatFiles/Enums.cs
View File

@@ -38,7 +38,7 @@ namespace SabreTools.Library.DatFiles
/// <summary>
/// SabreDAT XML
/// </summary>
SabreDAT = 1 << 5,
SabreXML = 1 << 5,
/// <summary>
/// openMSX Software List XML
@@ -55,7 +55,7 @@ namespace SabreTools.Library.DatFiles
ClrMamePro = 1 << 7,
/// <summary>
/// RomCetner INI-based
/// RomCenter INI-based
/// </summary>
RomCenter = 1 << 8,

2
SabreTools.Library/DatFiles/SabreJSON.cs
View File

@@ -13,7 +13,7 @@ using Newtonsoft.Json.Linq;
namespace SabreTools.Library.DatFiles
{
/// <summary>
/// Represents parsing and writing of a reference SabreJSON DAT
/// Represents parsing and writing of a reference SabreDAT JSON
/// </summary>
internal class SabreJSON : DatFile
{

6
SabreTools.Library/DatFiles/SabreDat.cs → SabreTools.Library/DatFiles/SabreXML.cs
View File

@@ -12,15 +12,15 @@ using SabreTools.Library.IO;
namespace SabreTools.Library.DatFiles
{
/// <summary>
/// Represents parsing and writing of a SabreDat XML DAT
/// Represents parsing and writing of a SabreDAT XML
/// </summary>
internal class SabreDat : DatFile
internal class SabreXML : DatFile
{
/// <summary>
/// Constructor designed for casting a base DatFile
/// </summary>
/// <param name="datFile">Parent DatFile to copy from</param>
public SabreDat(DatFile datFile)
public SabreXML(DatFile datFile)
: base(datFile)
{
}

2
SabreTools.Library/IO/FileExtensions.cs
View File

@@ -148,7 +148,7 @@ namespace SabreTools.Library.IO
return DatFormat.SoftwareList;
else if (second.StartsWith("<!doctype sabredat"))
return DatFormat.SabreDAT;
return DatFormat.SabreXML;
else if ((second.StartsWith("<dat") && !second.StartsWith("<datafile"))
|| second.StartsWith("<?xml-stylesheet"))

12
SabreTools.Library/README.1ST
View File

@@ -262,7 +262,6 @@ Options:
cmp, clrmamepro - ClrMamePro
csv - Standardized Comma-Separated Value
dc, doscenter - DOSCenter
json - SabreJSON
lr, listrom - MAME Listrom
lx, listxml - MAME Listxml
miss, missfile - GoodTools Missfile
@@ -271,7 +270,8 @@ Options:
ol, offlinelist - OfflineList XML
rc, romcenter - RomCenter
ripemd160 - RIPEMD160 (.NET Framework 4.8 only)
sd, sabredat - SabreDAT XML
sj, sabrejson - SabreJSON
sx, sabrexml - SabreDAT XML
sfv - SFV
sha1 - SHA1
sha256 - SHA256
@@ -635,7 +635,6 @@ Options:
cmp, clrmamepro - ClrMamePro
csv - Standardized Comma-Separated Value
dc, doscenter - DOSCenter
json - SabreJSON
lr, listrom - MAME Listrom
lx, listxml - MAME Listxml
miss, missfile - GoodTools Missfile
@@ -644,7 +643,8 @@ Options:
ol, offlinelist - OfflineList XML
rc, romcenter - RomCenter
ripemd160 - RIPEMD160 (.NET Framework 4.8 only)
sd, sabredat - SabreDAT XML
sj, sabrejson - SabreJSON
sx, sabrexml - SabreDAT XML
sfv - SFV
sha1 - SHA1
sha256 - SHA256
@@ -790,7 +790,6 @@ Options:
cmp, clrmamepro - ClrMamePro
csv - Standardized Comma-Separated Value
dc, doscenter - DOSCenter
json - SabreJSON
lr, listrom - MAME Listrom
lx, listxml - MAME Listxml
miss, missfile - GoodTools Missfile
@@ -799,7 +798,8 @@ Options:
ol, offlinelist - OfflineList XML
rc, romcenter - RomCenter
ripemd160 - RIPEMD160 (.NET Framework 4.8 only)
sd, sabredat - SabreDAT XML
sj, sabrejson - SabreJSON
sx, sabrexml - SabreDAT XML
sfv - SFV
sha1 - SHA1
sha256 - SHA256

6
SabreTools.Library/Tools/Converters.cs
View File

@@ -187,6 +187,8 @@ namespace SabreTools.Library.Tools
case "smdb":
return DatFormat.EverdriveSMDB;
case "json":
case "sj":
case "sabrejson":
return DatFormat.SabreJSON;
case "lr":
case "listrom":
@@ -214,7 +216,9 @@ namespace SabreTools.Library.Tools
#endif
case "sd":
case "sabredat":
return DatFormat.SabreDAT;
case "sx":
case "sabrexml":
return DatFormat.SabreXML;
case "sfv":
return DatFormat.RedumpSFV;
case "sha1":

4
SabreTools/Features/BaseFeature.cs
View File

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