From 68e49d3b0936101deba1251e95b9788716c0722a Mon Sep 17 00:00:00 2001 From: TrueDoctor Date: Mon, 18 Jun 2018 11:39:41 +0200 Subject: reworked Properties, to split each fiel into a different File --- DiscoBot/DSA_Game/Save/Properties.cs | 70 +++++++++++++++++++++++++++-------- DiscoBot/DSA_Game/Save/SaveCommand.cs | 43 +++++++++++++++++++++ DiscoBot/DSA_Game/Save/Session.cs | 2 + 3 files changed, 99 insertions(+), 16 deletions(-) create mode 100644 DiscoBot/DSA_Game/Save/SaveCommand.cs (limited to 'DiscoBot/DSA_Game/Save') diff --git a/DiscoBot/DSA_Game/Save/Properties.cs b/DiscoBot/DSA_Game/Save/Properties.cs index fe2f798..45bad4a 100644 --- a/DiscoBot/DSA_Game/Save/Properties.cs +++ b/DiscoBot/DSA_Game/Save/Properties.cs @@ -6,38 +6,76 @@ using System.Threading.Tasks; namespace DiscoBot.DSA_Game.Save { + using System.Collections; using System.IO; + using System.Reflection; + using System.Runtime.CompilerServices; using DiscoBot.Audio; using DiscoBot.Auxiliary; using DiscoBot.Commands; + using Discord; + using Newtonsoft.Json; - public class Properties + public static class Properties { - public List CommandInfos { get; set; } + private static Dictionary objects; - public List Sounds { get; set; } + static Properties() + { + objects = new Dictionary(); + /*this.objects.Add("Sounds", new List()); + this.objects.Add("CommandInfos", new List());*/ + } - public static Properties Deserialize(string path = @"..\..\Properties.json") - { - try - { - return JsonConvert.DeserializeObject(File.ReadAllText(path)); // Deserialize Data and create CommandInfo Struct - } - catch (Exception e) - { - // ignored - return null; - } + public static List CommandInfos { get => objects["CommandInfo"] as List; set => objects["CommandInfo"] = value; } // use Properties.Commandinfos to access the abstract Object array + + public static List Sounds { get => objects["Sound"] as List; set => objects["Sound"] = value; } + + public static void Deserialize(string path = @"..\..\sessions") + { + + var files = Directory.GetFiles(path, "*.json"); + + foreach (string file in files) + { + try + { + string name = file.Split('\\').Last().Split('.')[0].Replace('-', '.'); + string data = File.ReadAllText(file); + Type type = Type.GetType(name); + if (data.StartsWith("[")) + { + type = typeof(List<>).MakeGenericType(type); + } + + var o = JsonConvert.DeserializeObject(data, type); + objects.Add(name.Split('.').Last(), o); + } + catch (Exception e) + { + // ignored + var log = new LogMessage(LogSeverity.Warning, "Properties", $"Laden von Save-File {file} fehlgeschlagen.", e); + Console.WriteLine(log); + } + + } + } - public void Serialize(string path = @"..\..\Properties.json") + public static void Serialize(string path = @"..\..\sessions\") { try { - File.WriteAllText(path, JsonConvert.SerializeObject(this, Formatting.Indented)); // Deserialize Data and create CommandInfo Struct + foreach (var o in objects) + { + string assembly = o.Value is IList list ? ((IList)list)[0]?.GetType().FullName : o.Value.GetType().FullName; + + var name = path + assembly.Replace('.', '-') + ".json"; + File.WriteAllText(name, JsonConvert.SerializeObject(o.Value, Formatting.Indented)); // Deserialize Data and create CommandInfo Struct + } } catch (Exception e) { diff --git a/DiscoBot/DSA_Game/Save/SaveCommand.cs b/DiscoBot/DSA_Game/Save/SaveCommand.cs new file mode 100644 index 0000000..310d38a --- /dev/null +++ b/DiscoBot/DSA_Game/Save/SaveCommand.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DiscoBot.DSA_Game.Save +{ + using System.IO; + using System.Net.Http; + + using DiscoBot.Auxiliary; + + using Discord.Commands; + + public class SaveCommand : ModuleBase + { + [Command("save"), Summary("Save Session")] + public async Task ReportAsync() + { + + + await this.ReplyAsync($"Dein report wurde hinzugefügt"); + } + + [Command("save"), Summary("Save Session")] + public async Task ReportAsync([Remainder, Summary("Session Name")] string name) + { + if (name.Equals("?")) + { + await this.ReplyAsync($"Gespeicherte Sessions:"); + await this.ReplyAsync(this.ListSessions()); + } + } + + private string[] ListSessions() + { + return Directory.GetDirectories(@"..\..\sessions"); + } + + + } +} diff --git a/DiscoBot/DSA_Game/Save/Session.cs b/DiscoBot/DSA_Game/Save/Session.cs index b0a34a5..15ccc18 100644 --- a/DiscoBot/DSA_Game/Save/Session.cs +++ b/DiscoBot/DSA_Game/Save/Session.cs @@ -22,6 +22,8 @@ namespace DiscoBot.DSA_Game.Save public List Chars { get; set; } = new List(); // list of all characters + public string SessionName { get; set; } + public static Session Load(string path = @"..\..\session.json") { try -- cgit v1.3.1