diff options
author | crupest <crupest@outlook.com> | 2021-03-06 22:51:53 +0800 |
---|---|---|
committer | crupest <crupest@outlook.com> | 2021-03-06 22:51:53 +0800 |
commit | 890fef4f276ec44312eb936583adbbf47d7cfe9d (patch) | |
tree | 246541d65473634839d5536b1111f7b742f54dab /BackEnd/Timeline | |
parent | 5c0d0645fd2c1bfb51069d6f9079db32493f2956 (diff) | |
download | timeline-890fef4f276ec44312eb936583adbbf47d7cfe9d.tar.gz timeline-890fef4f276ec44312eb936583adbbf47d7cfe9d.tar.bz2 timeline-890fef4f276ec44312eb936583adbbf47d7cfe9d.zip |
feat: Auto translate url in markdown post.
Diffstat (limited to 'BackEnd/Timeline')
-rw-r--r-- | BackEnd/Timeline/Controllers/TimelinePostController.cs | 15 | ||||
-rw-r--r-- | BackEnd/Timeline/Services/MarkdownProcessor.cs | 52 | ||||
-rw-r--r-- | BackEnd/Timeline/Startup.cs | 2 | ||||
-rw-r--r-- | BackEnd/Timeline/Timeline.csproj | 1 | ||||
-rw-r--r-- | BackEnd/Timeline/packages.lock.json | 6 |
5 files changed, 74 insertions, 2 deletions
diff --git a/BackEnd/Timeline/Controllers/TimelinePostController.cs b/BackEnd/Timeline/Controllers/TimelinePostController.cs index 4026d551..86c5c8cf 100644 --- a/BackEnd/Timeline/Controllers/TimelinePostController.cs +++ b/BackEnd/Timeline/Controllers/TimelinePostController.cs @@ -32,14 +32,17 @@ namespace Timeline.Controllers private readonly TimelineMapper _timelineMapper;
+ private readonly MarkdownProcessor _markdownProcessor;
+
/// <summary>
///
/// </summary>
- public TimelinePostController(ITimelineService timelineService, ITimelinePostService timelinePostService, TimelineMapper timelineMapper)
+ public TimelinePostController(ITimelineService timelineService, ITimelinePostService timelinePostService, TimelineMapper timelineMapper, MarkdownProcessor markdownProcessor)
{
_timelineService = timelineService;
_postService = timelinePostService;
_timelineMapper = timelineMapper;
+ _markdownProcessor = markdownProcessor;
}
private bool UserHasAllTimelineManagementPermission => this.UserHasPermission(UserPermission.AllTimelineManagement);
@@ -147,7 +150,15 @@ namespace Timeline.Controllers return await DataCacheHelper.GenerateActionResult(this,
() => _postService.GetPostDataDigest(timelineId, post, dataIndex),
- () => _postService.GetPostData(timelineId, post, dataIndex)
+ async () =>
+ {
+ var data = await _postService.GetPostData(timelineId, post, dataIndex);
+ if (data.ContentType == MimeTypes.TextMarkdown)
+ {
+ return new ByteData(_markdownProcessor.Process(data.Data, Url, timeline, post), data.ContentType);
+ }
+ return data;
+ }
);
}
diff --git a/BackEnd/Timeline/Services/MarkdownProcessor.cs b/BackEnd/Timeline/Services/MarkdownProcessor.cs new file mode 100644 index 00000000..f34432cd --- /dev/null +++ b/BackEnd/Timeline/Services/MarkdownProcessor.cs @@ -0,0 +1,52 @@ +using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Markdig;
+using Markdig.Renderers.Normalize;
+using Markdig.Syntax;
+using Markdig.Syntax.Inlines;
+using Microsoft.AspNetCore.Mvc;
+using Timeline.Controllers;
+
+namespace Timeline.Services
+{
+ public class MarkdownProcessor
+ {
+ public string Process(string text, Func<long, string> urlGenerator)
+ {
+ MarkdownDocument markdown = Markdown.Parse(text);
+ foreach (var link in markdown.Descendants().Where(e => e is LinkInline).Cast<LinkInline>())
+ {
+ if (int.TryParse(link.Url, out var dataIndex))
+ {
+ link.Url = urlGenerator(dataIndex);
+ }
+ }
+
+ var writer = new StringWriter();
+ NormalizeRenderer renderer = new NormalizeRenderer(writer);
+ renderer.Render(markdown);
+
+ return writer.ToString();
+ }
+
+ /// <summary>Convert data url to true url with post id.</summary>
+ public string Process(string text, IUrlHelper url, string timeline, long post)
+ {
+ return Process(
+ text,
+ dataIndex => url.ActionLink(
+ nameof(TimelinePostController.DataGet),
+ nameof(TimelinePostController)[0..^nameof(Controller).Length],
+ new { timeline, post, data_index = dataIndex }
+ )
+ );
+ }
+
+ public byte[] Process(byte[] data, IUrlHelper url, string timeline, long post)
+ {
+ return Encoding.UTF8.GetBytes(Process(Encoding.UTF8.GetString(data), url, timeline, post));
+ }
+ }
+}
diff --git a/BackEnd/Timeline/Startup.cs b/BackEnd/Timeline/Startup.cs index 26ba3bfc..4f392b2d 100644 --- a/BackEnd/Timeline/Startup.cs +++ b/BackEnd/Timeline/Startup.cs @@ -125,6 +125,8 @@ namespace Timeline services.AddScoped<ISearchService, SearchService>();
+ services.AddScoped<MarkdownProcessor>();
+
services.AddOpenApiDocs();
if (_frontEndMode == FrontEndMode.Mock)
diff --git a/BackEnd/Timeline/Timeline.csproj b/BackEnd/Timeline/Timeline.csproj index 70536e00..6b565598 100644 --- a/BackEnd/Timeline/Timeline.csproj +++ b/BackEnd/Timeline/Timeline.csproj @@ -33,6 +33,7 @@ <ItemGroup>
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
+ <PackageReference Include="Markdig" Version="0.23.0" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1">
<PrivateAssets>all</PrivateAssets>
diff --git a/BackEnd/Timeline/packages.lock.json b/BackEnd/Timeline/packages.lock.json index 36442da7..da61aafc 100644 --- a/BackEnd/Timeline/packages.lock.json +++ b/BackEnd/Timeline/packages.lock.json @@ -23,6 +23,12 @@ "Microsoft.Extensions.Options": "3.0.0"
}
},
+ "Markdig": {
+ "type": "Direct",
+ "requested": "[0.23.0, )",
+ "resolved": "0.23.0",
+ "contentHash": "jPPcnHGSDSedPvwZ6jiMJpvK3iJGA2djU6TFmEr6XK2BiYK1ier2lTHVwDt41XLxDbfGu5Dn42hKDzwqs049PA=="
+ },
"Microsoft.AspNetCore.SpaServices.Extensions": {
"type": "Direct",
"requested": "[5.0.0, )",
|