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

202
SabreTools.DatItems/DatItemTool.cs
View File

@@ -3,6 +3,9 @@ using System.IO;
using SabreTools.Core.Tools; using SabreTools.Core.Tools;
using SabreTools.DatItems.Formats; using SabreTools.DatItems.Formats;
using SabreTools.FileTypes; using SabreTools.FileTypes;
using SabreTools.FileTypes.Aaru;
using SabreTools.FileTypes.CHD;
using SabreTools.IO.Extensions;
using SabreTools.IO.Logging; using SabreTools.IO.Logging;
using SabreTools.Matching.Compare; using SabreTools.Matching.Compare;
@@ -33,22 +36,22 @@ namespace SabreTools.DatItems
{ {
// Disk // Disk
#if NET20 || NET35 #if NET20 || NET35
FileTypes.CHD.CHDFile when (asFile & TreatAsFile.CHD) == 0 => new Disk(baseFile), FileTypes.CHD.CHDFile when (asFile & TreatAsFile.CHD) == 0 => baseFile.ConvertToDisk(),
#else #else
FileTypes.CHD.CHDFile when !asFile.HasFlag(TreatAsFile.CHD) => new Disk(baseFile), FileTypes.CHD.CHDFile when !asFile.HasFlag(TreatAsFile.CHD) => baseFile.ConvertToDisk(),
#endif #endif
// Media // Media
#if NET20 || NET35 #if NET20 || NET35
FileTypes.Aaru.AaruFormat when (asFile & TreatAsFile.AaruFormat) == 0 => new Media(baseFile), FileTypes.Aaru.AaruFormat when (asFile & TreatAsFile.AaruFormat) == 0 => baseFile.ConvertToMedia(),
#else #else
FileTypes.Aaru.AaruFormat when !asFile.HasFlag(TreatAsFile.AaruFormat) => new Media(baseFile), FileTypes.Aaru.AaruFormat when !asFile.HasFlag(TreatAsFile.AaruFormat) => baseFile.ConvertToMedia(),
#endif #endif
// Rom // Rom
BaseArchive => new Rom(baseFile), BaseArchive => baseFile.ConvertToRom(),
Folder => null, // Folders cannot be a DatItem Folder => null, // Folders cannot be a DatItem
BaseFile => new Rom(baseFile), BaseFile => baseFile.ConvertToRom(),
// Miscellaneous // Miscellaneous
_ => null, _ => null,
@@ -57,6 +60,193 @@ namespace SabreTools.DatItems
#endregion #endregion
#region Conversion
/// <summary>
/// Convert a BaseFile value to a Disk
/// </summary>
/// <param name="baseFile">BaseFile to convert</param>
/// <returns>Disk containing original BaseFile information</returns>
public static Disk ConvertToDisk(this BaseFile baseFile)
{
var disk = new Disk();
disk.SetName(baseFile.Filename);
if (baseFile is FileTypes.CHD.CHDFile chd)
{
disk.SetFieldValue<string?>(Models.Metadata.Disk.MD5Key, chd.InternalMD5.ToHexString());
disk.SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, chd.InternalSHA1.ToHexString());
}
else
{
disk.SetFieldValue<string?>(Models.Metadata.Disk.MD5Key, baseFile.MD5.ToHexString());
disk.SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, baseFile.SHA1.ToHexString());
}
disk.SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
return disk;
}
/// <summary>
/// Convert a BaseFile value to a File
/// </summary>
/// <param name="baseFile">BaseFile to convert</param>
/// <returns>File containing original BaseFile information</returns>
public static Formats.File ConvertToFile(this BaseFile baseFile)
{
var file = new Formats.File();
file.CRC = baseFile.CRC.ToHexString();
file.MD5 = baseFile.MD5.ToHexString();
file.SHA1 = baseFile.SHA1.ToHexString();
file.SHA256 = baseFile.SHA256.ToHexString();
file.SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.File);
file.SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
return file;
}
/// <summary>
/// Convert a BaseFile value to a Media
/// </summary>
/// <param name="baseFile">BaseFile to convert</param>
/// <returns>Media containing original BaseFile information</returns>
public static Media ConvertToMedia(this BaseFile baseFile)
{
var media = new Media();
media.SetName(baseFile.Filename);
if (baseFile is FileTypes.Aaru.AaruFormat aif)
{
media.SetFieldValue<string?>(Models.Metadata.Media.MD5Key, aif.InternalMD5.ToHexString());
media.SetFieldValue<string?>(Models.Metadata.Media.SHA1Key, aif.InternalSHA1.ToHexString());
media.SetFieldValue<string?>(Models.Metadata.Media.SHA256Key, aif.InternalSHA256.ToHexString());
media.SetFieldValue<string?>(Models.Metadata.Media.SpamSumKey, System.Text.Encoding.UTF8.GetString(aif.InternalSpamSum ?? []));
}
else
{
media.SetFieldValue<string?>(Models.Metadata.Media.MD5Key, baseFile.MD5.ToHexString());
media.SetFieldValue<string?>(Models.Metadata.Media.SHA1Key, baseFile.SHA1.ToHexString());
media.SetFieldValue<string?>(Models.Metadata.Media.SHA256Key, baseFile.SHA256.ToHexString());
media.SetFieldValue<string?>(Models.Metadata.Media.SpamSumKey, System.Text.Encoding.UTF8.GetString(baseFile.SpamSum ?? []));
}
media.SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
return media;
}
/// <summary>
/// Convert a BaseFile value to a Rom
/// </summary>
/// <param name="baseFile">BaseFile to convert</param>
/// <returns>Rom containing original BaseFile information</returns>
public static Rom ConvertToRom(this BaseFile baseFile)
{
var rom = new Rom();
rom.SetName(baseFile.Filename);
rom.SetFieldValue<string?>(Models.Metadata.Rom.DateKey, baseFile.Date);
rom.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, baseFile.CRC.ToHexString());
rom.SetFieldValue<string?>(Models.Metadata.Rom.MD5Key, baseFile.MD5.ToHexString());
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, baseFile.SHA1.ToHexString());
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA256Key, baseFile.SHA256.ToHexString());
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA384Key, baseFile.SHA384.ToHexString());
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, baseFile.SHA512.ToHexString());
rom.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, baseFile.Size.ToString());
if (baseFile.SpamSum != null)
rom.SetFieldValue<string?>(Models.Metadata.Rom.SpamSumKey, System.Text.Encoding.UTF8.GetString(baseFile.SpamSum));
rom.SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
return rom;
}
/// <summary>
/// Convert a Disk value to a BaseFile
/// </summary>
/// <param name="disk">Disk to convert</param>
/// <returns>BaseFile containing original Disk information</returns>
public static BaseFile ConvertToBaseFile(this Disk disk)
{
return new CHDFile()
{
Filename = disk.GetName(),
Parent = disk.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey),
MD5 = disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key).FromHexString(),
InternalMD5 = disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key).FromHexString(),
SHA1 = disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key).FromHexString(),
InternalSHA1 = disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key).FromHexString(),
};
}
/// <summary>
/// Convert a File value to a BaseFile
/// </summary>
/// <param name="file">File to convert</param>
/// <returns>BaseFile containing original File information</returns>
public static BaseFile ConvertToBaseFile(this Formats.File file)
{
return new BaseFile()
{
Parent = file.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey),
CRC = file.CRC.FromHexString(),
MD5 = file.MD5.FromHexString(),
SHA1 = file.SHA1.FromHexString(),
SHA256 = file.SHA256.FromHexString(),
};
}
/// <summary>
/// Convert a Media value to a BaseFile
/// </summary>
/// <param name="media">Media to convert</param>
/// <returns>BaseFile containing original Media information</returns>
public static BaseFile ConvertToBaseFile(this Media media)
{
return new AaruFormat()
{
Filename = media.GetName(),
Parent = media.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey),
MD5 = media.GetStringFieldValue(Models.Metadata.Media.MD5Key).FromHexString(),
InternalMD5 = media.GetStringFieldValue(Models.Metadata.Media.MD5Key).FromHexString(),
SHA1 = media.GetStringFieldValue(Models.Metadata.Media.SHA1Key).FromHexString(),
InternalSHA1 = media.GetStringFieldValue(Models.Metadata.Media.SHA1Key).FromHexString(),
SHA256 = media.GetStringFieldValue(Models.Metadata.Media.SHA256Key).FromHexString(),
InternalSHA256 = media.GetStringFieldValue(Models.Metadata.Media.SHA256Key).FromHexString(),
SpamSum = System.Text.Encoding.UTF8.GetBytes(media.GetStringFieldValue(Models.Metadata.Media.SpamSumKey) ?? string.Empty),
InternalSpamSum = System.Text.Encoding.UTF8.GetBytes(media.GetStringFieldValue(Models.Metadata.Media.SpamSumKey) ?? string.Empty),
};
}
/// <summary>
/// Convert a Rom value to a BaseFile
/// </summary>
/// <param name="rom">Rom to convert</param>
/// <returns>BaseFile containing original Rom information</returns>
public static BaseFile ConvertToBaseFile(this Rom rom)
{
string? spamSum = rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey);
return new BaseFile()
{
Filename = rom.GetName(),
Parent = rom.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey),
Date = rom.GetStringFieldValue(Models.Metadata.Rom.DateKey),
Size = NumberHelper.ConvertToInt64(rom.GetStringFieldValue(Models.Metadata.Rom.SizeKey)),
CRC = rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey).FromHexString(),
MD5 = rom.GetStringFieldValue(Models.Metadata.Rom.MD5Key).FromHexString(),
SHA1 = rom.GetStringFieldValue(Models.Metadata.Rom.SHA1Key).FromHexString(),
SHA256 = rom.GetStringFieldValue(Models.Metadata.Rom.SHA256Key).FromHexString(),
SHA384 = rom.GetStringFieldValue(Models.Metadata.Rom.SHA384Key).FromHexString(),
SHA512 = rom.GetStringFieldValue(Models.Metadata.Rom.SHA512Key).FromHexString(),
SpamSum = spamSum != null ? System.Text.Encoding.UTF8.GetBytes(spamSum) : null,
};
}
#endregion
#region Sorting and Merging #region Sorting and Merging
/// <summary> /// <summary>

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

