diff --git a/SabreTools.DatTools/Rebuilder.cs b/SabreTools.DatTools/Rebuilder.cs index 64df84b0..7889a56d 100644 --- a/SabreTools.DatTools/Rebuilder.cs +++ b/SabreTools.DatTools/Rebuilder.cs @@ -470,7 +470,7 @@ namespace SabreTools.DatTools outputFormat = OutputFormat.ParentFolder; // Get the output archive, if possible - IFolder? outputArchive = GetPreconfiguredFolder(datFile, date, outputFormat); + IParent? outputArchive = GetPreconfiguredFolder(datFile, date, outputFormat); // Now rebuild to the output file outputArchive!.Write(fileStream, outDir, (item as Rom)!.ConvertToBaseFile()); @@ -516,7 +516,7 @@ namespace SabreTools.DatTools datItem.SetName($"{datItem.GetName()}_{crc}"); // Get the output archive, if possible - IFolder? outputArchive = GetPreconfiguredFolder(datFile, date, outputFormat); + IParent? outputArchive = GetPreconfiguredFolder(datFile, date, outputFormat); // Now rebuild to the output file bool eitherSuccess = false; @@ -822,9 +822,9 @@ namespace SabreTools.DatTools /// True if the date from the DAT should be used if available, false otherwise /// Output format that files should be written to /// Folder configured with proper flags - private static IFolder? GetPreconfiguredFolder(DatFile datFile, bool date, OutputFormat outputFormat) + private static IParent? GetPreconfiguredFolder(DatFile datFile, bool date, OutputFormat outputFormat) { - IFolder? outputArchive = FileTypeTool.CreateFolderType(outputFormat); + IParent? outputArchive = FileTypeTool.CreateFolderType(outputFormat); if (outputArchive is BaseArchive baseArchive && date) baseArchive.SetRealDates(date); diff --git a/SabreTools.FileTypes/BaseArchive.cs b/SabreTools.FileTypes/BaseArchive.cs index 9203b3f1..c9713694 100644 --- a/SabreTools.FileTypes/BaseArchive.cs +++ b/SabreTools.FileTypes/BaseArchive.cs @@ -5,7 +5,7 @@ using SabreTools.IO.Logging; namespace SabreTools.FileTypes { - public abstract class BaseArchive : BaseFile, IFolder + public abstract class BaseArchive : BaseFile, IParent { #region Protected instance variables diff --git a/SabreTools.FileTypes/FileTypeTool.cs b/SabreTools.FileTypes/FileTypeTool.cs index fc2ce707..b27041f3 100644 --- a/SabreTools.FileTypes/FileTypeTool.cs +++ b/SabreTools.FileTypes/FileTypeTool.cs @@ -177,7 +177,7 @@ namespace SabreTools.FileTypes /// /// OutputFormat representing the archive to create /// IFolder object representing the inputs - public static IFolder? CreateFolderType(OutputFormat outputFormat) + public static IParent? CreateFolderType(OutputFormat outputFormat) { return outputFormat switch { diff --git a/SabreTools.FileTypes/Folder.cs b/SabreTools.FileTypes/Folder.cs index 24a60fdf..bc016941 100644 --- a/SabreTools.FileTypes/Folder.cs +++ b/SabreTools.FileTypes/Folder.cs @@ -12,7 +12,7 @@ namespace SabreTools.FileTypes /// /// Represents a folder for reading and writing /// - public class Folder : BaseFile, IFolder + public class Folder : BaseFile, IParent { #region Protected instance variables diff --git a/SabreTools.FileTypes/IFolder.cs b/SabreTools.FileTypes/IParent.cs similarity index 99% rename from SabreTools.FileTypes/IFolder.cs rename to SabreTools.FileTypes/IParent.cs index b3348bc7..2ca5a024 100644 --- a/SabreTools.FileTypes/IFolder.cs +++ b/SabreTools.FileTypes/IParent.cs @@ -6,7 +6,7 @@ namespace SabreTools.FileTypes /// /// Represents an item that can contain children /// - public interface IFolder + public interface IParent { #region Extraction