From 73c4eccc62df8bac370d25ea2e0759f13fcca32f Mon Sep 17 00:00:00 2001
From: Dunestorm <filippo333@gmail.com>
Date: Wed, 1 Jul 2020 22:53:40 +0100
Subject: [PATCH] Removed duplicate GsmDbStruct entries

---
 DevConsole/Program.cs                      | 40 +++++++++++-----------
 GSMParser/{GsmStruct.cs => GsmDbStruct.cs} | 15 ++------
 2 files changed, 23 insertions(+), 32 deletions(-)
 rename GSMParser/{GsmStruct.cs => GsmDbStruct.cs} (59%)

diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs
index a81aeef..74c0ecd 100644
--- a/DevConsole/Program.cs
+++ b/DevConsole/Program.cs
@@ -90,11 +90,11 @@ namespace DevConsole
             string r = Console.ReadLine();
             Console.Write("\n");
 
-            PrintGameEntries(gsmRO.LoadRecords<GameEntryModel>(GsmStruct.GameEntries.GameName,
-                                                                GsmStruct.Tables.GameEntry,
-                                                                GsmStruct.GameEntries.GameID,
-                                                                r,
-                                                                true));
+            PrintGameEntries(gsmRO.LoadRecords<GameEntryModel>(     GsmDbStruct.Columns.GameName,
+                                                                    GsmDbStruct.Tables.GameEntry,
+                                                                    GsmDbStruct.Columns.ID,
+                                                                    r,
+                                                                    true));
         }
 
         private static void OptionC()
@@ -103,11 +103,11 @@ namespace DevConsole
             string r = Console.ReadLine();
             Console.Write("\n");
 
-            PrintDirectories(gsmRO.LoadRecords<DirectoriesModel>("*",
-                                                    GsmStruct.Tables.Directories,
-                                                    GsmStruct.DirectoryColumns.GameID,
-                                                    r,
-                                                    true));
+            PrintDirectories(gsmRO.LoadRecords<DirectoriesModel>(   "*",
+                                                                    GsmDbStruct.Tables.Directories,
+                                                                    GsmDbStruct.Columns.GameID,
+                                                                    r,
+                                                                    true));
         }
 
         private static void OptionD()
@@ -116,11 +116,11 @@ namespace DevConsole
             string r = Console.ReadLine();
             Console.Write("\n");
 
-            PrintGameEntries(gsmRO.LoadRecords<GameEntryModel>(GsmStruct.GameEntries.GameName,
-                                                                GsmStruct.Tables.GameEntry,
-                                                                GsmStruct.GameEntries.GameName,
-                                                                r,
-                                                                false));
+            PrintGameEntries(gsmRO.LoadRecords<GameEntryModel>(     GsmDbStruct.Columns.GameName,
+                                                                    GsmDbStruct.Tables.GameEntry,
+                                                                    GsmDbStruct.Columns.GameName,
+                                                                    r,
+                                                                    false));
         }
 
         private static void OptionE()
@@ -149,11 +149,11 @@ namespace DevConsole
         private static void OptionF()
         {
             //Guid guid = Guid.NewGuid();
-            List<DirectoriesModel> dm = gsmRO.LoadRecords<DirectoriesModel>("*",
-                                                    GsmStruct.Tables.Directories,
-                                                    GsmStruct.DirectoryColumns.GameID,
-                                                    "600",
-                                                    true);
+            List<DirectoriesModel> dm = gsmRO.LoadRecords<  DirectoriesModel>("*",
+                                                            GsmDbStruct.Tables.Directories,
+                                                            GsmDbStruct.Columns.GameID,
+                                                            "600",
+                                                            true);
             foreach (var entry in dm)
             {
                 //entry.Path = guid.ToString();
diff --git a/GSMParser/GsmStruct.cs b/GSMParser/GsmDbStruct.cs
similarity index 59%
rename from GSMParser/GsmStruct.cs
rename to GSMParser/GsmDbStruct.cs
index 58a8d2b..4610373 100644
--- a/GSMParser/GsmStruct.cs
+++ b/GSMParser/GsmDbStruct.cs
@@ -1,6 +1,6 @@
 namespace Gsm
 {
-    public struct GsmStruct
+    public struct GsmDbStruct
     {
         public static class Tables
         {
@@ -9,20 +9,11 @@
             public static string RegistryList { get { return "RegistryList"; } }
         }
 
-        public static class DirectoryColumns
+        public static class Columns
         {
+            public static string ID { get { return "id"; } }
             public static string GameID { get { return "GameID"; } }
-        }
-
-        public static class GameEntries
-        {
-            public static string GameID { get { return "id"; } }
             public static string GameName { get { return "GameName"; } }
         }
-
-        public static class RegistryColumns
-        {
-            public static string GameID { get { return "GameID"; } }
-        }
     }
 }