DatFile types into their own folder and namespace

SabreTools.Core/Tools/Converters.cs

@@ -67,28 +67,6 @@ namespace SabreTools.Core.Tools
             return fields;
         }
 
-        /// <summary>
-        /// Get the default OutputFormat associated with each PackingFlag
-        /// </summary>
-        /// <param name="packing"></param>
-        /// <returns></returns>
-        public static OutputFormat AsOutputFormat(this PackingFlag packing)
-        {
-            switch (packing)
-            {
-                case PackingFlag.Zip:
-                    return OutputFormat.TorrentZip;
-                case PackingFlag.Unzip:
-                case PackingFlag.Partial:
-                    return OutputFormat.Folder;
-                case PackingFlag.Flat:
-                    return OutputFormat.ParentFolder;
-                case PackingFlag.None:
-                default:
-                    return OutputFormat.Folder;
-            }
-        }
-
         #endregion
 
         #region String to Enum

SabreTools.DatFiles/DatFile.Rebuilding.cs

@@ -48,7 +48,7 @@ namespace SabreTools.DatFiles
 
             // Now we want to get forcepack flag if it's not overridden
             if (outputFormat == OutputFormat.Folder && Header.ForcePacking != PackingFlag.None)
-                outputFormat = Header.ForcePacking.AsOutputFormat();
+                outputFormat = GetOutputFormat(Header.ForcePacking);
 
             // Preload the Skipper list
             SkipperMatch.Init();
@@ -188,7 +188,7 @@ namespace SabreTools.DatFiles
 
             // Now we want to get forcepack flag if it's not overridden
             if (outputFormat == OutputFormat.Folder && Header.ForcePacking != PackingFlag.None)
-                outputFormat = Header.ForcePacking.AsOutputFormat();
+                outputFormat = GetOutputFormat(Header.ForcePacking);
 
             // Preload the Skipper list
             SkipperMatch.Init();
@@ -630,6 +630,38 @@ namespace SabreTools.DatFiles
             return true;
         }
 
+        /// <summary>
+        /// Get the default OutputFormat associated with each PackingFlag
+        /// </summary>
+        public OutputFormat GetOutputFormat(PackingFlag packing)
+        {
+#if NET_FRAMEWORK
+            switch (packing)
+            {
+                case PackingFlag.Zip:
+                    return OutputFormat.TorrentZip;
+                case PackingFlag.Unzip:
+                case PackingFlag.Partial:
+                    return OutputFormat.Folder;
+                case PackingFlag.Flat:
+                    return OutputFormat.ParentFolder;
+                case PackingFlag.None:
+                default:
+                    return OutputFormat.Folder;
+            }
+#else
+            return packing switch
+            {
+                PackingFlag.Zip => OutputFormat.TorrentZip,
+                PackingFlag.Unzip => OutputFormat.Folder,
+                PackingFlag.Partial => OutputFormat.Folder,
+                PackingFlag.Flat => OutputFormat.ParentFolder,
+                PackingFlag.None => OutputFormat.Folder,
+                _ => OutputFormat.Folder,
+            };
+#endif
+        }
+
         /// <summary>
         /// Get preconfigured Folder for rebuilding
         /// </summary>

SabreTools.DatFiles/DatFile.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.DatFiles.Formats;
 using SabreTools.Logging;
 using Newtonsoft.Json;
 

SabreTools.DatFiles/DatHeader.cs

@@ -6,6 +6,7 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
+using SabreTools.DatFiles.Formats;
 using SabreTools.IO;
 using Newtonsoft.Json;
 

SabreTools.DatFiles/Formats/AttractMode.cs

@@ -7,7 +7,7 @@ using SabreTools.Core;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of an AttractMode DAT

SabreTools.DatFiles/Formats/Auxiliary.cs

@@ -1,7 +1,7 @@
 /// <summary>
 /// This holds all of the auxiliary types needed for proper parsing
 /// </summary>
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     #region DatHeader
 

SabreTools.DatFiles/Formats/ClrMamePro.cs

@@ -8,7 +8,7 @@ using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a ClrMamePro DAT

SabreTools.DatFiles/Formats/DosCenter.cs

@@ -9,7 +9,7 @@ using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a DosCenter DAT

SabreTools.DatFiles/Formats/EverdriveSmdb.cs

@@ -7,7 +7,7 @@ using SabreTools.Core;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of an Everdrive SMDB file

SabreTools.DatFiles/Formats/Hashfile.cs

@@ -7,7 +7,7 @@ using SabreTools.Core;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a hashfile such as an SFV, MD5, or SHA-1 file

SabreTools.DatFiles/Formats/Listrom.cs

@@ -9,7 +9,7 @@ using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a MAME Listrom DAT

SabreTools.DatFiles/Formats/Listxml.cs

@@ -11,7 +11,7 @@ using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a MAME XML DAT

SabreTools.DatFiles/Formats/Logiqx.cs

@@ -12,7 +12,7 @@ using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a Logiqx-derived DAT

SabreTools.DatFiles/Formats/Missfile.cs

@@ -5,7 +5,7 @@ using System.Text;
 
 using SabreTools.DatItems;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a Missfile

SabreTools.DatFiles/Formats/OfflineList.cs

@@ -10,7 +10,7 @@ using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of an OfflineList XML DAT

SabreTools.DatFiles/Formats/OpenMSX.cs

@@ -10,7 +10,7 @@ using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a openMSX softawre list XML DAT

SabreTools.DatFiles/Formats/RomCenter.cs

@@ -8,7 +8,7 @@ using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a RomCenter DAT

SabreTools.DatFiles/Formats/SabreJSON.cs

@@ -11,7 +11,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a reference SabreDAT JSON

SabreTools.DatFiles/Formats/SabreXML.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 using SabreTools.DatItems;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a SabreDAT XML

SabreTools.DatFiles/Formats/SeparatedValue.cs

@@ -8,7 +8,7 @@ using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a value-separated DAT

SabreTools.DatFiles/Formats/SoftwareList.cs

@@ -12,7 +12,7 @@ using SabreTools.DatItems;
 using SabreTools.IO;
 
 // TODO: Use softwarelist.dtd and *try* to make this write more correctly
-namespace SabreTools.DatFiles
+namespace SabreTools.DatFiles.Formats
 {
     /// <summary>
     /// Represents parsing and writing of a SoftwareList