DatItem formats to own sub-namespace

This commit is contained in:
Matt Nadareski
2021-02-02 10:23:43 -08:00
parent 11fd354a47
commit c54b35db92
76 changed files with 79 additions and 42 deletions

View File

@@ -4,6 +4,7 @@ using System.Linq;
using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.DatTools;
using SabreTools.FileTypes;
using SabreTools.Help;

View File

@@ -9,6 +9,7 @@ using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.DatTools;
using SabreTools.FileTypes;
using SabreTools.Help;

View File

@@ -3,6 +3,7 @@ using System.IO;
using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.DatTools;
using SabreTools.FileTypes;
using SabreTools.Help;

View File

@@ -3,6 +3,7 @@ using System.IO;
using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.DatTools;
using SabreTools.FileTypes;
using SabreTools.Help;

View File

@@ -8,6 +8,7 @@ using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatFiles.Formats;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Logging;
using Newtonsoft.Json;

View File

@@ -5,6 +5,7 @@ using System.Text;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
using SabreTools.IO.Readers;
using SabreTools.IO.Writers;

View File

@@ -6,6 +6,7 @@ using System.Text;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
using SabreTools.IO.Readers;
using SabreTools.IO.Writers;

View File

@@ -7,6 +7,7 @@ using System.Text;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
using SabreTools.IO.Readers;
using SabreTools.IO.Writers;

View File

@@ -5,6 +5,7 @@ using System.Text;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
using SabreTools.IO.Readers;
using SabreTools.IO.Writers;

View File

@@ -5,6 +5,7 @@ using System.Text;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
using SabreTools.IO.Writers;

View File

@@ -7,6 +7,7 @@ using System.Text.RegularExpressions;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
namespace SabreTools.DatFiles.Formats

View File

