diff --git a/DATabase/Generate.cs b/DATabase/Generate.cs index 1235563a..30b56331 100644 --- a/DATabase/Generate.cs +++ b/DATabase/Generate.cs @@ -466,24 +466,4 @@ JOIN checksums return roms; } } - - /// - /// Intermediate struct for holding and processing rom data - /// - public struct RomData - { - public string Manufacturer; - public string System; - public int SystemID; - public string Source; - public string URL; - public int SourceID; - public string Game; - public string Name; - public string Type; - public long Size; - public string CRC; - public string MD5; - public string SHA1; - } } diff --git a/DATabase/Import.cs b/DATabase/Import.cs index 13a3224d..e4894483 100644 --- a/DATabase/Import.cs +++ b/DATabase/Import.cs @@ -46,22 +46,6 @@ namespace SabreTools private static string _redumpDatePattern = @"(\d{4})(\d{2})(\d{2}) (\d{2})-(\d{2})-(\d{2})"; private static string _tosecDatePattern = @"(\d{4})-(\d{2})-(\d{2})"; - /// - /// Possible DAT import classes - /// - private enum DatType - { - none = 0, - Custom, - MAME, - NoIntro, - Redump, - TOSEC, - TruRip, - NonGood, - MaybeIntro, - } - // Public instance variables public string FilePath { diff --git a/Deheader/Headerer.cs b/Deheader/Headerer.cs index cce568b5..a040fed8 100644 --- a/Deheader/Headerer.cs +++ b/Deheader/Headerer.cs @@ -19,21 +19,6 @@ namespace SabreTools private static string _connectionString = "Data Source=" + _dbName + ";Version = 3;"; private static Logger logger; - /// - /// Possible detected header type - /// - private enum HeaderType - { - None = 0, - A7800, - FDS, - Lynx, - //N64, - NES, - PCE, - SNES, - } - /// /// Start deheader operation with supplied parameters /// diff --git a/SabreHelper/Enums.cs b/SabreHelper/Enums.cs new file mode 100644 index 00000000..20f5b102 --- /dev/null +++ b/SabreHelper/Enums.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SabreTools.Helper +{ + /// + /// Possible DAT import classes + /// + public enum DatType + { + none = 0, + Custom, + MAME, + NoIntro, + Redump, + TOSEC, + TruRip, + NonGood, + MaybeIntro, + } + + /// + /// Possible detected header type + /// + public enum HeaderType + { + None = 0, + A7800, + FDS, + Lynx, + //N64, + NES, + PCE, + SNES, + } + + /// + /// Severity of the logging statement + /// + public enum LogLevel + { + VERBOSE = 0, + WARNING, + ERROR, + } +} diff --git a/SabreHelper/Logger.cs b/SabreHelper/Logger.cs index a9010bcd..0bab0119 100644 --- a/SabreHelper/Logger.cs +++ b/SabreHelper/Logger.cs @@ -13,13 +13,6 @@ namespace SabreTools.Helper private string _filename; private StreamWriter _log; - public enum LogLevel - { - VERBOSE = 0, - WARNING, - ERROR, - } - // Public wrappers public bool ToFile { diff --git a/SabreHelper/SabreHelper.csproj b/SabreHelper/SabreHelper.csproj index 2d7397ef..d275866f 100644 --- a/SabreHelper/SabreHelper.csproj +++ b/SabreHelper/SabreHelper.csproj @@ -66,9 +66,11 @@ + + diff --git a/SabreHelper/Structs.cs b/SabreHelper/Structs.cs new file mode 100644 index 00000000..875d89f8 --- /dev/null +++ b/SabreHelper/Structs.cs @@ -0,0 +1,22 @@ +namespace SabreTools.Helper +{ + /// + /// Intermediate struct for holding and processing rom data + /// + public struct RomData + { + public string Manufacturer; + public string System; + public int SystemID; + public string Source; + public string URL; + public int SourceID; + public string Game; + public string Name; + public string Type; + public long Size; + public string CRC; + public string MD5; + public string SHA1; + } +}