calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-03-22 06:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix file lock not getting disposed when postamble throws an exception

Browse Source
This commit is contained in:
Tyrrrz
2023-01-30 12:04:33 +02:00
parent a68df7a065
commit bf76f10030
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DiscordChatExporter.Core/Exporting/MessageExporter.cs
View File

@@ -23,9 +23,16 @@ internal partial class MessageExporter : IAsyncDisposable
{
if (_writer is not null)
{
await _writer.WritePostambleAsync(cancellationToken);
await _writer.DisposeAsync();
_writer = null;
try
{
await _writer.WritePostambleAsync(cancellationToken);
}
// Writer must be disposed, even if writing postamble fails
finally
{
await _writer.DisposeAsync();
_writer = null;
}
}
}

4
DiscordChatExporter.Core/Exporting/Writers/HtmlMessageWriter.cs
View File

@@ -67,9 +67,7 @@ internal class HtmlMessageWriter : MessageWriter
}
// Use <!--wmm:ignore--> to preserve blocks of code inside the templates
private string Minify(string html) => _minifier
.Minify(html, false)
.MinifiedContent;
private string Minify(string html) => _minifier.Minify(html, false).MinifiedContent;
public override async ValueTask WritePreambleAsync(
CancellationToken cancellationToken = default)