diff --git a/BinaryObjectScanner/Interfaces/IExtractable.cs b/BinaryObjectScanner/Interfaces/IExtractable.cs deleted file mode 100644 index 1ac46cc3..00000000 --- a/BinaryObjectScanner/Interfaces/IExtractable.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.IO; - -namespace BinaryObjectScanner.Interfaces -{ - /// - /// Mark a file type as being able to be extracted - /// - public interface IExtractable - { - /// - /// Extract a file to a temporary path, if possible - /// - /// Path to the input file - /// Path to the output directory - /// True to include debug data, false otherwise - /// Indicates if the extractable was successfully extracted - /// Ideally, this should just point to the other extract implementation. - bool Extract(string file, string outDir, bool includeDebug); - - /// - /// Extract a stream to a temporary path, if possible - /// - /// Stream representing the input file - /// Path to the input file - /// Path to the output directory - /// True to include debug data, false otherwise - /// Indicates if the extractable was successfully extracted - bool Extract(Stream? stream, string file, string outDir, bool includeDebug); - } -} diff --git a/BinaryObjectScanner/Interfaces/IExtractableT.cs b/BinaryObjectScanner/Interfaces/IExtractableT.cs deleted file mode 100644 index ce3d29af..00000000 --- a/BinaryObjectScanner/Interfaces/IExtractableT.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SabreTools.Serialization.Interfaces; - -namespace BinaryObjectScanner.Interfaces -{ - /// - /// Mark a file type as being able to be extracted - /// - public interface IExtractable : IExtractable where T : IWrapper { } -} diff --git a/BinaryObjectScanner/Scanner.cs b/BinaryObjectScanner/Scanner.cs index 502a5efb..21fc3b21 100644 --- a/BinaryObjectScanner/Scanner.cs +++ b/BinaryObjectScanner/Scanner.cs @@ -4,6 +4,7 @@ using System.IO; using BinaryObjectScanner.Data; using BinaryObjectScanner.Interfaces; using SabreTools.IO.Extensions; +using SabreTools.Serialization.Interfaces; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner @@ -287,7 +288,7 @@ namespace BinaryObjectScanner #region Archive File Types // If we're scanning archives - if (wrapper is SabreTools.Serialization.Interfaces.IExtractable extractable && _options.ScanArchives) + if (wrapper is IExtractable extractable && _options.ScanArchives) { // If the extractable file itself fails try