Move flags, logging

RombaSharp/Features/DatStats.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.IO;
 
-using SabreTools.Library.Data;
 using SabreTools.Library.DatFiles;
 using SabreTools.Library.Help;
+using SabreTools.Library.Reports;
 
 namespace RombaSharp.Features
 {

RombaSharp/Program.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using RombaSharp.Features;
 using SabreTools.Library.Data;
 using SabreTools.Library.Help;
-using SabreTools.Library.Tools;
+using SabreTools.Library.Logging;
 
 namespace RombaSharp
 {

SabreTools.Library/DatFiles/Enums.cs

@@ -1,4 +1,6 @@
-namespace SabreTools.Library.DatFiles
+using System;
+
+namespace SabreTools.Library.DatFiles
 {
     /// <summary>
     /// Determines how the current dictionary is bucketed by
@@ -19,6 +21,159 @@
         Game,
     }
 
+    /// <summary>
+    /// DAT output formats
+    /// </summary>
+    [Flags]
+    public enum DatFormat
+    {
+        #region XML Formats
+
+        /// <summary>
+        /// Logiqx XML (using machine)
+        /// </summary>
+        Logiqx = 1 << 0,
+
+        /// <summary>
+        /// Logiqx XML (using game)
+        /// </summary>
+        LogiqxDeprecated = 1 << 1,
+
+        /// <summary>
+        /// MAME Softare List XML
+        /// </summary>
+        SoftwareList = 1 << 2,
+
+        /// <summary>
+        /// MAME Listxml output
+        /// </summary>
+        Listxml = 1 << 3,
+
+        /// <summary>
+        /// OfflineList XML
+        /// </summary>
+        OfflineList = 1 << 4,
+
+        /// <summary>
+        /// SabreDat XML
+        /// </summary>
+        SabreDat = 1 << 5,
+
+        /// <summary>
+        /// openMSX Software List XML
+        /// </summary>
+        OpenMSX = 1 << 6,
+
+        #endregion
+
+        #region Propietary Formats
+
+        /// <summary>
+        /// ClrMamePro custom
+        /// </summary>
+        ClrMamePro = 1 << 7,
+
+        /// <summary>
+        /// RomCetner INI-based
+        /// </summary>
+        RomCenter = 1 << 8,
+
+        /// <summary>
+        /// DOSCenter custom
+        /// </summary>
+        DOSCenter = 1 << 9,
+
+        /// <summary>
+        /// AttractMode custom
+        /// </summary>
+        AttractMode = 1 << 10,
+
+        #endregion
+
+        #region Standardized Text Formats
+
+        /// <summary>
+        /// ClrMamePro missfile
+        /// </summary>
+        MissFile = 1 << 11,
+
+        /// <summary>
+        /// Comma-Separated Values (standardized)
+        /// </summary>
+        CSV = 1 << 12,
+
+        /// <summary>
+        /// Semicolon-Separated Values (standardized)
+        /// </summary>
+        SSV = 1 << 13,
+
+        /// <summary>
+        /// Tab-Separated Values (standardized)
+        /// </summary>
+        TSV = 1 << 14,
+
+        /// <summary>
+        /// MAME Listrom output
+        /// </summary>
+        Listrom = 1 << 15,
+
+        /// <summary>
+        /// Everdrive Packs SMDB
+        /// </summary>
+        EverdriveSMDB = 1 << 16,
+
+        /// <summary>
+        /// JSON
+        /// </summary>
+        Json = 1 << 17,
+
+        #endregion
+
+        #region SFV-similar Formats
+
+        /// <summary>
+        /// CRC32 hash list
+        /// </summary>
+        RedumpSFV = 1 << 18,
+
+        /// <summary>
+        /// MD5 hash list
+        /// </summary>
+        RedumpMD5 = 1 << 19,
+
+#if NET_FRAMEWORK
+        /// <summary>
+        /// RIPEMD160 hash list
+        /// </summary>
+        RedumpRIPEMD160 = 1 << 20,
+#endif
+
+        /// <summary>
+        /// SHA-1 hash list
+        /// </summary>
+        RedumpSHA1 = 1 << 21,
+
+        /// <summary>
+        /// SHA-256 hash list
+        /// </summary>
+        RedumpSHA256 = 1 << 22,
+
+        /// <summary>
+        /// SHA-384 hash list
+        /// </summary>
+        RedumpSHA384 = 1 << 23,
+
+        /// <summary>
+        /// SHA-512 hash list
+        /// </summary>
+        RedumpSHA512 = 1 << 24,
+
+        #endregion
+
+        // Specialty combinations
+        ALL = Int32.MaxValue,
+    }
+
     /// <summary>
     /// Determines the DAT deduplication type
     /// </summary>
@@ -73,6 +228,33 @@
         Unzip,
     }
 
+    /// <summary>
+    /// Available hashing types
+    /// </summary>
+    [Flags]
+    public enum Hash
+    {
+        CRC = 1 << 0,
+        MD5 = 1 << 1,
+#if NET_FRAMEWORK
+        RIPEMD160 = 1 << 2,
+#endif
+        SHA1 = 1 << 3,
+        SHA256 = 1 << 4,
+        SHA384 = 1 << 5,
+        SHA512 = 1 << 6,
+
+        // Special combinations
+        Standard = CRC | MD5 | SHA1,
+#if NET_FRAMEWORK
+        DeepHashes = RIPEMD160 | SHA256 | SHA384 | SHA512,
+        SecureHashes = MD5 | RIPEMD160 | SHA1 | SHA256 | SHA384 | SHA512,
+#else
+        DeepHashes = SHA256 | SHA384 | SHA512,
+        SecureHashes = MD5 | SHA1 | SHA256 | SHA384 | SHA512,
+#endif
+    }
+
     /// <summary>
     /// Determines which files should be skipped in DFD
     /// </summary>

SabreTools.Library/DatItems/Enums.cs

@@ -1,5 +1,22 @@
-namespace SabreTools.Library.DatItems
+using System;
+
+namespace SabreTools.Library.DatItems
 {
+    /// <summary>
+    /// Determines which type of duplicate a file is
+    /// </summary>
+    [Flags]
+    public enum DupeType
+    {
+        // Type of match
+        Hash = 1 << 0,
+        All = 1 << 1,
+
+        // Location of match
+        Internal = 1 << 2,
+        External = 1 << 3,
+    }
+
     /// <summary>
     /// List of valid field types within a DatItem/Machine
     /// </summary>
@@ -69,6 +86,24 @@
         Inverted,
     }
 
+    /// <summary>
+    /// Determine the status of the item
+    /// </summary>
+    [Flags]
+    public enum ItemStatus
+    {
+        /// <summary>
+        /// This is a fake flag that is used for filter only
+        /// </summary>
+        NULL = 0x00,
+
+        None = 1 << 0,
+        Good = 1 << 1,
+        BadDump = 1 << 2,
+        Nodump = 1 << 3,
+        Verified = 1 << 4,
+    }
+
     /// <summary>
     /// Determine what type of file an item is
     /// </summary>
@@ -83,4 +118,21 @@
 
         Blank = 99, // This is not a real type, only used internally
     }
