dunestorm/FireLance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistent Interface added to GsmMgr.

Browse Source
This commit is contained in:
Dunestorm
2020-07-06 17:39:44 +01:00
parent 0b5e174785
commit 62b29d3aff
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DevConsole/Program.cs
+5 -7
View File
@@ -12,7 +12,6 @@ namespace DevConsole
class Program class Program
{ {
public static GsmMgr gsmMgr = new GsmMgr(); public static GsmMgr gsmMgr = new GsmMgr();
public static GsmRO gsmRO;
public static FirelanceMgr flcMgr = new FirelanceMgr(); public static FirelanceMgr flcMgr = new FirelanceMgr();
static void Main(string[] args) static void Main(string[] args)
@@ -58,7 +57,6 @@ namespace DevConsole
private static void ConnectToGsmDb() private static void ConnectToGsmDb()
{ {
gsmMgr.OpenConnection(@"C:\Users\Dunestorm\Projects\FireLance\GSMParser\games.db", 0); gsmMgr.OpenConnection(@"C:\Users\Dunestorm\Projects\FireLance\GSMParser\games.db", 0);
gsmRO = new GsmRO(gsmMgr.Database);
Console.WriteLine($"GSMParser Connection State: {gsmMgr.IsConnectionOpen()}"); Console.WriteLine($"GSMParser Connection State: {gsmMgr.IsConnectionOpen()}");
} }
@@ -118,7 +116,7 @@ namespace DevConsole
case "A": case "A":
Console.WriteLine("Enter a game ID:"); Console.WriteLine("Enter a game ID:");
var queryId = gsmRO.LoadRecords<GameEntryModel>( Gsm.Collections.Columns.GameName, var queryId = gsmMgr.RO.LoadRecords<GameEntryModel>( Gsm.Collections.Columns.GameName,
Gsm.Collections.Tables.GameEntry, Gsm.Collections.Tables.GameEntry,
Gsm.Collections.Columns.ID, Gsm.Collections.Columns.ID,
Console.ReadLine(), Console.ReadLine(),
@@ -129,7 +127,7 @@ namespace DevConsole
case "B": case "B":
Console.WriteLine("Enter a game ID:"); Console.WriteLine("Enter a game ID:");
var queryDirectoryId = gsmRO.LoadRecords<DirectoriesModel>( Gsm.Collections.Options.All, var queryDirectoryId = gsmMgr.RO.LoadRecords<DirectoriesModel>( Gsm.Collections.Options.All,
Gsm.Collections.Tables.Directories, Gsm.Collections.Tables.Directories,
Gsm.Collections.Columns.GameID, Gsm.Collections.Columns.GameID,
Console.ReadLine(), Console.ReadLine(),
@@ -139,7 +137,7 @@ namespace DevConsole
case "C": case "C":
Console.WriteLine("Enter game title to search:"); Console.WriteLine("Enter game title to search:");
var queryGameByName = gsmRO.LoadRecords<GameEntryModel>( Gsm.Collections.Columns.GameName, var queryGameByName = gsmMgr.RO.LoadRecords<GameEntryModel>( Gsm.Collections.Columns.GameName,
Gsm.Collections.Tables.GameEntry, Gsm.Collections.Tables.GameEntry,
Gsm.Collections.Columns.GameName, Gsm.Collections.Columns.GameName,
Console.ReadLine(), Console.ReadLine(),
@@ -195,13 +193,13 @@ namespace DevConsole
private static void FlcWriteMasterGameRecordAction() private static void FlcWriteMasterGameRecordAction()
{ {
var masterGameRecord = new MasterGameRecordModel(); var masterGameRecord = new MasterGameRecordModel();
List<DirectoriesModel> directories = gsmRO.LoadRecords<DirectoriesModel>( Gsm.Collections.Options.All, List<DirectoriesModel> directories = gsmMgr.RO.LoadRecords<DirectoriesModel>( Gsm.Collections.Options.All,
Gsm.Collections.Tables.Directories, Gsm.Collections.Tables.Directories,
Gsm.Collections.Columns.GameID, Gsm.Collections.Columns.GameID,
"600", "600",
true); true);
GameEntryModel gameEntry = gsmRO.LoadRecords<GameEntryModel>( Gsm.Collections.Columns.GameName, GameEntryModel gameEntry = gsmMgr.RO.LoadRecords<GameEntryModel>( Gsm.Collections.Columns.GameName,
Gsm.Collections.Tables.GameEntry, Gsm.Collections.Tables.GameEntry,
Gsm.Collections.Columns.ID, Gsm.Collections.Columns.ID,
"600", "600",
GSMParser/GsmMgr.cs
+12 -3
View File
@@ -2,13 +2,22 @@
using System; using System;
using System.IO; using System.IO;
using Firelance.Interfaces; using Firelance.Interfaces;
using GSMParser.Inferfaces;
namespace Gsm namespace Gsm
{ {
public class GsmMgr : IFlcBaseDBConnection, IGsmSqliteDBConnection public class GsmMgr : IFlcBaseDBConnection
{ {
public SqliteConnection Database { get; private set; } private SqliteConnection _database;
public SqliteConnection Database
{
get { return _database; }
private set
{
_database = value;
RO.SetDatabaseInstance(_database);
}
}
public GsmRO RO = new GsmRO();
public void OpenConnection(string dbLocation, int port) public void OpenConnection(string dbLocation, int port)
{ {
GSMParser/GsmRO.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace Gsm
public class GsmRO : IGsmSqliteDBConnection public class GsmRO : IGsmSqliteDBConnection
{ {
public SqliteConnection Database { get; private set; } public SqliteConnection Database { get; private set; }
public GsmRO(SqliteConnection db) public void SetDatabaseInstance(SqliteConnection db)
{ {
Database = db; Database = db;
} }
GSMParser/Inferfaces/IGsmSqliteDBConnection.cs
+1 -4
View File
@@ -1,12 +1,9 @@
using Microsoft.Data.Sqlite; using Microsoft.Data.Sqlite;
using System;
using System.Collections.Generic;
using System.Text;
namespace GSMParser.Inferfaces namespace GSMParser.Inferfaces
{ {
public interface IGsmSqliteDBConnection public interface IGsmSqliteDBConnection
{ {
public SqliteConnection Database { get; } void SetDatabaseInstance(SqliteConnection db);
} }
} }