@@ -2,8 +2,6 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools; using SabreTools.Core.Tools;
using SabreTools.FileTypes;
using SabreTools.IO.Extensions;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -72,42 +70,10 @@ namespace SabreTools.DatItems.Formats
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00); 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 #endregion
#region Cloning Methods #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> /// <summary>
/// Convert a disk to the closest Rom approximation /// Convert a disk to the closest Rom approximation
/// </summary> /// </summary>

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

@@ -2,7 +2,6 @@ using System.Linq;
using System.Xml.Serialization; using System.Xml.Serialization;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core.Tools; using SabreTools.Core.Tools;
using SabreTools.FileTypes;
using SabreTools.Hashing; using SabreTools.Hashing;
using SabreTools.IO.Extensions; using SabreTools.IO.Extensions;
@@ -105,21 +104,6 @@ namespace SabreTools.DatItems.Formats
SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType); 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 #endregion
#region Cloning Methods #region Cloning Methods
@@ -146,21 +130,6 @@ namespace SabreTools.DatItems.Formats
return file; 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> /// <summary>
/// Convert a disk to the closest Rom approximation /// Convert a disk to the closest Rom approximation
/// </summary> /// </summary>

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

@@ -1,8 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.FileTypes;
using SabreTools.IO.Extensions;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -34,48 +32,10 @@ namespace SabreTools.DatItems.Formats
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00); 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 #endregion
#region Cloning Methods #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> /// <summary>
/// Convert a media to the closest Rom approximation /// Convert a media to the closest Rom approximation
/// </summary> /// </summary>

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

