SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-09-22 06:45:11 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Convert most of Media over to properties

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-03 19:47:58 -04:00
parent 5b3ff31f85
commit 8e2f519e15
36 changed files with 444 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs
View File

@@ -684,11 +684,11 @@ namespace SabreTools.Metadata.DatFiles.Test
{
return new Data.Models.Metadata.Media
{
[Data.Models.Metadata.Media.MD5Key] = HashType.MD5.ZeroString,
MD5 = HashType.MD5.ZeroString,
Name = "name",
[Data.Models.Metadata.Media.SHA1Key] = HashType.SHA1.ZeroString,
[Data.Models.Metadata.Media.SHA256Key] = HashType.SHA256.ZeroString,
[Data.Models.Metadata.Media.SpamSumKey] = HashType.SpamSum.ZeroString,
SHA1 = HashType.SHA1.ZeroString,
SHA256 = HashType.SHA256.ZeroString,
SpamSum = HashType.SpamSum.ZeroString,
};
}
@@ -1415,11 +1415,11 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateMedia(Media? media)
{
Assert.NotNull(media);
Assert.Equal(HashType.MD5.ZeroString, media.ReadString(Data.Models.Metadata.Media.MD5Key));
Assert.Equal(HashType.MD5.ZeroString, media.MD5);
Assert.Equal("name", media.Name);
Assert.Equal(HashType.SHA1.ZeroString, media.ReadString(Data.Models.Metadata.Media.SHA1Key));
Assert.Equal(HashType.SHA256.ZeroString, media.ReadString(Data.Models.Metadata.Media.SHA256Key));
Assert.Equal(HashType.SpamSum.ZeroString, media.ReadString(Data.Models.Metadata.Media.SpamSumKey));
Assert.Equal(HashType.SHA1.ZeroString, media.SHA1);
Assert.Equal(HashType.SHA256.ZeroString, media.SHA256);
Assert.Equal(HashType.SpamSum.ZeroString, media.SpamSum);
}
private static void ValidatePart(Part? part)

8
SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs
View File

@@ -950,11 +950,11 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateMetadataMedia(Data.Models.Metadata.Media? media)
{
Assert.NotNull(media);
Assert.Equal(HashType.MD5.ZeroString, media.ReadString(Data.Models.Metadata.Media.MD5Key));
Assert.Equal(HashType.MD5.ZeroString, media.MD5);
Assert.Equal("name", media.Name);
Assert.Equal(HashType.SHA1.ZeroString, media.ReadString(Data.Models.Metadata.Media.SHA1Key));
Assert.Equal(HashType.SHA256.ZeroString, media.ReadString(Data.Models.Metadata.Media.SHA256Key));
Assert.Equal(HashType.SpamSum.ZeroString, media.ReadString(Data.Models.Metadata.Media.SpamSumKey));
Assert.Equal(HashType.SHA1.ZeroString, media.SHA1);
Assert.Equal(HashType.SHA256.ZeroString, media.SHA256);
Assert.Equal(HashType.SpamSum.ZeroString, media.SpamSum);
}
private static void ValidateMetadataPart(Data.Models.Metadata.Part? part)

24
SabreTools.Metadata.DatFiles.Test/DatFileTests.cs
View File

