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

Migrate most DatItem conversion code

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-06 11:18:04 -05:00
parent 05616db0f4
commit 33fa3461b3
8 changed files with 211 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
SabreTools.DatItems/Formats/Disk.cs
View File

@@ -2,8 +2,6 @@
using Newtonsoft.Json;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.FileTypes;
using SabreTools.IO.Extensions;
namespace SabreTools.DatItems.Formats
{
@@ -72,42 +70,10 @@ namespace SabreTools.DatItems.Formats
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
}
public Disk(BaseFile baseFile) : base()
{
SetName(baseFile.Filename);
if (baseFile is FileTypes.CHD.CHDFile chd)
{
SetFieldValue<string?>(Models.Metadata.Disk.MD5Key, chd.InternalMD5.ToHexString());
SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, chd.InternalSHA1.ToHexString());
}
else
{
SetFieldValue<string?>(Models.Metadata.Disk.MD5Key, baseFile.MD5.ToHexString());
SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, baseFile.SHA1.ToHexString());
}
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
}
#endregion
#region Cloning Methods
/// <summary>
/// Convert Disk object to a BaseFile
/// </summary>
public BaseFile ConvertToBaseFile()
{
return new BaseFile()
{
Filename = GetName(),
Parent = GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey),
MD5 = GetStringFieldValue(Models.Metadata.Disk.MD5Key).FromHexString(),
SHA1 = GetStringFieldValue(Models.Metadata.Disk.SHA1Key).FromHexString(),
};
}
/// <summary>
/// Convert a disk to the closest Rom approximation
/// </summary>

31
SabreTools.DatItems/Formats/File.cs
View File

@@ -2,7 +2,6 @@ using System.Linq;
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Core.Tools;
using SabreTools.FileTypes;
using SabreTools.Hashing;
using SabreTools.IO.Extensions;
@@ -105,21 +104,6 @@ namespace SabreTools.DatItems.Formats
SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType);
}
/// <summary>
/// Create a File object from a BaseFile
/// </summary>
/// <param name="baseFile"></param>
public File(BaseFile baseFile)
{
_crc = baseFile.CRC;
_md5 = baseFile.MD5;
_sha1 = baseFile.SHA1;
_sha256 = baseFile.SHA256;
SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType);
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
}
#endregion
#region Cloning Methods
@@ -146,21 +130,6 @@ namespace SabreTools.DatItems.Formats
return file;
}
/// <summary>
/// Convert Disk object to a BaseFile
/// </summary>
public BaseFile ConvertToBaseFile()
{
return new BaseFile()
{
Parent = GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey),
CRC = this._crc,
MD5 = this._md5,
SHA1 = this._sha1,
SHA256 = this._sha256,
};
}
/// <summary>
/// Convert a disk to the closest Rom approximation
/// </summary>

40
SabreTools.DatItems/Formats/Media.cs
View File

@@ -1,8 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Core;
using SabreTools.FileTypes;
using SabreTools.IO.Extensions;
namespace SabreTools.DatItems.Formats
{
@@ -34,48 +32,10 @@ namespace SabreTools.DatItems.Formats
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
}
public Media(BaseFile baseFile) : base()
{
SetName(baseFile.Filename);
if (baseFile is FileTypes.Aaru.AaruFormat aif)
{
SetFieldValue<string?>(Models.Metadata.Media.MD5Key, aif.InternalMD5.ToHexString());
SetFieldValue<string?>(Models.Metadata.Media.SHA1Key, aif.InternalSHA1.ToHexString());
SetFieldValue<string?>(Models.Metadata.Media.SHA256Key, aif.InternalSHA256.ToHexString());
SetFieldValue<string?>(Models.Metadata.Media.SpamSumKey, System.Text.Encoding.UTF8.GetString(aif.InternalSpamSum ?? []));
}
else
{
SetFieldValue<string?>(Models.Metadata.Media.MD5Key, baseFile.MD5.ToHexString());
SetFieldValue<string?>(Models.Metadata.Media.SHA1Key, baseFile.SHA1.ToHexString());
SetFieldValue<string?>(Models.Metadata.Media.SHA256Key, baseFile.SHA256.ToHexString());
SetFieldValue<string?>(Models.Metadata.Media.SpamSumKey, System.Text.Encoding.UTF8.GetString(baseFile.SpamSum ?? []));
}
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
}
#endregion
#region Cloning Methods
/// <summary>
/// Convert Media object to a BaseFile
/// </summary>
public BaseFile ConvertToBaseFile()
{
return new BaseFile()
{
Filename = GetName(),
Parent = GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey),
MD5 = GetStringFieldValue(Models.Metadata.Media.MD5Key).FromHexString(),
SHA1 = GetStringFieldValue(Models.Metadata.Media.SHA1Key).FromHexString(),
SHA256 = GetStringFieldValue(Models.Metadata.Media.SHA256Key).FromHexString(),
SpamSum = System.Text.Encoding.UTF8.GetBytes(GetStringFieldValue(Models.Metadata.Media.SpamSumKey) ?? string.Empty),
};
}
/// <summary>
/// Convert a media to the closest Rom approximation
/// </summary>

