mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-06-05 01:03:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch from RazorLight to MiniRazor

Browse source
This commit is contained in:
Alexey Golub 2020-07-29 20:08:51 +03:00
parent 752003abc3
commit 3db29b520c
11 changed files with 85 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
DiscordChatExporter.Domain/DiscordChatExporter.Domain.csproj
View file

@ -2,8 +2,8 @@
<Import Project="../DiscordChatExporter.props" />
<ItemGroup>
<PackageReference Include="MiniRazor" Version="1.0.1" />
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="RazorLight" Version="2.0.0-beta9" />
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
</ItemGroup>
@ -11,9 +11,9 @@
<EmbeddedResource Include="Exporting\Writers\Html\Core.css" />
<EmbeddedResource Include="Exporting\Writers\Html\Dark.css" />
<EmbeddedResource Include="Exporting\Writers\Html\Light.css" />
<EmbeddedResource Include="Exporting\Writers\Html\LayoutTemplate-End.cshtml" />
<EmbeddedResource Include="Exporting\Writers\Html\LayoutTemplate-Begin.cshtml" />
<EmbeddedResource Include="Exporting\Writers\Html\PreambleTemplate.cshtml" />
<EmbeddedResource Include="Exporting\Writers\Html\PostambleTemplate.cshtml" />
<EmbeddedResource Include="Exporting\Writers\Html\MessageGroupTemplate.cshtml" />
</ItemGroup>
</Project>
</Project>

