paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Summary length may be overflowed

Browse Source
This commit is contained in:
Paul Schneider
2020-10-10 17:53:50 +01:00
parent f81f6617ce
commit a7f501c183
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Yavsc/Helpers/Tags/MarkDownTagHelper.cs
View File

@ -25,8 +25,8 @@ namespace Yavsc.TagHelpers
private const string MarkdownContentAttributeName = "markdown"; private const string MarkdownContentAttributeName = "markdown";
private const string MarkdownMarkAttributeName = "ismarkdown"; private const string MarkdownMarkAttributeName = "ismarkdown";
private const string SummaryMarkAttributeName = "summary"; private const string SummaryMarkAttributeName = "summary";
[HtmlAttributeName("site")] [HtmlAttributeName("site")]
public SiteSettings Site { get; set; } public SiteSettings Site { get; set; }
[HtmlAttributeName("base")] [HtmlAttributeName("base")]
public string Base { get; set; } public string Base { get; set; }
@ -36,7 +36,7 @@ namespace Yavsc.TagHelpers
[HtmlAttributeName(SummaryMarkAttributeName)] [HtmlAttributeName(SummaryMarkAttributeName)]
public int Summary { get; set; } public int Summary { get; set; }
static Regex rxExtractLanguage = new Regex("^({{(.+)}}[\r\n])", RegexOptions.Compiled); static Regex rxExtractLanguage = new Regex("^({{(.+)}}[\r\n])", RegexOptions.Compiled);
private static string FormatCodePrettyPrint(MarkdownDeep.Markdown m, string code) private static string FormatCodePrettyPrint(MarkdownDeep.Markdown m, string code)
@ -90,7 +90,18 @@ namespace Yavsc.TagHelpers
// Transform the supplied text (Markdown) into HTML. // Transform the supplied text (Markdown) into HTML.
var markdownTransformer = GetMarkdownTransformer(); var markdownTransformer = GetMarkdownTransformer();
markdownTransformer.UrlBaseLocation = urlBaseLocation; markdownTransformer.UrlBaseLocation = urlBaseLocation;
// Si seul un sommaire est demandé,
// s'assurer que la longueur du contenu ne dépasse pas de trop la longueur indiquée
if (Summary > 0)
{
if (text.Length > Summary + 28)
{
text = text.Substring(0, Summary + 28);
}
}
string html = markdownTransformer.Transform(text); string html = markdownTransformer.Transform(text);
// Wrap the html in an MvcHtmlString otherwise it'll be HtmlEncoded and displayed to the user as HTML :( // Wrap the html in an MvcHtmlString otherwise it'll be HtmlEncoded and displayed to the user as HTML :(
return html; return html;
} }
@ -110,7 +121,7 @@ namespace Yavsc.TagHelpers
} }
public ModelExpression Content { get; set; } public ModelExpression Content { get; set; }
public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output) public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
{ {
if (output.TagName == "markdown") if (output.TagName == "markdown")
@ -123,7 +134,7 @@ namespace Yavsc.TagHelpers
var markdown = content; var markdown = content;
var htbase = Base; var htbase = Base;
var html = Markdown(markdown, htbase); var html = Markdown(markdown, htbase);