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

Create and use SortedKeys

Browse Source
This commit is contained in:
Matt Nadareski
2020-07-26 21:00:30 -07:00
parent 0112821a72
commit efc90457e5
18 changed files with 49 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,11 +134,8 @@ namespace SabreTools.Library.DatFiles
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

7
SabreTools.Library/DatFiles/ClrMamePro.cs
View File

@@ -464,11 +464,8 @@ namespace SabreTools.Library.DatFiles
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

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

@@ -239,6 +239,20 @@ namespace SabreTools.Library.DatFiles
DatHeader.Type = type; DatHeader.Type = type;
} }
/// <summary>
/// Get the keys in sorted order from the file dictionary
/// </summary>
/// <returns>List of the keys in sorted order</returns>
public List<string> SortedKeys
{
get
{
var keys = Items.Keys.ToList();
keys.Sort(new NaturalComparer());
return keys;
}
}
/// <summary> /// <summary>
/// Ensure the key exists in the items dictionary /// Ensure the key exists in the items dictionary
/// </summary> /// </summary>
@@ -1335,8 +1349,8 @@ namespace SabreTools.Library.DatFiles
// Now, loop through the dictionary and populate the correct DATs // Now, loop through the dictionary and populate the correct DATs
watch.Start("Populating all output DATs"); watch.Start("Populating all output DATs");
List<string> keys = Keys;
List<string> keys = Keys;
Parallel.ForEach(keys, Globals.ParallelOptions, key => Parallel.ForEach(keys, Globals.ParallelOptions, key =>
{ {
List<DatItem> items = DatItem.Merge(this[key]); List<DatItem> items = DatItem.Merge(this[key]);

7
SabreTools.Library/DatFiles/DosCenter.cs
View File

@@ -290,11 +290,8 @@ namespace SabreTools.Library.DatFiles
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

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

@@ -110,11 +110,8 @@ namespace SabreTools.Library.DatFiles
VerifyFieldCount = true VerifyFieldCount = true
}; };
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

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

@@ -125,11 +125,8 @@ namespace SabreTools.Library.DatFiles
VerifyFieldCount = true VerifyFieldCount = true
}; };
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

7
SabreTools.Library/DatFiles/Json.cs
View File

@@ -776,11 +776,8 @@ namespace SabreTools.Library.DatFiles
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

7
SabreTools.Library/DatFiles/Listrom.cs
View File

@@ -253,11 +253,8 @@ namespace SabreTools.Library.DatFiles
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

7
SabreTools.Library/DatFiles/Listxml.cs
View File

@@ -574,11 +574,8 @@ namespace SabreTools.Library.DatFiles
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

7
SabreTools.Library/DatFiles/Logiqx.cs
View File

@@ -671,11 +671,8 @@ namespace SabreTools.Library.DatFiles
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

7
SabreTools.Library/DatFiles/Missfile.cs
View File

@@ -67,11 +67,8 @@ namespace SabreTools.Library.DatFiles
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

7
SabreTools.Library/DatFiles/OfflineList.cs
View File

@@ -757,11 +757,8 @@ namespace SabreTools.Library.DatFiles
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

7
SabreTools.Library/DatFiles/OpenMSX.cs
View File

@@ -501,11 +501,8 @@ namespace SabreTools.Library.DatFiles
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

7
SabreTools.Library/DatFiles/RomCenter.cs
View File

@@ -392,11 +392,8 @@ namespace SabreTools.Library.DatFiles
string lastgame = null; string lastgame = null;
List<string> splitpath = new List<string>(); List<string> splitpath = new List<string>();
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

7
SabreTools.Library/DatFiles/SabreDat.cs
View File

@@ -563,11 +563,8 @@ namespace SabreTools.Library.DatFiles
string lastgame = null; string lastgame = null;
List<string> splitpath = new List<string>(); List<string> splitpath = new List<string>();
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

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

@@ -882,11 +882,8 @@ namespace SabreTools.Library.DatFiles
// Write out the header // Write out the header
WriteHeader(svw); WriteHeader(svw);
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

7
SabreTools.Library/DatFiles/SoftwareList.cs
View File

@@ -554,11 +554,8 @@ namespace SabreTools.Library.DatFiles
// Write out each of the machines and roms // Write out each of the machines and roms
string lastgame = null; string lastgame = null;
// Get a properly sorted set of keys // Use a sorted list of games to output
List<string> keys = Keys; foreach (string key in SortedKeys)
keys.Sort(new NaturalComparer());
foreach (string key in keys)
{ {
List<DatItem> roms = this[key]; List<DatItem> roms = this[key];

4
SabreTools.Library/Data/Constants.cs
View File

@@ -12,8 +12,8 @@ namespace SabreTools.Library.Data
/// <summary> /// <summary>
/// The current toolset version to be used by all child applications /// The current toolset version to be used by all child applications
/// </summary> /// </summary>
public readonly static string Version = $"v1.0.2"; ///public readonly static string Version = $"v1.0.2";
//public readonly static string Version = $"v1.0.2-{File.GetCreationTime(Assembly.GetExecutingAssembly().Location):yyyy-MM-dd HH:mm:ss}"; public readonly static string Version = $"v1.0.2-{File.GetCreationTime(Assembly.GetExecutingAssembly().Location):yyyy-MM-dd HH:mm:ss}";
public const int HeaderHeight = 3; public const int HeaderHeight = 3;
#region 0-byte file constants #region 0-byte file constants