diff --git a/DevConsole/DevConsole.csproj b/DevConsole/DevConsole.csproj
index 7abe394..2de7d5f 100644
--- a/DevConsole/DevConsole.csproj
+++ b/DevConsole/DevConsole.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs
index f408a1f..afb1de0 100644
--- a/DevConsole/Program.cs
+++ b/DevConsole/Program.cs
@@ -1,5 +1,5 @@
-using FireLance;
-using FireLance.Models;
+using Firelance;
+using Firelance.Models;
using Gsm;
using System;
using System.Collections.Generic;
@@ -119,9 +119,9 @@ namespace DevConsole
case "A":
Console.WriteLine("Enter a game ID:");
- var queryId = gsmRO.LoadRecords( GsmRO.Columns.GameName,
- GsmRO.Tables.GameEntry,
- GsmRO.Columns.ID,
+ var queryId = gsmRO.LoadRecords( Gsm.Collections.Columns.GameName,
+ Gsm.Collections.Tables.GameEntry,
+ Gsm.Collections.Columns.ID,
Console.ReadLine(),
true);
foreach (var record in queryId) PrintAllValues(record);
@@ -131,8 +131,8 @@ namespace DevConsole
Console.WriteLine("Enter a game ID:");
var queryDirectoryId = gsmRO.LoadRecords( "*",
- GsmRO.Tables.Directories,
- GsmRO.Columns.GameID,
+ Gsm.Collections.Tables.Directories,
+ Gsm.Collections.Columns.GameID,
Console.ReadLine(),
true);
foreach (var record in queryDirectoryId) PrintAllValues(record);
@@ -140,9 +140,9 @@ namespace DevConsole
case "C":
Console.WriteLine("Enter game title to search:");
- var queryGameByName = gsmRO.LoadRecords( GsmRO.Columns.GameName,
- GsmRO.Tables.GameEntry,
- GsmRO.Columns.GameName,
+ var queryGameByName = gsmRO.LoadRecords( Gsm.Collections.Columns.GameName,
+ Gsm.Collections.Tables.GameEntry,
+ Gsm.Collections.Columns.GameName,
Console.ReadLine(),
false);
foreach (var record in queryGameByName) PrintAllValues(record);
@@ -196,15 +196,15 @@ namespace DevConsole
private static void FlcWriteMasterGameRecordAction()
{
var masterGameRecord = new MasterGameRecordModel();
- List directories = gsmRO.LoadRecords("*",
- GsmRO.Tables.Directories,
- GsmRO.Columns.GameID,
+ List directories = gsmRO.LoadRecords( Gsm.Collections.Options.All,
+ Gsm.Collections.Tables.Directories,
+ Gsm.Collections.Columns.GameID,
"600",
true);
- GameEntryModel gameEntry = gsmRO.LoadRecords(GsmRO.Columns.GameName,
- GsmRO.Tables.GameEntry,
- GsmRO.Columns.ID,
+ GameEntryModel gameEntry = gsmRO.LoadRecords( Gsm.Collections.Columns.GameName,
+ Gsm.Collections.Tables.GameEntry,
+ Gsm.Collections.Columns.ID,
"600",
true).First();
@@ -215,12 +215,12 @@ namespace DevConsole
masterGameRecord.GameEntry = gameEntry;
masterGameRecord.SaveGameEntries = saveGameEntries;
- flcCRUD.InsertRecord("GameRecords", masterGameRecord);
+ flcCRUD.InsertRecord(Firelance.Collections.GameRecords, masterGameRecord);
}
static void FlcReadMasterGameRecordAction()
{
- var masterGameRecords = flcCRUD.LoadRecordsFromTable("GameRecords");
+ var masterGameRecords = flcCRUD.LoadRecordsFromTable(Firelance.Collections.GameRecords);
foreach (var record in masterGameRecords)
{
Console.WriteLine(record.Id);
@@ -244,21 +244,29 @@ namespace DevConsole
private static void FlcRemoveSaveEntryAction()
{
- Guid firstMasterGameRecordGuid = flcCRUD.LoadRecordsFromTable("GameRecords").First().Id;
- var masterGameRecordToRemove = flcCRUD.LoadRecordById("GameRecords", firstMasterGameRecordGuid);
+ Guid firstMasterGameRecordGuid = flcCRUD.LoadRecordsFromTable(
+ Firelance.Collections.GameRecords).First().Id;
+ var masterGameRecordToRemove = flcCRUD.LoadRecordById(
+ Firelance.Collections.GameRecords, firstMasterGameRecordGuid);
Guid firstSaveGameEntryGuid = masterGameRecordToRemove.SaveGameEntries.Select(x => x.Id).First();
masterGameRecordToRemove.SaveGameEntries.RemoveAll(x => x.Id == firstSaveGameEntryGuid);
- flcCRUD.UpsertRecordById("GameRecords", firstMasterGameRecordGuid, masterGameRecordToRemove);
+ flcCRUD.UpsertRecordById(Firelance.Collections.GameRecords,
+ firstMasterGameRecordGuid,
+ masterGameRecordToRemove);
}
private static void FlcInsertSaveEntryAction()
{
- Guid firstMasterGameRecordGuid = flcCRUD.LoadRecordsFromTable("GameRecords").First().Id;
- var masterGameRecordToInsert = flcCRUD.LoadRecordById("GameRecords", firstMasterGameRecordGuid);
+ Guid firstMasterGameRecordGuid = flcCRUD.LoadRecordsFromTable(
+ Firelance.Collections.GameRecords).First().Id;
+ var masterGameRecordToInsert = flcCRUD.LoadRecordById(
+ Firelance.Collections.GameRecords, firstMasterGameRecordGuid);
masterGameRecordToInsert.SaveGameEntries.Add(new SaveGameEntriesModel());
- flcCRUD.UpsertRecordById("GameRecords", firstMasterGameRecordGuid, masterGameRecordToInsert);
+ flcCRUD.UpsertRecordById(Firelance.Collections.GameRecords,
+ firstMasterGameRecordGuid,
+ masterGameRecordToInsert);
}
private static void FlcUploadToGridFsAction()
diff --git a/FireLance.sln b/FireLance.sln
index 1d96090..64e13c3 100644
--- a/FireLance.sln
+++ b/FireLance.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30204.135
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GSMParser", "GSMParser\GSMParser.csproj", "{7344FC11-3894-4393-A558-82E7D671372D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GsmMgr", "GSMParser\GsmMgr.csproj", "{7344FC11-3894-4393-A558-82E7D671372D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevConsole", "DevConsole\DevConsole.csproj", "{6B7A9B29-420B-4F58-975E-3D72A3D95314}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Firelance", "FireLance\Firelance.csproj", "{6ACF5E6F-42EE-4FD6-8657-51E6380D422C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FirelanceMgr", "FireLance\FirelanceMgr.csproj", "{6ACF5E6F-42EE-4FD6-8657-51E6380D422C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/FireLance/Collections.cs b/FireLance/Collections.cs
new file mode 100644
index 0000000..066408c
--- /dev/null
+++ b/FireLance/Collections.cs
@@ -0,0 +1,10 @@
+namespace Firelance
+{
+ public static class Collections
+ {
+ public const string GameRecords = "GameRecords";
+ public const string SaveGamesBucket = "SaveGames";
+ public const string SaveGamesChunks = "SaveGames.chunks";
+ public const string SaveGamesFiles = "SaveGames.files";
+ }
+}
diff --git a/FireLance/FireLanceCRUD.cs b/FireLance/FireLanceCRUD.cs
index f94b617..6ac2339 100644
--- a/FireLance/FireLanceCRUD.cs
+++ b/FireLance/FireLanceCRUD.cs
@@ -3,7 +3,7 @@ using MongoDB.Driver;
using System;
using System.Collections.Generic;
-namespace FireLance
+namespace Firelance
{
public class FirelanceCRUD : IFlcMongoDBConnecton
{
diff --git a/FireLance/FireLanceGFS.cs b/FireLance/FireLanceGFS.cs
index dd72646..c33628f 100644
--- a/FireLance/FireLanceGFS.cs
+++ b/FireLance/FireLanceGFS.cs
@@ -4,7 +4,7 @@ using MongoDB.Driver.GridFS;
using System.IO;
using System.Threading.Tasks;
-namespace FireLance
+namespace Firelance
{
public class FirelanceGFS
{
@@ -14,7 +14,7 @@ namespace FireLance
{
gridFSBucket = new GridFSBucket(db, new GridFSBucketOptions
{
- BucketName = "SaveGames"
+ BucketName = Collections.SaveGamesBucket
});
}
diff --git a/FireLance/FirelanceMgr.cs b/FireLance/FirelanceMgr.cs
index f4778d6..5c1a78a 100644
--- a/FireLance/FirelanceMgr.cs
+++ b/FireLance/FirelanceMgr.cs
@@ -1,9 +1,9 @@
-using FireLance.Interfaces;
+using Firelance.Interfaces;
using MongoDB.Bson;
using MongoDB.Driver;
using System;
-namespace FireLance
+namespace Firelance
{
public class FirelanceMgr : IFlcBaseDBConnection, IFlcMongoDBConnecton
{
diff --git a/FireLance/FireLance.csproj b/FireLance/FirelanceMgr.csproj
similarity index 100%
rename from FireLance/FireLance.csproj
rename to FireLance/FirelanceMgr.csproj
diff --git a/FireLance/Interfaces/IFlcBaseDBConnection.cs b/FireLance/Interfaces/IFlcBaseDBConnection.cs
index e0c4d24..773252b 100644
--- a/FireLance/Interfaces/IFlcBaseDBConnection.cs
+++ b/FireLance/Interfaces/IFlcBaseDBConnection.cs
@@ -1,4 +1,4 @@
-namespace FireLance.Interfaces
+namespace Firelance.Interfaces
{
public interface IFlcBaseDBConnection
{
diff --git a/FireLance/Interfaces/IFlcMongoDBConnecton.cs b/FireLance/Interfaces/IFlcMongoDBConnecton.cs
index 98676e1..578be11 100644
--- a/FireLance/Interfaces/IFlcMongoDBConnecton.cs
+++ b/FireLance/Interfaces/IFlcMongoDBConnecton.cs
@@ -1,6 +1,6 @@
using MongoDB.Driver;
-namespace FireLance
+namespace Firelance
{
public interface IFlcMongoDBConnecton
{
diff --git a/FireLance/Models/DirectoriesModel.cs b/FireLance/Models/DirectoriesModel.cs
index d6eca39..24ca046 100644
--- a/FireLance/Models/DirectoriesModel.cs
+++ b/FireLance/Models/DirectoriesModel.cs
@@ -1,4 +1,4 @@
-namespace FireLance.Models
+namespace Firelance.Models
{
public class DirectoriesModel
{
diff --git a/FireLance/Models/GameEntryModel.cs b/FireLance/Models/GameEntryModel.cs
index 72eea82..116d9db 100644
--- a/FireLance/Models/GameEntryModel.cs
+++ b/FireLance/Models/GameEntryModel.cs
@@ -1,4 +1,4 @@
-namespace FireLance.Models
+namespace Firelance.Models
{
public class GameEntryModel
{
diff --git a/FireLance/Models/MasterGameRecordModel.cs b/FireLance/Models/MasterGameRecordModel.cs
index 91d9895..c512ab9 100644
--- a/FireLance/Models/MasterGameRecordModel.cs
+++ b/FireLance/Models/MasterGameRecordModel.cs
@@ -2,7 +2,7 @@
using System;
using System.Collections.Generic;
-namespace FireLance.Models
+namespace Firelance.Models
{
public class MasterGameRecordModel
{
diff --git a/FireLance/Models/SaveGameEntriesModel.cs b/FireLance/Models/SaveGameEntriesModel.cs
index bee229d..9d54016 100644
--- a/FireLance/Models/SaveGameEntriesModel.cs
+++ b/FireLance/Models/SaveGameEntriesModel.cs
@@ -2,7 +2,7 @@
using System;
using System.Collections.Generic;
-namespace FireLance.Models
+namespace Firelance.Models
{
public class SaveGameEntriesModel
{
diff --git a/GSMParser/Collections.cs b/GSMParser/Collections.cs
new file mode 100644
index 0000000..359e3d4
--- /dev/null
+++ b/GSMParser/Collections.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Gsm
+{
+ public static class Collections
+ {
+ public static class Tables
+ {
+ public const string Directories = "Directories";
+ public const string GameEntry = "GameEntry";
+ public const string RegistryList = "RegistryList";
+ }
+
+ public static class Columns
+ {
+ public const string ID = "id";
+ public const string GameID = "GameID";
+ public const string GameName = "GameName";
+ }
+
+ public static class Options
+ {
+ public static string All = "*";
+ }
+ }
+}
diff --git a/GSMParser/GsmMgr.cs b/GSMParser/GsmMgr.cs
index a0b4f69..3ad21b4 100644
--- a/GSMParser/GsmMgr.cs
+++ b/GSMParser/GsmMgr.cs
@@ -1,7 +1,7 @@
using Microsoft.Data.Sqlite;
using System;
using System.IO;
-using FireLance.Interfaces;
+using Firelance.Interfaces;
using GSMParser.Inferfaces;
namespace Gsm
diff --git a/GSMParser/GSMParser.csproj b/GSMParser/GsmMgr.csproj
similarity index 88%
rename from GSMParser/GSMParser.csproj
rename to GSMParser/GsmMgr.csproj
index 73f54d5..dd26f5f 100644
--- a/GSMParser/GSMParser.csproj
+++ b/GSMParser/GsmMgr.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/GSMParser/GsmRO.cs b/GSMParser/GsmRO.cs
index 5670b90..fadd834 100644
--- a/GSMParser/GsmRO.cs
+++ b/GSMParser/GsmRO.cs
@@ -7,20 +7,6 @@ namespace Gsm
{
public class GsmRO : IGsmSqliteDBConnection
{
- 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 SqliteConnection Database { get; private set; }
public GsmRO(SqliteConnection db)
{