3
DiscordChatExporter.Domain/Exporting/ExportContext.cs
View file

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using DiscordChatExporter.Domain.Discord.Models;
@ -12,7 +11,7 @@ using Tyrrrz.Extensions;
namespace DiscordChatExporter.Domain.Exporting
{
public class ExportContext
internal class ExportContext
{
private readonly MediaDownloader _mediaDownloader;

2
DiscordChatExporter.Domain/Exporting/Writers/Html/LayoutTemplateContext.cs
View file

@ -1,6 +1,6 @@
namespace DiscordChatExporter.Domain.Exporting.Writers.Html
{
public class LayoutTemplateContext
internal class LayoutTemplateContext
{
public ExportContext ExportContext { get; }

4
DiscordChatExporter.Domain/Exporting/Writers/Html/MessageGroup.cs
View file

@ -6,7 +6,7 @@ using DiscordChatExporter.Domain.Discord.Models;
namespace DiscordChatExporter.Domain.Exporting.Writers.Html
{
// Used for grouping contiguous messages in HTML export
public partial class MessageGroup
internal partial class MessageGroup
{
public User Author { get; }
@ -22,7 +22,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.Html
}
}
public partial class MessageGroup
internal partial class MessageGroup
{
public static bool CanJoin(Message message1, Message message2) =>
string.Equals(message1.Author.Id, message2.Author.Id, StringComparison.Ordinal) &&

7
DiscordChatExporter.Domain/Exporting/Writers/Html/MessageGroupTemplate.cshtml
View file

@ -1,6 +1,7 @@
@using RazorLight
@using DiscordChatExporter.Domain.Exporting.Writers.Html
@inherits TemplatePage<MessageGroupTemplateContext>
@using System
@using System.Linq
@using System.Threading.Tasks
@inherits MiniRazor.MiniRazorTemplateBase<DiscordChatExporter.Domain.Exporting.Writers.Html.MessageGroupTemplateContext>
@{
string FormatDate(DateTimeOffset date) => Model.ExportContext.FormatDate(date);

2
DiscordChatExporter.Domain/Exporting/Writers/Html/MessageGroupTemplateContext.cs
View file

@ -2,7 +2,7 @@
namespace DiscordChatExporter.Domain.Exporting.Writers.Html
{
public class MessageGroupTemplateContext
internal class MessageGroupTemplateContext
{
public ExportContext ExportContext { get; }

4
DiscordChatExporter.Domain/Exporting/Writers/Html/LayoutTemplate-End.cshtml → DiscordChatExporter.Domain/Exporting/Writers/Html/PostambleTemplate.cshtml
View file

@ -1,6 +1,4 @@
@using RazorLight
@using DiscordChatExporter.Domain.Exporting.Writers.Html
@inherits TemplatePage<LayoutTemplateContext>
@inherits MiniRazor.MiniRazorTemplateBase<DiscordChatExporter.Domain.Exporting.Writers.Html.LayoutTemplateContext>
</div>

13
DiscordChatExporter.Domain/Exporting/Writers/Html/LayoutTemplate-Begin.cshtml → DiscordChatExporter.Domain/Exporting/Writers/Html/PreambleTemplate.cshtml
View file

@ -1,15 +1,14 @@
@using RazorLight
@using DiscordChatExporter.Domain.Exporting.Writers.Html
@using System
@using System.Threading.Tasks
@using Tyrrrz.Extensions
@inherits TemplatePage<LayoutTemplateContext>
@inherits MiniRazor.MiniRazorTemplateBase<DiscordChatExporter.Domain.Exporting.Writers.Html.LayoutTemplateContext>
@{
string FormatDate(DateTimeOffset date) => Model.ExportContext.FormatDate(date);
ValueTask<string> ResolveUrlAsync(string url) => Model.ExportContext.ResolveMediaUrlAsync(url);
// Workaround: https://github.com/toddams/RazorLight/issues/359
string RenderStyleSheet(string name) => Model.GetType().Assembly.GetManifestResourceString($"DiscordChatExporter.Domain.Exporting.Writers.Html.{name}.css");
string GetStyleSheet(string name) => Model.GetType().Assembly.GetManifestResourceString($"DiscordChatExporter.Domain.Exporting.Writers.Html.{name}.css");
}
<!DOCTYPE html>
@ -21,10 +20,10 @@
<meta name="viewport" content="width=device-width">
<style>
@Raw(RenderStyleSheet("Core"))
@Raw(GetStyleSheet("Core"))
</style>
<style>
@Raw(RenderStyleSheet(Model.ThemeName))
@Raw(GetStyleSheet(Model.ThemeName))
</style>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/solarized-@(Model.ThemeName.ToLowerInvariant()).min.css">

59
DiscordChatExporter.Domain/Exporting/Writers/Html/TemplateBundle.cs Normal file
View file

@ -0,0 +1,59 @@
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using MiniRazor;
using Tyrrrz.Extensions;
[assembly: InternalsVisibleTo("RazorAssembly")]
namespace DiscordChatExporter.Domain.Exporting.Writers.Html
{
internal partial class TemplateBundle
{
public MiniRazorTemplateDescriptor PreambleTemplate { get; }
public MiniRazorTemplateDescriptor MessageGroupTemplate { get; }
public MiniRazorTemplateDescriptor PostambleTemplate { get; }
public TemplateBundle(
MiniRazorTemplateDescriptor preambleTemplate,
MiniRazorTemplateDescriptor messageGroupTemplate,
MiniRazorTemplateDescriptor postambleTemplate)
{
PreambleTemplate = preambleTemplate;
MessageGroupTemplate = messageGroupTemplate;
PostambleTemplate = postambleTemplate;
}
}
internal partial class TemplateBundle
{
private static TemplateBundle? _lastBundle;
// This is very CPU-heavy
private static async ValueTask<TemplateBundle> CompileAsync() => await Task.Run(() =>
{
var ns = typeof(TemplateBundle).Namespace!;
var preambleTemplateSource = typeof(HtmlMessageWriter).Assembly
.GetManifestResourceString($"{ns}.PreambleTemplate.cshtml");
var messageGroupTemplateSource = typeof(HtmlMessageWriter).Assembly
.GetManifestResourceString($"{ns}.MessageGroupTemplate.cshtml");
var postambleTemplateSource = typeof(HtmlMessageWriter).Assembly
.GetManifestResourceString($"{ns}.PostambleTemplate.cshtml");
var engine = new MiniRazorTemplateEngine("RazorAssembly", ns);
var preambleTemplate = engine.Compile(preambleTemplateSource);
var messageGroupTemplate = engine.Compile(messageGroupTemplateSource);
var postambleTemplate = engine.Compile(postambleTemplateSource);
return new TemplateBundle(preambleTemplate, messageGroupTemplate, postambleTemplate);
});
public static async ValueTask<TemplateBundle> ResolveAsync() =>
_lastBundle ??= await CompileAsync();
}
}

16
DiscordChatExporter.Domain/Exporting/Writers/HtmlMessageWriter.cs
View file

@ -4,7 +4,6 @@ using System.Linq;
using System.Threading.Tasks;
using DiscordChatExporter.Domain.Discord.Models;
using DiscordChatExporter.Domain.Exporting.Writers.Html;
using RazorLight;
namespace DiscordChatExporter.Domain.Exporting.Writers
{
@ -13,7 +12,6 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
private readonly TextWriter _writer;
private readonly string _themeName;
private readonly RazorLightEngine _templateEngine;
private readonly List<Message> _messageGroupBuffer = new List<Message>();
private long _messageCount;
@ -23,28 +21,25 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
{
_writer = new StreamWriter(stream);
_themeName = themeName;
_templateEngine = new RazorLightEngineBuilder()
.EnableEncoding()
.UseEmbeddedResourcesProject(typeof(HtmlMessageWriter).Assembly, $"{typeof(HtmlMessageWriter).Namespace}.Html")
.Build();
}
public override async ValueTask WritePreambleAsync()
{
var templateContext = new LayoutTemplateContext(Context, _themeName, _messageCount);
var templateBundle = await TemplateBundle.ResolveAsync();
await _writer.WriteLineAsync(
await _templateEngine.CompileRenderAsync("LayoutTemplate-Begin.cshtml", templateContext)
await templateBundle.PreambleTemplate.RenderAsync(templateContext)
);
}
private async ValueTask WriteMessageGroupAsync(MessageGroup messageGroup)
{
var templateContext = new MessageGroupTemplateContext(Context, messageGroup);
var templateBundle = await TemplateBundle.ResolveAsync();
await _writer.WriteLineAsync(
await _templateEngine.CompileRenderAsync("MessageGroupTemplate.cshtml", templateContext)
await templateBundle.MessageGroupTemplate.RenderAsync(templateContext)
);
}
@ -75,9 +70,10 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
await WriteMessageGroupAsync(MessageGroup.Join(_messageGroupBuffer));
var templateContext = new LayoutTemplateContext(Context, _themeName, _messageCount);
var templateBundle = await TemplateBundle.ResolveAsync();
await _writer.WriteLineAsync(
await _templateEngine.CompileRenderAsync("LayoutTemplate-End.cshtml", templateContext)
await templateBundle.PostambleTemplate.RenderAsync(templateContext)
);
}