diff --git a/AideDeJeu/AideDeJeu.UWP/Package.appxmanifest b/AideDeJeu/AideDeJeu.UWP/Package.appxmanifest index 15a68eec..25d6f852 100644 --- a/AideDeJeu/AideDeJeu.UWP/Package.appxmanifest +++ b/AideDeJeu/AideDeJeu.UWP/Package.appxmanifest @@ -1,6 +1,6 @@  - + Aide de Jeu diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj index cccb3073..c2fcccbc 100644 --- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj +++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj @@ -60,4 +60,9 @@ + + + + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Tools/Helpers.cs b/AideDeJeu/AideDeJeu/Tools/Helpers.cs index 1f46ae54..fa85e711 100644 --- a/AideDeJeu/AideDeJeu/Tools/Helpers.cs +++ b/AideDeJeu/AideDeJeu/Tools/Helpers.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Globalization; +using System.IO; using System.Linq; using System.Net.Http; using System.Reflection; @@ -22,6 +23,18 @@ namespace AideDeJeu.Tools } } + public static async Task GetResourceStringAsync(string resourceName) + { + var assembly = typeof(Helpers).GetTypeInfo().Assembly; + using (var stream = assembly.GetManifestResourceStream(resourceName)) + { + using (var sr = new StreamReader(stream)) + { + return await sr.ReadToEndAsync(); + } + } + } + public static async Task GetStringFromUrl(string url) { using (var client = new HttpClient()) diff --git a/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs b/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs index 08870dd9..11718f56 100644 --- a/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs +++ b/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs @@ -15,13 +15,15 @@ namespace AideDeJeu.Tools { public static IEnumerable MarkdownToSpells(string md) { - var document = Markdig.Parsers.MarkdownParser.Parse(md); + var pipeline = new MarkdownPipelineBuilder().UsePipeTables().Build(); + var document = Markdig.Parsers.MarkdownParser.Parse(md, pipeline); return document.ToSpells(); } public static IEnumerable MarkdownToMonsters(string md) { - var document = Markdig.Parsers.MarkdownParser.Parse(md); + var pipeline = new MarkdownPipelineBuilder().UsePipeTables().Build(); + var document = Markdig.Parsers.MarkdownParser.Parse(md, pipeline); return document.ToMonsters(); } @@ -162,6 +164,7 @@ namespace AideDeJeu.Tools List actions = new List(); foreach (var block in document) { + Debug.WriteLine(block.GetType()); //DumpBlock(block); if (block is Markdig.Syntax.HeadingBlock) { @@ -221,7 +224,7 @@ namespace AideDeJeu.Tools case "NameVO": monster.NameVO = value; break; - case "CastingTime": + case "SizeAlignment": { var regexx = new Regex("(?.*) de taille (?.*), (?.*)"); var matchh = regexx.Match(value); diff --git a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs index 4c2b68a8..afadffb8 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs @@ -45,8 +45,9 @@ namespace AideDeJeu.ViewModels _AllItems = Tools.Helpers.GetResourceObject>(resourceName); break; case ItemSourceType.MonsterHD: - resourceName = "AideDeJeu.Data.monsters_hd.json"; - var mdm = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/monsters_hd.md"); + resourceName = "AideDeJeu.Data.monsters_hd.md"; + //var mdm = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/monsters_hd.md"); + var mdm = await Tools.Helpers.GetResourceStringAsync(resourceName); _AllItems = Tools.MarkdownExtensions.MarkdownToMonsters(mdm); //_AllItems = Tools.Helpers.GetResourceObject>(resourceName); break; @@ -61,7 +62,7 @@ namespace AideDeJeu.ViewModels _AllItems = Tools.Helpers.GetResourceObject>(resourceName); break; case ItemSourceType.SpellHD: - resourceName = "AideDeJeu.Data.spells_hd.json"; + resourceName = "AideDeJeu.Data.spells_hd.md"; var mds = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/spells_hd.md"); _AllItems = Tools.MarkdownExtensions.MarkdownToSpells(mds); //_AllItems = Tools.Helpers.GetResourceObject>(resourceName);