mirror of
https://github.com/claunia/SabreTools.git
synced 2025-12-16 19:14:27 +00:00
Core.Globals is definitely good
This commit is contained in:
@@ -1,6 +1,8 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
#if NET40_OR_GREATER || NETCOREAPP
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
#endif
|
||||||
using SabreTools.Core;
|
using SabreTools.Core;
|
||||||
using SabreTools.Core.Tools;
|
using SabreTools.Core.Tools;
|
||||||
using SabreTools.DatItems;
|
using SabreTools.DatItems;
|
||||||
@@ -35,7 +37,7 @@ namespace SabreTools.DatFiles
|
|||||||
private void ApplyRemovalsItemDictionary(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
|
private void ApplyRemovalsItemDictionary(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
|
||||||
{
|
{
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(Items.Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(Items.Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(Items.Keys, key =>
|
Parallel.ForEach(Items.Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -67,7 +69,7 @@ namespace SabreTools.DatFiles
|
|||||||
private void ApplyRemovalsItemDictionaryDB(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
|
private void ApplyRemovalsItemDictionaryDB(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
|
||||||
{
|
{
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(ItemsDB.SortedKeys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(ItemsDB.SortedKeys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(ItemsDB.SortedKeys, key =>
|
Parallel.ForEach(ItemsDB.SortedKeys, key =>
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -688,7 +688,7 @@ namespace SabreTools.DatFiles
|
|||||||
List<string> oldkeys = [.. Keys];
|
List<string> oldkeys = [.. Keys];
|
||||||
|
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.For(0, oldkeys.Count, Globals.ParallelOptions, k =>
|
Parallel.For(0, oldkeys.Count, Core.Globals.ParallelOptions, k =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.For(0, oldkeys.Count, k =>
|
Parallel.For(0, oldkeys.Count, k =>
|
||||||
#else
|
#else
|
||||||
@@ -740,7 +740,7 @@ namespace SabreTools.DatFiles
|
|||||||
|
|
||||||
List<string> keys = [.. Keys];
|
List<string> keys = [.. Keys];
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(keys, key =>
|
Parallel.ForEach(keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -780,7 +780,7 @@ namespace SabreTools.DatFiles
|
|||||||
{
|
{
|
||||||
List<string> keys = [.. Keys];
|
List<string> keys = [.. Keys];
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(keys, key =>
|
Parallel.ForEach(keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -828,7 +828,7 @@ namespace SabreTools.DatFiles
|
|||||||
{
|
{
|
||||||
List<string> keys = [.. Keys];
|
List<string> keys = [.. Keys];
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(keys, key =>
|
Parallel.ForEach(keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -981,7 +981,7 @@ namespace SabreTools.DatFiles
|
|||||||
{
|
{
|
||||||
// For each rom, we want to update the game to be "<game name>/<rom name>"
|
// For each rom, we want to update the game to be "<game name>/<rom name>"
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(Keys, key =>
|
Parallel.ForEach(Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -1017,7 +1017,7 @@ namespace SabreTools.DatFiles
|
|||||||
|
|
||||||
// Now process all of the roms
|
// Now process all of the roms
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(Keys, key =>
|
Parallel.ForEach(Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -1064,7 +1064,7 @@ namespace SabreTools.DatFiles
|
|||||||
Dictionary<string, string> mapping = [];
|
Dictionary<string, string> mapping = [];
|
||||||
#endif
|
#endif
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(Keys, key =>
|
Parallel.ForEach(Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -1134,7 +1134,7 @@ namespace SabreTools.DatFiles
|
|||||||
private void UpdateMachineNamesFromDescriptions(IDictionary<string, string> mapping)
|
private void UpdateMachineNamesFromDescriptions(IDictionary<string, string> mapping)
|
||||||
{
|
{
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(Keys, key =>
|
Parallel.ForEach(Keys, key =>
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -1009,7 +1009,7 @@ namespace SabreTools.DatFiles
|
|||||||
long[] itemIndicies = [.. _items.Keys];
|
long[] itemIndicies = [.. _items.Keys];
|
||||||
|
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.For(0, itemIndicies.Length, Globals.ParallelOptions, i =>
|
Parallel.For(0, itemIndicies.Length, Core.Globals.ParallelOptions, i =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.For(0, itemIndicies.Length, i =>
|
Parallel.For(0, itemIndicies.Length, i =>
|
||||||
#else
|
#else
|
||||||
@@ -1049,7 +1049,7 @@ namespace SabreTools.DatFiles
|
|||||||
string[] bucketKeys = [.. _buckets.Keys];
|
string[] bucketKeys = [.. _buckets.Keys];
|
||||||
|
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.For(0, bucketKeys.Length, Globals.ParallelOptions, i =>
|
Parallel.For(0, bucketKeys.Length, Core.Globals.ParallelOptions, i =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.For(0, bucketKeys.Length, i =>
|
Parallel.For(0, bucketKeys.Length, i =>
|
||||||
#else
|
#else
|
||||||
@@ -1092,7 +1092,7 @@ namespace SabreTools.DatFiles
|
|||||||
string[] bucketKeys = [.. _buckets.Keys];
|
string[] bucketKeys = [.. _buckets.Keys];
|
||||||
|
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.For(0, bucketKeys.Length, Globals.ParallelOptions, i =>
|
Parallel.For(0, bucketKeys.Length, Core.Globals.ParallelOptions, i =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.For(0, bucketKeys.Length, i =>
|
Parallel.For(0, bucketKeys.Length, i =>
|
||||||
#else
|
#else
|
||||||
@@ -1224,7 +1224,7 @@ namespace SabreTools.DatFiles
|
|||||||
{
|
{
|
||||||
List<string> keys = [.. SortedKeys];
|
List<string> keys = [.. SortedKeys];
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(keys, key =>
|
Parallel.ForEach(keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -1366,7 +1366,7 @@ namespace SabreTools.DatFiles
|
|||||||
{
|
{
|
||||||
// For each rom, we want to update the game to be "<game name>/<rom name>"
|
// For each rom, we want to update the game to be "<game name>/<rom name>"
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(SortedKeys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(SortedKeys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(SortedKeys, key =>
|
Parallel.ForEach(SortedKeys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -1402,7 +1402,7 @@ namespace SabreTools.DatFiles
|
|||||||
|
|
||||||
// Now process all of the roms
|
// Now process all of the roms
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(SortedKeys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(SortedKeys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(SortedKeys, key =>
|
Parallel.ForEach(SortedKeys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -1452,7 +1452,7 @@ namespace SabreTools.DatFiles
|
|||||||
Dictionary<string, string> mapping = [];
|
Dictionary<string, string> mapping = [];
|
||||||
#endif
|
#endif
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(SortedKeys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(SortedKeys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(SortedKeys, key =>
|
Parallel.ForEach(SortedKeys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -1555,7 +1555,7 @@ namespace SabreTools.DatFiles
|
|||||||
private void UpdateMachineNamesFromDescriptions(IDictionary<string, string> mapping)
|
private void UpdateMachineNamesFromDescriptions(IDictionary<string, string> mapping)
|
||||||
{
|
{
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(SortedKeys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(SortedKeys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(SortedKeys, key =>
|
Parallel.ForEach(SortedKeys, key =>
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace SabreTools.DatTools
|
|||||||
{
|
{
|
||||||
List<string> keys = [.. datFile.Items.Keys];
|
List<string> keys = [.. datFile.Items.Keys];
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(keys, key =>
|
Parallel.ForEach(keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -107,7 +107,7 @@ namespace SabreTools.DatTools
|
|||||||
{
|
{
|
||||||
List<string> keys = [.. datFile.ItemsDB.SortedKeys];
|
List<string> keys = [.. datFile.ItemsDB.SortedKeys];
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(keys, key =>
|
Parallel.ForEach(keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -186,7 +186,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Then we do a hashwise comparison against the base DAT
|
// Then we do a hashwise comparison against the base DAT
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(intDat.Items.Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(intDat.Items.Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(intDat.Items.Keys, key =>
|
Parallel.ForEach(intDat.Items.Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -234,7 +234,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Then we do a namewise comparison against the base DAT
|
// Then we do a namewise comparison against the base DAT
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(intDat.Items.Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(intDat.Items.Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(intDat.Items.Keys, key =>
|
Parallel.ForEach(intDat.Items.Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -303,7 +303,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Then we do a hashwise comparison against the base DAT
|
// Then we do a hashwise comparison against the base DAT
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(intDat.ItemsDB.SortedKeys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(intDat.ItemsDB.SortedKeys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(intDat.ItemsDB.SortedKeys, key =>
|
Parallel.ForEach(intDat.ItemsDB.SortedKeys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -344,7 +344,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Then we do a namewise comparison against the base DAT
|
// Then we do a namewise comparison against the base DAT
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(intDat.ItemsDB.SortedKeys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(intDat.ItemsDB.SortedKeys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(intDat.ItemsDB.SortedKeys, key =>
|
Parallel.ForEach(intDat.ItemsDB.SortedKeys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -401,7 +401,7 @@ namespace SabreTools.DatTools
|
|||||||
// Then we compare against the base DAT
|
// Then we compare against the base DAT
|
||||||
List<string> keys = [.. intDat.Items.Keys];
|
List<string> keys = [.. intDat.Items.Keys];
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(keys, key =>
|
Parallel.ForEach(keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -503,7 +503,7 @@ namespace SabreTools.DatTools
|
|||||||
// Create the DatFiles from the set of headers
|
// Create the DatFiles from the set of headers
|
||||||
DatFile[] outDatsArray = new DatFile[datHeaders.Count];
|
DatFile[] outDatsArray = new DatFile[datHeaders.Count];
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.For(0, datHeaders.Count, Globals.ParallelOptions, j =>
|
Parallel.For(0, datHeaders.Count, Core.Globals.ParallelOptions, j =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.For(0, datHeaders.Count, j =>
|
Parallel.For(0, datHeaders.Count, j =>
|
||||||
#else
|
#else
|
||||||
@@ -571,7 +571,7 @@ namespace SabreTools.DatTools
|
|||||||
watch.Start("Populating duplicate DAT");
|
watch.Start("Populating duplicate DAT");
|
||||||
|
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datFile.Items.Keys, key =>
|
Parallel.ForEach(datFile.Items.Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -675,7 +675,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Loop through and add the items
|
// Loop through and add the items
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
|
Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datItems, item =>
|
Parallel.ForEach(datItems, item =>
|
||||||
#else
|
#else
|
||||||
@@ -767,7 +767,7 @@ namespace SabreTools.DatTools
|
|||||||
DatFile[] outDatsArray = new DatFile[inputs.Count];
|
DatFile[] outDatsArray = new DatFile[inputs.Count];
|
||||||
|
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.For(0, inputs.Count, Globals.ParallelOptions, j =>
|
Parallel.For(0, inputs.Count, Core.Globals.ParallelOptions, j =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.For(0, inputs.Count, j =>
|
Parallel.For(0, inputs.Count, j =>
|
||||||
#else
|
#else
|
||||||
@@ -796,7 +796,7 @@ namespace SabreTools.DatTools
|
|||||||
watch.Start("Populating all individual DATs");
|
watch.Start("Populating all individual DATs");
|
||||||
|
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datFile.Items.Keys, key =>
|
Parallel.ForEach(datFile.Items.Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -860,7 +860,7 @@ namespace SabreTools.DatTools
|
|||||||
DatFile[] outDatsArray = new DatFile[inputs.Count];
|
DatFile[] outDatsArray = new DatFile[inputs.Count];
|
||||||
|
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.For(0, inputs.Count, Globals.ParallelOptions, j =>
|
Parallel.For(0, inputs.Count, Core.Globals.ParallelOptions, j =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.For(0, inputs.Count, j =>
|
Parallel.For(0, inputs.Count, j =>
|
||||||
#else
|
#else
|
||||||
@@ -925,7 +925,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Loop through and add the items
|
// Loop through and add the items
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
|
Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datItems, item =>
|
Parallel.ForEach(datItems, item =>
|
||||||
#else
|
#else
|
||||||
@@ -1006,7 +1006,7 @@ namespace SabreTools.DatTools
|
|||||||
watch.Start("Populating no duplicate DAT");
|
watch.Start("Populating no duplicate DAT");
|
||||||
|
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datFile.Items.Keys, key =>
|
Parallel.ForEach(datFile.Items.Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -1108,7 +1108,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Loop through and add the items
|
// Loop through and add the items
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
|
Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datItems, item =>
|
Parallel.ForEach(datItems, item =>
|
||||||
#else
|
#else
|
||||||
@@ -1190,7 +1190,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Parse all of the DATs into their own DatFiles in the array
|
// Parse all of the DATs into their own DatFiles in the array
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.For(0, inputs.Count, Globals.ParallelOptions, i =>
|
Parallel.For(0, inputs.Count, Core.Globals.ParallelOptions, i =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.For(0, inputs.Count, i =>
|
Parallel.For(0, inputs.Count, i =>
|
||||||
#else
|
#else
|
||||||
@@ -1281,7 +1281,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Loop through and add the items
|
// Loop through and add the items
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
|
Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datItems, item =>
|
Parallel.ForEach(datItems, item =>
|
||||||
#else
|
#else
|
||||||
@@ -1320,7 +1320,7 @@ namespace SabreTools.DatTools
|
|||||||
{
|
{
|
||||||
// Loop through and add the items for this index to the output
|
// Loop through and add the items for this index to the output
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datFile.Items.Keys, key =>
|
Parallel.ForEach(datFile.Items.Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -1386,7 +1386,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Loop through and add the items
|
// Loop through and add the items
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
|
Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datItems, item =>
|
Parallel.ForEach(datItems, item =>
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ namespace SabreTools.DatTools
|
|||||||
// Now loop through and get only directories from the input paths
|
// Now loop through and get only directories from the input paths
|
||||||
List<string> directories = [];
|
List<string> directories = [];
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(inputs, Globals.ParallelOptions, input =>
|
Parallel.ForEach(inputs, Core.Globals.ParallelOptions, input =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(inputs, input =>
|
Parallel.ForEach(inputs, input =>
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Now separate the roms accordingly
|
// Now separate the roms accordingly
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datFile.Items.Keys, key =>
|
Parallel.ForEach(datFile.Items.Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -170,7 +170,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Loop through and add the items
|
// Loop through and add the items
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
|
Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datItems, item =>
|
Parallel.ForEach(datItems, item =>
|
||||||
#else
|
#else
|
||||||
@@ -240,7 +240,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Now populate each of the DAT objects in turn
|
// Now populate each of the DAT objects in turn
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datFile.Items.Keys, key =>
|
Parallel.ForEach(datFile.Items.Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -390,7 +390,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Loop through and add the items
|
// Loop through and add the items
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
|
Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datItems, item =>
|
Parallel.ForEach(datItems, item =>
|
||||||
#else
|
#else
|
||||||
@@ -489,7 +489,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Then, we loop over the games
|
// Then, we loop over the games
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(keys, key =>
|
Parallel.ForEach(keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -615,7 +615,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Now populate each of the DAT objects in turn
|
// Now populate each of the DAT objects in turn
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datFile.Items.Keys, key =>
|
Parallel.ForEach(datFile.Items.Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -708,7 +708,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Loop through and add the items
|
// Loop through and add the items
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
|
Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datItems, item =>
|
Parallel.ForEach(datItems, item =>
|
||||||
#else
|
#else
|
||||||
@@ -867,7 +867,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Now populate each of the DAT objects in turn
|
// Now populate each of the DAT objects in turn
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(outputTypes, Globals.ParallelOptions, itemType =>
|
Parallel.ForEach(outputTypes, Core.Globals.ParallelOptions, itemType =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(outputTypes, itemType =>
|
Parallel.ForEach(outputTypes, itemType =>
|
||||||
#else
|
#else
|
||||||
@@ -897,7 +897,7 @@ namespace SabreTools.DatTools
|
|||||||
{
|
{
|
||||||
// Loop through and add the items for this index to the output
|
// Loop through and add the items for this index to the output
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
|
Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datFile.Items.Keys, key =>
|
Parallel.ForEach(datFile.Items.Keys, key =>
|
||||||
#else
|
#else
|
||||||
@@ -962,7 +962,7 @@ namespace SabreTools.DatTools
|
|||||||
|
|
||||||
// Loop through and add the items
|
// Loop through and add the items
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
|
Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(datItems, item =>
|
Parallel.ForEach(datItems, item =>
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ namespace SabreTools.DatTools
|
|||||||
{
|
{
|
||||||
// Write out all required formats
|
// Write out all required formats
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(outfiles.Keys, SabreTools.Core.Globals.ParallelOptions, reportFormat =>
|
Parallel.ForEach(outfiles.Keys, Core.Globals.ParallelOptions, reportFormat =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(outfiles.Keys, reportFormat =>
|
Parallel.ForEach(outfiles.Keys, reportFormat =>
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ namespace SabreTools.DatTools
|
|||||||
{
|
{
|
||||||
// Write out all required formats
|
// Write out all required formats
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(outfiles.Keys, SabreTools.Core.Globals.ParallelOptions, datFormat =>
|
Parallel.ForEach(outfiles.Keys, Core.Globals.ParallelOptions, datFormat =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(outfiles.Keys, datFormat =>
|
Parallel.ForEach(outfiles.Keys, datFormat =>
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ namespace SabreTools.Features
|
|||||||
|
|
||||||
// Loop through each type DatFile
|
// Loop through each type DatFile
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(typeDats.Keys, Globals.ParallelOptions, itemType =>
|
Parallel.ForEach(typeDats.Keys, Core.Globals.ParallelOptions, itemType =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(typeDats.Keys, itemType =>
|
Parallel.ForEach(typeDats.Keys, itemType =>
|
||||||
#else
|
#else
|
||||||
@@ -152,7 +152,7 @@ namespace SabreTools.Features
|
|||||||
|
|
||||||
// Loop through each type DatFile
|
// Loop through each type DatFile
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(sizedDats, Globals.ParallelOptions, sizedDat =>
|
Parallel.ForEach(sizedDats, Core.Globals.ParallelOptions, sizedDat =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(sizedDats, sizedDat =>
|
Parallel.ForEach(sizedDats, sizedDat =>
|
||||||
#else
|
#else
|
||||||
@@ -178,7 +178,7 @@ namespace SabreTools.Features
|
|||||||
|
|
||||||
// Loop through each type DatFile
|
// Loop through each type DatFile
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(typeDats.Keys, Globals.ParallelOptions, itemType =>
|
Parallel.ForEach(typeDats.Keys, Core.Globals.ParallelOptions, itemType =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(typeDats.Keys, itemType =>
|
Parallel.ForEach(typeDats.Keys, itemType =>
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ namespace SabreTools.Features
|
|||||||
{
|
{
|
||||||
// Loop through each input and update
|
// Loop through each input and update
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(inputPaths, Globals.ParallelOptions, inputPath =>
|
Parallel.ForEach(inputPaths, Core.Globals.ParallelOptions, inputPath =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(inputPaths, inputPath =>
|
Parallel.ForEach(inputPaths, inputPath =>
|
||||||
#else
|
#else
|
||||||
@@ -260,7 +260,7 @@ namespace SabreTools.Features
|
|||||||
InternalStopwatch watch = new("Outputting all individual DATs");
|
InternalStopwatch watch = new("Outputting all individual DATs");
|
||||||
|
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.For(0, inputPaths.Count, Globals.ParallelOptions, j =>
|
Parallel.For(0, inputPaths.Count, Core.Globals.ParallelOptions, j =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.For(0, inputPaths.Count, j =>
|
Parallel.For(0, inputPaths.Count, j =>
|
||||||
#else
|
#else
|
||||||
@@ -285,7 +285,7 @@ namespace SabreTools.Features
|
|||||||
{
|
{
|
||||||
// Preprocess the DatHeaders
|
// Preprocess the DatHeaders
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.For(0, datHeaders.Count, Globals.ParallelOptions, j =>
|
Parallel.For(0, datHeaders.Count, Core.Globals.ParallelOptions, j =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.For(0, datHeaders.Count, j =>
|
Parallel.For(0, datHeaders.Count, j =>
|
||||||
#else
|
#else
|
||||||
@@ -316,7 +316,7 @@ namespace SabreTools.Features
|
|||||||
|
|
||||||
int startIndex = GetBoolean(features, SkipFirstOutputValue) ? 1 : 0;
|
int startIndex = GetBoolean(features, SkipFirstOutputValue) ? 1 : 0;
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.For(startIndex, inputPaths.Count, Globals.ParallelOptions, j =>
|
Parallel.For(startIndex, inputPaths.Count, Core.Globals.ParallelOptions, j =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.For(startIndex, inputPaths.Count, j =>
|
Parallel.For(startIndex, inputPaths.Count, j =>
|
||||||
#else
|
#else
|
||||||
@@ -341,7 +341,7 @@ namespace SabreTools.Features
|
|||||||
{
|
{
|
||||||
// Loop through each input and diff against the base
|
// Loop through each input and diff against the base
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(inputPaths, Globals.ParallelOptions, inputPath =>
|
Parallel.ForEach(inputPaths, Core.Globals.ParallelOptions, inputPath =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(inputPaths, inputPath =>
|
Parallel.ForEach(inputPaths, inputPath =>
|
||||||
#else
|
#else
|
||||||
@@ -378,7 +378,7 @@ namespace SabreTools.Features
|
|||||||
{
|
{
|
||||||
// Loop through each input and apply the base DatFile
|
// Loop through each input and apply the base DatFile
|
||||||
#if NET452_OR_GREATER || NETCOREAPP
|
#if NET452_OR_GREATER || NETCOREAPP
|
||||||
Parallel.ForEach(inputPaths, Globals.ParallelOptions, inputPath =>
|
Parallel.ForEach(inputPaths, Core.Globals.ParallelOptions, inputPath =>
|
||||||
#elif NET40_OR_GREATER
|
#elif NET40_OR_GREATER
|
||||||
Parallel.ForEach(inputPaths, inputPath =>
|
Parallel.ForEach(inputPaths, inputPath =>
|
||||||
#else
|
#else
|
||||||
|
|||||||
Reference in New Issue
Block a user