From 3871bcd162ef84cb0f759e0c93d578d240b71e66 Mon Sep 17 00:00:00 2001 From: Dunestorm Date: Tue, 30 Jun 2020 21:21:45 +0100 Subject: [PATCH] Removed interfaces for all models --- DevConsole/Program.cs | 6 +++--- FireLance/Interfaces/IDatabaseConnection.cs | 2 -- .../Interfaces/Models/IDirectoriesModel.cs | 19 ------------------- .../Interfaces/Models/IGameEntryModel.cs | 14 -------------- FireLance/Interfaces/Models/ISaveDataModel.cs | 14 -------------- .../{Model => Models}/DirectoriesModel.cs | 9 ++------- FireLance/Models/GameEntryModel.cs | 10 ++++++++++ FireLance/{Model => Models}/SaveDataModel.cs | 7 ++----- GSMParser/DataModels/DirectoriesModel.cs | 12 ------------ GSMParser/DataModels/GameEntryModel.cs | 9 --------- GSMParser/DatabaseConnection.cs | 13 +++++++------ 11 files changed, 24 insertions(+), 91 deletions(-) delete mode 100644 FireLance/Interfaces/Models/IDirectoriesModel.cs delete mode 100644 FireLance/Interfaces/Models/IGameEntryModel.cs delete mode 100644 FireLance/Interfaces/Models/ISaveDataModel.cs rename FireLance/{Model => Models}/DirectoriesModel.cs (70%) create mode 100644 FireLance/Models/GameEntryModel.cs rename FireLance/{Model => Models}/SaveDataModel.cs (68%) delete mode 100644 GSMParser/DataModels/DirectoriesModel.cs delete mode 100644 GSMParser/DataModels/GameEntryModel.cs diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs index 9ecbe22..5ee6c83 100644 --- a/DevConsole/Program.cs +++ b/DevConsole/Program.cs @@ -135,7 +135,7 @@ namespace DevConsole private static void OptionF() { //Guid guid = Guid.NewGuid(); - IEnumerable dm = gsmParser.QueryDirectoryById("600"); + List dm = gsmParser.QueryDirectoryById("600"); foreach (var entry in dm) { //entry.Path = guid.ToString(); @@ -144,7 +144,7 @@ namespace DevConsole } #endregion - private static void PrintGameEntries(IEnumerable gameEntries) + private static void PrintGameEntries(List gameEntries) { foreach (var game in gameEntries) { @@ -155,7 +155,7 @@ namespace DevConsole } } - private static void PrintDirectories(IEnumerable directoryEntries) + private static void PrintDirectories(List directoryEntries) { foreach (var directory in directoryEntries) { diff --git a/FireLance/Interfaces/IDatabaseConnection.cs b/FireLance/Interfaces/IDatabaseConnection.cs index ffb0b83..4ae95ab 100644 --- a/FireLance/Interfaces/IDatabaseConnection.cs +++ b/FireLance/Interfaces/IDatabaseConnection.cs @@ -3,9 +3,7 @@ public interface IDatabaseConnection { public void OpenConnection(string dbLocation, int port); - public void CloseCurrentConnection(); - public bool IsConnectionOpen(); } } diff --git a/FireLance/Interfaces/Models/IDirectoriesModel.cs b/FireLance/Interfaces/Models/IDirectoriesModel.cs deleted file mode 100644 index 41594e3..0000000 --- a/FireLance/Interfaces/Models/IDirectoriesModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace FireLance.Interfaces -{ - public interface IDirectoriesModel - { - int GameID { get; set; } - string SpecialPath { get; set; } - string Path { get; set; } - string RegHive { get; set; } - string RegPath { get; set; } - string RegValue { get; set; } - string DefinedFiles { get; set; } - string ExcludedFiles { get; set; } - bool Recurse { get; set; } - } -} diff --git a/FireLance/Interfaces/Models/IGameEntryModel.cs b/FireLance/Interfaces/Models/IGameEntryModel.cs deleted file mode 100644 index bb2c1c7..0000000 --- a/FireLance/Interfaces/Models/IGameEntryModel.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace FireLance.Interfaces -{ - public interface IGameEntryModel - { - string GameName { get; set; } - string BackupWarning { get; set; } - string RestoreWarning { get; set; } - string LastModified { get; set; } - } -} diff --git a/FireLance/Interfaces/Models/ISaveDataModel.cs b/FireLance/Interfaces/Models/ISaveDataModel.cs deleted file mode 100644 index 2d0dc17..0000000 --- a/FireLance/Interfaces/Models/ISaveDataModel.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -namespace FireLance.Interfaces -{ - public interface ISaveDataModel - { - int GameID { get; set; } - string SHA256Hash { get; set; } - string Description { get; set; } - DateTime CreationDate { get; set; } - object SaveData { get; set; } - uint BackupSize { get; set; } - } -} diff --git a/FireLance/Model/DirectoriesModel.cs b/FireLance/Models/DirectoriesModel.cs similarity index 70% rename from FireLance/Model/DirectoriesModel.cs rename to FireLance/Models/DirectoriesModel.cs index ca48c13..12cf202 100644 --- a/FireLance/Model/DirectoriesModel.cs +++ b/FireLance/Models/DirectoriesModel.cs @@ -1,11 +1,6 @@ -using FireLance.Interfaces; -using System; -using System.Collections.Generic; -using System.Text; - -namespace FireLance.Model +namespace FireLance.Model { - public class DirectoriesModel : IDirectoriesModel + public class DirectoriesModel { public int GameID { get; set; } public string SpecialPath { get; set; } diff --git a/FireLance/Models/GameEntryModel.cs b/FireLance/Models/GameEntryModel.cs new file mode 100644 index 0000000..7c2cedb --- /dev/null +++ b/FireLance/Models/GameEntryModel.cs @@ -0,0 +1,10 @@ +namespace FireLance.Model +{ + public class GameEntryModel + { + public string GameName { get; set; } + public string BackupWarning { get; set; } + public string RestoreWarning { get; set; } + public string LastModified { get; set; } + } +} \ No newline at end of file diff --git a/FireLance/Model/SaveDataModel.cs b/FireLance/Models/SaveDataModel.cs similarity index 68% rename from FireLance/Model/SaveDataModel.cs rename to FireLance/Models/SaveDataModel.cs index 2041c04..f8b331d 100644 --- a/FireLance/Model/SaveDataModel.cs +++ b/FireLance/Models/SaveDataModel.cs @@ -1,11 +1,8 @@ -using FireLance.Interfaces; -using System; -using System.Collections.Generic; -using System.Text; +using System; namespace FireLance.Model { - public class SaveDataModel : ISaveDataModel + public class SaveDataModel { public int GameID { get; set; } public string SHA256Hash { get; set; } diff --git a/GSMParser/DataModels/DirectoriesModel.cs b/GSMParser/DataModels/DirectoriesModel.cs deleted file mode 100644 index b6984ca..0000000 --- a/GSMParser/DataModels/DirectoriesModel.cs +++ /dev/null @@ -1,12 +0,0 @@ -public class DirectoriesModel : FireLance.Interfaces.IDirectoriesModel -{ - public int GameID { get; set; } - public string SpecialPath { get; set; } - public string Path { get; set; } - public string RegHive { get; set; } - public string RegPath { get; set; } - public string RegValue { get; set; } - public string DefinedFiles { get; set; } - public string ExcludedFiles { get; set; } - public bool Recurse { get; set; } -} diff --git a/GSMParser/DataModels/GameEntryModel.cs b/GSMParser/DataModels/GameEntryModel.cs deleted file mode 100644 index 2575b1c..0000000 --- a/GSMParser/DataModels/GameEntryModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Data.Common; - -public class GameEntryModel : FireLance.Interfaces.IGameEntryModel -{ - public string GameName { get; set; } - public string BackupWarning { get; set; } - public string RestoreWarning { get; set; } - public string LastModified { get; set; } -} \ No newline at end of file diff --git a/GSMParser/DatabaseConnection.cs b/GSMParser/DatabaseConnection.cs index c0e731e..257ed44 100644 --- a/GSMParser/DatabaseConnection.cs +++ b/GSMParser/DatabaseConnection.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.IO; using Dapper; using FireLance.Interfaces; +using FireLance.Model; namespace GSMParser { @@ -32,19 +33,19 @@ namespace GSMParser return Convert.ToBoolean(DBConnection.State); } - public IEnumerable QueryGameById(string id) + public List QueryGameById(string id) { - return DBConnection.Query(QueryBuilder.GameEntryByGameId(id), new DynamicParameters()); + return (List) DBConnection.Query(QueryBuilder.GameEntryByGameId(id), new DynamicParameters()); } - public IEnumerable QueryDirectoryById(string id) + public List QueryDirectoryById(string id) { - return DBConnection.Query(QueryBuilder.DirectoryByGameId(id), new DynamicParameters()); + return (List) DBConnection.Query(QueryBuilder.DirectoryByGameId(id), new DynamicParameters()); } - public IEnumerable QueryGameByName(string name) + public List QueryGameByName(string name) { - return DBConnection.Query(QueryBuilder.GameEntryByName(name), new DynamicParameters()); + return (List) DBConnection.Query(QueryBuilder.GameEntryByName(name), new DynamicParameters()); } } }