Code formatting and usings cleanup

RombaSharp/Features/Archive.cs

@@ -206,7 +206,7 @@ have a current entry in the DAT index.";
                 outDir: _depots!.Keys.ToList()[0],
                 outputFormat: OutputFormat.TorrentGzipRomba,
                 asFiles: TreatAsFile.NonArchive);
-            
+
             return true;
         }
     }

RombaSharp/Features/DatStats.cs

@@ -42,7 +42,7 @@ namespace RombaSharp.Features
                 baddumpCol: true,
                 nodumpCol: true,
                 StatReportFormat.Textfile);
-            
+
             return true;
         }
     }

SabreTools.Core/Filter/Operation.cs

@@ -9,7 +9,7 @@ namespace SabreTools.Core.Filter
         /// Default value, does nothing
         /// </summary>
         NONE,
-        
+
         Equals,
         NotEquals,
         GreaterThan,

SabreTools.DatFiles/DatFile.ToMetadata.cs

@@ -1429,6 +1429,6 @@ namespace SabreTools.DatFiles
             }
         }
 
-#endregion
+        #endregion
     }
 }

SabreTools.DatFiles/DatStatistics.cs

@@ -57,7 +57,7 @@ namespace SabreTools.DatFiles
         /// Number of items with the remove flag
         /// </summary>
         public long RemovedCount { get; private set; } = 0;
-        
+
         /// <summary>
         /// Name to display on output
         /// </summary>

SabreTools.DatFiles/ItemDictionary.cs

@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-
 #if NET40_OR_GREATER || NETCOREAPP
 using System.Threading.Tasks;
 #endif

SabreTools.DatFiles/Setter.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using SabreTools.Core;
 using SabreTools.Core.Filter;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;

SabreTools.DatItems/Formats/Adjuster.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Analog.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Archive.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/BiosSet.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Blank.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 
 namespace SabreTools.DatItems.Formats

SabreTools.DatItems/Formats/Chip.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Condition.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/ConfLocation.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/ConfSetting.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Configuration.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Control.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/DataArea.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Device.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/DeviceRef.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/DipLocation.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/DipSwitch.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/DipValue.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/DiskArea.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Display.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 
 namespace SabreTools.DatItems.Formats

SabreTools.DatItems/Formats/Driver.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Extension.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Feature.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/File.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.FileTypes;
 using SabreTools.Hashing;

SabreTools.DatItems/Formats/Info.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Input.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Instance.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Part.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/PartFeature.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Port.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/RamOption.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Release.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/ReleaseDetails.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 
 // TODO: Add item mappings for all fields

SabreTools.DatItems/Formats/Sample.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Serials.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 
 // TODO: Add item mappings for all fields

SabreTools.DatItems/Formats/SharedFeat.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Slot.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/SlotOption.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/SoftwareList.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/Sound.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {

SabreTools.DatItems/Formats/SourceDetails.cs

@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 
 // TODO: Add item mappings for all fields

SabreTools.DatTools/DatFileTool.cs

@@ -3,8 +3,6 @@ using System.IO;
 using System.Linq;
 #if NET40_OR_GREATER || NETCOREAPP
 using System.Threading.Tasks;
-using Microsoft.VisualBasic;
-
 #endif
 using SabreTools.Core;
 using SabreTools.DatFiles;

SabreTools.DatTools/Splitter.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

SabreTools.DatTools/Statistics.cs

@@ -6,7 +6,6 @@ using System.Net;
 #if NET40_OR_GREATER || NETCOREAPP
 using System.Threading.Tasks;
 #endif
-using SabreTools.Core;
 using SabreTools.DatFiles;
 using SabreTools.IO;
 using SabreTools.IO.Extensions;

SabreTools.DatTools/Writer.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 #if NET40_OR_GREATER || NETCOREAPP
 using System.Threading.Tasks;
 #endif
-using SabreTools.Core;
 using SabreTools.DatFiles;
 using SabreTools.DatItems;
 using SabreTools.IO.Extensions;
@@ -167,14 +166,14 @@ namespace SabreTools.DatTools
             {
                 if (string.IsNullOrEmpty(datFile.Header.GetStringFieldValue(Models.Metadata.Header.NameKey)) && string.IsNullOrEmpty(datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)))
                 {
-                    datFile.Header.SetFieldValue<string?>(DatHeader.FileNameKey,"Default");
+                    datFile.Header.SetFieldValue<string?>(DatHeader.FileNameKey, "Default");
                     datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, "Default");
                     datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, "Default");
                 }
 
                 else if (string.IsNullOrEmpty(datFile.Header.GetStringFieldValue(Models.Metadata.Header.NameKey)) && !string.IsNullOrEmpty(datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)))
                 {
-                    datFile.Header.SetFieldValue<string?>(DatHeader.FileNameKey,datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey));
+                    datFile.Header.SetFieldValue<string?>(DatHeader.FileNameKey, datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey));
                     datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey));
                 }
 

SabreTools.FileTypes/BaseArchive.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-
 using SabreTools.FileTypes.Archives;
 
 namespace SabreTools.FileTypes

SabreTools.Filtering/Replacer.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.DatItems.Formats;

SabreTools.Help/TopLevel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-
 using SabreTools.Logging;
 
 namespace SabreTools.Help