@@ -1448,12 +1448,14 @@ namespace SabreTools.Metadata.DatFiles.Test
machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher");
machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category");
DatItem item = new Media();
DatItem item = new Media
{
MD5 = "md5",
SHA1 = "sha1",
SHA256 = "sha256",
SpamSum = "spamsum",
};
item.SetName("name");
item.Write(Data.Models.Metadata.Media.MD5Key, "md5");
item.Write(Data.Models.Metadata.Media.SHA1Key, "sha1");
item.Write(Data.Models.Metadata.Media.SHA256Key, "sha256");
item.Write(Data.Models.Metadata.Media.SpamSumKey, "spamsum");
string actual = DatFile.FormatPrefixPostfix(item, machine, fix);
Assert.Equal(expected, actual);
@@ -1731,8 +1733,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Media_MD5()
{
string hash = "XXXXXX";
DatItem datItem = new Media();
datItem.Write(Data.Models.Metadata.Media.MD5Key, hash);
DatItem datItem = new Media() { MD5 = hash };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1742,8 +1743,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Media_SHA1()
{
string hash = "XXXXXX";
DatItem datItem = new Media();
datItem.Write(Data.Models.Metadata.Media.SHA1Key, hash);
DatItem datItem = new Media() { SHA1 = hash };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1753,8 +1753,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Media_SHA256()
{
string hash = "XXXXXX";
DatItem datItem = new Media();
datItem.Write(Data.Models.Metadata.Media.SHA256Key, hash);
DatItem datItem = new Media() { SHA256 = hash };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1764,8 +1763,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Media_SpamSum()
{
string hash = "XXXXXX";
DatItem datItem = new Media();
datItem.Write(Data.Models.Metadata.Media.SpamSumKey, hash);
DatItem datItem = new Media() { SpamSum = hash };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);

8
SabreTools.Metadata.DatFiles.Test/DatStatisticsTests.cs
View File

@@ -284,10 +284,10 @@ namespace SabreTools.Metadata.DatFiles.Test
{
var media = new Media();
media.Write<string?>(Data.Models.Metadata.Media.MD5Key, HashType.MD5.ZeroString);
media.Write<string?>(Data.Models.Metadata.Media.SHA1Key, HashType.SHA1.ZeroString);
media.Write<string?>(Data.Models.Metadata.Media.SHA256Key, HashType.SHA256.ZeroString);
media.Write<string?>(Data.Models.Metadata.Media.SpamSumKey, HashType.SpamSum.ZeroString);
media.MD5 = HashType.MD5.ZeroString;
media.SHA1 = HashType.SHA1.ZeroString;
media.SHA256 = HashType.SHA256.ZeroString;
media.SpamSum = HashType.SpamSum.ZeroString;
return media;
}

16
SabreTools.Metadata.DatFiles.Test/FormatsTests.cs
View File

@@ -442,7 +442,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Media.Name),
Data.Models.Metadata.Media.MD5Key,
nameof(Data.Models.Metadata.Media.MD5),
]));
}
@@ -549,7 +549,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Media.Name),
Data.Models.Metadata.Media.SHA1Key,
nameof(Data.Models.Metadata.Media.SHA1),
]));
}
@@ -590,7 +590,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Media.Name),
Data.Models.Metadata.Media.SHA256Key,
nameof(Data.Models.Metadata.Media.SHA256),
]));
}
@@ -681,7 +681,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Media.Name),
Data.Models.Metadata.Media.SpamSumKey,
nameof(Data.Models.Metadata.Media.SpamSum),
]));
}
@@ -1154,7 +1154,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Media.Name),
Data.Models.Metadata.Media.SHA1Key,
nameof(Data.Models.Metadata.Media.SHA1),
]));
}
@@ -1406,7 +1406,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Media.Name),
Data.Models.Metadata.Media.SHA1Key,
nameof(Data.Models.Metadata.Media.SHA1),
]));
}
@@ -1464,7 +1464,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Media.Name),
Data.Models.Metadata.Media.SHA1Key,
nameof(Data.Models.Metadata.Media.SHA1),
]));
}
@@ -1522,7 +1522,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Media.Name),
Data.Models.Metadata.Media.SHA1Key,
nameof(Data.Models.Metadata.Media.SHA1),
]));
}

3
SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs
View File

@@ -96,9 +96,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem media = new Media();
DatItem media = new Media() { SHA1 = "deadbeef" };
media.SetName("item");
media.Write<string?>(Data.Models.Metadata.Media.SHA1Key, "deadbeef");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);

3
SabreTools.Metadata.DatFiles.Test/ItemDictionaryTests.cs
View File

@@ -96,9 +96,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem media = new Media();
DatItem media = new Media() { SHA1 = "deadbeef" };
media.SetName("item");
media.Write<string?>(Data.Models.Metadata.Media.SHA1Key, "deadbeef");
media.Source = source;
media.Machine = machine;