From b63154c66ab0a12bf194b6329199384576371c68 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 12 Sep 2016 15:43:15 -0700 Subject: [PATCH] [SabreTools, Headerer] Add DB stuff from Headerer to SabreTools --- SabreTools.Helper/Objects/Headerer.cs | 13 ++++++------- SabreTools/Partials/SabreTools_Helpers.cs | 10 ++++++---- SabreTools/Partials/SabreTools_Inits.cs | 14 +++++++------- SabreTools/SabreTools.cs | 11 ++++++++--- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/SabreTools.Helper/Objects/Headerer.cs b/SabreTools.Helper/Objects/Headerer.cs index da01fedc..fc8388bc 100644 --- a/SabreTools.Helper/Objects/Headerer.cs +++ b/SabreTools.Helper/Objects/Headerer.cs @@ -1,7 +1,6 @@ using Mono.Data.Sqlite; using SabreTools.Helper; using System; -using System.Collections.Generic; using System.IO; namespace SabreTools @@ -17,9 +16,9 @@ namespace SabreTools private Logger _logger; // Private required variables - private static string _dbSchema = "Headerer"; - private static string _dbName = "Headerer.sqlite"; - private static string _connectionString = "Data Source=" + _dbName + ";Version = 3;"; + private static string _headererDbSchema = "Headerer"; + private static string _headererDbName = "Headerer.sqlite"; + private static string _headererConnectionString = "Data Source=" + _headererDbName + ";Version = 3;"; /// /// Create a new Headerer object @@ -151,7 +150,7 @@ namespace SabreTools bool exists = false; string query = @"SELECT * FROM data WHERE sha1='" + SHA1 + "' AND header='" + header + "'"; - using (SqliteConnection dbc = new SqliteConnection(_connectionString)) + using (SqliteConnection dbc = new SqliteConnection(_headererConnectionString)) { dbc.Open(); using (SqliteCommand slc = new SqliteCommand(query, dbc)) @@ -169,7 +168,7 @@ namespace SabreTools SHA1 + "', " + "'" + header + "', " + "'" + type.ToString() + "')"; - using (SqliteConnection dbc = new SqliteConnection(_connectionString)) + using (SqliteConnection dbc = new SqliteConnection(_headererConnectionString)) { dbc.Open(); using (SqliteCommand slc = new SqliteCommand(query, dbc)) @@ -194,7 +193,7 @@ namespace SabreTools string header = ""; string query = @"SELECT header, type FROM data WHERE sha1='" + rom.HashData.SHA1 + "'"; - using (SqliteConnection dbc = new SqliteConnection(_connectionString)) + using (SqliteConnection dbc = new SqliteConnection(_headererConnectionString)) { dbc.Open(); using (SqliteCommand slc = new SqliteCommand(query, dbc)) diff --git a/SabreTools/Partials/SabreTools_Helpers.cs b/SabreTools/Partials/SabreTools_Helpers.cs index 5e29abb9..e5031b3d 100644 --- a/SabreTools/Partials/SabreTools_Helpers.cs +++ b/SabreTools/Partials/SabreTools_Helpers.cs @@ -25,9 +25,9 @@ namespace SabreTools { Directory.CreateDirectory(_outroot); } - DBTools.EnsureDatabase(_dbSchema, _dbName, _connectionString); + DBTools.EnsureDatabase(_databaseDbSchema, _databaseDbName, _databaseConnectionString); - using (SqliteConnection dbc = new SqliteConnection(_connectionString)) + using (SqliteConnection dbc = new SqliteConnection(_databaseConnectionString)) { dbc.Open(); @@ -49,6 +49,8 @@ namespace SabreTools } } } + + DBTools.EnsureDatabase(_headererDbSchema, _headererDbName, _headererConnectionString); } /// @@ -61,7 +63,7 @@ namespace SabreTools SELECT DISTINCT source.id, source.name, source.url FROM source ORDER BY source.name"; - using (SqliteConnection dbc = new SqliteConnection(_connectionString)) + using (SqliteConnection dbc = new SqliteConnection(_databaseConnectionString)) { dbc.Open(); using (SqliteCommand slc = new SqliteCommand(query, dbc)) @@ -95,7 +97,7 @@ ORDER BY source.name"; SELECT DISTINCT system.id, system.manufacturer, system.name FROM system ORDER BY system.manufacturer, system.name"; - using (SqliteConnection dbc = new SqliteConnection(_connectionString)) + using (SqliteConnection dbc = new SqliteConnection(_databaseConnectionString)) { dbc.Open(); using (SqliteCommand slc = new SqliteCommand(query, dbc)) diff --git a/SabreTools/Partials/SabreTools_Inits.cs b/SabreTools/Partials/SabreTools_Inits.cs index ed325f51..529345f6 100644 --- a/SabreTools/Partials/SabreTools_Inits.cs +++ b/SabreTools/Partials/SabreTools_Inits.cs @@ -17,7 +17,7 @@ namespace SabreTools /// private static void InitImport(bool ignore) { - IImport imp = new ImportTwo(_datroot, _connectionString, _logger, ignore); + IImport imp = new ImportTwo(_datroot, _databaseConnectionString, _logger, ignore); imp.UpdateDatabase(); } @@ -29,7 +29,7 @@ namespace SabreTools /// True if the output file should be in ClrMamePro format (default false) private static void InitGenerate(string systemid, bool norename, bool old) { - IGenerate gen = new GenerateTwo(systemid, "" /* sourceid */, _datroot, _outroot, _connectionString, _logger, norename, old); + IGenerate gen = new GenerateTwo(systemid, "" /* sourceid */, _datroot, _outroot, _databaseConnectionString, _logger, norename, old); gen.Export(); } @@ -39,7 +39,7 @@ namespace SabreTools private static void InitGenerateAll(bool norename, bool old) { List systems = new List(); - using (SqliteConnection dbc = new SqliteConnection(_connectionString)) + using (SqliteConnection dbc = new SqliteConnection(_databaseConnectionString)) { dbc.Open(); @@ -611,7 +611,7 @@ namespace SabreTools /// Source URL(s) private static void InitAddSource(string name, string url) { - if (DBTools.AddSource(name, url, _connectionString)) + if (DBTools.AddSource(name, url, _databaseConnectionString)) { _logger.Log("Source " + name + " added!"); } @@ -630,7 +630,7 @@ namespace SabreTools int srcid = -1; if (Int32.TryParse(sourceid, out srcid)) { - if (DBTools.RemoveSource(srcid, _connectionString)) + if (DBTools.RemoveSource(srcid, _databaseConnectionString)) { _logger.Log("Source '" + srcid + "' removed!"); } @@ -652,7 +652,7 @@ namespace SabreTools /// System name private static void InitAddSystem(string manufacturer, string system) { - if (DBTools.AddSystem(manufacturer, system, _connectionString)) + if (DBTools.AddSystem(manufacturer, system, _databaseConnectionString)) { _logger.Log("System " + manufacturer + " - " + system + " added!"); } @@ -671,7 +671,7 @@ namespace SabreTools int sysid = -1; if (Int32.TryParse(systemid, out sysid)) { - if (DBTools.RemoveSystem(sysid, _connectionString)) + if (DBTools.RemoveSystem(sysid, _databaseConnectionString)) { _logger.Log("System '" + sysid + "' removed!"); } diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs index 9004a9a7..7db3844d 100644 --- a/SabreTools/SabreTools.cs +++ b/SabreTools/SabreTools.cs @@ -26,9 +26,14 @@ namespace SabreTools // Private required variables private static string _datroot = "DATS"; private static string _outroot = "Output"; - private static string _dbSchema = "dats"; - private static string _dbName = "dats.sqlite"; - private static string _connectionString = "Data Source=" + _dbName + ";Version = 3;"; + + // Database schema variables + private static string _databaseDbSchema = "dats"; + private static string _databaseDbName = "dats.sqlite"; + private static string _databaseConnectionString = "Data Source=" + _databaseDbName + ";Version = 3;"; + private static string _headererDbSchema = "Headerer"; + private static string _headererDbName = "Headerer.sqlite"; + private static string _headererConnectionString = "Data Source=" + _headererDbName + ";Version = 3;"; private static Logger _logger;