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

Reduce direct ItemDB access, make fixes

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-14 11:01:27 -05:00
parent 8c3c6ab3e8
commit 3954a959be
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SabreTools.DatFiles.Test/DatFileTests.FromMetadata.cs
View File

@@ -18,8 +18,8 @@ namespace SabreTools.DatFiles.Test
DatFile datFile = new Formats.Logiqx(null, deprecated: false); DatFile datFile = new Formats.Logiqx(null, deprecated: false);
datFile.ConvertFromMetadata(item, "filename", indexId: 0, keep: true, statsOnly: false); datFile.ConvertFromMetadata(item, "filename", indexId: 0, keep: true, statsOnly: false);
Assert.Equal(0, datFile.DatStatistics.TotalCount); Assert.Equal(0, datFile.Items.DatStatistics.TotalCount);
Assert.Empty(datFile.ItemsDB.GetItems()); Assert.Equal(0, datFile.ItemsDB.DatStatistics.TotalCount);
} }
[Fact] [Fact]
@@ -30,8 +30,8 @@ namespace SabreTools.DatFiles.Test
DatFile datFile = new Formats.Logiqx(null, deprecated: false); DatFile datFile = new Formats.Logiqx(null, deprecated: false);
datFile.ConvertFromMetadata(item, "filename", indexId: 0, keep: true, statsOnly: false); datFile.ConvertFromMetadata(item, "filename", indexId: 0, keep: true, statsOnly: false);
Assert.Equal(0, datFile.DatStatistics.TotalCount); Assert.Equal(0, datFile.Items.DatStatistics.TotalCount);
Assert.Empty(datFile.ItemsDB.GetItems()); Assert.Equal(0, datFile.ItemsDB.DatStatistics.TotalCount);
} }
[Fact] [Fact]

29
SabreTools.DatFiles.Test/DatFileTests.cs
View File

@@ -19,20 +19,35 @@ namespace SabreTools.DatFiles.Test
Assert.NotNull(created.Header); Assert.NotNull(created.Header);
Assert.NotNull(created.Items); Assert.NotNull(created.Items);
Assert.Equal(0, created.DatStatistics.TotalCount); Assert.Equal(0, created.Items.DatStatistics.TotalCount);
Assert.NotNull(created.ItemsDB); Assert.NotNull(created.ItemsDB);
Assert.Empty(created.ItemsDB.GetItems()); Assert.Equal(0, created.ItemsDB.DatStatistics.TotalCount);
} }
[Fact] [Fact]
public void Constructor_NonNull() public void Constructor_NonNull()
{ {
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "key");
DatItem rom = new Rom();
rom.SetName("rom");
rom.SetFieldValue(Models.Metadata.Rom.CRCKey, "deadbeef");
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, deprecated: false);
datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, "name"); datFile.Header.SetFieldValue(Models.Metadata.Header.NameKey, "name");
datFile.Add("key", new Rom()); datFile.AddItem(rom, statsOnly: false);
datFile.AddItemDB(new Rom(), 0, 0, false);
long sourceIndex = datFile.AddSourceDB(source);
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, deprecated: false);
created.BucketBy(ItemKey.Machine, DedupeType.None);
Assert.NotNull(created.Header); Assert.NotNull(created.Header);
Assert.Equal("name", created.Header.GetStringFieldValue(Models.Metadata.Header.NameKey)); Assert.Equal("name", created.Header.GetStringFieldValue(Models.Metadata.Header.NameKey));
@@ -42,7 +57,7 @@ namespace SabreTools.DatFiles.Test
Assert.True(datItem is Rom); Assert.True(datItem is Rom);
Assert.NotNull(created.ItemsDB); Assert.NotNull(created.ItemsDB);
KeyValuePair<long, DatItem> dbKvp = Assert.Single(created.ItemsDB.GetItems()); KeyValuePair<long, DatItem> dbKvp = Assert.Single(created.GetItemsForBucketDB("key"));
Assert.Equal(0, dbKvp.Key); Assert.Equal(0, dbKvp.Key);
Assert.True(dbKvp.Value is Rom); Assert.True(dbKvp.Value is Rom);
} }
@@ -187,9 +202,9 @@ namespace SabreTools.DatFiles.Test
Assert.NotNull(datFile.Header); Assert.NotNull(datFile.Header);
Assert.NotNull(datFile.Items); Assert.NotNull(datFile.Items);
Assert.Equal(0, datFile.DatStatistics.TotalCount); Assert.Equal(0, datFile.Items.DatStatistics.TotalCount);
Assert.NotNull(datFile.ItemsDB); Assert.NotNull(datFile.ItemsDB);
Assert.Empty(datFile.ItemsDB.GetItems()); Assert.Equal(0, datFile.ItemsDB.DatStatistics.TotalCount);
} }
#endregion #endregion

9
SabreTools.DatFiles/ItemDictionary.cs
View File

@@ -350,10 +350,10 @@ namespace SabreTools.DatFiles
{ {
#if NET40_OR_GREATER || NETCOREAPP #if NET40_OR_GREATER || NETCOREAPP
if (_items.TryGetValue(key, out var list) && list != null) if (_items.TryGetValue(key, out var list) && list != null)
return list.Contains(value); return list.Exists(i => i.Equals(value));
#else #else
if (_items.ContainsKey(key) && _items[key] != null) if (_items.ContainsKey(key) && _items[key] != null)
return _items[key]!.Contains(value); return _items[key]!.Exists(i => i.Equals(value));
#endif #endif
} }
@@ -681,7 +681,10 @@ namespace SabreTools.DatFiles
if (newkey != key) if (newkey != key)
{ {
Add(newkey, item); Add(newkey, item);
Remove(key, item); bool removed = Remove(key, item);
if (!removed)
break;
i--; // This make sure that the pointer stays on the correct since one was removed i--; // This make sure that the pointer stays on the correct since one was removed
} }
} }