5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-30 15:06:06 +00:00
Code Issues Projects Releases Wiki Activity

Correctif parsing link markdown

Browse source
This commit is contained in:
Yan Maniez 2018-06-25 10:11:07 +02:00
parent 3966d4a2b0
commit e7586e08c1
2 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AideDeJeu/AideDeJeu.UWP/Package.appxmanifest
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="7385YanManiez.AidedeJeu" Publisher="CN=2C78A91E-528B-4FF0-A4BE-FD7F7EBABB44" Version="1.1.1.0" /> <Identity Name="7385YanManiez.AidedeJeu" Publisher="CN=2C78A91E-528B-4FF0-A4BE-FD7F7EBABB44" Version="1.15.0.0" />
<mp:PhoneIdentity PhoneProductId="7b75e00f-ae8d-472e-9d0f-cbfe5e44017c" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> <mp:PhoneIdentity PhoneProductId="7b75e00f-ae8d-472e-9d0f-cbfe5e44017c" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties> <Properties>
<DisplayName>Aide de Jeu</DisplayName> <DisplayName>Aide de Jeu</DisplayName>

46
AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs
View file

@ -53,7 +53,7 @@ namespace AideDeJeu.Tools
//yield return spell; //yield return spell;
} }
spell = new Spell(); spell = new Spell();
spell.Name = spell.NamePHB = headingBlock.Inline.ToContainerString(); spell.Name = spell.NamePHB = headingBlock.Inline.ToMarkdownString();
spell.Id = spell.IdVF = spell.IdVO = Tools.Helpers.IdFromName(spell.Name); spell.Id = spell.IdVF = spell.IdVO = Tools.Helpers.IdFromName(spell.Name);
//Console.WriteLine(spell.Name); //Console.WriteLine(spell.Name);
} }
@ -61,7 +61,7 @@ namespace AideDeJeu.Tools
if (block is Markdig.Syntax.ParagraphBlock) if (block is Markdig.Syntax.ParagraphBlock)
{ {
var paragraphBlock = block as Markdig.Syntax.ParagraphBlock; var paragraphBlock = block as Markdig.Syntax.ParagraphBlock;
spell.DescriptionHtml += MarkdownToHtml(paragraphBlock.ToParagraphString()); spell.DescriptionHtml += MarkdownToHtml(paragraphBlock.ToMarkdownString());
////DumpParagraphBlock(paragraphBlock); ////DumpParagraphBlock(paragraphBlock);
//Console.WriteLine(paragraphBlock.IsBreakable); //Console.WriteLine(paragraphBlock.IsBreakable);
//spell.DescriptionHtml += paragraphBlock.Inline.ToContainerString(); //spell.DescriptionHtml += paragraphBlock.Inline.ToContainerString();
@ -91,7 +91,7 @@ namespace AideDeJeu.Tools
{ {
var paragraphBlock = ininblock as Markdig.Syntax.ParagraphBlock; var paragraphBlock = ininblock as Markdig.Syntax.ParagraphBlock;
//DumpParagraphBlock(paragraphBlock); //DumpParagraphBlock(paragraphBlock);
var str = paragraphBlock.Inline.ToContainerString(); var str = paragraphBlock.Inline.ToMarkdownString();
var properties = new List<Tuple<string, Action<Spell, string>>>() var properties = new List<Tuple<string, Action<Spell, string>>>()
{ {
@ -177,7 +177,7 @@ namespace AideDeJeu.Tools
if (ininblock is Markdig.Syntax.ParagraphBlock) if (ininblock is Markdig.Syntax.ParagraphBlock)
{ {
var paragraphBlock = ininblock as Markdig.Syntax.ParagraphBlock; var paragraphBlock = ininblock as Markdig.Syntax.ParagraphBlock;
spell.DescriptionHtml += listBlock.BulletType + " " + MarkdownToHtml(paragraphBlock.ToParagraphString()); spell.DescriptionHtml += listBlock.BulletType + " " + MarkdownToHtml(paragraphBlock.ToMarkdownString());
} }
} }
} }
@ -228,13 +228,13 @@ namespace AideDeJeu.Tools
//yield return monster; //yield return monster;
} }
monster = new Monster(); monster = new Monster();
monster.Name = monster.NamePHB = headingBlock.Inline.ToContainerString(); monster.Name = monster.NamePHB = headingBlock.Inline.ToMarkdownString();
monster.Id = monster.IdVF = monster.IdVO = Tools.Helpers.IdFromName(monster.Name); monster.Id = monster.IdVF = monster.IdVO = Tools.Helpers.IdFromName(monster.Name);
//Console.WriteLine(spell.Name); //Console.WriteLine(spell.Name);
} }
if (headingBlock.HeaderChar == '#' && headingBlock.Level == 2) if (headingBlock.HeaderChar == '#' && headingBlock.Level == 2)
{ {
switch (headingBlock.Inline.ToContainerString()) switch (headingBlock.Inline.ToMarkdownString())
{ {
case "Capacités": case "Capacités":
case "Special Features": case "Special Features":
@ -256,7 +256,7 @@ namespace AideDeJeu.Tools
else if (block is Markdig.Syntax.ParagraphBlock) else if (block is Markdig.Syntax.ParagraphBlock)
{ {
var paragraphBlock = block as Markdig.Syntax.ParagraphBlock; var paragraphBlock = block as Markdig.Syntax.ParagraphBlock;
features?.Add(paragraphBlock.ToParagraphString()); features?.Add(paragraphBlock.ToMarkdownString());
////DumpParagraphBlock(paragraphBlock); ////DumpParagraphBlock(paragraphBlock);
//Console.WriteLine(paragraphBlock.IsBreakable); //Console.WriteLine(paragraphBlock.IsBreakable);
//spell.DescriptionHtml += paragraphBlock.Inline.ToContainerString(); //spell.DescriptionHtml += paragraphBlock.Inline.ToContainerString();
@ -286,7 +286,7 @@ namespace AideDeJeu.Tools
{ {
var paragraphBlock = ininblock as Markdig.Syntax.ParagraphBlock; var paragraphBlock = ininblock as Markdig.Syntax.ParagraphBlock;
//DumpParagraphBlock(paragraphBlock); //DumpParagraphBlock(paragraphBlock);
var str = paragraphBlock.Inline.ToContainerString(); var str = paragraphBlock.Inline.ToMarkdownString();
var properties = new List<Tuple<string, Action<Monster, string>>>() var properties = new List<Tuple<string, Action<Monster, string>>>()
{ {
@ -400,7 +400,7 @@ namespace AideDeJeu.Tools
if (ininblock is Markdig.Syntax.ParagraphBlock) if (ininblock is Markdig.Syntax.ParagraphBlock)
{ {
var paragraphBlock = ininblock as Markdig.Syntax.ParagraphBlock; var paragraphBlock = ininblock as Markdig.Syntax.ParagraphBlock;
features?.Add(listBlock.BulletType + " " + paragraphBlock.ToParagraphString()); features?.Add(listBlock.BulletType + " " + paragraphBlock.ToMarkdownString());
} }
} }
} }
@ -462,11 +462,7 @@ namespace AideDeJeu.Tools
return monsters; return monsters;
} }
public static string ToString(this Markdig.Syntax.SourceSpan span, string md) public static string ToMarkdownString(this Markdig.Syntax.Inlines.ContainerInline inlines)
{
return md.Substring(span.Start, span.Length);
}
public static string ToContainerString(this Markdig.Syntax.Inlines.ContainerInline inlines)
{ {
var str = string.Empty; var str = string.Empty;
foreach (var inline in inlines) foreach (var inline in inlines)
@ -490,7 +486,7 @@ namespace AideDeJeu.Tools
{ {
delimiterChar += delimiterChar; delimiterChar += delimiterChar;
} }
add = delimiterChar + emphasisInline.ToContainerString() + delimiterChar; add = delimiterChar + emphasisInline.ToMarkdownString() + delimiterChar;
} }
else if (inline is Markdig.Syntax.Inlines.LinkInline) else if (inline is Markdig.Syntax.Inlines.LinkInline)
{ {
@ -500,12 +496,22 @@ namespace AideDeJeu.Tools
{ {
add = "!"; add = "!";
} }
add += string.Format($"[{linkInline.Label}]({linkInline.Url} \"{linkInline.Title}\")", linkInline.Label); //containerInline.ToContainerString(); var label = linkInline.ToMarkdownString();
var url = linkInline.Url;
var title = linkInline.Title;
if (!string.IsNullOrEmpty(title))
{
add += string.Format($"[{label}]({url} \"{title}\")");
}
else
{
add += string.Format($"[{label}]({url})");
}
} }
else if (inline is Markdig.Syntax.Inlines.ContainerInline) else if (inline is Markdig.Syntax.Inlines.ContainerInline)
{ {
var containerInline = inline as Markdig.Syntax.Inlines.ContainerInline; var containerInline = inline as Markdig.Syntax.Inlines.ContainerInline;
add = containerInline.ToContainerString(); add = containerInline.ToMarkdownString();
} }
else else
{ {
@ -516,10 +522,10 @@ namespace AideDeJeu.Tools
} }
return str; return str;
} }
public static string ToParagraphString(this Markdig.Syntax.ParagraphBlock paragraphBlock) public static string ToMarkdownString(this Markdig.Syntax.ParagraphBlock paragraphBlock)
{ {
var str = string.Empty; var str = string.Empty;
str += paragraphBlock.Inline.ToContainerString(); str += paragraphBlock.Inline.ToMarkdownString();
if (paragraphBlock.IsBreakable) if (paragraphBlock.IsBreakable)
{ {
str += "\n"; str += "\n";
@ -541,7 +547,7 @@ namespace AideDeJeu.Tools
foreach (var blockpar in cell) foreach (var blockpar in cell)
{ {
var par = blockpar as Markdig.Syntax.ParagraphBlock; var par = blockpar as Markdig.Syntax.ParagraphBlock;
var name = par.ToParagraphString().Trim(); var name = par.ToMarkdownString().Trim();
if (row.IsHeader) if (row.IsHeader)
{ {
indexes[indexCol] = name; indexes[indexCol] = name;