From 253911f89c18b7396728979d70878852101c0281 Mon Sep 17 00:00:00 2001
From: Dunestorm <filippo333@gmail.com>
Date: Fri, 3 Jul 2020 18:54:58 +0100
Subject: [PATCH] Merged GsmDbStruct with GsmRO.

---
 DevConsole/Program.cs    | 41 ++++++++++++++++++++--------------------
 GSMParser/GsmDbStruct.cs | 19 -------------------
 GSMParser/GsmRO.cs       | 16 ++++++++++++++--
 3 files changed, 34 insertions(+), 42 deletions(-)
 delete mode 100644 GSMParser/GsmDbStruct.cs

diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs
index b2f60e4..296dbbc 100644
--- a/DevConsole/Program.cs
+++ b/DevConsole/Program.cs
@@ -116,32 +116,32 @@ namespace DevConsole
                 case "A":
                     Console.WriteLine("Enter a game ID:");
 
-                    var queryId = gsmRO.LoadRecords<GameEntryModel>(     GsmDbStruct.Columns.GameName,
-                                                                            GsmDbStruct.Tables.GameEntry,
-                                                                            GsmDbStruct.Columns.ID,
-                                                                            Console.ReadLine(),
-                                                                            true);
+                    var queryId = gsmRO.LoadRecords<GameEntryModel>(            GsmRO.Columns.GameName,
+                                                                                GsmRO.Tables.GameEntry,
+                                                                                GsmRO.Columns.ID,
+                                                                                Console.ReadLine(),
+                                                                                true);
                     foreach (var record in queryId) PrintAllValues(record);
 
                     break;
                 case "B":
                     Console.WriteLine("Enter a game ID:");
 
-                    var queryDirectoryId = gsmRO.LoadRecords<DirectoriesModel>(   "*",
-                                                                            GsmDbStruct.Tables.Directories,
-                                                                            GsmDbStruct.Columns.GameID,
-                                                                            Console.ReadLine(),
-                                                                            true);
+                    var queryDirectoryId = gsmRO.LoadRecords<DirectoriesModel>( "*",
+                                                                                GsmRO.Tables.Directories,
+                                                                                GsmRO.Columns.GameID,
+                                                                                Console.ReadLine(),
+                                                                                true);
                     foreach (var record in queryDirectoryId) PrintAllValues(record);
                     break;
                 case "C":
                     Console.WriteLine("Enter game title to search:");
 
-                   var queryGameByName = gsmRO.LoadRecords<GameEntryModel>(     GsmDbStruct.Columns.GameName,
-                                                                            GsmDbStruct.Tables.GameEntry,
-                                                                            GsmDbStruct.Columns.GameName,
-                                                                            Console.ReadLine(),
-                                                                            false);
+                   var queryGameByName = gsmRO.LoadRecords<GameEntryModel>(     GsmRO.Columns.GameName,
+                                                                                GsmRO.Tables.GameEntry,
+                                                                                GsmRO.Columns.GameName,
+                                                                                Console.ReadLine(),
+                                                                                false);
                     foreach (var record in queryGameByName) PrintAllValues(record);
                     break;
                 case "X":
@@ -164,14 +164,14 @@ namespace DevConsole
                 case "A":
                     var writeMasterGameRecord = new MasterGameRecordModel();
                     List<DirectoriesModel> directories = gsmRO.LoadRecords<DirectoriesModel>(   "*",
-                                                                                                GsmDbStruct.Tables.Directories,
-                                                                                                GsmDbStruct.Columns.GameID,
+                                                                                                GsmRO.Tables.Directories,
+                                                                                                GsmRO.Columns.GameID,
                                                                                                 "600",
                                                                                                 true);
 
-                    GameEntryModel gameEntry = gsmRO.LoadRecords<GameEntryModel>(               GsmDbStruct.Columns.GameName,
-                                                                                                GsmDbStruct.Tables.GameEntry,
-                                                                                                GsmDbStruct.Columns.ID,
+                    GameEntryModel gameEntry = gsmRO.LoadRecords<GameEntryModel>(               GsmRO.Columns.GameName,
+                                                                                                GsmRO.Tables.GameEntry,
+                                                                                                GsmRO.Columns.ID,
                                                                                                 "600",
                                                                                                 true).First();
 
@@ -219,7 +219,6 @@ namespace DevConsole
             {
                 Console.WriteLine($"{item.Name}: {item.GetValue(data)}");
             }
-            Console.WriteLine("");
         }
     }
 }
diff --git a/GSMParser/GsmDbStruct.cs b/GSMParser/GsmDbStruct.cs
deleted file mode 100644
index 4610373..0000000
--- a/GSMParser/GsmDbStruct.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Gsm
-{
-    public struct GsmDbStruct
-    {
-        public static class Tables
-        {
-            public static string Directories { get { return "Directories"; } }
-            public static string GameEntry { get { return "GameEntry"; } }
-            public static string RegistryList { get { return "RegistryList"; } }
-        }
-
-        public static class Columns
-        {
-            public static string ID { get { return "id"; } }
-            public static string GameID { get { return "GameID"; } }
-            public static string GameName { get { return "GameName"; } }
-        }
-    }
-}
diff --git a/GSMParser/GsmRO.cs b/GSMParser/GsmRO.cs
index 6f01d08..5c94d97 100644
--- a/GSMParser/GsmRO.cs
+++ b/GSMParser/GsmRO.cs
@@ -1,12 +1,24 @@
 using Dapper;
-using FireLance.Models;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Gsm
 {
     public class GsmRO : GsmDB
     {
+        public static class Tables
+        {
+            public static string Directories { get { return "Directories"; } }
+            public static string GameEntry { get { return "GameEntry"; } }
+            public static string RegistryList { get { return "RegistryList"; } }
+        }
+
+        public static class Columns
+        {
+            public static string ID { get { return "id"; } }
+            public static string GameID { get { return "GameID"; } }
+            public static string GameName { get { return "GameName"; } }
+        }
+
         public List<T> LoadRecords<T>(string select, string from, string column, string query, bool exactMatch)
         {
             string command =    $"SELECT \"{select}\",*" +