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

[DatItem, Machine] Remove direct usage of Machine from DatItem

Browse Source
This commit is contained in:
Matt Nadareski
2017-10-06 17:31:14 -07:00
parent ae01adfc6e
commit dd19501cf3
10 changed files with 582 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs
View File

@@ -640,17 +640,14 @@ namespace SabreTools.Library.Dats
// Get the item from the current file
Rom item = FileTools.GetStreamInfo(fileStream, fileStream.Length, keepReadOpen: true);
item.Machine = new Machine()
{
Name = Style.GetFileNameWithoutExtension(item.Name),
Description = Style.GetFileNameWithoutExtension(item.Name),
};
item.MachineName = Style.GetFileNameWithoutExtension(item.Name);
item.Description = Style.GetFileNameWithoutExtension(item.Name);
// If we are coming from an archive, set the correct machine name
if (machinename != null)
{
item.Machine.UpdateName(machinename);
item.Machine.UpdateDescription(machinename);
item.MachineName = machinename;
item.Description = machinename;
}
Globals.Logger.User("No matches found for '{0}', rebuilding accordingly from inverse flag...", Style.GetFileName(rom.Name));
@@ -659,7 +656,7 @@ namespace SabreTools.Library.Dats
switch (outputFormat)
{
case OutputFormat.Folder:
string outfile = Path.Combine(outDir, Style.RemovePathUnsafeCharacters(item.Machine.Name), item.Name);
string outfile = Path.Combine(outDir, Style.RemovePathUnsafeCharacters(item.MachineName), item.Name);
// Make sure the output folder is created
Directory.CreateDirectory(Path.GetDirectoryName(outfile));
@@ -777,7 +774,7 @@ namespace SabreTools.Library.Dats
foreach (Rom item in dupes)
{
// Create a headered item to use as well
rom.Machine = (Machine)item.Machine.Clone();
rom.CopyMachineInformation(item);
rom.Name += "_" + rom.CRC;
// If either copy succeeds, then we want to set rebuilt to true