Aaru, Archives, CHDs all in folders

SabreTools.DatFiles/DatFromDir.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using SabreTools.Core;
 using SabreTools.DatItems;
 using SabreTools.FileTypes;
+using SabreTools.FileTypes.Archives;
 using SabreTools.IO;
 using SabreTools.Logging;
 

SabreTools.DatFiles/Rebuilder.cs

@@ -7,6 +7,7 @@ using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.FileTypes;
+using SabreTools.FileTypes.Archives;
 using SabreTools.IO;
 using SabreTools.Logging;
 using SabreTools.Skippers;

SabreTools.DatFiles/Verification.cs

@@ -6,6 +6,7 @@ using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.FileTypes;
+using SabreTools.FileTypes.Archives;
 using SabreTools.Logging;
 
 // This file represents all methods related to verifying with a DatFile

SabreTools.FileTypes/Aaru/AaruFormat.cs

@@ -3,9 +3,8 @@ using System.Text;
 
 using SabreTools.Core.Tools;
 using SabreTools.IO;
-using SabreTools.FileTypes.Aaru;
 
-namespace SabreTools.FileTypes
+namespace SabreTools.FileTypes.Aaru
 {
     /// <summary>
     /// AaruFormat code is based on the Aaru project

SabreTools.FileTypes/Archives/GZipArchive.cs

@@ -11,7 +11,7 @@ using Compress;
 using Compress.gZip;
 using Compress.ZipFile.ZLib;
 
-namespace SabreTools.FileTypes
+namespace SabreTools.FileTypes.Archives
 {
     /// <summary>
     /// Represents a TorrentGZip archive for reading and writing

SabreTools.FileTypes/Archives/LRZipArchive.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace SabreTools.FileTypes
+namespace SabreTools.FileTypes.Archives
 {
     /// <summary>
     /// Represents a TorrentLRZip archive for reading and writing

SabreTools.FileTypes/Archives/LZ4Archive.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace SabreTools.FileTypes
+namespace SabreTools.FileTypes.Archives
 {
     /// <summary>
     /// Represents a TorrentLRZip archive for reading and writing

SabreTools.FileTypes/Archives/RarArchive.cs

@@ -8,7 +8,7 @@ using SharpCompress.Archives;
 using SharpCompress.Archives.Rar;
 using SharpCompress.Readers;
 
-namespace SabreTools.FileTypes
+namespace SabreTools.FileTypes.Archives
 {
     /// <summary>
     /// Represents a TorrentRAR archive for reading and writing

SabreTools.FileTypes/Archives/SevenZipArchive.cs

@@ -10,7 +10,7 @@ using Compress.SevenZip;
 using Compress.ZipFile;
 using NaturalSort;
 
-namespace SabreTools.FileTypes
+namespace SabreTools.FileTypes.Archives
 {
     /// <summary>
     /// Represents a Torrent7zip archive for reading and writing

SabreTools.FileTypes/Archives/TapeArchive.cs

@@ -12,7 +12,7 @@ using SharpCompress.Common;
 using SharpCompress.Readers;
 using SharpCompress.Writers;
 
-namespace SabreTools.FileTypes
+namespace SabreTools.FileTypes.Archives
 {
     /// <summary>
     /// Represents a Tape archive for reading and writing

SabreTools.FileTypes/Archives/XZArchive.cs

@@ -8,7 +8,7 @@ using SabreTools.Core.Tools;
 using SabreTools.IO;
 using SharpCompress.Compressors.Xz;
 
-namespace SabreTools.FileTypes
+namespace SabreTools.FileTypes.Archives
 {
     /// <summary>
     /// Represents a TorrentXZ archive for reading and writing

SabreTools.FileTypes/Archives/ZPAQArchive.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace SabreTools.FileTypes
+namespace SabreTools.FileTypes.Archives
 {
     /// <summary>
     /// Represents a ZPAQArchive archive for reading and writing

SabreTools.FileTypes/Archives/ZipArchive.cs

@@ -9,7 +9,7 @@ using Compress;
 using Compress.ZipFile;
 using NaturalSort;
 
-namespace SabreTools.FileTypes
+namespace SabreTools.FileTypes.Archives
 {
     /// <summary>
     /// Represents a Zip archive for reading and writing

SabreTools.FileTypes/Archives/ZstdArchive.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace SabreTools.FileTypes
+namespace SabreTools.FileTypes.Archives
 {
     /// <summary>
     /// Represents a ZstdArchive archive for reading and writing

SabreTools.FileTypes/BaseArchive.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.IO;
 
+using SabreTools.FileTypes.Archives;
+
 namespace SabreTools.FileTypes
 {
     public abstract class BaseArchive : Folder

SabreTools.FileTypes/BaseFile.cs

@@ -5,6 +5,8 @@ using System.Threading.Tasks;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
+using SabreTools.FileTypes.Aaru;
+using SabreTools.FileTypes.CHD;
 using SabreTools.IO;
 using SabreTools.Logging;
 using SabreTools.Skippers;

SabreTools.FileTypes/CHD/CHDFile.cs

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

SabreTools.FileTypes/Folder.cs

@@ -5,6 +5,7 @@ using System.Linq;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
+using SabreTools.FileTypes.Archives;
 using SabreTools.IO;
 using SabreTools.Logging;
 

SabreTools.Filtering/Filter.cs

@@ -11,6 +11,7 @@ namespace SabreTools.Filtering
     /// Represents the filtering operations that need to be performed on a set of items, usually a DAT
     /// </summary>
     /// TODO: Can clever use of Filtering allow for easier external splitting methods?
+    /// TODO: Investigate how to reduce the amount of hardcoded filter statements
     public class Filter
     {
         #region Fields