+
+    /// <summary>
+    /// Determine what type of machine it is
+    /// </summary>
+    [Flags]
+    public enum MachineType
+    {
+        /// <summary>
+        /// This is a fake flag that is used for filter only
+        /// </summary>
+        NULL = 0x00,
+
+        None = 1 << 0,
+        Bios = 1 << 1,
+        Device = 1 << 2,
+        Mechanical = 1 << 3,
+    }
 }

SabreTools.Library/Data/Enums.cs

@@ -129,21 +129,6 @@
 
     #endregion
 
-    #region Logging related
-
-    /// <summary>
-    /// Severity of the logging statement
-    /// </summary>
-    public enum LogLevel
-    {
-        VERBOSE = 0,
-        USER,
-        WARNING,
-        ERROR,
-    }
-
-    #endregion
-
     #region Reader related
 
     /// <summary>

SabreTools.Library/Data/Flags.cs

@@ -1,281 +0,0 @@
-using System;
-
-namespace SabreTools.Library.Data
-{
-    #region DatFile related
-
-    /// <summary>
-    /// DAT output formats
-    /// </summary>
-    [Flags]
-    public enum DatFormat
-    {
-        #region XML Formats
-
-        /// <summary>
-        /// Logiqx XML (using machine)
-        /// </summary>
-        Logiqx = 1 << 0,
-
-        /// <summary>
-        /// Logiqx XML (using game)
-        /// </summary>
-        LogiqxDeprecated = 1 << 1,
-
-        /// <summary>
-        /// MAME Softare List XML
-        /// </summary>
-        SoftwareList = 1 << 2,
-
-        /// <summary>
-        /// MAME Listxml output
-        /// </summary>
-        Listxml = 1 << 3,
-
-        /// <summary>
-        /// OfflineList XML
-        /// </summary>
-        OfflineList = 1 << 4,
-
-        /// <summary>
-        /// SabreDat XML
-        /// </summary>
-        SabreDat = 1 << 5,
-
-        /// <summary>
-        /// openMSX Software List XML
-        /// </summary>
-        OpenMSX = 1 << 6,
-
-        #endregion
-
-        #region Propietary Formats
-
-        /// <summary>
-        /// ClrMamePro custom
-        /// </summary>
-        ClrMamePro = 1 << 7,
-
-        /// <summary>
-        /// RomCetner INI-based
-        /// </summary>
-        RomCenter = 1 << 8,
-
-        /// <summary>
-        /// DOSCenter custom
-        /// </summary>
-        DOSCenter = 1 << 9,
-
-        /// <summary>
-        /// AttractMode custom
-        /// </summary>
-        AttractMode = 1 << 10,
-
-        #endregion
-
-        #region Standardized Text Formats
-
-        /// <summary>
-        /// ClrMamePro missfile
-        /// </summary>
-        MissFile = 1 << 11,
-
-        /// <summary>
-        /// Comma-Separated Values (standardized)
-        /// </summary>
-        CSV = 1 << 12,
-
-        /// <summary>
-        /// Semicolon-Separated Values (standardized)
-        /// </summary>
-        SSV = 1 << 13,
-
-        /// <summary>
-        /// Tab-Separated Values (standardized)
-        /// </summary>
-        TSV = 1 << 14,
-
-        /// <summary>
-        /// MAME Listrom output
-        /// </summary>
-        Listrom = 1 << 15,
-
-        /// <summary>
-        /// Everdrive Packs SMDB
-        /// </summary>
-        EverdriveSMDB = 1 << 16,
-
-        /// <summary>
-        /// JSON
-        /// </summary>
-        Json = 1 << 17,
-
-        #endregion
-
-        #region SFV-similar Formats
-
-        /// <summary>
-        /// CRC32 hash list
-        /// </summary>
-        RedumpSFV = 1 << 18,
-
-        /// <summary>
-        /// MD5 hash list
-        /// </summary>
-        RedumpMD5 = 1 << 19,
-
-#if NET_FRAMEWORK
-        /// <summary>
-        /// RIPEMD160 hash list
-        /// </summary>
-        RedumpRIPEMD160 =       1 << 20,
-#endif
-
-        /// <summary>
-        /// SHA-1 hash list
-        /// </summary>
-        RedumpSHA1 = 1 << 21,
-
-        /// <summary>
-        /// SHA-256 hash list
-        /// </summary>
-        RedumpSHA256 = 1 << 22,
-
-        /// <summary>
-        /// SHA-384 hash list
-        /// </summary>
-        RedumpSHA384 = 1 << 23,
-
-        /// <summary>
-        /// SHA-512 hash list
-        /// </summary>
-        RedumpSHA512 = 1 << 24,
-
-        #endregion
-
-        // Specialty combinations
-        ALL = Int32.MaxValue,
-    }
-
-    /// <summary>
-    /// Available hashing types
-    /// </summary>
-    [Flags]
-    public enum Hash
-    {
-        CRC = 1 << 0,
-        MD5 = 1 << 1,
-#if NET_FRAMEWORK
-        RIPEMD160 = 1 << 2,
-#endif
-        SHA1 = 1 << 3,
-        SHA256 = 1 << 4,
-        SHA384 = 1 << 5,
-        SHA512 = 1 << 6,
-
-        // Special combinations
-        Standard = CRC | MD5 | SHA1,
-#if NET_FRAMEWORK
-        DeepHashes = RIPEMD160 | SHA256 | SHA384 | SHA512,
-        SecureHashes = MD5 | RIPEMD160 | SHA1 | SHA256 | SHA384 | SHA512,
-#else
-        DeepHashes = SHA256 | SHA384 | SHA512,
-        SecureHashes = MD5 | SHA1 | SHA256 | SHA384 | SHA512,
-#endif
-    }
-
-    /// <summary>
-    /// Determine which format to output Stats to
-    /// </summary>
-    [Flags]
-    public enum StatReportFormat
-    {
-        /// <summary>
-        /// Only output to the console
-        /// </summary>
-        None = 0x00,
-
-        /// <summary>
-        /// Console-formatted
-        /// </summary>
-        Textfile = 1 << 0,
-
-        /// <summary>
-        /// ClrMamePro HTML
-        /// </summary>
-        HTML = 1 << 1,
-
-        /// <summary>
-        /// Comma-Separated Values (Standardized)
-        /// </summary>
-        CSV = 1 << 2,
-
-        /// <summary>
-        /// Semicolon-Separated Values (Standardized)
-        /// </summary>
-        SSV = 1 << 3,
-
-        /// <summary>
-        /// Tab-Separated Values (Standardized)
-        /// </summary>
-        TSV = 1 << 4,
-
-        All = Int32.MaxValue,
-    }
-
-    #endregion
-
-    #region DatItem related
-
-    /// <summary>
-    /// Determines which type of duplicate a file is
-    /// </summary>
-    [Flags]
-    public enum DupeType
-    {
-        // Type of match
-        Hash = 1 << 0,
-        All = 1 << 1,
-
-        // Location of match
-        Internal = 1 << 2,
-        External = 1 << 3,
-    }
-
-    /// <summary>
-    /// Determine the status of the item
-    /// </summary>
-    [Flags]
-    public enum ItemStatus
-    {
-        /// <summary>
-        /// This is a fake flag that is used for filter only
-        /// </summary>
-        NULL = 0x00,
-
-        None = 1 << 0,
-        Good = 1 << 1,
-        BadDump = 1 << 2,
-        Nodump = 1 << 3,
-        Verified = 1 << 4,
-    }
-
-    /// <summary>
-    /// Determine what type of machine it is
-    /// </summary>
-    [Flags]
-    public enum MachineType
-    {
-        /// <summary>
-        /// This is a fake flag that is used for filter only
-        /// </summary>
-        NULL = 0x00,
-
-        None = 1 << 0,
-        Bios = 1 << 1,
-        Device = 1 << 2,
-        Mechanical = 1 << 3,
-    }
-
-    #endregion
-}

