From 17a6a7ec69cf9ef707e7332ca88c4c0cabb77f37 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sat, 1 Aug 2020 23:04:11 -0700 Subject: [PATCH] IO extensions to IO namespace --- RombaSharp/Features/BaseFeature.cs | 1 + RombaSharp/Features/Build.cs | 2 +- RombaSharp/Features/Diffdat.cs | 2 +- RombaSharp/Features/Dir2Dat.cs | 2 +- RombaSharp/Features/EDiffdat.cs | 2 +- RombaSharp/Features/Export.cs | 2 +- RombaSharp/Features/Import.cs | 2 +- RombaSharp/Features/Merge.cs | 2 +- RombaSharp/Features/Miss.cs | 2 +- SabreTools.Library/DatFiles/DatFile.cs | 1 + SabreTools.Library/DatFiles/DatHeader.cs | 3 +-- SabreTools.Library/DatFiles/ItemDictionary.cs | 2 +- SabreTools.Library/DatFiles/Json.cs | 1 + SabreTools.Library/DatFiles/Listrom.cs | 1 + SabreTools.Library/DatFiles/Listxml.cs | 1 + SabreTools.Library/DatFiles/Logiqx.cs | 1 + SabreTools.Library/DatFiles/Missfile.cs | 2 +- SabreTools.Library/DatFiles/OfflineList.cs | 2 +- SabreTools.Library/DatFiles/OpenMSX.cs | 2 +- SabreTools.Library/DatFiles/SabreDat.cs | 1 + SabreTools.Library/DatFiles/SoftwareList.cs | 1 + SabreTools.Library/FileTypes/BaseArchive.cs | 2 +- SabreTools.Library/FileTypes/BaseFile.cs | 3 +-- SabreTools.Library/FileTypes/CHD/CHDFileV1.cs | 2 +- SabreTools.Library/FileTypes/CHD/CHDFileV2.cs | 2 +- SabreTools.Library/FileTypes/CHD/CHDFileV3.cs | 2 +- SabreTools.Library/FileTypes/CHD/CHDFileV4.cs | 2 +- SabreTools.Library/FileTypes/CHD/CHDFileV5.cs | 2 +- SabreTools.Library/FileTypes/CHDFile.cs | 3 +-- SabreTools.Library/FileTypes/Folder.cs | 1 + SabreTools.Library/FileTypes/GZipArchive.cs | 1 + SabreTools.Library/FileTypes/RarArchive.cs | 2 +- SabreTools.Library/FileTypes/SevenZipArchive.cs | 1 + SabreTools.Library/FileTypes/TapeArchive.cs | 1 + SabreTools.Library/FileTypes/XZArchive.cs | 1 + SabreTools.Library/FileTypes/ZipArchive.cs | 1 + SabreTools.Library/{Tools => IO}/BinaryReaderExtensions.cs | 2 +- SabreTools.Library/{Tools => IO}/DirectoryExtensions.cs | 2 +- SabreTools.Library/{Tools => IO}/FileExtensions.cs | 3 +-- SabreTools.Library/{Tools => IO}/ParentablePath.cs | 2 +- SabreTools.Library/{Tools => IO}/PathExtensions.cs | 2 +- SabreTools.Library/{Tools => IO}/StreamExtensions.cs | 3 ++- SabreTools.Library/Logging/Logger.cs | 2 +- SabreTools.Library/Reports/BaseReport.cs | 3 +-- SabreTools.Library/Skippers/SkipperFile.cs | 2 +- SabreTools.Library/Skippers/SkipperRule.cs | 2 +- SabreTools.Library/Skippers/Transform.cs | 1 + SabreTools/Features/Extract.cs | 2 +- SabreTools/Features/Restore.cs | 2 +- SabreTools/Features/Sort.cs | 1 + SabreTools/Features/Split.cs | 2 +- SabreTools/Features/Update.cs | 2 +- SabreTools/Features/Verify.cs | 1 + 53 files changed, 54 insertions(+), 41 deletions(-) rename SabreTools.Library/{Tools => IO}/BinaryReaderExtensions.cs (99%) rename SabreTools.Library/{Tools => IO}/DirectoryExtensions.cs (99%) rename SabreTools.Library/{Tools => IO}/FileExtensions.cs (99%) rename SabreTools.Library/{Tools => IO}/ParentablePath.cs (99%) rename SabreTools.Library/{Tools => IO}/PathExtensions.cs (99%) rename SabreTools.Library/{Tools => IO}/StreamExtensions.cs (99%) diff --git a/RombaSharp/Features/BaseFeature.cs b/RombaSharp/Features/BaseFeature.cs index 198fb295..7479c570 100644 --- a/RombaSharp/Features/BaseFeature.cs +++ b/RombaSharp/Features/BaseFeature.cs @@ -8,6 +8,7 @@ using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; using SabreTools.Library.Help; +using SabreTools.Library.IO; using SabreTools.Library.Tools; using Microsoft.Data.Sqlite; diff --git a/RombaSharp/Features/Build.cs b/RombaSharp/Features/Build.cs index 1793c814..ee52cd69 100644 --- a/RombaSharp/Features/Build.cs +++ b/RombaSharp/Features/Build.cs @@ -5,7 +5,7 @@ using System.Linq; using SabreTools.Library.DatFiles; using SabreTools.Library.FileTypes; using SabreTools.Library.Help; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace RombaSharp.Features { diff --git a/RombaSharp/Features/Diffdat.cs b/RombaSharp/Features/Diffdat.cs index 25dd7731..0cb7432e 100644 --- a/RombaSharp/Features/Diffdat.cs +++ b/RombaSharp/Features/Diffdat.cs @@ -5,7 +5,7 @@ using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.Filtering; using SabreTools.Library.Help; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace RombaSharp.Features { diff --git a/RombaSharp/Features/Dir2Dat.cs b/RombaSharp/Features/Dir2Dat.cs index f251131c..c644e5aa 100644 --- a/RombaSharp/Features/Dir2Dat.cs +++ b/RombaSharp/Features/Dir2Dat.cs @@ -4,7 +4,7 @@ using System.IO; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.Help; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace RombaSharp.Features { diff --git a/RombaSharp/Features/EDiffdat.cs b/RombaSharp/Features/EDiffdat.cs index a222b425..4fec9fbe 100644 --- a/RombaSharp/Features/EDiffdat.cs +++ b/RombaSharp/Features/EDiffdat.cs @@ -5,7 +5,7 @@ using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.Filtering; using SabreTools.Library.Help; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace RombaSharp.Features { diff --git a/RombaSharp/Features/Export.cs b/RombaSharp/Features/Export.cs index 28a13139..f590a8d7 100644 --- a/RombaSharp/Features/Export.cs +++ b/RombaSharp/Features/Export.cs @@ -2,7 +2,7 @@ using System.IO; using SabreTools.Library.Help; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; using Microsoft.Data.Sqlite; namespace RombaSharp.Features diff --git a/RombaSharp/Features/Import.cs b/RombaSharp/Features/Import.cs index c47077de..49b22a30 100644 --- a/RombaSharp/Features/Import.cs +++ b/RombaSharp/Features/Import.cs @@ -4,7 +4,7 @@ using System.Linq; using SabreTools.Library.Data; using SabreTools.Library.Help; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; using Microsoft.Data.Sqlite; namespace RombaSharp.Features diff --git a/RombaSharp/Features/Merge.cs b/RombaSharp/Features/Merge.cs index 1d23f7c2..733b0bcf 100644 --- a/RombaSharp/Features/Merge.cs +++ b/RombaSharp/Features/Merge.cs @@ -4,7 +4,7 @@ using System.Linq; using SabreTools.Library.Data; using SabreTools.Library.Help; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace RombaSharp.Features { diff --git a/RombaSharp/Features/Miss.cs b/RombaSharp/Features/Miss.cs index 1247ac41..a7a058ca 100644 --- a/RombaSharp/Features/Miss.cs +++ b/RombaSharp/Features/Miss.cs @@ -4,7 +4,7 @@ using System.IO; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.Help; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace RombaSharp.Features { diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs index f9bf74f1..cac505c1 100644 --- a/SabreTools.Library/DatFiles/DatFile.cs +++ b/SabreTools.Library/DatFiles/DatFile.cs @@ -9,6 +9,7 @@ using SabreTools.Library.Data; using SabreTools.Library.DatItems; using SabreTools.Library.FileTypes; using SabreTools.Library.Filtering; +using SabreTools.Library.IO; using SabreTools.Library.Reports; using SabreTools.Library.Skippers; using SabreTools.Library.Tools; diff --git a/SabreTools.Library/DatFiles/DatHeader.cs b/SabreTools.Library/DatFiles/DatHeader.cs index 3da7c524..4db1e188 100644 --- a/SabreTools.Library/DatFiles/DatHeader.cs +++ b/SabreTools.Library/DatFiles/DatHeader.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.IO; -using SabreTools.Library.Data; using SabreTools.Library.DatItems; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; using Newtonsoft.Json; namespace SabreTools.Library.DatFiles diff --git a/SabreTools.Library/DatFiles/ItemDictionary.cs b/SabreTools.Library/DatFiles/ItemDictionary.cs index 73df01e3..32a0137f 100644 --- a/SabreTools.Library/DatFiles/ItemDictionary.cs +++ b/SabreTools.Library/DatFiles/ItemDictionary.cs @@ -7,8 +7,8 @@ using System.Threading.Tasks; using SabreTools.Library.Data; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Reports; -using SabreTools.Library.Tools; using NaturalSort; namespace SabreTools.Library.DatFiles diff --git a/SabreTools.Library/DatFiles/Json.cs b/SabreTools.Library/DatFiles/Json.cs index 3b48c092..a13b3ffe 100644 --- a/SabreTools.Library/DatFiles/Json.cs +++ b/SabreTools.Library/DatFiles/Json.cs @@ -5,6 +5,7 @@ using System.Text; using SabreTools.Library.Data; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; using Newtonsoft.Json; diff --git a/SabreTools.Library/DatFiles/Listrom.cs b/SabreTools.Library/DatFiles/Listrom.cs index cd5e8283..c5c61db4 100644 --- a/SabreTools.Library/DatFiles/Listrom.cs +++ b/SabreTools.Library/DatFiles/Listrom.cs @@ -6,6 +6,7 @@ using System.Text.RegularExpressions; using SabreTools.Library.Data; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; namespace SabreTools.Library.DatFiles diff --git a/SabreTools.Library/DatFiles/Listxml.cs b/SabreTools.Library/DatFiles/Listxml.cs index 98d05aaf..2060997c 100644 --- a/SabreTools.Library/DatFiles/Listxml.cs +++ b/SabreTools.Library/DatFiles/Listxml.cs @@ -6,6 +6,7 @@ using System.Xml; using SabreTools.Library.Data; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; namespace SabreTools.Library.DatFiles diff --git a/SabreTools.Library/DatFiles/Logiqx.cs b/SabreTools.Library/DatFiles/Logiqx.cs index 297e5643..94af5947 100644 --- a/SabreTools.Library/DatFiles/Logiqx.cs +++ b/SabreTools.Library/DatFiles/Logiqx.cs @@ -8,6 +8,7 @@ using System.Xml; using SabreTools.Library.Data; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; namespace SabreTools.Library.DatFiles diff --git a/SabreTools.Library/DatFiles/Missfile.cs b/SabreTools.Library/DatFiles/Missfile.cs index d42d7b75..bc8ada00 100644 --- a/SabreTools.Library/DatFiles/Missfile.cs +++ b/SabreTools.Library/DatFiles/Missfile.cs @@ -5,7 +5,7 @@ using System.Text; using SabreTools.Library.Data; using SabreTools.Library.DatItems; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/OfflineList.cs b/SabreTools.Library/DatFiles/OfflineList.cs index e71c7f37..e4ec3786 100644 --- a/SabreTools.Library/DatFiles/OfflineList.cs +++ b/SabreTools.Library/DatFiles/OfflineList.cs @@ -6,7 +6,7 @@ using System.Xml; using SabreTools.Library.Data; using SabreTools.Library.DatItems; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/OpenMSX.cs b/SabreTools.Library/DatFiles/OpenMSX.cs index cb4d4fe7..12ac33d8 100644 --- a/SabreTools.Library/DatFiles/OpenMSX.cs +++ b/SabreTools.Library/DatFiles/OpenMSX.cs @@ -6,7 +6,7 @@ using System.Xml; using SabreTools.Library.Data; using SabreTools.Library.DatItems; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/SabreDat.cs b/SabreTools.Library/DatFiles/SabreDat.cs index ae3ab58b..2c094867 100644 --- a/SabreTools.Library/DatFiles/SabreDat.cs +++ b/SabreTools.Library/DatFiles/SabreDat.cs @@ -7,6 +7,7 @@ using System.Xml; using SabreTools.Library.Data; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; namespace SabreTools.Library.DatFiles diff --git a/SabreTools.Library/DatFiles/SoftwareList.cs b/SabreTools.Library/DatFiles/SoftwareList.cs index f68332dd..008db0c3 100644 --- a/SabreTools.Library/DatFiles/SoftwareList.cs +++ b/SabreTools.Library/DatFiles/SoftwareList.cs @@ -6,6 +6,7 @@ using System.Xml; using SabreTools.Library.Data; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; namespace SabreTools.Library.DatFiles diff --git a/SabreTools.Library/FileTypes/BaseArchive.cs b/SabreTools.Library/FileTypes/BaseArchive.cs index e3d4935f..325790be 100644 --- a/SabreTools.Library/FileTypes/BaseArchive.cs +++ b/SabreTools.Library/FileTypes/BaseArchive.cs @@ -4,7 +4,7 @@ using System.IO; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.FileTypes { diff --git a/SabreTools.Library/FileTypes/BaseFile.cs b/SabreTools.Library/FileTypes/BaseFile.cs index a6540512..ecfb97ec 100644 --- a/SabreTools.Library/FileTypes/BaseFile.cs +++ b/SabreTools.Library/FileTypes/BaseFile.cs @@ -1,7 +1,6 @@ using System.IO; -using SabreTools.Library.Data; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.FileTypes { diff --git a/SabreTools.Library/FileTypes/CHD/CHDFileV1.cs b/SabreTools.Library/FileTypes/CHD/CHDFileV1.cs index 500de9d7..05633af1 100644 --- a/SabreTools.Library/FileTypes/CHD/CHDFileV1.cs +++ b/SabreTools.Library/FileTypes/CHD/CHDFileV1.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.FileTypes.CHD { diff --git a/SabreTools.Library/FileTypes/CHD/CHDFileV2.cs b/SabreTools.Library/FileTypes/CHD/CHDFileV2.cs index a7cd21b4..a902cab9 100644 --- a/SabreTools.Library/FileTypes/CHD/CHDFileV2.cs +++ b/SabreTools.Library/FileTypes/CHD/CHDFileV2.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.FileTypes.CHD { diff --git a/SabreTools.Library/FileTypes/CHD/CHDFileV3.cs b/SabreTools.Library/FileTypes/CHD/CHDFileV3.cs index b7fc5f5f..f9c32b9c 100644 --- a/SabreTools.Library/FileTypes/CHD/CHDFileV3.cs +++ b/SabreTools.Library/FileTypes/CHD/CHDFileV3.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.FileTypes.CHD { diff --git a/SabreTools.Library/FileTypes/CHD/CHDFileV4.cs b/SabreTools.Library/FileTypes/CHD/CHDFileV4.cs index d64fb395..190cff13 100644 --- a/SabreTools.Library/FileTypes/CHD/CHDFileV4.cs +++ b/SabreTools.Library/FileTypes/CHD/CHDFileV4.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.FileTypes.CHD { diff --git a/SabreTools.Library/FileTypes/CHD/CHDFileV5.cs b/SabreTools.Library/FileTypes/CHD/CHDFileV5.cs index 098d8058..2643fdd3 100644 --- a/SabreTools.Library/FileTypes/CHD/CHDFileV5.cs +++ b/SabreTools.Library/FileTypes/CHD/CHDFileV5.cs @@ -1,7 +1,7 @@ using System.IO; using System.Text; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.FileTypes.CHD { diff --git a/SabreTools.Library/FileTypes/CHDFile.cs b/SabreTools.Library/FileTypes/CHDFile.cs index 07a08137..228457f1 100644 --- a/SabreTools.Library/FileTypes/CHDFile.cs +++ b/SabreTools.Library/FileTypes/CHDFile.cs @@ -2,9 +2,8 @@ using System.IO; using System.Text; -using SabreTools.Library.Data; using SabreTools.Library.FileTypes.CHD; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.FileTypes { diff --git a/SabreTools.Library/FileTypes/Folder.cs b/SabreTools.Library/FileTypes/Folder.cs index cc8430d1..56eaba4b 100644 --- a/SabreTools.Library/FileTypes/Folder.cs +++ b/SabreTools.Library/FileTypes/Folder.cs @@ -6,6 +6,7 @@ using System.Linq; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; namespace SabreTools.Library.FileTypes diff --git a/SabreTools.Library/FileTypes/GZipArchive.cs b/SabreTools.Library/FileTypes/GZipArchive.cs index 5ee91e0e..2f237734 100644 --- a/SabreTools.Library/FileTypes/GZipArchive.cs +++ b/SabreTools.Library/FileTypes/GZipArchive.cs @@ -7,6 +7,7 @@ using System.Text.RegularExpressions; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; using Compress; using Compress.gZip; diff --git a/SabreTools.Library/FileTypes/RarArchive.cs b/SabreTools.Library/FileTypes/RarArchive.cs index 83085fe2..c5c4386f 100644 --- a/SabreTools.Library/FileTypes/RarArchive.cs +++ b/SabreTools.Library/FileTypes/RarArchive.cs @@ -6,7 +6,7 @@ using System.Linq; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; using SharpCompress.Archives; using SharpCompress.Archives.Rar; using SharpCompress.Readers; diff --git a/SabreTools.Library/FileTypes/SevenZipArchive.cs b/SabreTools.Library/FileTypes/SevenZipArchive.cs index f119d0f1..1dbf3d80 100644 --- a/SabreTools.Library/FileTypes/SevenZipArchive.cs +++ b/SabreTools.Library/FileTypes/SevenZipArchive.cs @@ -6,6 +6,7 @@ using System.Linq; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; using Compress; using Compress.SevenZip; diff --git a/SabreTools.Library/FileTypes/TapeArchive.cs b/SabreTools.Library/FileTypes/TapeArchive.cs index eb63665d..30c28fab 100644 --- a/SabreTools.Library/FileTypes/TapeArchive.cs +++ b/SabreTools.Library/FileTypes/TapeArchive.cs @@ -6,6 +6,7 @@ using System.Linq; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; using Compress.ZipFile; using SharpCompress.Archives; diff --git a/SabreTools.Library/FileTypes/XZArchive.cs b/SabreTools.Library/FileTypes/XZArchive.cs index f5464ee9..68285e99 100644 --- a/SabreTools.Library/FileTypes/XZArchive.cs +++ b/SabreTools.Library/FileTypes/XZArchive.cs @@ -6,6 +6,7 @@ using System.Text.RegularExpressions; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; using SharpCompress.Compressors.Xz; diff --git a/SabreTools.Library/FileTypes/ZipArchive.cs b/SabreTools.Library/FileTypes/ZipArchive.cs index 12868f4e..61d3f311 100644 --- a/SabreTools.Library/FileTypes/ZipArchive.cs +++ b/SabreTools.Library/FileTypes/ZipArchive.cs @@ -6,6 +6,7 @@ using System.Linq; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; +using SabreTools.Library.IO; using SabreTools.Library.Tools; using Compress; using Compress.ZipFile; diff --git a/SabreTools.Library/Tools/BinaryReaderExtensions.cs b/SabreTools.Library/IO/BinaryReaderExtensions.cs similarity index 99% rename from SabreTools.Library/Tools/BinaryReaderExtensions.cs rename to SabreTools.Library/IO/BinaryReaderExtensions.cs index 87d5d5b4..5fa24203 100644 --- a/SabreTools.Library/Tools/BinaryReaderExtensions.cs +++ b/SabreTools.Library/IO/BinaryReaderExtensions.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace SabreTools.Library.Tools +namespace SabreTools.Library.IO { /// /// Big endian reading overloads for BinaryReader diff --git a/SabreTools.Library/Tools/DirectoryExtensions.cs b/SabreTools.Library/IO/DirectoryExtensions.cs similarity index 99% rename from SabreTools.Library/Tools/DirectoryExtensions.cs rename to SabreTools.Library/IO/DirectoryExtensions.cs index b6946429..6b52f8ac 100644 --- a/SabreTools.Library/Tools/DirectoryExtensions.cs +++ b/SabreTools.Library/IO/DirectoryExtensions.cs @@ -6,7 +6,7 @@ using System.Linq; using SabreTools.Library.Data; using NaturalSort; -namespace SabreTools.Library.Tools +namespace SabreTools.Library.IO { /// /// Extensions to Directory functionality diff --git a/SabreTools.Library/Tools/FileExtensions.cs b/SabreTools.Library/IO/FileExtensions.cs similarity index 99% rename from SabreTools.Library/Tools/FileExtensions.cs rename to SabreTools.Library/IO/FileExtensions.cs index 3e1c5c5e..7e244373 100644 --- a/SabreTools.Library/Tools/FileExtensions.cs +++ b/SabreTools.Library/IO/FileExtensions.cs @@ -8,10 +8,9 @@ using System.Xml.Schema; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.FileTypes; -using SabreTools.Library.IO; using SabreTools.Library.Skippers; -namespace SabreTools.Library.Tools +namespace SabreTools.Library.IO { /// /// Extensions to File functionality diff --git a/SabreTools.Library/Tools/ParentablePath.cs b/SabreTools.Library/IO/ParentablePath.cs similarity index 99% rename from SabreTools.Library/Tools/ParentablePath.cs rename to SabreTools.Library/IO/ParentablePath.cs index 0ab64690..9ecc91b8 100644 --- a/SabreTools.Library/Tools/ParentablePath.cs +++ b/SabreTools.Library/IO/ParentablePath.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace SabreTools.Library.Tools +namespace SabreTools.Library.IO { /// /// A path that optionally contains a parent root diff --git a/SabreTools.Library/Tools/PathExtensions.cs b/SabreTools.Library/IO/PathExtensions.cs similarity index 99% rename from SabreTools.Library/Tools/PathExtensions.cs rename to SabreTools.Library/IO/PathExtensions.cs index d8c98e10..e65cf8f0 100644 --- a/SabreTools.Library/Tools/PathExtensions.cs +++ b/SabreTools.Library/IO/PathExtensions.cs @@ -2,7 +2,7 @@ using SabreTools.Library.Data; -namespace SabreTools.Library.Tools +namespace SabreTools.Library.IO { /// /// Extensions to Path functionality diff --git a/SabreTools.Library/Tools/StreamExtensions.cs b/SabreTools.Library/IO/StreamExtensions.cs similarity index 99% rename from SabreTools.Library/Tools/StreamExtensions.cs rename to SabreTools.Library/IO/StreamExtensions.cs index faf43e81..30fb1068 100644 --- a/SabreTools.Library/Tools/StreamExtensions.cs +++ b/SabreTools.Library/IO/StreamExtensions.cs @@ -7,9 +7,10 @@ using System.Threading.Tasks; using SabreTools.Library.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.FileTypes; +using SabreTools.Library.Tools; using Compress.ThreadReaders; -namespace SabreTools.Library.Tools +namespace SabreTools.Library.IO { /// /// Extensions to Stream functionality diff --git a/SabreTools.Library/Logging/Logger.cs b/SabreTools.Library/Logging/Logger.cs index a9301bf4..d7be7146 100644 --- a/SabreTools.Library/Logging/Logger.cs +++ b/SabreTools.Library/Logging/Logger.cs @@ -3,7 +3,7 @@ using System.IO; using System.Text; using SabreTools.Library.Data; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.Logging { diff --git a/SabreTools.Library/Reports/BaseReport.cs b/SabreTools.Library/Reports/BaseReport.cs index 096a95e1..691192fb 100644 --- a/SabreTools.Library/Reports/BaseReport.cs +++ b/SabreTools.Library/Reports/BaseReport.cs @@ -1,9 +1,8 @@ using System; using System.IO; -using SabreTools.Library.Data; using SabreTools.Library.DatFiles; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.Reports { diff --git a/SabreTools.Library/Skippers/SkipperFile.cs b/SabreTools.Library/Skippers/SkipperFile.cs index cbac1120..ea3f0b8a 100644 --- a/SabreTools.Library/Skippers/SkipperFile.cs +++ b/SabreTools.Library/Skippers/SkipperFile.cs @@ -4,7 +4,7 @@ using System.Globalization; using System.IO; using System.Xml; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.Skippers { diff --git a/SabreTools.Library/Skippers/SkipperRule.cs b/SabreTools.Library/Skippers/SkipperRule.cs index 4c3bf742..6f71d8e4 100644 --- a/SabreTools.Library/Skippers/SkipperRule.cs +++ b/SabreTools.Library/Skippers/SkipperRule.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using SabreTools.Library.Data; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Library.Skippers { diff --git a/SabreTools.Library/Skippers/Transform.cs b/SabreTools.Library/Skippers/Transform.cs index bac516fc..ac65f649 100644 --- a/SabreTools.Library/Skippers/Transform.cs +++ b/SabreTools.Library/Skippers/Transform.cs @@ -3,6 +3,7 @@ using System.IO; using SabreTools.Library.Data; using SabreTools.Library.FileTypes; +using SabreTools.Library.IO; using SabreTools.Library.Tools; namespace SabreTools.Library.Skippers diff --git a/SabreTools/Features/Extract.cs b/SabreTools/Features/Extract.cs index 0381ccde..6b8516f3 100644 --- a/SabreTools/Features/Extract.cs +++ b/SabreTools/Features/Extract.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using SabreTools.Library.Help; +using SabreTools.Library.IO; using SabreTools.Library.Skippers; -using SabreTools.Library.Tools; namespace SabreTools.Features { diff --git a/SabreTools/Features/Restore.cs b/SabreTools/Features/Restore.cs index e3969c45..c6271676 100644 --- a/SabreTools/Features/Restore.cs +++ b/SabreTools/Features/Restore.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using SabreTools.Library.Help; +using SabreTools.Library.IO; using SabreTools.Library.Skippers; -using SabreTools.Library.Tools; namespace SabreTools.Features { diff --git a/SabreTools/Features/Sort.cs b/SabreTools/Features/Sort.cs index 4f3a00a5..249becd6 100644 --- a/SabreTools/Features/Sort.cs +++ b/SabreTools/Features/Sort.cs @@ -4,6 +4,7 @@ using System.IO; using SabreTools.Library.DatFiles; using SabreTools.Library.FileTypes; using SabreTools.Library.Help; +using SabreTools.Library.IO; using SabreTools.Library.Tools; namespace SabreTools.Features diff --git a/SabreTools/Features/Split.cs b/SabreTools/Features/Split.cs index 4388bd3b..77a356a4 100644 --- a/SabreTools/Features/Split.cs +++ b/SabreTools/Features/Split.cs @@ -2,7 +2,7 @@ using SabreTools.Library.DatFiles; using SabreTools.Library.Help; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Features { diff --git a/SabreTools/Features/Update.cs b/SabreTools/Features/Update.cs index 966b9207..38edd7d6 100644 --- a/SabreTools/Features/Update.cs +++ b/SabreTools/Features/Update.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; using SabreTools.Library.Help; -using SabreTools.Library.Tools; +using SabreTools.Library.IO; namespace SabreTools.Features { diff --git a/SabreTools/Features/Verify.cs b/SabreTools/Features/Verify.cs index 79c3f3a3..68665a80 100644 --- a/SabreTools/Features/Verify.cs +++ b/SabreTools/Features/Verify.cs @@ -3,6 +3,7 @@ using SabreTools.Library.DatFiles; using SabreTools.Library.Filtering; using SabreTools.Library.Help; +using SabreTools.Library.IO; using SabreTools.Library.Tools; namespace SabreTools.Features