diff --git a/SabreTools.DatFiles.Test/DatFileTests.Filtering.cs b/SabreTools.DatFiles.Test/DatFileTests.Filtering.cs index 4fd3906d..fa8b0434 100644 --- a/SabreTools.DatFiles.Test/DatFileTests.Filtering.cs +++ b/SabreTools.DatFiles.Test/DatFileTests.Filtering.cs @@ -28,7 +28,7 @@ namespace SabreTools.DatFiles.Test datItem.SetFieldValue(DatItem.MachineKey, machine); datItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(datItem, statsOnly: false); datFile.BucketBy(ItemKey.Machine); @@ -56,7 +56,7 @@ namespace SabreTools.DatFiles.Test datItem.SetFieldValue(DatItem.MachineKey, machine); datItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long sourceIndex = datFile.AddSourceDB(source); long machineIndex = datFile.AddMachineDB(machine); _ = datFile.AddItemDB(datItem, machineIndex, sourceIndex, statsOnly: false); @@ -86,7 +86,7 @@ namespace SabreTools.DatFiles.Test datItem.SetFieldValue(DatItem.MachineKey, machine); datItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(datItem, statsOnly: false); datFile.MachineDescriptionToName(); @@ -106,7 +106,7 @@ namespace SabreTools.DatFiles.Test machine.SetFieldValue(Models.Metadata.Machine.NameKey, "machine"); machine.SetFieldValue(Models.Metadata.Machine.DescriptionKey, "description"); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); _ = datFile.AddMachineDB(machine); datFile.MachineDescriptionToName(); @@ -138,7 +138,7 @@ namespace SabreTools.DatFiles.Test disk.SetFieldValue(DatItem.MachineKey, machine); disk.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(rom, statsOnly: false); datFile.AddItem(disk, statsOnly: false); @@ -173,7 +173,7 @@ namespace SabreTools.DatFiles.Test DatItem disk = new Disk(); disk.SetName("disk"); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long sourceIndex = datFile.AddSourceDB(source); long machineIndex = datFile.AddMachineDB(machine); _ = datFile.AddItemDB(rom, machineIndex, sourceIndex, statsOnly: false); @@ -218,7 +218,7 @@ namespace SabreTools.DatFiles.Test worldRom.SetName("rom.nib"); worldRom.SetFieldValue(DatItem.MachineKey, worldMachine); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(nowhereRom, statsOnly: false); datFile.AddItem(worldRom, statsOnly: false); @@ -244,7 +244,7 @@ namespace SabreTools.DatFiles.Test worldMachine.SetFieldValue(Models.Metadata.Machine.NameKey, "machine (World)"); worldMachine.SetFieldValue(Models.Metadata.Machine.CloneOfKey, "machine (Nowhere)"); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); _ = datFile.AddMachineDB(nowhereMachine); _ = datFile.AddMachineDB(worldMachine); @@ -272,7 +272,7 @@ namespace SabreTools.DatFiles.Test datItem.SetFieldValue(DatItem.MachineKey, machine); datItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(datItem, statsOnly: false); datFile.StripSceneDatesFromItems(); @@ -290,7 +290,7 @@ namespace SabreTools.DatFiles.Test Machine machine = new Machine(); machine.SetFieldValue(Models.Metadata.Machine.NameKey, "10.10.10-machine-name"); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); _ = datFile.AddMachineDB(machine); datFile.StripSceneDatesFromItems(); diff --git a/SabreTools.DatFiles.Test/DatFileTests.FromMetadata.cs b/SabreTools.DatFiles.Test/DatFileTests.FromMetadata.cs index f7d04cfe..3f5f2b01 100644 --- a/SabreTools.DatFiles.Test/DatFileTests.FromMetadata.cs +++ b/SabreTools.DatFiles.Test/DatFileTests.FromMetadata.cs @@ -15,7 +15,7 @@ namespace SabreTools.DatFiles.Test { Models.Metadata.MetadataFile? item = null; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); datFile.ConvertFromMetadata(item, "filename", indexId: 0, keep: true, statsOnly: false); Assert.Equal(0, datFile.Items.DatStatistics.TotalCount); @@ -27,7 +27,7 @@ namespace SabreTools.DatFiles.Test { Models.Metadata.MetadataFile? item = new Models.Metadata.MetadataFile(); - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); datFile.ConvertFromMetadata(item, "filename", indexId: 0, keep: true, statsOnly: false); Assert.Equal(0, datFile.Items.DatStatistics.TotalCount); @@ -45,7 +45,7 @@ namespace SabreTools.DatFiles.Test [Models.Metadata.MetadataFile.MachineKey] = machines, }; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); datFile.ConvertFromMetadata(item, "filename", indexId: 0, keep: true, statsOnly: false); ValidateHeader(datFile.Header); @@ -63,7 +63,7 @@ namespace SabreTools.DatFiles.Test [Models.Metadata.MetadataFile.MachineKey] = machines, }; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); datFile.ConvertFromMetadata(item, "filename", indexId: 0, keep: true, statsOnly: false); DatItems.Machine actualMachine = Assert.Single(datFile.ItemsDB.GetMachines()).Value; diff --git a/SabreTools.DatFiles.Test/DatFileTests.Splitting.cs b/SabreTools.DatFiles.Test/DatFileTests.Splitting.cs index 90d259ea..d67a8ced 100644 --- a/SabreTools.DatFiles.Test/DatFileTests.Splitting.cs +++ b/SabreTools.DatFiles.Test/DatFileTests.Splitting.cs @@ -43,7 +43,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(parentItem, statsOnly: false); datFile.AddItem(matchChildItem, statsOnly: false); datFile.AddItem(noMatchChildItem, statsOnly: false); @@ -88,7 +88,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(parentItem, statsOnly: false); datFile.AddItem(matchChildItem, statsOnly: false); datFile.AddItem(noMatchChildItem, statsOnly: false); @@ -133,7 +133,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long biosMachineIndex = datFile.AddMachineDB(parentMachine); long deviceMachineIndex = datFile.AddMachineDB(childMachine); long sourceIndex = datFile.AddSourceDB(source); @@ -181,7 +181,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long biosMachineIndex = datFile.AddMachineDB(parentMachine); long deviceMachineIndex = datFile.AddMachineDB(childMachine); long sourceIndex = datFile.AddSourceDB(source); @@ -233,7 +233,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(parentItem, statsOnly: false); datFile.AddItem(matchChildItem, statsOnly: false); datFile.AddItem(noMatchChildItem, statsOnly: false); @@ -278,7 +278,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long biosMachineIndex = datFile.AddMachineDB(parentMachine); long deviceMachineIndex = datFile.AddMachineDB(childMachine); long sourceIndex = datFile.AddSourceDB(source); @@ -342,7 +342,7 @@ namespace SabreTools.DatFiles.Test slotOption.SetFieldValue(DatItem.MachineKey, itemMachine); slotOption.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(deviceItem, statsOnly: false); datFile.AddItem(slotOptionItem, statsOnly: false); datFile.AddItem(datItem, statsOnly: false); @@ -391,7 +391,7 @@ namespace SabreTools.DatFiles.Test DatItem slotOption = new SlotOption(); slotOption.SetName("slotoption"); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long deviceMachineIndex = datFile.AddMachineDB(deviceMachine); long slotOptionMachineIndex = datFile.AddMachineDB(slotOptionMachine); long itemMachineIndex = datFile.AddMachineDB(itemMachine); @@ -446,7 +446,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(parentItem, statsOnly: false); datFile.AddItem(matchChildItem, statsOnly: false); datFile.AddItem(noMatchChildItem, statsOnly: false); @@ -491,7 +491,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long biosMachineIndex = datFile.AddMachineDB(parentMachine); long deviceMachineIndex = datFile.AddMachineDB(childMachine); long sourceIndex = datFile.AddSourceDB(source); @@ -530,7 +530,7 @@ namespace SabreTools.DatFiles.Test deviceItem.SetFieldValue(DatItem.MachineKey, deviceMachine); deviceItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(biosItem, statsOnly: false); datFile.AddItem(deviceItem, statsOnly: false); @@ -557,7 +557,7 @@ namespace SabreTools.DatFiles.Test DatItem biosItem = new Rom(); DatItem deviceItem = new Rom(); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long biosMachineIndex = datFile.AddMachineDB(biosMachine); long deviceMachineIndex = datFile.AddMachineDB(deviceMachine); long sourceIndex = datFile.AddSourceDB(source); @@ -608,7 +608,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(parentItem, statsOnly: false); datFile.AddItem(matchChildItem, statsOnly: false); datFile.AddItem(noMatchChildItem, statsOnly: false); @@ -658,7 +658,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long biosMachineIndex = datFile.AddMachineDB(parentMachine); long deviceMachineIndex = datFile.AddMachineDB(childMachine); long sourceIndex = datFile.AddSourceDB(source); @@ -715,7 +715,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(parentItem, statsOnly: false); datFile.AddItem(matchChildItem, statsOnly: false); datFile.AddItem(noMatchChildItem, statsOnly: false); @@ -764,7 +764,7 @@ namespace SabreTools.DatFiles.Test noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long biosMachineIndex = datFile.AddMachineDB(parentMachine); long deviceMachineIndex = datFile.AddMachineDB(childMachine); long sourceIndex = datFile.AddSourceDB(source); @@ -801,7 +801,7 @@ namespace SabreTools.DatFiles.Test datItem.SetFieldValue(DatItem.MachineKey, machine); datItem.SetFieldValue(DatItem.SourceKey, source); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(datItem, statsOnly: false); datFile.BucketBy(ItemKey.Machine); @@ -828,7 +828,7 @@ namespace SabreTools.DatFiles.Test DatItem datItem = new Rom(); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long machineIndex = datFile.AddMachineDB(machine); long sourceIndex = datFile.AddSourceDB(source); _ = datFile.AddItemDB(datItem, machineIndex, sourceIndex, statsOnly: false); diff --git a/SabreTools.DatFiles.Test/DatFileTests.ToMetadata.cs b/SabreTools.DatFiles.Test/DatFileTests.ToMetadata.cs index 607685f2..8a362466 100644 --- a/SabreTools.DatFiles.Test/DatFileTests.ToMetadata.cs +++ b/SabreTools.DatFiles.Test/DatFileTests.ToMetadata.cs @@ -15,7 +15,7 @@ namespace SabreTools.DatFiles.Test [Fact] public void ConvertToMetadata_Empty() { - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); Models.Metadata.MetadataFile? actual = datFile.ConvertToMetadata(); Assert.Null(actual); @@ -26,7 +26,7 @@ namespace SabreTools.DatFiles.Test { DatHeader header = CreateHeader(); - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); datFile.SetHeader(header); datFile.AddItem(new Rom(), statsOnly: false); diff --git a/SabreTools.DatFiles.Test/DatFileTests.cs b/SabreTools.DatFiles.Test/DatFileTests.cs index 12230b13..919c05f3 100644 --- a/SabreTools.DatFiles.Test/DatFileTests.cs +++ b/SabreTools.DatFiles.Test/DatFileTests.cs @@ -16,7 +16,7 @@ namespace SabreTools.DatFiles.Test public void Constructor_Null() { DatFile? datFile = null; - DatFile created = new Formats.Logiqx(datFile, deprecated: false); + DatFile created = new Formats.Logiqx(datFile, useGame: false); Assert.NotNull(created.Header); Assert.NotNull(created.Items); @@ -39,7 +39,7 @@ namespace SabreTools.DatFiles.Test rom.SetFieldValue(DatItem.SourceKey, source); rom.SetFieldValue(DatItem.MachineKey, machine); - DatFile? datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile? datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, "name"); datFile.AddItem(rom, statsOnly: false); @@ -47,7 +47,7 @@ namespace SabreTools.DatFiles.Test long machineIndex = datFile.AddMachineDB(machine); datFile.AddItemDB(rom, machineIndex, sourceIndex, statsOnly: false); - DatFile created = new Formats.Logiqx(datFile, deprecated: false); + DatFile created = new Formats.Logiqx(datFile, useGame: false); created.BucketBy(ItemKey.Machine); Assert.NotNull(created.Header); @@ -79,7 +79,7 @@ namespace SabreTools.DatFiles.Test datItem.SetFieldValue(DatItem.SourceKey, source); datItem.SetFieldValue(DatItem.MachineKey, machine); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.AddItem(datItem, statsOnly: false); datFile.ClearEmpty(); @@ -96,7 +96,7 @@ namespace SabreTools.DatFiles.Test DatItem datItem = new Rom(); - DatFile datFile = new Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Logiqx(datFile: null, useGame: false); long sourceIndex = datFile.AddSourceDB(source); long machineIndex = datFile.AddMachineDB(machine); _ = datFile.AddItemDB(datItem, machineIndex, sourceIndex, statsOnly: false); @@ -112,7 +112,7 @@ namespace SabreTools.DatFiles.Test [Fact] public void FillHeaderFromPath_NoNameNoDesc_NotBare() { - DatFile datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, string.Empty); datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, string.Empty); datFile.Header.SetFieldValue(Models.Metadata.Header.DateKey, "1980-01-01"); @@ -127,7 +127,7 @@ namespace SabreTools.DatFiles.Test [Fact] public void FillHeaderFromPath_NoNameNoDesc_Bare() { - DatFile datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, string.Empty); datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, string.Empty); datFile.Header.SetFieldValue(Models.Metadata.Header.DateKey, "1980-01-01"); @@ -142,7 +142,7 @@ namespace SabreTools.DatFiles.Test [Fact] public void FillHeaderFromPath_NoNameDesc_NotBare() { - DatFile datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, string.Empty); datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, "Description"); datFile.Header.SetFieldValue(Models.Metadata.Header.DateKey, "1980-01-01"); @@ -157,7 +157,7 @@ namespace SabreTools.DatFiles.Test [Fact] public void FillHeaderFromPath_NoNameDesc_Bare() { - DatFile datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, string.Empty); datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, "Description"); datFile.Header.SetFieldValue(Models.Metadata.Header.DateKey, "1980-01-01"); @@ -172,7 +172,7 @@ namespace SabreTools.DatFiles.Test [Fact] public void FillHeaderFromPath_NameNoDesc_NotBare() { - DatFile datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, "Name"); datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, string.Empty); datFile.Header.SetFieldValue(Models.Metadata.Header.DateKey, "1980-01-01"); @@ -187,7 +187,7 @@ namespace SabreTools.DatFiles.Test [Fact] public void FillHeaderFromPath_NameNoDesc_Bare() { - DatFile datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, "Name"); datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, string.Empty); datFile.Header.SetFieldValue(Models.Metadata.Header.DateKey, "1980-01-01"); @@ -202,7 +202,7 @@ namespace SabreTools.DatFiles.Test [Fact] public void FillHeaderFromPath_NameDesc_NotBare() { - DatFile datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, "Name"); datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, "Description"); datFile.Header.SetFieldValue(Models.Metadata.Header.DateKey, "1980-01-01"); @@ -217,7 +217,7 @@ namespace SabreTools.DatFiles.Test [Fact] public void FillHeaderFromPath_NameDesc_Bare() { - DatFile datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, "Name "); datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, "Description "); datFile.Header.SetFieldValue(Models.Metadata.Header.DateKey, "1980-01-01"); @@ -239,7 +239,7 @@ namespace SabreTools.DatFiles.Test DatHeader datHeader = new DatHeader(); datHeader.SetFieldValue(Models.Metadata.Header.NameKey, "name"); - DatFile? datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile? datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, "notname"); datFile.SetHeader(datHeader); @@ -257,7 +257,7 @@ namespace SabreTools.DatFiles.Test DatModifiers datModifiers = new DatModifiers(); datModifiers.AddExtension = ".new"; - DatFile? datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile? datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Modifiers.AddExtension = ".old"; datFile.SetModifiers(datModifiers); @@ -272,7 +272,7 @@ namespace SabreTools.DatFiles.Test [Fact] public void ResetDictionaryTest() { - DatFile datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, "name"); datFile.AddItem(new Rom(), statsOnly: false); datFile.AddItemDB(new Rom(), 0, 0, false); @@ -1335,7 +1335,7 @@ namespace SabreTools.DatFiles.Test item.SetFieldValue(Models.Metadata.Rom.NameKey, "name"); item.SetFieldValue(Models.Metadata.Rom.SHA1Key, ZeroHash.SHA1Str); - DatFile? datFile = new Formats.Logiqx(datFile: null, deprecated: false); + DatFile? datFile = new Formats.Logiqx(datFile: null, useGame: false); datFile.Modifiers.Prefix = fix; datFile.Modifiers.Postfix = fix; datFile.Modifiers.AddExtension = addExtension; @@ -1588,7 +1588,7 @@ namespace SabreTools.DatFiles.Test public void ContainsWritable_Empty_True() { List datItems = []; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); bool actual = datFile.ContainsWritable(datItems); Assert.True(actual); @@ -1598,7 +1598,7 @@ namespace SabreTools.DatFiles.Test public void ContainsWritable_NoWritable_False() { List datItems = [new Blank()]; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); bool actual = datFile.ContainsWritable(datItems); Assert.False(actual); @@ -1608,7 +1608,7 @@ namespace SabreTools.DatFiles.Test public void ContainsWritable_Writable_True() { List datItems = [new Rom()]; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); bool actual = datFile.ContainsWritable(datItems); Assert.True(actual); @@ -1623,7 +1623,7 @@ namespace SabreTools.DatFiles.Test { List datItems = []; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); List actual = datFile.ResolveNames(datItems); Assert.Empty(actual); @@ -1646,7 +1646,7 @@ namespace SabreTools.DatFiles.Test List datItems = [romA]; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); List actual = datFile.ResolveNames(datItems); DatItem actualItemA = Assert.Single(actual); @@ -1681,7 +1681,7 @@ namespace SabreTools.DatFiles.Test List datItems = [romA, romB]; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); List actual = datFile.ResolveNames(datItems); Assert.Equal(2, actual.Count); @@ -1723,7 +1723,7 @@ namespace SabreTools.DatFiles.Test List datItems = [romA, romB]; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); List actual = datFile.ResolveNames(datItems); DatItem actualItemA = Assert.Single(actual); @@ -1758,7 +1758,7 @@ namespace SabreTools.DatFiles.Test List datItems = [romA, romB]; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); List actual = datFile.ResolveNames(datItems); Assert.Equal(2, actual.Count); @@ -1785,7 +1785,7 @@ namespace SabreTools.DatFiles.Test { List> mappings = []; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); List> actual = datFile.ResolveNamesDB(mappings); Assert.Empty(actual); @@ -1810,7 +1810,7 @@ namespace SabreTools.DatFiles.Test [ new KeyValuePair(0, romA), ]; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); List> actual = datFile.ResolveNamesDB(mappings); KeyValuePair actualItemA = Assert.Single(actual); @@ -1848,7 +1848,7 @@ namespace SabreTools.DatFiles.Test new KeyValuePair(0, romA), new KeyValuePair(1, romB), ]; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); List> actual = datFile.ResolveNamesDB(mappings); Assert.Equal(2, actual.Count); @@ -1893,7 +1893,7 @@ namespace SabreTools.DatFiles.Test new KeyValuePair(0, romA), new KeyValuePair(1, romB), ]; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); List> actual = datFile.ResolveNamesDB(mappings); KeyValuePair actualItemA = Assert.Single(actual); @@ -1931,7 +1931,7 @@ namespace SabreTools.DatFiles.Test new KeyValuePair(0, romA), new KeyValuePair(1, romB), ]; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); List> actual = datFile.ResolveNamesDB(mappings); Assert.Equal(2, actual.Count); @@ -1957,7 +1957,7 @@ namespace SabreTools.DatFiles.Test public void ShouldIgnore_NullItem_True() { DatItem? datItem = null; - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: true); Assert.True(actual); @@ -1968,7 +1968,7 @@ namespace SabreTools.DatFiles.Test { DatItem? datItem = new Rom(); datItem.SetFieldValue(DatItem.RemoveKey, true); - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: true); Assert.True(actual); @@ -1978,7 +1978,7 @@ namespace SabreTools.DatFiles.Test public void ShouldIgnore_Blank_True() { DatItem? datItem = new Blank(); - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: true); Assert.True(actual); @@ -1988,7 +1988,7 @@ namespace SabreTools.DatFiles.Test public void ShouldIgnore_IgnoreBlanksZeroRom_True() { DatItem? datItem = new Rom(); - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: true); Assert.True(actual); @@ -2001,7 +2001,7 @@ namespace SabreTools.DatFiles.Test datItem.SetFieldValue(Models.Metadata.Rom.NameKey, "name"); datItem.SetFieldValue(Models.Metadata.Rom.SizeKey, 12345); datItem.SetFieldValue(Models.Metadata.Rom.CRCKey, "crc"); - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: false); Assert.False(actual); @@ -2011,7 +2011,7 @@ namespace SabreTools.DatFiles.Test public void ShouldIgnore_UnsupportedType_True() { DatItem? datItem = new DatItems.Formats.SoftwareList(); - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: true); Assert.True(actual); @@ -2023,7 +2023,7 @@ namespace SabreTools.DatFiles.Test DatItem? datItem = new Rom(); datItem.SetFieldValue(Models.Metadata.Rom.NameKey, "name"); datItem.SetFieldValue(Models.Metadata.Rom.SizeKey, 12345); - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: true); Assert.True(actual); @@ -2042,7 +2042,7 @@ namespace SabreTools.DatFiles.Test datItem.SetFieldValue(Models.Metadata.Rom.SHA384Key, "crc"); datItem.SetFieldValue(Models.Metadata.Rom.SHA512Key, "crc"); datItem.SetFieldValue(Models.Metadata.Rom.SpamSumKey, "crc"); - DatFile datFile = new Formats.Logiqx(null, deprecated: false); + DatFile datFile = new Formats.Logiqx(null, useGame: false); bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: true); Assert.False(actual); diff --git a/SabreTools.DatFiles/Formats/Logiqx.cs b/SabreTools.DatFiles/Formats/Logiqx.cs index 36a40b94..a6820f91 100644 --- a/SabreTools.DatFiles/Formats/Logiqx.cs +++ b/SabreTools.DatFiles/Formats/Logiqx.cs @@ -238,7 +238,7 @@ namespace SabreTools.DatFiles.Formats /// /// Indicates if game should be used instead of machine /// - private readonly bool _deprecated; + private readonly bool _useGame; #endregion @@ -246,10 +246,10 @@ namespace SabreTools.DatFiles.Formats /// Constructor designed for casting a base DatFile /// /// Parent DatFile to copy from - /// True if the output uses "game", false if the output uses "machine" - public Logiqx(DatFile? datFile, bool deprecated) : base(datFile) + /// True if the output uses "game", false if the output uses "machine" + public Logiqx(DatFile? datFile, bool useGame) : base(datFile) { - _deprecated = deprecated; + _useGame = useGame; } /// @@ -359,7 +359,7 @@ namespace SabreTools.DatFiles.Formats // Serialize the input file var metadata = ConvertToMetadata(ignoreblanks); - var datafile = new Serialization.CrossModel.Logiqx().Deserialize(metadata, _deprecated); + var datafile = new Serialization.CrossModel.Logiqx().Deserialize(metadata, _useGame); // TODO: Reenable doctype writing // Only write the doctype if we don't have No-Intro data