45
SabreTools.DatItems/Formats/Rom.cs
View File

@@ -2,8 +2,6 @@
using Newtonsoft.Json;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.FileTypes;
using SabreTools.IO.Extensions;
namespace SabreTools.DatItems.Formats
{
@@ -91,23 +89,6 @@ namespace SabreTools.DatItems.Formats
SetFieldValue<string?>(Models.Metadata.Rom.StatusKey, ItemStatus.None.AsStringValue());
}
public Rom(BaseFile baseFile) : base()
{
SetName(baseFile.Filename);
SetFieldValue<string?>(Models.Metadata.Rom.DateKey, baseFile.Date);
SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, baseFile.CRC.ToHexString());
SetFieldValue<string?>(Models.Metadata.Rom.MD5Key, baseFile.MD5.ToHexString());
SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, baseFile.SHA1.ToHexString());
SetFieldValue<string?>(Models.Metadata.Rom.SHA256Key, baseFile.SHA256.ToHexString());
SetFieldValue<string?>(Models.Metadata.Rom.SHA384Key, baseFile.SHA384.ToHexString());
SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, baseFile.SHA512.ToHexString());
SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, baseFile.Size.ToString());
if (baseFile.SpamSum != null)
SetFieldValue<string?>(Models.Metadata.Rom.SpamSumKey, System.Text.Encoding.UTF8.GetString(baseFile.SpamSum));
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
}
public Rom(Models.Metadata.Rom item) : base(item)
{
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
@@ -115,32 +96,6 @@ namespace SabreTools.DatItems.Formats
#endregion
#region Cloning Methods
/// <summary>
/// Convert Rom object to a BaseFile
/// </summary>
public BaseFile ConvertToBaseFile()
{
string? spamSum = GetStringFieldValue(Models.Metadata.Rom.SpamSumKey);
return new BaseFile()
{
Filename = GetName(),
Parent = GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey),
Date = GetStringFieldValue(Models.Metadata.Rom.DateKey),
Size = NumberHelper.ConvertToInt64(GetStringFieldValue(Models.Metadata.Rom.SizeKey)),
CRC = GetStringFieldValue(Models.Metadata.Rom.CRCKey).FromHexString(),
MD5 = GetStringFieldValue(Models.Metadata.Rom.MD5Key).FromHexString(),
SHA1 = GetStringFieldValue(Models.Metadata.Rom.SHA1Key).FromHexString(),
SHA256 = GetStringFieldValue(Models.Metadata.Rom.SHA256Key).FromHexString(),
SHA384 = GetStringFieldValue(Models.Metadata.Rom.SHA384Key).FromHexString(),
SHA512 = GetStringFieldValue(Models.Metadata.Rom.SHA512Key).FromHexString(),
SpamSum = spamSum != null ? System.Text.Encoding.UTF8.GetBytes(spamSum) : null,
};
}
#endregion
#region Comparision Methods
/// <summary>