From e4d26d4d810a4ad13f5c3fb57b1e44ed5ac82a92 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 18 Mar 2026 16:13:02 -0400 Subject: [PATCH] Put interfaces in respective namespaces --- README.MD | 19 +++++++++---------- .../BaseMetadataSerializer.cs | 1 - .../FDS.Deserializer.cs | 1 - .../FDS.Serializer.cs | 1 - .../ICrossModel.cs | 2 +- .../BaseBinaryReader.cs | 1 - .../IByteReader.cs | 2 +- .../IFileReader.cs | 2 +- .../IStreamReader.cs | 2 +- .../IStringReader.cs | 2 +- .../SabreTools.Serialization.Readers/XMID.cs | 2 -- .../SabreTools.Serialization.Readers/XeMID.cs | 2 -- .../BaseBinaryWriter.cs | 1 - .../IByteWriter.cs | 2 +- .../IFileWriter.cs | 2 +- .../IStreamWriter.cs | 2 +- .../IStringWriter.cs | 2 +- .../SabreTools.Serialization.Writers/XMID.cs | 1 - .../SabreTools.Serialization.Writers/XeMID.cs | 1 - 19 files changed, 18 insertions(+), 30 deletions(-) rename SabreTools.Serialization/{SabreTools.Serialization.Interfaces => SabreTools.Serialization.CrossModel}/ICrossModel.cs (96%) rename SabreTools.Serialization/{SabreTools.Serialization.Interfaces => SabreTools.Serialization.Readers}/IByteReader.cs (94%) rename SabreTools.Serialization/{SabreTools.Serialization.Interfaces => SabreTools.Serialization.Readers}/IFileReader.cs (93%) rename SabreTools.Serialization/{SabreTools.Serialization.Interfaces => SabreTools.Serialization.Readers}/IStreamReader.cs (93%) rename SabreTools.Serialization/{SabreTools.Serialization.Interfaces => SabreTools.Serialization.Readers}/IStringReader.cs (93%) rename SabreTools.Serialization/{SabreTools.Serialization.Interfaces => SabreTools.Serialization.Writers}/IByteWriter.cs (93%) rename SabreTools.Serialization/{SabreTools.Serialization.Interfaces => SabreTools.Serialization.Writers}/IFileWriter.cs (94%) rename SabreTools.Serialization/{SabreTools.Serialization.Interfaces => SabreTools.Serialization.Writers}/IStreamWriter.cs (93%) rename SabreTools.Serialization/{SabreTools.Serialization.Interfaces => SabreTools.Serialization.Writers}/IStringWriter.cs (93%) diff --git a/README.MD b/README.MD index c302c56a..8b45ffc9 100644 --- a/README.MD +++ b/README.MD @@ -89,15 +89,15 @@ Below is a table representing the various conversion interfaces that are impleme | Interface Name | Source Type | Destination Type | | --- | --- | --- | -| `SabreTools.Serialization.Interfaces.IByteReader` | `byte[]?` | `TModel` | -| `SabreTools.Serialization.Interfaces.IByteWriter` | `TModel` | `byte[]?` | -| `SabreTools.Serialization.Interfaces.ICrossModel` | `TSource`/`TDest` | `TDest`/`TSource` | -| `SabreTools.Serialization.Interfaces.IFileReader` | `string?` path | `TModel` | -| `SabreTools.Serialization.Interfaces.IFileWriter` | `TModel` | `string?` path | -| `SabreTools.Serialization.Interfaces.IStreamReader` | `Stream?` | `TModel` | -| `SabreTools.Serialization.Interfaces.IStreamWriter` | `TModel` | `Stream?` | -| `SabreTools.Serialization.Interfaces.IStringReader` | `string?` representation | `TModel` | -| `SabreTools.Serialization.Interfaces.IStringWriter` | `TModel` | `string?` representation | +| `SabreTools.Serialization.CrossModel.ICrossModel` | `TSource`/`TDest` | `TDest`/`TSource` | +| `SabreTools.Serialization.Readers.IByteReader` | `byte[]?` | `TModel` | +| `SabreTools.Serialization.Readers.IFileReader` | `string?` path | `TModel` | +| `SabreTools.Serialization.Readers.IStreamReader` | `Stream?` | `TModel` | +| `SabreTools.Serialization.Readers.IStringReader` | `string?` representation | `TModel` | +| `SabreTools.Serialization.Writers.IByteWriter` | `TModel` | `byte[]?` | +| `SabreTools.Serialization.Writers.IFileWriter` | `TModel` | `string?` path | +| `SabreTools.Serialization.Writers.IStreamWriter` | `TModel` | `Stream?` | +| `SabreTools.Serialization.Writers.IStringWriter` | `TModel` | `string?` representation | Below is a table representing the various non-conversion interfaces that are implemented within this library. @@ -119,7 +119,6 @@ Below is a table of all namespaces within the library and what they represent | `SabreTools.Data.Models` | Models representing different file and structure types | | `SabreTools.Data.ObjectIdentifier` | Object Identifier (OID) parsing | | `SabreTools.Serialization.CrossModel` | Convert between models; mainly used for metadata files converting to and from a common, `Dictionary`-based model | -| `SabreTools.Serialization.Interfaces` | Interfaces used commonly throughout the library | | `SabreTools.Serialization.Readers` | Convert from external sources to models | | `SabreTools.Serialization.Wrappers` | Classes that wrap serialization and models to allow for including extension properties | | `SabreTools.Serialization.Writers` | Convert from models to external sources | diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/BaseMetadataSerializer.cs b/SabreTools.Serialization/SabreTools.Serialization.CrossModel/BaseMetadataSerializer.cs index ed6989f1..e2ff7c41 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/BaseMetadataSerializer.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.CrossModel/BaseMetadataSerializer.cs @@ -1,5 +1,4 @@ using SabreTools.Data.Models.Metadata; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.CrossModel { diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Deserializer.cs b/SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Deserializer.cs index 772a3e90..6b846ecb 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Deserializer.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Deserializer.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using SabreTools.Data.Models.NES; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.CrossModel { diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Serializer.cs b/SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Serializer.cs index 4b1f2e4f..5e260d02 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Serializer.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Serializer.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using SabreTools.Data.Models.NES; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.CrossModel { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/ICrossModel.cs b/SabreTools.Serialization/SabreTools.Serialization.CrossModel/ICrossModel.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Interfaces/ICrossModel.cs rename to SabreTools.Serialization/SabreTools.Serialization.CrossModel/ICrossModel.cs index f64ce9f4..567e830b 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/ICrossModel.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.CrossModel/ICrossModel.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.CrossModel { /// /// Defines how to convert between two model types diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/BaseBinaryReader.cs b/SabreTools.Serialization/SabreTools.Serialization.Readers/BaseBinaryReader.cs index 2d57c966..0463d584 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Readers/BaseBinaryReader.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Readers/BaseBinaryReader.cs @@ -1,5 +1,4 @@ using System.IO; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Readers { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IByteReader.cs b/SabreTools.Serialization/SabreTools.Serialization.Readers/IByteReader.cs similarity index 94% rename from SabreTools.Serialization/SabreTools.Serialization.Interfaces/IByteReader.cs rename to SabreTools.Serialization/SabreTools.Serialization.Readers/IByteReader.cs index f50b7dfd..665ab352 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IByteReader.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Readers/IByteReader.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.Readers { /// /// Defines how to read from byte arrays diff --git a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IFileReader.cs b/SabreTools.Serialization/SabreTools.Serialization.Readers/IFileReader.cs similarity index 93% rename from SabreTools.Serialization/SabreTools.Serialization.Interfaces/IFileReader.cs rename to SabreTools.Serialization/SabreTools.Serialization.Readers/IFileReader.cs index f1bf805b..5e5e9e9a 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IFileReader.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Readers/IFileReader.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.Readers { /// /// Defines how to read from files diff --git a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStreamReader.cs b/SabreTools.Serialization/SabreTools.Serialization.Readers/IStreamReader.cs similarity index 93% rename from SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStreamReader.cs rename to SabreTools.Serialization/SabreTools.Serialization.Readers/IStreamReader.cs index d1a199ab..737ba04c 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStreamReader.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Readers/IStreamReader.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.Readers { /// /// Defines how to read from Streams diff --git a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStringReader.cs b/SabreTools.Serialization/SabreTools.Serialization.Readers/IStringReader.cs similarity index 93% rename from SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStringReader.cs rename to SabreTools.Serialization/SabreTools.Serialization.Readers/IStringReader.cs index a50660dc..a6d945be 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStringReader.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Readers/IStringReader.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.Readers { /// /// Defines how to read from strings diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/XMID.cs b/SabreTools.Serialization/SabreTools.Serialization.Readers/XMID.cs index 48d4bd19..7d3ba9fc 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Readers/XMID.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Readers/XMID.cs @@ -1,5 +1,3 @@ -using SabreTools.Serialization.Interfaces; - #pragma warning disable IDE0017 // Simplify object initialization namespace SabreTools.Serialization.Readers { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/XeMID.cs b/SabreTools.Serialization/SabreTools.Serialization.Readers/XeMID.cs index 57eefa62..4128a826 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Readers/XeMID.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Readers/XeMID.cs @@ -1,5 +1,3 @@ -using SabreTools.Serialization.Interfaces; - #pragma warning disable IDE0017 // Simplify object initialization namespace SabreTools.Serialization.Readers { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/BaseBinaryWriter.cs b/SabreTools.Serialization/SabreTools.Serialization.Writers/BaseBinaryWriter.cs index a0e2df7d..c0478ea1 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Writers/BaseBinaryWriter.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Writers/BaseBinaryWriter.cs @@ -1,5 +1,4 @@ using System.IO; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Writers { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IByteWriter.cs b/SabreTools.Serialization/SabreTools.Serialization.Writers/IByteWriter.cs similarity index 93% rename from SabreTools.Serialization/SabreTools.Serialization.Interfaces/IByteWriter.cs rename to SabreTools.Serialization/SabreTools.Serialization.Writers/IByteWriter.cs index 1fdb3e82..2ba2e028 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IByteWriter.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Writers/IByteWriter.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.Writers { /// /// Defines how to write to byte arrays diff --git a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IFileWriter.cs b/SabreTools.Serialization/SabreTools.Serialization.Writers/IFileWriter.cs similarity index 94% rename from SabreTools.Serialization/SabreTools.Serialization.Interfaces/IFileWriter.cs rename to SabreTools.Serialization/SabreTools.Serialization.Writers/IFileWriter.cs index 84d791fa..81f30f7a 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IFileWriter.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Writers/IFileWriter.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.Writers { /// /// Defines how to write to files diff --git a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStreamWriter.cs b/SabreTools.Serialization/SabreTools.Serialization.Writers/IStreamWriter.cs similarity index 93% rename from SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStreamWriter.cs rename to SabreTools.Serialization/SabreTools.Serialization.Writers/IStreamWriter.cs index 1ed3f4f7..6eeb6ecc 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStreamWriter.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Writers/IStreamWriter.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.Writers { /// /// Defines how to write to Streams diff --git a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStringWriter.cs b/SabreTools.Serialization/SabreTools.Serialization.Writers/IStringWriter.cs similarity index 93% rename from SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStringWriter.cs rename to SabreTools.Serialization/SabreTools.Serialization.Writers/IStringWriter.cs index 17be2304..93520adc 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Interfaces/IStringWriter.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Writers/IStringWriter.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.Writers { /// /// Defines how to write to strings diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/XMID.cs b/SabreTools.Serialization/SabreTools.Serialization.Writers/XMID.cs index 646cbbe0..323b67e4 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Writers/XMID.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Writers/XMID.cs @@ -1,5 +1,4 @@ using System.Text; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Writers { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/XeMID.cs b/SabreTools.Serialization/SabreTools.Serialization.Writers/XeMID.cs index ddbfbb3c..cadb78ba 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Writers/XeMID.cs +++ b/SabreTools.Serialization/SabreTools.Serialization.Writers/XeMID.cs @@ -1,5 +1,4 @@ using System.Text; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Writers {