Extract out FileTypes namespace

.gitignore

@@ -10,6 +10,8 @@
 /SabreTools/SabreTools.csproj.user
 /SabreTools.Core/bin/
 /SabreTools.Core/obj/
+/SabreTools.FileTypes/bin/
+/SabreTools.FileTypes/obj/
 /SabreTools.Filtering/bin/
 /SabreTools.Filtering/obj/
 /SabreTools.Help/bin/

RombaSharp/Features/BaseFeature.cs

@@ -6,11 +6,11 @@ using System.Xml;
 using System.Xml.Schema;
 
 using SabreTools.Core;
+using SabreTools.FileTypes;
 using SabreTools.Help;
 using SabreTools.Logging;
 using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
-using SabreTools.Library.FileTypes;
 using Microsoft.Data.Sqlite;
 
 namespace RombaSharp.Features

RombaSharp/RombaSharp.csproj

@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\SabreTools.FileTypes\SabreTools.FileTypes.csproj" />
     <ProjectReference Include="..\SabreTools.Filtering\SabreTools.Filtering.csproj" />
     <ProjectReference Include="..\SabreTools.Help\SabreTools.Help.csproj" />
     <ProjectReference Include="..\SabreTools.Library\SabreTools.Library.csproj" />

SabreTools.Core/NaturalSort/NaturalComparer.cs

@@ -11,7 +11,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 

SabreTools.FileTypes/Aaru/ChecksumEntry.cs

@@ -3,7 +3,7 @@ using System.Text;
 
 using SabreTools.Core;
 
-namespace SabreTools.Library.FileTypes.Aaru
+namespace SabreTools.FileTypes.Aaru
 {
     /// <summary>
     /// Checksum entry, followed by checksum data itself

SabreTools.FileTypes/Aaru/ChecksumHeader.cs

@@ -3,7 +3,7 @@ using System.Text;
 
 using SabreTools.Core;
 
-namespace SabreTools.Library.FileTypes.Aaru
+namespace SabreTools.FileTypes.Aaru
 {
     /// <summary>
     /// Checksum block, contains a checksum of all user data sectors

SabreTools.FileTypes/Aaru/IndexEntry.cs

@@ -3,7 +3,7 @@ using System.Text;
 
 using SabreTools.Core;
 
-namespace SabreTools.Library.FileTypes.Aaru
+namespace SabreTools.FileTypes.Aaru
 {
     /// <summary>
     /// Index entry

SabreTools.FileTypes/Aaru/IndexHeader.cs

@@ -3,7 +3,7 @@ using System.Text;
 
 using SabreTools.Core;
 
-namespace SabreTools.Library.FileTypes.Aaru
+namespace SabreTools.FileTypes.Aaru
 {
     /// <summary>
     /// Header for the index, followed by entries

SabreTools.FileTypes/AaruFormat.cs

@@ -1,12 +1,11 @@
-using System;
+using System.IO;
-using System.IO;
 using System.Text;
 
 using SabreTools.IO;
 using SabreTools.Core;
-using SabreTools.Library.FileTypes.Aaru;
+using SabreTools.FileTypes.Aaru;
 
-namespace SabreTools.Library.FileTypes
+namespace SabreTools.FileTypes
 {
     /// <summary>
     /// AaruFormat code is based on the Aaru project

SabreTools.FileTypes/BaseArchive.cs

@@ -3,7 +3,7 @@ using System.IO;
 
 using SabreTools.Core;
 
-namespace SabreTools.Library.FileTypes
+namespace SabreTools.FileTypes
 {
     public abstract class BaseArchive : Folder
     {

SabreTools.FileTypes/BaseFile.cs

@@ -1,16 +1,15 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
 using SabreTools.Core;
 using SabreTools.IO;
-using SabreTools.Library.IO;
 using SabreTools.Logging;
+using SabreTools.Skippers;
 using Compress.ThreadReaders;
 
-namespace SabreTools.Library.FileTypes
+namespace SabreTools.FileTypes
 {
     public class BaseFile
     {
@@ -268,7 +267,7 @@ namespace SabreTools.Library.FileTypes
             // Try to match the supplied header skipper
             if (header != null)
             {
-                var rule = Transform.GetMatchingRule(input, Path.GetFileNameWithoutExtension(header));
+                var rule = SkipperMatch.GetMatchingRule(input, Path.GetFileNameWithoutExtension(header));
 
                 // If there's a match, transform the stream before getting info
                 if (rule.Tests != null && rule.Tests.Count != 0)

SabreTools.FileTypes/CHD/CHDFileV1.cs

@@ -4,7 +4,7 @@ using System.Text;
 
 using SabreTools.IO;
 
-namespace SabreTools.Library.FileTypes.CHD
+namespace SabreTools.FileTypes.CHD
 {
     /// <summary>
     /// CHD V1 File

SabreTools.FileTypes/CHD/CHDFileV2.cs

@@ -4,7 +4,7 @@ using System.Text;
 
 using SabreTools.IO;
 
-namespace SabreTools.Library.FileTypes.CHD
+namespace SabreTools.FileTypes.CHD
 {
     /// <summary>
     /// CHD V2 File

SabreTools.FileTypes/CHD/CHDFileV3.cs

@@ -4,7 +4,7 @@ using System.Text;
 
 using SabreTools.IO;
 
-namespace SabreTools.Library.FileTypes.CHD
+namespace SabreTools.FileTypes.CHD
 {
     /// <summary>
     /// CHD V3 File

SabreTools.FileTypes/CHD/CHDFileV4.cs

@@ -4,7 +4,7 @@ using System.Text;
 
 using SabreTools.IO;
 
-namespace SabreTools.Library.FileTypes.CHD
+namespace SabreTools.FileTypes.CHD
 {
     /// <summary>
     /// CHD V4 File

SabreTools.FileTypes/CHD/CHDFileV5.cs

@@ -3,7 +3,7 @@ using System.Text;
 
 using SabreTools.IO;
 
-namespace SabreTools.Library.FileTypes.CHD
+namespace SabreTools.FileTypes.CHD
 {
     /// <summary>
     /// CHD V5 File

SabreTools.FileTypes/CHDFile.cs

@@ -4,9 +4,9 @@ using System.Text;
 
 using SabreTools.Core;
 using SabreTools.IO;
-using SabreTools.Library.FileTypes.CHD;
+using SabreTools.FileTypes.CHD;
 
-namespace SabreTools.Library.FileTypes
+namespace SabreTools.FileTypes
 {
     /// <summary>
     /// This is code adapted from chd.h and chd.cpp in MAME