SabreTools.Logging/LogEventArgs.cs

@@ -1,7 +1,5 @@
 using System;
 
-using SabreTools.Core;
-
 namespace SabreTools.Logging
 {
     /// <summary>

SabreTools.Logging/Logger.cs

@@ -12,7 +12,7 @@ namespace SabreTools.Logging
         /// </summary>
         /// TODO: Derive class name for this object, if possible
         private readonly object? instance;
-        
+
         /// <summary>
         /// Constructor
         /// </summary>

SabreTools.Reports/BaseReport.cs

@@ -59,7 +59,7 @@ namespace SabreTools.Reports
         /// <param name="throwOnError">True if the error that is thrown should be thrown back to the caller, false otherwise</param>
         /// <returns>True if the report was written correctly, false otherwise</returns>
         public abstract bool WriteToFile(string? outfile, bool baddumpCol, bool nodumpCol, bool throwOnError = false);
-    
+
         /// <summary>
         /// Returns the human-readable file size for an arbitrary, 64-bit file size 
         /// The default format is "0.### XB", e.g. "4.2 KB" or "1.434 GB"

SabreTools.Reports/Formats/Textfile.cs

@@ -53,7 +53,7 @@ namespace SabreTools.Reports.Formats
                     if (stat.IsDirectory)
                     {
                         WriteIndividual(sw, stat, baddumpCol, nodumpCol);
-                        
+
                         // If we have anything but the last value, write the separator
                         if (i < Statistics.Count - 1)
                             WriteFooterSeparator(sw);

SabreTools/Enums.cs

@@ -2,48 +2,48 @@ using System;
 
 namespace SabreTools
 {
-        /// <summary>
-        /// Determines how the DAT will be split on output
-        /// </summary>
-        [Flags]
-        public enum SplittingMode
-        {
-            None = 0x00,
+    /// <summary>
+    /// Determines how the DAT will be split on output
+    /// </summary>
+    [Flags]
+    public enum SplittingMode
+    {
+        None = 0x00,
 
-            Extension = 1 << 0,
-            Hash = 1 << 1,
-            Level = 1 << 2,
-            Type = 1 << 3,
-            Size = 1 << 4,
-            TotalSize = 1 << 5,
-        }
+        Extension = 1 << 0,
+        Hash = 1 << 1,
+        Level = 1 << 2,
+        Type = 1 << 3,
+        Size = 1 << 4,
+        TotalSize = 1 << 5,
+    }
 
-        /// <summary>
-        /// Determines special update modes
-        /// </summary>
-        [Flags]
-        public enum UpdateMode
-        {
-            None = 0x00,
+    /// <summary>
+    /// Determines special update modes
+    /// </summary>
+    [Flags]
+    public enum UpdateMode
+    {
+        None = 0x00,
 
-            // Standard diffs
-            DiffDupesOnly = 1 << 0,
-            DiffNoDupesOnly = 1 << 1,
-            DiffIndividualsOnly = 1 << 2,
+        // Standard diffs
+        DiffDupesOnly = 1 << 0,
+        DiffNoDupesOnly = 1 << 1,
+        DiffIndividualsOnly = 1 << 2,
 
-            // Cascaded diffs
-            DiffCascade = 1 << 3,
-            DiffReverseCascade = 1 << 4,
+        // Cascaded diffs
+        DiffCascade = 1 << 3,
+        DiffReverseCascade = 1 << 4,
 
-            // Base diffs
-            DiffAgainst = 1 << 5,
+        // Base diffs
+        DiffAgainst = 1 << 5,
 
-            // Special update modes
-            Merge = 1 << 6,
-            BaseReplace = 1 << 7,
-            ReverseBaseReplace = 1 << 8,
+        // Special update modes
+        Merge = 1 << 6,
+        BaseReplace = 1 << 7,
+        ReverseBaseReplace = 1 << 8,
 
-            // Combinations
-            AllDiffs = DiffDupesOnly | DiffNoDupesOnly | DiffIndividualsOnly,
-        }
+        // Combinations
+        AllDiffs = DiffDupesOnly | DiffNoDupesOnly | DiffIndividualsOnly,
+    }
 }

SabreTools/Features/BaseFeature.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using Microsoft.Data.Sqlite;
 using SabreTools.Core;

SabreTools/Features/Batch.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using SabreTools.Core;
 using SabreTools.Core.Filter;
 using SabreTools.Core.Tools;
 using SabreTools.DatFiles;

SabreTools/Features/Stats.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-
 using SabreTools.DatTools;
 using SabreTools.Help;
 

SabreTools/Features/Update.cs

@@ -424,7 +424,7 @@ namespace SabreTools.Features
                 // If we're in SuperDAT mode, prefix all games with their respective DATs
                 if (string.Equals(userInputDat.Header.GetStringFieldValue(Models.Metadata.Header.TypeKey), "SuperDAT", StringComparison.OrdinalIgnoreCase))
                     DatFileTool.ApplySuperDAT(userInputDat, inputPaths);
-                    //DatFileTool.ApplySuperDATDB(userInputDat, inputPaths);
+                //DatFileTool.ApplySuperDATDB(userInputDat, inputPaths);
 
                 Writer.Write(userInputDat, OutputDir);
             }