SabreTools.Library/Data/Globals.cs

@@ -3,7 +3,7 @@ using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
 
-using SabreTools.Library.Tools;
+using SabreTools.Library.Logging;
 
 namespace SabreTools.Library.Data
 {

SabreTools.Library/FileTypes/BaseArchive.cs

@@ -2,6 +2,7 @@
 using System.IO;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 

SabreTools.Library/FileTypes/Folder.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 

SabreTools.Library/FileTypes/GZipArchive.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 using Compress;

SabreTools.Library/FileTypes/LRZipArchive.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 
 namespace SabreTools.Library.FileTypes

SabreTools.Library/FileTypes/LZ4Archive.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 
 namespace SabreTools.Library.FileTypes

SabreTools.Library/FileTypes/RarArchive.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 using SharpCompress.Archives;

SabreTools.Library/FileTypes/SevenZipArchive.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 using Compress;

SabreTools.Library/FileTypes/TapeArchive.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 using Compress.ZipFile;

SabreTools.Library/FileTypes/XZArchive.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 using SharpCompress.Compressors.Xz;

SabreTools.Library/FileTypes/ZPAQArchive.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 
 namespace SabreTools.Library.FileTypes

SabreTools.Library/FileTypes/ZipArchive.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 using Compress;

SabreTools.Library/FileTypes/ZstdArchive.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 
 namespace SabreTools.Library.FileTypes

SabreTools.Library/Logging/Enums.cs

@@ -0,0 +1,13 @@
+namespace SabreTools.Library.Logging
+{
+    /// <summary>
+    /// Severity of the logging statement
+    /// </summary>
+    public enum LogLevel
+    {
+        VERBOSE = 0,
+        USER,
+        WARNING,
+        ERROR,
+    }
+}

SabreTools.Library/Logging/Logger.cs

@@ -3,8 +3,9 @@ using System.IO;
 using System.Text;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
-namespace SabreTools.Library.Tools
+namespace SabreTools.Library.Logging
 {
     /// <summary>
     /// Log either to file or to the console

SabreTools.Library/Reports/Enums.cs

@@ -0,0 +1,43 @@
+using System;
+
+namespace SabreTools.Library.Reports
+{
+    /// <summary>
+    /// Determine which format to output Stats to
+    /// </summary>
+    [Flags]
+    public enum StatReportFormat
+    {
+        /// <summary>
+        /// Only output to the console
+        /// </summary>
+        None = 0x00,
+
+        /// <summary>
+        /// Console-formatted
+        /// </summary>
+        Textfile = 1 << 0,
+
+        /// <summary>
+        /// ClrMamePro HTML
+        /// </summary>
+        HTML = 1 << 1,
+
+        /// <summary>
+        /// Comma-Separated Values (Standardized)
+        /// </summary>
+        CSV = 1 << 2,
+
+        /// <summary>
+        /// Semicolon-Separated Values (Standardized)
+        /// </summary>
+        SSV = 1 << 3,
+
+        /// <summary>
+        /// Tab-Separated Values (Standardized)
+        /// </summary>
+        TSV = 1 << 4,
+
+        All = Int32.MaxValue,
+    }
+}

SabreTools.Library/Tools/Converters.cs

@@ -1,6 +1,6 @@
-using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
-using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
+using SabreTools.Library.Reports;
 
 namespace SabreTools.Library.Tools
 {

SabreTools.Library/Tools/FileExtensions.cs

@@ -6,6 +6,7 @@ using System.Xml;
 using System.Xml.Schema;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.FileTypes;
 using SabreTools.Library.Readers;
 using SabreTools.Library.Skippers;

SabreTools.Library/Tools/Hasher.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
 
-using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 
 namespace SabreTools.Library.Tools
 {

SabreTools.Library/Tools/StreamExtensions.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.FileTypes;
 using Compress.ThreadReaders;
 

SabreTools/Features/BaseFeature.cs

@@ -6,6 +6,7 @@ using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Filtering;
 using SabreTools.Library.Help;
+using SabreTools.Library.Reports;
 using SabreTools.Library.Tools;
 
 namespace SabreTools.Features

SabreTools/Program.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using SabreTools.Features;
 using SabreTools.Library.Data;
 using SabreTools.Library.Help;
-using SabreTools.Library.Tools;
+using SabreTools.Library.Logging;
 
 namespace SabreTools
 {