@@ -2,8 +2,6 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools; using SabreTools.Core.Tools;
using SabreTools.FileTypes;
using SabreTools.IO.Extensions;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -91,23 +89,6 @@ namespace SabreTools.DatItems.Formats
SetFieldValue<string?>(Models.Metadata.Rom.StatusKey, ItemStatus.None.AsStringValue()); 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) public Rom(Models.Metadata.Rom item) : base(item)
{ {
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00); SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
@@ -115,32 +96,6 @@ namespace SabreTools.DatItems.Formats
#endregion #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 #region Comparision Methods
/// <summary> /// <summary>

2
SabreTools.DatTools/DatFromDir.cs
View File

@@ -229,7 +229,7 @@ namespace SabreTools.DatTools
if (baseFile != null && baseFile.Filename != null) if (baseFile != null && baseFile.Filename != null)
{ {
// Add the list if it doesn't exist already // Add the list if it doesn't exist already
Rom rom = new(baseFile); Rom rom = baseFile.ConvertToRom();
datFile.Items.Add(rom.GetKey(ItemKey.CRC), rom); datFile.Items.Add(rom.GetKey(ItemKey.CRC), rom);
logger.Verbose($"File added: {Path.GetFileNameWithoutExtension(item)}"); logger.Verbose($"File added: {Path.GetFileNameWithoutExtension(item)}");
} }

20
SabreTools.DatTools/Rebuilder.cs
View File

@@ -157,13 +157,13 @@ namespace SabreTools.DatTools
// Otherwise, we rebuild that file to all locations that we need to // Otherwise, we rebuild that file to all locations that we need to
bool usedInternally; bool usedInternally;
if (items[0].GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() == ItemType.Disk) if (items[0].GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() == ItemType.Disk)
usedInternally = RebuildIndividualFile(datFile, new Disk(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false); usedInternally = RebuildIndividualFile(datFile, fileinfo.ConvertToDisk(), foundpath, outDir, date, inverse, outputFormat, isZip: false);
else if (items[0].GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() == ItemType.File) else if (items[0].GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() == ItemType.File)
usedInternally = RebuildIndividualFile(datFile, new DatItems.Formats.File(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false); usedInternally = RebuildIndividualFile(datFile, fileinfo.ConvertToFile(), foundpath, outDir, date, inverse, outputFormat, isZip: false);
else if (items[0].GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() == ItemType.Media) else if (items[0].GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() == ItemType.Media)
usedInternally = RebuildIndividualFile(datFile, new Media(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false); usedInternally = RebuildIndividualFile(datFile, fileinfo.ConvertToMedia(), foundpath, outDir, date, inverse, outputFormat, isZip: false);
else else
usedInternally = RebuildIndividualFile(datFile, new Rom(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false); usedInternally = RebuildIndividualFile(datFile, fileinfo.ConvertToRom(), foundpath, outDir, date, inverse, outputFormat, isZip: false);
// If we are supposed to delete the depot file, do so // If we are supposed to delete the depot file, do so
if (delete && usedInternally) if (delete && usedInternally)
@@ -335,15 +335,15 @@ namespace SabreTools.DatTools
#else #else
else if (internalFileInfo is FileTypes.Aaru.AaruFormat && !asFile.HasFlag(TreatAsFile.AaruFormat)) else if (internalFileInfo is FileTypes.Aaru.AaruFormat && !asFile.HasFlag(TreatAsFile.AaruFormat))
#endif #endif
internalDatItem = new Media(internalFileInfo); internalDatItem = internalFileInfo.ConvertToMedia();
#if NET20 || NET35 #if NET20 || NET35
else if (internalFileInfo is FileTypes.CHD.CHDFile && (asFile & TreatAsFile.CHD) == 0) else if (internalFileInfo is FileTypes.CHD.CHDFile && (asFile & TreatAsFile.CHD) == 0)
#else #else
else if (internalFileInfo is FileTypes.CHD.CHDFile && !asFile.HasFlag(TreatAsFile.CHD)) else if (internalFileInfo is FileTypes.CHD.CHDFile && !asFile.HasFlag(TreatAsFile.CHD))
#endif #endif
internalDatItem = new Disk(internalFileInfo); internalDatItem = internalFileInfo.ConvertToDisk();
else else
internalDatItem = new Rom(internalFileInfo); internalDatItem = internalFileInfo.ConvertToRom();
if (internalDatItem != null) if (internalDatItem != null)
usedExternally = RebuildIndividualFile(datFile, internalDatItem, file, outDir, date, inverse, outputFormat); usedExternally = RebuildIndividualFile(datFile, internalDatItem, file, outDir, date, inverse, outputFormat);
@@ -500,7 +500,7 @@ namespace SabreTools.DatTools
{ {
// Get the file informations that we will be using // Get the file informations that we will be using
HashType[] hashes = [HashType.CRC32, HashType.MD5, HashType.SHA1]; HashType[] hashes = [HashType.CRC32, HashType.MD5, HashType.SHA1];
Rom headerless = new(FileTypeTool.GetInfo(transformStream, hashes)); Rom headerless = FileTypeTool.GetInfo(transformStream, hashes).ConvertToRom();
// If we have duplicates and we're not filtering // If we have duplicates and we're not filtering
if (ShouldRebuild(datFile, headerless, transformStream, false, out dupes)) if (ShouldRebuild(datFile, headerless, transformStream, false, out dupes))
@@ -575,7 +575,7 @@ namespace SabreTools.DatTools
// Get the item from the current file // Get the item from the current file
HashType[] hashes = [HashType.CRC32, HashType.MD5, HashType.SHA1]; HashType[] hashes = [HashType.CRC32, HashType.MD5, HashType.SHA1];
Rom item = new(FileTypeTool.GetInfo(stream, hashes)); Rom item = FileTypeTool.GetInfo(stream, hashes).ConvertToRom();
item.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.DescriptionKey, Path.GetFileNameWithoutExtension(item.GetName())); item.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.DescriptionKey, Path.GetFileNameWithoutExtension(item.GetName()));
item.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, Path.GetFileNameWithoutExtension(item.GetName())); item.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, Path.GetFileNameWithoutExtension(item.GetName()));
@@ -633,7 +633,7 @@ namespace SabreTools.DatTools
// Get the item from the current file // Get the item from the current file
HashType[] hashes = [HashType.CRC32, HashType.MD5, HashType.SHA1]; HashType[] hashes = [HashType.CRC32, HashType.MD5, HashType.SHA1];
var item = new Rom(FileTypeTool.GetInfo(stream, hashes)); Rom item = FileTypeTool.GetInfo(stream, hashes).ConvertToRom();
// Create a machine for the current item // Create a machine for the current item
var machine = new Machine(); var machine = new Machine();

8
SabreTools.DatTools/Verification.cs
View File

@@ -96,8 +96,8 @@ namespace SabreTools.DatTools
continue; continue;
// Now we want to remove all duplicates from the DAT // Now we want to remove all duplicates from the DAT
datFile.Items.GetDuplicates(new Rom(fileinfo)) datFile.Items.GetDuplicates(fileinfo.ConvertToRom())
.AddRange(datFile.Items.GetDuplicates(new Disk(fileinfo))); .AddRange(datFile.Items.GetDuplicates(fileinfo.ConvertToDisk()));
} }
watch.Stop(); watch.Stop();
@@ -181,8 +181,8 @@ namespace SabreTools.DatTools
continue; continue;
// Now we want to remove all duplicates from the DAT // Now we want to remove all duplicates from the DAT
datFile.ItemsDB.GetDuplicates(new KeyValuePair<long, DatItem>(-1, new Rom(fileinfo))) datFile.ItemsDB.GetDuplicates(new KeyValuePair<long, DatItem>(-1, fileinfo.ConvertToRom()))
.Concat(datFile.ItemsDB.GetDuplicates(new KeyValuePair<long, DatItem>(-1, new Disk(fileinfo)))); .Concat(datFile.ItemsDB.GetDuplicates(new KeyValuePair<long, DatItem>(-1, fileinfo.ConvertToDisk())));
} }
watch.Stop(); watch.Stop();