From 24e73489d202c3bea7e2723f7486240ca7f37f46 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 10 Dec 2020 22:31:23 -0800 Subject: [PATCH] Aaru, Archives, CHDs all in folders --- SabreTools.DatFiles/DatFromDir.cs | 1 + SabreTools.DatFiles/Rebuilder.cs | 1 + SabreTools.DatFiles/Verification.cs | 1 + SabreTools.FileTypes/{ => Aaru}/AaruFormat.cs | 3 +-- SabreTools.FileTypes/{ => Archives}/GZipArchive.cs | 2 +- SabreTools.FileTypes/{ => Archives}/LRZipArchive.cs | 2 +- SabreTools.FileTypes/{ => Archives}/LZ4Archive.cs | 2 +- SabreTools.FileTypes/{ => Archives}/RarArchive.cs | 2 +- SabreTools.FileTypes/{ => Archives}/SevenZipArchive.cs | 2 +- SabreTools.FileTypes/{ => Archives}/TapeArchive.cs | 2 +- SabreTools.FileTypes/{ => Archives}/XZArchive.cs | 2 +- SabreTools.FileTypes/{ => Archives}/ZPAQArchive.cs | 2 +- SabreTools.FileTypes/{ => Archives}/ZipArchive.cs | 2 +- SabreTools.FileTypes/{ => Archives}/ZstdArchive.cs | 2 +- SabreTools.FileTypes/BaseArchive.cs | 2 ++ SabreTools.FileTypes/BaseFile.cs | 2 ++ SabreTools.FileTypes/{ => CHD}/CHDFile.cs | 3 +-- SabreTools.FileTypes/Folder.cs | 1 + SabreTools.Filtering/Filter.cs | 1 + 19 files changed, 21 insertions(+), 14 deletions(-) rename SabreTools.FileTypes/{ => Aaru}/AaruFormat.cs (99%) rename SabreTools.FileTypes/{ => Archives}/GZipArchive.cs (99%) rename SabreTools.FileTypes/{ => Archives}/LRZipArchive.cs (98%) rename SabreTools.FileTypes/{ => Archives}/LZ4Archive.cs (98%) rename SabreTools.FileTypes/{ => Archives}/RarArchive.cs (99%) rename SabreTools.FileTypes/{ => Archives}/SevenZipArchive.cs (99%) rename SabreTools.FileTypes/{ => Archives}/TapeArchive.cs (99%) rename SabreTools.FileTypes/{ => Archives}/XZArchive.cs (99%) rename SabreTools.FileTypes/{ => Archives}/ZPAQArchive.cs (98%) rename SabreTools.FileTypes/{ => Archives}/ZipArchive.cs (99%) rename SabreTools.FileTypes/{ => Archives}/ZstdArchive.cs (98%) rename SabreTools.FileTypes/{ => CHD}/CHDFile.cs (98%) diff --git a/SabreTools.DatFiles/DatFromDir.cs b/SabreTools.DatFiles/DatFromDir.cs index be49bfc8..1f462bd6 100644 --- a/SabreTools.DatFiles/DatFromDir.cs +++ b/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; diff --git a/SabreTools.DatFiles/Rebuilder.cs b/SabreTools.DatFiles/Rebuilder.cs index 1632dbc2..68991e9b 100644 --- a/SabreTools.DatFiles/Rebuilder.cs +++ b/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; diff --git a/SabreTools.DatFiles/Verification.cs b/SabreTools.DatFiles/Verification.cs index a4e0eb11..ea9efaed 100644 --- a/SabreTools.DatFiles/Verification.cs +++ b/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 diff --git a/SabreTools.FileTypes/AaruFormat.cs b/SabreTools.FileTypes/Aaru/AaruFormat.cs similarity index 99% rename from SabreTools.FileTypes/AaruFormat.cs rename to SabreTools.FileTypes/Aaru/AaruFormat.cs index d596b2ee..c92333ca 100644 --- a/SabreTools.FileTypes/AaruFormat.cs +++ b/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 { /// /// AaruFormat code is based on the Aaru project diff --git a/SabreTools.FileTypes/GZipArchive.cs b/SabreTools.FileTypes/Archives/GZipArchive.cs similarity index 99% rename from SabreTools.FileTypes/GZipArchive.cs rename to SabreTools.FileTypes/Archives/GZipArchive.cs index 5a0a53fb..57c45b5f 100644 --- a/SabreTools.FileTypes/GZipArchive.cs +++ b/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 { /// /// Represents a TorrentGZip archive for reading and writing diff --git a/SabreTools.FileTypes/LRZipArchive.cs b/SabreTools.FileTypes/Archives/LRZipArchive.cs similarity index 98% rename from SabreTools.FileTypes/LRZipArchive.cs rename to SabreTools.FileTypes/Archives/LRZipArchive.cs index f227372d..b2192fbf 100644 --- a/SabreTools.FileTypes/LRZipArchive.cs +++ b/SabreTools.FileTypes/Archives/LRZipArchive.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace SabreTools.FileTypes +namespace SabreTools.FileTypes.Archives { /// /// Represents a TorrentLRZip archive for reading and writing diff --git a/SabreTools.FileTypes/LZ4Archive.cs b/SabreTools.FileTypes/Archives/LZ4Archive.cs similarity index 98% rename from SabreTools.FileTypes/LZ4Archive.cs rename to SabreTools.FileTypes/Archives/LZ4Archive.cs index 5a8a4762..10c57393 100644 --- a/SabreTools.FileTypes/LZ4Archive.cs +++ b/SabreTools.FileTypes/Archives/LZ4Archive.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace SabreTools.FileTypes +namespace SabreTools.FileTypes.Archives { /// /// Represents a TorrentLRZip archive for reading and writing diff --git a/SabreTools.FileTypes/RarArchive.cs b/SabreTools.FileTypes/Archives/RarArchive.cs similarity index 99% rename from SabreTools.FileTypes/RarArchive.cs rename to SabreTools.FileTypes/Archives/RarArchive.cs index 127fe036..caca4ce2 100644 --- a/SabreTools.FileTypes/RarArchive.cs +++ b/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 { /// /// Represents a TorrentRAR archive for reading and writing diff --git a/SabreTools.FileTypes/SevenZipArchive.cs b/SabreTools.FileTypes/Archives/SevenZipArchive.cs similarity index 99% rename from SabreTools.FileTypes/SevenZipArchive.cs rename to SabreTools.FileTypes/Archives/SevenZipArchive.cs index f2e21e35..9ebcbc37 100644 --- a/SabreTools.FileTypes/SevenZipArchive.cs +++ b/SabreTools.FileTypes/Archives/SevenZipArchive.cs @@ -10,7 +10,7 @@ using Compress.SevenZip; using Compress.ZipFile; using NaturalSort; -namespace SabreTools.FileTypes +namespace SabreTools.FileTypes.Archives { /// /// Represents a Torrent7zip archive for reading and writing diff --git a/SabreTools.FileTypes/TapeArchive.cs b/SabreTools.FileTypes/Archives/TapeArchive.cs similarity index 99% rename from SabreTools.FileTypes/TapeArchive.cs rename to SabreTools.FileTypes/Archives/TapeArchive.cs index 7295eaea..cae90b68 100644 --- a/SabreTools.FileTypes/TapeArchive.cs +++ b/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 { /// /// Represents a Tape archive for reading and writing diff --git a/SabreTools.FileTypes/XZArchive.cs b/SabreTools.FileTypes/Archives/XZArchive.cs similarity index 99% rename from SabreTools.FileTypes/XZArchive.cs rename to SabreTools.FileTypes/Archives/XZArchive.cs index 148b2b0a..0a01d113 100644 --- a/SabreTools.FileTypes/XZArchive.cs +++ b/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 { /// /// Represents a TorrentXZ archive for reading and writing diff --git a/SabreTools.FileTypes/ZPAQArchive.cs b/SabreTools.FileTypes/Archives/ZPAQArchive.cs similarity index 98% rename from SabreTools.FileTypes/ZPAQArchive.cs rename to SabreTools.FileTypes/Archives/ZPAQArchive.cs index 8d1844f3..878dafd4 100644 --- a/SabreTools.FileTypes/ZPAQArchive.cs +++ b/SabreTools.FileTypes/Archives/ZPAQArchive.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace SabreTools.FileTypes +namespace SabreTools.FileTypes.Archives { /// /// Represents a ZPAQArchive archive for reading and writing diff --git a/SabreTools.FileTypes/ZipArchive.cs b/SabreTools.FileTypes/Archives/ZipArchive.cs similarity index 99% rename from SabreTools.FileTypes/ZipArchive.cs rename to SabreTools.FileTypes/Archives/ZipArchive.cs index c785660c..7accea69 100644 --- a/SabreTools.FileTypes/ZipArchive.cs +++ b/SabreTools.FileTypes/Archives/ZipArchive.cs @@ -9,7 +9,7 @@ using Compress; using Compress.ZipFile; using NaturalSort; -namespace SabreTools.FileTypes +namespace SabreTools.FileTypes.Archives { /// /// Represents a Zip archive for reading and writing diff --git a/SabreTools.FileTypes/ZstdArchive.cs b/SabreTools.FileTypes/Archives/ZstdArchive.cs similarity index 98% rename from SabreTools.FileTypes/ZstdArchive.cs rename to SabreTools.FileTypes/Archives/ZstdArchive.cs index 73076b2a..00fb9ff8 100644 --- a/SabreTools.FileTypes/ZstdArchive.cs +++ b/SabreTools.FileTypes/Archives/ZstdArchive.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace SabreTools.FileTypes +namespace SabreTools.FileTypes.Archives { /// /// Represents a ZstdArchive archive for reading and writing diff --git a/SabreTools.FileTypes/BaseArchive.cs b/SabreTools.FileTypes/BaseArchive.cs index e7efc460..0ca94b02 100644 --- a/SabreTools.FileTypes/BaseArchive.cs +++ b/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 diff --git a/SabreTools.FileTypes/BaseFile.cs b/SabreTools.FileTypes/BaseFile.cs index 4ba97fc5..e9b416cd 100644 --- a/SabreTools.FileTypes/BaseFile.cs +++ b/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; diff --git a/SabreTools.FileTypes/CHDFile.cs b/SabreTools.FileTypes/CHD/CHDFile.cs similarity index 98% rename from SabreTools.FileTypes/CHDFile.cs rename to SabreTools.FileTypes/CHD/CHDFile.cs index 88d13235..8a550346 100644 --- a/SabreTools.FileTypes/CHDFile.cs +++ b/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 { /// /// This is code adapted from chd.h and chd.cpp in MAME diff --git a/SabreTools.FileTypes/Folder.cs b/SabreTools.FileTypes/Folder.cs index 1fe0bd34..413e81bc 100644 --- a/SabreTools.FileTypes/Folder.cs +++ b/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; diff --git a/SabreTools.Filtering/Filter.cs b/SabreTools.Filtering/Filter.cs index 6104e98b..b93d366e 100644 --- a/SabreTools.Filtering/Filter.cs +++ b/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 /// /// 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