diff --git a/AideDeJeu/AideDeJeu/Models/FilteredItems.cs b/AideDeJeu/AideDeJeu/Models/FilteredItems.cs index 95bfe23c..a894d6ca 100644 --- a/AideDeJeu/AideDeJeu/Models/FilteredItems.cs +++ b/AideDeJeu/AideDeJeu/Models/FilteredItems.cs @@ -24,25 +24,16 @@ namespace AideDeJeuLib } } - public override string Markdown + + [IgnoreDataMember] + [YamlIgnore] + public override string YamlMarkdown { get { - if (_Items != null) - { - var md = string.Empty; - foreach (var item in _Items) - { - md += item.Markdown; - } - return md; - } - return null; - } - set - { - + return $"---\n{Yaml}---\n{SubMarkdown}"; } } + } } diff --git a/AideDeJeu/AideDeJeu/Models/Item.cs b/AideDeJeu/AideDeJeu/Models/Item.cs index 966c5176..1bce6e12 100644 --- a/AideDeJeu/AideDeJeu/Models/Item.cs +++ b/AideDeJeu/AideDeJeu/Models/Item.cs @@ -238,7 +238,7 @@ namespace AideDeJeuLib [IgnoreDataMember] [YamlIgnore] - public string YamlMarkdown + public virtual string YamlMarkdown { get { @@ -246,6 +246,29 @@ namespace AideDeJeuLib } } + [IgnoreDataMember] + [YamlIgnore] + public string SubMarkdown + { + get + { + if (_Items != null) + { + var md = string.Empty; + foreach (var item in _Items) + { + md += item.CleanMarkdown; + } + return md; + } + return null; + } + set + { + + } + } + public static Item ParseYamlMarkdown(string yamlmd) { var builder = new DeserializerBuilder(); diff --git a/AideDeJeu/AideDeJeuCmd/Program.cs b/AideDeJeu/AideDeJeuCmd/Program.cs index edc7772a..8742fbfd 100644 --- a/AideDeJeu/AideDeJeuCmd/Program.cs +++ b/AideDeJeu/AideDeJeuCmd/Program.cs @@ -352,7 +352,7 @@ namespace AideDeJeuCmd foreach (var item in await context.Items.ToListAsync()) { - await item.LoadFilteredItemsAsync(); + //await item.LoadFilteredItemsAsync(); if(item is Spells) { int iii = 1; @@ -374,6 +374,19 @@ namespace AideDeJeuCmd Console.WriteLine(filename); } await SaveStringAsync(filename, yaml); + + var filtervm = item.GetNewFilterViewModel(); + if(filtervm != null) + { + foreach(var filter in filtervm.Filters) + { + foreach(var kv in filter.KeyValues) + { + var key = kv.Key; + var val = kv.Value; + } + } + } } int i = 1; diff --git a/Data/library.db b/Data/library.db index 6e88a64b..db8ace60 100644 Binary files a/Data/library.db and b/Data/library.db differ