@@ -9,6 +9,7 @@ using System.Xml.Schema;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
namespace SabreTools.DatFiles.Formats
@@ -716,7 +717,7 @@ namespace SabreTools.DatFiles.Formats
break;
case "softwarelist":
datItems.Add(new DatItems.SoftwareList
datItems.Add(new DatItems.Formats.SoftwareList
{
Name = reader.GetAttribute("name"),
Status = reader.GetAttribute("status").AsSoftwareListStatus(),
@@ -1836,7 +1837,7 @@ namespace SabreTools.DatFiles.Formats
break;
case ItemType.SoftwareList:
var softwareList = datItem as DatItems.SoftwareList;
var softwareList = datItem as DatItems.Formats.SoftwareList;
xtw.WriteStartElement("softwarelist");
xtw.WriteRequiredAttributeString("name", softwareList.Name);
xtw.WriteOptionalAttributeString("status", softwareList.Status.FromSoftwareListStatus());

View File

@@ -10,6 +10,7 @@ using System.Xml.Schema;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
namespace SabreTools.DatFiles.Formats

View File

@@ -8,6 +8,7 @@ using System.Xml.Schema;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
namespace SabreTools.DatFiles.Formats

View File

@@ -8,6 +8,7 @@ using System.Xml.Schema;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
namespace SabreTools.DatFiles.Formats

View File

@@ -6,6 +6,7 @@ using System.Text;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO.Readers;
using SabreTools.IO.Writers;

View File

@@ -7,6 +7,7 @@ using System.Text;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
@@ -314,7 +315,7 @@ namespace SabreTools.DatFiles.Formats
datItem = datItemObj.ToObject<SlotOption>();
break;
case ItemType.SoftwareList:
datItem = datItemObj.ToObject<DatItems.SoftwareList>();
datItem = datItemObj.ToObject<DatItems.Formats.SoftwareList>();
break;
case ItemType.Sound:
datItem = datItemObj.ToObject<Sound>();

View File

@@ -6,6 +6,7 @@ using System.Text;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
using SabreTools.IO.Readers;
using SabreTools.IO.Writers;

View File

@@ -9,6 +9,7 @@ using System.Xml.Schema;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
// TODO: Use softwarelist.dtd and *try* to make this write more correctly

View File

@@ -7,6 +7,7 @@ using System.Xml.Serialization;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Logging;
using NaturalSort;
using Newtonsoft.Json;

View File

@@ -5,6 +5,7 @@ using System.Linq;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Logging;
namespace SabreTools.DatFiles

View File

@@ -6,6 +6,7 @@ using System.Xml.Serialization;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems.Formats;
using SabreTools.FileTypes;
using SabreTools.Logging;
using NaturalSort;

View File

@@ -4,7 +4,7 @@ using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents which Adjuster(s) is associated with a set

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents a single analog item

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents generic archive files to be included in a set

View File

@@ -5,7 +5,7 @@ using Newtonsoft.Json;
/// <summary>
/// This holds all of the auxiliary types needed for proper parsing
/// </summary>
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
#region DatItem

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents which BIOS(es) is associated with a set

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents a blank set from an input DAT

View File

@@ -4,7 +4,7 @@ using SabreTools.Core;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents which Chip(s) is associated with a set

View File

@@ -4,7 +4,7 @@ using SabreTools.Core;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents a condition on a machine or other item

View File

@@ -4,7 +4,7 @@ using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents which Configuration(s) is associated with a set

View File

@@ -4,7 +4,7 @@ using SabreTools.Core;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents control for an input

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// SoftwareList dataarea information

View File

@@ -5,7 +5,7 @@ using SabreTools.Core;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents a single device on the machine

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents which Device Reference(s) is associated with a set

View File

@@ -4,7 +4,7 @@ using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents which DIP Switch(es) is associated with a set

View File

@@ -6,7 +6,7 @@ using SabreTools.FileTypes;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents Compressed Hunks of Data (CHD) formatted disks which use internal hashes

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// SoftwareList diskarea information

View File

@@ -4,7 +4,7 @@ using SabreTools.Core;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents one machine display

View File

@@ -4,7 +4,7 @@ using SabreTools.Core;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents the a driver of the machine

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents a matchable extension

View File

@@ -4,7 +4,7 @@ using SabreTools.Core;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents the a feature of the machine

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents special information about a machine

View File

@@ -4,7 +4,7 @@ using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents one ListXML input

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents a single instance of another item

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents one conflocation or diplocation

View File

@@ -6,7 +6,7 @@ using SabreTools.Core.Tools;
using SabreTools.FileTypes;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents Aaruformat images which use internal hashes

View File

@@ -4,7 +4,7 @@ using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// SoftwareList part information

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents one part feature object

View File

@@ -4,7 +4,7 @@ using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents a single port on a machine

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents which RAM option(s) is associated with a set

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents release information about a set

View File

@@ -9,7 +9,7 @@ using SabreTools.FileTypes;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents a generic file within a set

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents a (usually WAV-formatted) sample to be included for use in the set

View File

@@ -4,7 +4,7 @@ using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents one ListXML confsetting or dipvalue

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents one shared feature object

View File

@@ -4,7 +4,7 @@ using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents which Slot(s) is associated with a set

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents one ListXML slotoption

View File

@@ -4,7 +4,7 @@ using SabreTools.Core;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents which SoftwareList(s) is associated with a set

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.DatItems
namespace SabreTools.DatItems.Formats
{
/// <summary>
/// Represents the sound output for a machine

View File

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

View File

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

View File

@@ -8,6 +8,7 @@ using System.Threading.Tasks;
using SabreTools.Core;
using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO;
using SabreTools.Logging;
using NaturalSort;

View File

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

View File

@@ -3,6 +3,7 @@
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Logging;
namespace SabreTools.Filtering

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
namespace SabreTools.Filtering
{

View File

@@ -2,6 +2,7 @@ using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
namespace SabreTools.Filtering
{

View File

@@ -5,6 +5,7 @@ using System.Linq;
using SabreTools.Core;
using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Logging;
namespace SabreTools.Filtering

View File

@@ -2,6 +2,7 @@ using System.Collections.Generic;
using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using Xunit;
namespace SabreTools.Test.DatFiles

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using Xunit;
namespace SabreTools.Test.DatFiles

View File

@@ -1,5 +1,6 @@
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.FileTypes;
using SabreTools.FileTypes.Aaru;
using SabreTools.FileTypes.Archives;

View File

@@ -4,7 +4,7 @@ using System.Text;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.FileTypes;
using Xunit;

View File

@@ -1,4 +1,5 @@
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Filtering;
using Xunit;

View File

@@ -1,6 +1,7 @@
using System.Collections.Generic;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Filtering;
using Xunit;

View File

@@ -1,4 +1,5 @@
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Filtering;
using Xunit;

View File

@@ -2,6 +2,7 @@ using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Filtering;
using Xunit;