From d67922a1c5664adc79b53472b927037adee04d8f Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Sun, 2 Jul 2023 22:12:07 +0800 Subject: [PATCH] Add include pages info --- MyApp/Markdown.Pages.cs | 2 +- MyApp/MarkdownPagesBase.cs | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/MyApp/Markdown.Pages.cs b/MyApp/Markdown.Pages.cs index 92af30eea..9500426e5 100644 --- a/MyApp/Markdown.Pages.cs +++ b/MyApp/Markdown.Pages.cs @@ -12,7 +12,7 @@ public class MarkdownPages : MarkdownPagesBase ""; public MarkdownPages(ILogger log, IWebHostEnvironment env) : base(log,env) {} - List Pages { get; set; } = new(); + public List Pages { get; set; } = new(); public List GetVisiblePages(string? prefix=null, bool allDirectories=false) => prefix == null ? Pages.Where(x => IsVisible(x) && !x.Slug!.Contains('/')).OrderBy(x => x.Order).ThenBy(x => x.Path).ToList() : Pages.Where(x => IsVisible(x) && x.Slug!.StartsWith(prefix.WithTrailingSlash())) diff --git a/MyApp/MarkdownPagesBase.cs b/MyApp/MarkdownPagesBase.cs index 712f5dcb7..f03d5d406 100644 --- a/MyApp/MarkdownPagesBase.cs +++ b/MyApp/MarkdownPagesBase.cs @@ -384,12 +384,13 @@ protected override void Write(HtmlRenderer renderer, CustomContainerInline obj) renderer.Write("'); MarkdownFileBase? doc = null; string? slug = null; + string? prefix = null; var allIncludes = new List(); + var markdown = HostContext.Resolve(); if (include.EndsWith(".md")) { - var markdown = HostContext.Resolve(); include = include.TrimStart('/'); - var prefix = include.LeftPart('/'); + prefix = include.LeftPart('/'); slug = include.LeftPart('.'); allIncludes = markdown.GetVisiblePages(prefix, allDirectories: true); doc = allIncludes.FirstOrDefault(x => x.Slug == slug); @@ -404,13 +405,15 @@ protected override void Write(HtmlRenderer renderer, CustomContainerInline obj) var log = HostContext.Resolve>(); log.LogError("Could not find: {Include}", include); renderer.WriteLine($"Could not find: {include}"); - renderer.WriteLine($""); } + + renderer.WriteLine($""); + renderer.Write(""); } }