From 6157fed6842858d0f84c71a4fa5aa3baf7a4c842 Mon Sep 17 00:00:00 2001 From: Dunestorm Date: Fri, 3 Jul 2020 15:52:16 +0100 Subject: [PATCH] Functional GsmDB to FlcDB full import. --- DevConsole/Program.cs | 32 +++++++++++++------ FireLance/Models/MasterGameEntryModel.cs | 4 +-- ...riptorModel.cs => SaveDescriptorsModel.cs} | 3 +- 3 files changed, 25 insertions(+), 14 deletions(-) rename FireLance/Models/{SaveDescriptorModel.cs => SaveDescriptorsModel.cs} (86%) diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs index 8446065..341d9cc 100644 --- a/DevConsole/Program.cs +++ b/DevConsole/Program.cs @@ -4,6 +4,7 @@ using Gsm; using System; using System.Collections.Generic; using System.IO; +using System.Linq; namespace DevConsole { @@ -155,16 +156,27 @@ namespace DevConsole switch (userInput.ToUpper()) { case "A": - List dm = gsmRO.LoadRecords("*", - GsmDbStruct.Tables.Directories, - GsmDbStruct.Columns.GameID, - "600", - true); - foreach (var entry in dm) - { - //entry.Path = guid.ToString(); - fireLanceCRUD.InsertRecord("SaveData", entry); - } + var masterGameRecord = new MasterGameRecordModel(); + List directories = gsmRO.LoadRecords( "*", + GsmDbStruct.Tables.Directories, + GsmDbStruct.Columns.GameID, + "600", + true); + + List gameEntry = gsmRO.LoadRecords( GsmDbStruct.Columns.GameName, + GsmDbStruct.Tables.GameEntry, + GsmDbStruct.Columns.ID, + "600", + true); + + List saveDescriptor = new List(); + saveDescriptor.Add(new SaveDescriptorsModel()); + + masterGameRecord.Directories = directories; + masterGameRecord.GameEntry = gameEntry.First(); + masterGameRecord.SaveDescriptors = saveDescriptor; + + fireLanceCRUD.InsertRecord("GameRecords", masterGameRecord); break; case "X": break; diff --git a/FireLance/Models/MasterGameEntryModel.cs b/FireLance/Models/MasterGameEntryModel.cs index c0a3033..10278ce 100644 --- a/FireLance/Models/MasterGameEntryModel.cs +++ b/FireLance/Models/MasterGameEntryModel.cs @@ -10,7 +10,7 @@ namespace FireLance.Models public Guid Id { get; set; } public GameEntryModel GameEntry { get; set; } - public DirectoriesModel Directories { get; set; } - public List SaveDescriptor { get; set; } + public List Directories { get; set; } + public List SaveDescriptors { get; set; } } } diff --git a/FireLance/Models/SaveDescriptorModel.cs b/FireLance/Models/SaveDescriptorsModel.cs similarity index 86% rename from FireLance/Models/SaveDescriptorModel.cs rename to FireLance/Models/SaveDescriptorsModel.cs index 39b60bf..0d50e3b 100644 --- a/FireLance/Models/SaveDescriptorModel.cs +++ b/FireLance/Models/SaveDescriptorsModel.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace FireLance.Models { - public class SaveDescriptorModel + public class SaveDescriptorsModel { [BsonId] public Guid Id { get; set; } @@ -12,7 +12,6 @@ namespace FireLance.Models public Guid SaveDataID { get; set; } public string SaveDataSHA256Hash { get; set; } public Dictionary SaveDirectoryTreeSize { get; set; } - public int GameID { get; set; } public string Description { get; set; } public DateTime CreationDate { get; set; } public uint BackupSize { get; set; }