From ac64d9943a6bd6612d2e2d29b23e7f820a584d14 Mon Sep 17 00:00:00 2001 From: Alexey Golub Date: Sat, 18 Jul 2020 15:45:09 +0300 Subject: [PATCH] Self-contained export (#321) --- .../Commands/Base/ExportCommandBase.cs | 25 ++- .../Base/ExportMultipleCommandBase.cs | 22 ++- .../Discord/AuthToken.cs | 8 +- .../Discord/DiscordClient.cs | 60 +++---- .../Discord/Models/Attachment.cs | 2 +- .../Discord/Models/Channel.cs | 2 +- .../Discord/Models/Embed.cs | 2 +- .../Discord/Models/EmbedAuthor.cs | 2 +- .../Discord/Models/EmbedField.cs | 2 +- .../Discord/Models/EmbedFooter.cs | 2 +- .../Discord/Models/EmbedImage.cs | 2 +- .../Discord/Models/Emoji.cs | 2 +- .../Discord/Models/Guild.cs | 22 ++- .../Discord/Models/Member.cs | 2 +- .../Discord/Models/Message.cs | 7 +- .../Discord/Models/Reaction.cs | 2 +- .../Discord/Models/Role.cs | 2 +- .../Discord/Models/User.cs | 35 ++-- .../DiscordChatExporter.Domain.csproj | 10 +- .../DiscordChatExporterException.cs | 8 +- .../Exporting/ChannelExporter.cs | 121 +++---------- .../Exporting/ExportContext.cs | 57 +++--- .../Exporting/ExportOptions.cs | 18 -- .../Exporting/ExportRequest.cs | 136 ++++++++++++++ .../Exporting/MediaDownloader.cs | 47 +++++ .../Exporting/MessageExporter.cs | 22 ++- .../Exporting/Writers/CsvMessageWriter.cs | 71 ++++++-- .../HtmlCore.css => Writers/Html/Core.css} | 0 .../HtmlDark.css => Writers/Html/Dark.css} | 0 .../Html/LayoutTemplate.html} | 26 +-- .../HtmlLight.css => Writers/Html/Light.css} | 0 .../{ => Writers/Html}/MessageGroup.cs | 16 +- .../Html/MessageGroupTemplate.html} | 24 +-- .../Exporting/Writers/HtmlMessageWriter.cs | 41 ++--- .../Exporting/Writers/JsonMessageWriter.cs | 91 ++++++---- .../MarkdownVisitors/HtmlMarkdownVisitor.cs | 21 ++- .../PlainTextMarkdownVisitor.cs | 12 +- .../Writers/PlainTextMessageWriter.cs | 168 ++++++++---------- .../{ => Extensions}/ColorExtensions.cs | 2 +- .../{ => Extensions}/DateExtensions.cs | 2 +- .../{ => Extensions}/GenericExtensions.cs | 2 +- .../Extensions/HttpClientExtensions.cs | 28 +++ .../{ => Extensions}/JsonElementExtensions.cs | 2 +- .../Internal/Extensions/StringExtensions.cs | 12 ++ .../Utf8JsonWriterExtensions.cs | 2 +- .../Internal/HttpClientExtensions.cs | 17 -- .../Internal/Singleton.cs | 23 +++ .../Internal/StringExtensions.cs | 21 --- .../{Discord => Internal}/UrlBuilder.cs | 12 +- .../Markdown/MarkdownVisitor.cs | 14 +- .../DiscordChatExporter.Gui.csproj | 2 +- .../Services/SettingsService.cs | 2 + .../Dialogs/ExportSetupViewModel.cs | 22 ++- .../ViewModels/RootViewModel.cs | 16 +- .../Views/Dialogs/ExportSetupView.xaml | 108 +++++++---- .../Views/Dialogs/ExportSetupView.xaml.cs | 11 +- 56 files changed, 810 insertions(+), 578 deletions(-) delete mode 100644 DiscordChatExporter.Domain/Exporting/ExportOptions.cs create mode 100644 DiscordChatExporter.Domain/Exporting/ExportRequest.cs create mode 100644 DiscordChatExporter.Domain/Exporting/MediaDownloader.cs rename DiscordChatExporter.Domain/Exporting/{Resources/HtmlCore.css => Writers/Html/Core.css} (100%) rename DiscordChatExporter.Domain/Exporting/{Resources/HtmlDark.css => Writers/Html/Dark.css} (100%) rename DiscordChatExporter.Domain/Exporting/{Resources/HtmlLayoutTemplate.html => Writers/Html/LayoutTemplate.html} (67%) rename DiscordChatExporter.Domain/Exporting/{Resources/HtmlLight.css => Writers/Html/Light.css} (100%) rename DiscordChatExporter.Domain/Exporting/{ => Writers/Html}/MessageGroup.cs (67%) rename DiscordChatExporter.Domain/Exporting/{Resources/HtmlMessageGroupTemplate.html => Writers/Html/MessageGroupTemplate.html} (92%) rename DiscordChatExporter.Domain/Internal/{ => Extensions}/ColorExtensions.cs (85%) rename DiscordChatExporter.Domain/Internal/{ => Extensions}/DateExtensions.cs (89%) rename DiscordChatExporter.Domain/Internal/{ => Extensions}/GenericExtensions.cs (86%) create mode 100644 DiscordChatExporter.Domain/Internal/Extensions/HttpClientExtensions.cs rename DiscordChatExporter.Domain/Internal/{ => Extensions}/JsonElementExtensions.cs (86%) create mode 100644 DiscordChatExporter.Domain/Internal/Extensions/StringExtensions.cs rename DiscordChatExporter.Domain/Internal/{ => Extensions}/Utf8JsonWriterExtensions.cs (92%) delete mode 100644 DiscordChatExporter.Domain/Internal/HttpClientExtensions.cs create mode 100644 DiscordChatExporter.Domain/Internal/Singleton.cs delete mode 100644 DiscordChatExporter.Domain/Internal/StringExtensions.cs rename DiscordChatExporter.Domain/{Discord => Internal}/UrlBuilder.cs (80%) diff --git a/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs b/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs index adb8434..c4309dd 100644 --- a/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs +++ b/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs @@ -11,12 +11,12 @@ namespace DiscordChatExporter.Cli.Commands.Base { public abstract class ExportCommandBase : TokenCommandBase { - [CommandOption("format", 'f', Description = "Output file format.")] - public ExportFormat ExportFormat { get; set; } = ExportFormat.HtmlDark; - [CommandOption("output", 'o', Description = "Output file or directory path.")] public string OutputPath { get; set; } = Directory.GetCurrentDirectory(); + [CommandOption("format", 'f', Description = "Output file format.")] + public ExportFormat ExportFormat { get; set; } = ExportFormat.HtmlDark; + [CommandOption("after", Description = "Limit to messages sent after this date.")] public DateTimeOffset? After { get; set; } @@ -26,6 +26,9 @@ namespace DiscordChatExporter.Cli.Commands.Base [CommandOption("partition", 'p', Description = "Split output into partitions limited to this number of messages.")] public int? PartitionLimit { get; set; } + [CommandOption("media", Description = "Download referenced media content.")] + public bool ShouldDownloadMedia { get; set; } + [CommandOption("dateformat", Description = "Date format used in output.")] public string DateFormat { get; set; } = "dd-MMM-yy hh:mm tt"; @@ -36,9 +39,19 @@ namespace DiscordChatExporter.Cli.Commands.Base console.Output.Write($"Exporting channel '{channel.Category} / {channel.Name}'... "); var progress = console.CreateProgressTicker(); - await GetChannelExporter().ExportAsync(guild, channel, - OutputPath, ExportFormat, DateFormat, PartitionLimit, - After, Before, progress); + var request = new ExportRequest( + guild, + channel, + OutputPath, + ExportFormat, + After, + Before, + PartitionLimit, + ShouldDownloadMedia, + DateFormat + ); + + await GetChannelExporter().ExportChannelAsync(request, progress); console.Output.WriteLine(); console.Output.WriteLine("Done."); diff --git a/DiscordChatExporter.Cli/Commands/Base/ExportMultipleCommandBase.cs b/DiscordChatExporter.Cli/Commands/Base/ExportMultipleCommandBase.cs index a830637..0167081 100644 --- a/DiscordChatExporter.Cli/Commands/Base/ExportMultipleCommandBase.cs +++ b/DiscordChatExporter.Cli/Commands/Base/ExportMultipleCommandBase.cs @@ -7,6 +7,7 @@ using CliFx.Attributes; using CliFx.Utilities; using DiscordChatExporter.Domain.Discord.Models; using DiscordChatExporter.Domain.Exceptions; +using DiscordChatExporter.Domain.Exporting; using DiscordChatExporter.Domain.Utilities; using Gress; using Tyrrrz.Extensions; @@ -15,13 +16,12 @@ namespace DiscordChatExporter.Cli.Commands.Base { public abstract class ExportMultipleCommandBase : ExportCommandBase { - [CommandOption("parallel", Description = "Export this number of separate channels in parallel.")] + [CommandOption("parallel", Description = "Export this number of channels in parallel.")] public int ParallelLimit { get; set; } = 1; protected async ValueTask ExportMultipleAsync(IConsole console, IReadOnlyList channels) { - // This uses a separate route from ExportCommandBase because the progress ticker is not thread-safe - // Ugly code ahead. Will need to refactor. + // HACK: this uses a separate route from ExportCommandBase because the progress ticker is not thread-safe console.Output.Write($"Exporting {channels.Count} channels... "); var progress = console.CreateProgressTicker(); @@ -39,9 +39,19 @@ namespace DiscordChatExporter.Cli.Commands.Base { var guild = await GetDiscordClient().GetGuildAsync(channel.GuildId); - await GetChannelExporter().ExportAsync(guild, channel, - OutputPath, ExportFormat, DateFormat, PartitionLimit, - After, Before, operation); + var request = new ExportRequest( + guild, + channel, + OutputPath, + ExportFormat, + After, + Before, + PartitionLimit, + ShouldDownloadMedia, + DateFormat + ); + + await GetChannelExporter().ExportChannelAsync(request, operation); Interlocked.Increment(ref successfulExportCount); } diff --git a/DiscordChatExporter.Domain/Discord/AuthToken.cs b/DiscordChatExporter.Domain/Discord/AuthToken.cs index e9d1ade..22b62dc 100644 --- a/DiscordChatExporter.Domain/Discord/AuthToken.cs +++ b/DiscordChatExporter.Domain/Discord/AuthToken.cs @@ -16,9 +16,11 @@ namespace DiscordChatExporter.Domain.Discord Value = value; } - public AuthenticationHeaderValue GetAuthorizationHeader() => Type == AuthTokenType.User - ? new AuthenticationHeaderValue(Value) - : new AuthenticationHeaderValue("Bot", Value); + public AuthenticationHeaderValue GetAuthorizationHeader() => Type switch + { + AuthTokenType.Bot => new AuthenticationHeaderValue("Bot", Value), + _ => new AuthenticationHeaderValue(Value) + }; public override string ToString() => Value; } diff --git a/DiscordChatExporter.Domain/Discord/DiscordClient.cs b/DiscordChatExporter.Domain/Discord/DiscordClient.cs index a1b6efb..473cbc0 100644 --- a/DiscordChatExporter.Domain/Discord/DiscordClient.cs +++ b/DiscordChatExporter.Domain/Discord/DiscordClient.cs @@ -8,25 +8,26 @@ using System.Threading.Tasks; using DiscordChatExporter.Domain.Discord.Models; using DiscordChatExporter.Domain.Exceptions; using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; using Polly; namespace DiscordChatExporter.Domain.Discord { - public partial class DiscordClient + public class DiscordClient { private readonly AuthToken _token; - private readonly HttpClient _httpClient; + private readonly HttpClient _httpClient = Singleton.HttpClient; private readonly IAsyncPolicy _httpRequestPolicy; private readonly Uri _baseUri = new Uri("https://discordapp.com/api/v6/", UriKind.Absolute); - public DiscordClient(AuthToken token, HttpClient httpClient) + public DiscordClient(AuthToken token) { _token = token; - _httpClient = httpClient; // Discord seems to always respond with 429 on the first request with unreasonable wait time (10+ minutes). - // For that reason the policy will start respecting their retry-after header only after Nth failed response. + // For that reason the policy will ignore such errors at first, then wait a constant amount of time, and + // finally wait the specified amount of time, based on how many requests have failed in a row. _httpRequestPolicy = Policy .HandleResult(m => m.StatusCode == HttpStatusCode.TooManyRequests) .OrResult(m => m.StatusCode >= HttpStatusCode.InternalServerError) @@ -41,24 +42,17 @@ namespace DiscordChatExporter.Domain.Discord return result.Result.Headers.RetryAfter.Delta ?? TimeSpan.FromSeconds(10 * i); }, - (response, timespan, retryCount, context) => Task.CompletedTask); + (response, timespan, retryCount, context) => Task.CompletedTask + ); } - public DiscordClient(AuthToken token) - : this(token, LazyHttpClient.Value) + private async Task GetResponseAsync(string url) => await _httpRequestPolicy.ExecuteAsync(async () => { - } + using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url)); + request.Headers.Authorization = _token.GetAuthorizationHeader(); - private async Task GetResponseAsync(string url) - { - return await _httpRequestPolicy.ExecuteAsync(async () => - { - using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url)); - request.Headers.Authorization = _token.GetAuthorizationHeader(); - - return await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); - }); - } + return await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); + }); private async Task GetJsonResponseAsync(string url) { @@ -97,15 +91,14 @@ namespace DiscordChatExporter.Domain.Discord var url = new UrlBuilder() .SetPath("users/@me/guilds") .SetQueryParameter("limit", "100") - .SetQueryParameterIfNotNullOrWhiteSpace("after", afterId) + .SetQueryParameter("after", afterId) .Build(); var response = await GetJsonResponseAsync(url); var isEmpty = true; - foreach (var guildJson in response.EnumerateArray()) + foreach (var guild in response.EnumerateArray().Select(Guild.Parse)) { - var guild = Guild.Parse(guildJson); yield return guild; afterId = guild.Id; @@ -206,7 +199,7 @@ namespace DiscordChatExporter.Domain.Discord var url = new UrlBuilder() .SetPath($"channels/{channelId}/messages") .SetQueryParameter("limit", "1") - .SetQueryParameterIfNotNullOrWhiteSpace("before", before?.ToSnowflake()) + .SetQueryParameter("before", before?.ToSnowflake()) .Build(); var response = await GetJsonResponseAsync(url); @@ -219,11 +212,15 @@ namespace DiscordChatExporter.Domain.Discord DateTimeOffset? before = null, IProgress? progress = null) { - // Get the last message in the specified range + // Get the last message in the specified range. + // This snapshots the boundaries, which means that messages posted after the exported started + // will not appear in the output. + // Additionally, it provides the date of the last message, which is used to calculate progress. var lastMessage = await TryGetLastMessageAsync(channelId, before); if (lastMessage == null || lastMessage.Timestamp < after) yield break; + // Keep track of first message in range in order to calculate progress var firstMessage = default(Message); var afterId = after?.ToSnowflake() ?? "0"; @@ -267,19 +264,4 @@ namespace DiscordChatExporter.Domain.Discord } } } - - public partial class DiscordClient - { - private static readonly Lazy LazyHttpClient = new Lazy(() => - { - var handler = new HttpClientHandler(); - - if (handler.SupportsAutomaticDecompression) - handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate; - - handler.UseCookies = false; - - return new HttpClient(handler, true); - }); - } } \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Discord/Models/Attachment.cs b/DiscordChatExporter.Domain/Discord/Models/Attachment.cs index f8f4277..474e193 100644 --- a/DiscordChatExporter.Domain/Discord/Models/Attachment.cs +++ b/DiscordChatExporter.Domain/Discord/Models/Attachment.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using System.Text.Json; using DiscordChatExporter.Domain.Discord.Models.Common; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Discord.Models { diff --git a/DiscordChatExporter.Domain/Discord/Models/Channel.cs b/DiscordChatExporter.Domain/Discord/Models/Channel.cs index b67f8f4..2b0a389 100644 --- a/DiscordChatExporter.Domain/Discord/Models/Channel.cs +++ b/DiscordChatExporter.Domain/Discord/Models/Channel.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Text.Json; using DiscordChatExporter.Domain.Discord.Models.Common; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; using Tyrrrz.Extensions; namespace DiscordChatExporter.Domain.Discord.Models diff --git a/DiscordChatExporter.Domain/Discord/Models/Embed.cs b/DiscordChatExporter.Domain/Discord/Models/Embed.cs index b75c583..bd15761 100644 --- a/DiscordChatExporter.Domain/Discord/Models/Embed.cs +++ b/DiscordChatExporter.Domain/Discord/Models/Embed.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Text.Json; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Discord.Models { diff --git a/DiscordChatExporter.Domain/Discord/Models/EmbedAuthor.cs b/DiscordChatExporter.Domain/Discord/Models/EmbedAuthor.cs index 6597a95..dffe793 100644 --- a/DiscordChatExporter.Domain/Discord/Models/EmbedAuthor.cs +++ b/DiscordChatExporter.Domain/Discord/Models/EmbedAuthor.cs @@ -1,5 +1,5 @@ using System.Text.Json; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Discord.Models { diff --git a/DiscordChatExporter.Domain/Discord/Models/EmbedField.cs b/DiscordChatExporter.Domain/Discord/Models/EmbedField.cs index a72faf7..ced7742 100644 --- a/DiscordChatExporter.Domain/Discord/Models/EmbedField.cs +++ b/DiscordChatExporter.Domain/Discord/Models/EmbedField.cs @@ -1,5 +1,5 @@ using System.Text.Json; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Discord.Models { diff --git a/DiscordChatExporter.Domain/Discord/Models/EmbedFooter.cs b/DiscordChatExporter.Domain/Discord/Models/EmbedFooter.cs index 44022cf..3b8e8dd 100644 --- a/DiscordChatExporter.Domain/Discord/Models/EmbedFooter.cs +++ b/DiscordChatExporter.Domain/Discord/Models/EmbedFooter.cs @@ -1,5 +1,5 @@ using System.Text.Json; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Discord.Models { diff --git a/DiscordChatExporter.Domain/Discord/Models/EmbedImage.cs b/DiscordChatExporter.Domain/Discord/Models/EmbedImage.cs index aa8f5d9..389e635 100644 --- a/DiscordChatExporter.Domain/Discord/Models/EmbedImage.cs +++ b/DiscordChatExporter.Domain/Discord/Models/EmbedImage.cs @@ -1,5 +1,5 @@ using System.Text.Json; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Discord.Models { diff --git a/DiscordChatExporter.Domain/Discord/Models/Emoji.cs b/DiscordChatExporter.Domain/Discord/Models/Emoji.cs index f73513b..7c3972d 100644 --- a/DiscordChatExporter.Domain/Discord/Models/Emoji.cs +++ b/DiscordChatExporter.Domain/Discord/Models/Emoji.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Text; using System.Text.Json; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; using Tyrrrz.Extensions; namespace DiscordChatExporter.Domain.Discord.Models diff --git a/DiscordChatExporter.Domain/Discord/Models/Guild.cs b/DiscordChatExporter.Domain/Discord/Models/Guild.cs index ccbebe8..45ce376 100644 --- a/DiscordChatExporter.Domain/Discord/Models/Guild.cs +++ b/DiscordChatExporter.Domain/Discord/Models/Guild.cs @@ -12,12 +12,11 @@ namespace DiscordChatExporter.Domain.Discord.Models public string IconUrl { get; } - public Guild(string id, string name, string? iconHash) + public Guild(string id, string name, string iconUrl) { Id = id; Name = name; - - IconUrl = GetIconUrl(id, iconHash); + IconUrl = iconUrl; } public override string ToString() => Name; @@ -26,12 +25,13 @@ namespace DiscordChatExporter.Domain.Discord.Models public partial class Guild { public static Guild DirectMessages { get; } = - new Guild("@me", "Direct Messages", null); + new Guild("@me", "Direct Messages", GetDefaultIconUrl()); + + private static string GetDefaultIconUrl() => + "https://cdn.discordapp.com/embed/avatars/0.png"; - private static string GetIconUrl(string id, string? iconHash) => - !string.IsNullOrWhiteSpace(iconHash) - ? $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png" - : "https://cdn.discordapp.com/embed/avatars/0.png"; + private static string GetIconUrl(string id, string iconHash) => + $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png"; public static Guild Parse(JsonElement json) { @@ -39,7 +39,11 @@ namespace DiscordChatExporter.Domain.Discord.Models var name = json.GetProperty("name").GetString(); var iconHash = json.GetProperty("icon").GetString(); - return new Guild(id, name, iconHash); + var iconUrl = !string.IsNullOrWhiteSpace(iconHash) + ? GetIconUrl(id, iconHash) + : GetDefaultIconUrl(); + + return new Guild(id, name, iconUrl); } } } \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Discord/Models/Member.cs b/DiscordChatExporter.Domain/Discord/Models/Member.cs index 0b1356e..2487c51 100644 --- a/DiscordChatExporter.Domain/Discord/Models/Member.cs +++ b/DiscordChatExporter.Domain/Discord/Models/Member.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.Json; using DiscordChatExporter.Domain.Discord.Models.Common; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Discord.Models { diff --git a/DiscordChatExporter.Domain/Discord/Models/Message.cs b/DiscordChatExporter.Domain/Discord/Models/Message.cs index 03df1c4..2375607 100644 --- a/DiscordChatExporter.Domain/Discord/Models/Message.cs +++ b/DiscordChatExporter.Domain/Discord/Models/Message.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.Json; using DiscordChatExporter.Domain.Discord.Models.Common; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Discord.Models { @@ -71,10 +71,7 @@ namespace DiscordChatExporter.Domain.Discord.Models MentionedUsers = mentionedUsers; } - public override string ToString() => - Content ?? (Embeds.Any() - ? "" - : ""); + public override string ToString() => Content; } public partial class Message diff --git a/DiscordChatExporter.Domain/Discord/Models/Reaction.cs b/DiscordChatExporter.Domain/Discord/Models/Reaction.cs index 9f31449..127f266 100644 --- a/DiscordChatExporter.Domain/Discord/Models/Reaction.cs +++ b/DiscordChatExporter.Domain/Discord/Models/Reaction.cs @@ -1,5 +1,5 @@ using System.Text.Json; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Discord.Models { diff --git a/DiscordChatExporter.Domain/Discord/Models/Role.cs b/DiscordChatExporter.Domain/Discord/Models/Role.cs index 12c6b44..9fcc8cb 100644 --- a/DiscordChatExporter.Domain/Discord/Models/Role.cs +++ b/DiscordChatExporter.Domain/Discord/Models/Role.cs @@ -1,6 +1,6 @@ using System.Drawing; using System.Text.Json; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Discord.Models { diff --git a/DiscordChatExporter.Domain/Discord/Models/User.cs b/DiscordChatExporter.Domain/Discord/Models/User.cs index 32f2de0..c56b14a 100644 --- a/DiscordChatExporter.Domain/Discord/Models/User.cs +++ b/DiscordChatExporter.Domain/Discord/Models/User.cs @@ -1,7 +1,7 @@ using System; using System.Text.Json; using DiscordChatExporter.Domain.Discord.Models.Common; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Discord.Models { @@ -20,14 +20,13 @@ namespace DiscordChatExporter.Domain.Discord.Models public string AvatarUrl { get; } - public User(string id, bool isBot, int discriminator, string name, string? avatarHash) + public User(string id, bool isBot, int discriminator, string name, string avatarUrl) { Id = id; IsBot = isBot; Discriminator = discriminator; Name = name; - - AvatarUrl = GetAvatarUrl(id, discriminator, avatarHash); + AvatarUrl = avatarUrl; } public override string ToString() => FullName; @@ -35,21 +34,17 @@ namespace DiscordChatExporter.Domain.Discord.Models public partial class User { - private static string GetAvatarUrl(string id, int discriminator, string? avatarHash) - { - // Custom avatar - if (!string.IsNullOrWhiteSpace(avatarHash)) - { - // Animated - if (avatarHash.StartsWith("a_", StringComparison.Ordinal)) - return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.gif"; + private static string GetDefaultAvatarUrl(int discriminator) => + $"https://cdn.discordapp.com/embed/avatars/{discriminator % 5}.png"; - // Non-animated - return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.png"; - } + private static string GetAvatarUrl(string id, string avatarHash) + { + // Animated + if (avatarHash.StartsWith("a_", StringComparison.Ordinal)) + return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.gif"; - // Default avatar - return $"https://cdn.discordapp.com/embed/avatars/{discriminator % 5}.png"; + // Non-animated + return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.png"; } public static User Parse(JsonElement json) @@ -60,7 +55,11 @@ namespace DiscordChatExporter.Domain.Discord.Models var avatarHash = json.GetProperty("avatar").GetString(); var isBot = json.GetPropertyOrNull("bot")?.GetBoolean() ?? false; - return new User(id, isBot, discriminator, name, avatarHash); + var avatarUrl = !string.IsNullOrWhiteSpace(avatarHash) + ? GetAvatarUrl(id, avatarHash) + : GetDefaultAvatarUrl(discriminator); + + return new User(id, isBot, discriminator, name, avatarUrl); } } } \ No newline at end of file diff --git a/DiscordChatExporter.Domain/DiscordChatExporter.Domain.csproj b/DiscordChatExporter.Domain/DiscordChatExporter.Domain.csproj index f2669f5..5644bf7 100644 --- a/DiscordChatExporter.Domain/DiscordChatExporter.Domain.csproj +++ b/DiscordChatExporter.Domain/DiscordChatExporter.Domain.csproj @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/DiscordChatExporter.Domain/Exceptions/DiscordChatExporterException.cs b/DiscordChatExporter.Domain/Exceptions/DiscordChatExporterException.cs index 3dcf382..d1ee082 100644 --- a/DiscordChatExporter.Domain/Exceptions/DiscordChatExporterException.cs +++ b/DiscordChatExporter.Domain/Exceptions/DiscordChatExporterException.cs @@ -1,6 +1,5 @@ using System; using System.Net.Http; -using DiscordChatExporter.Domain.Discord.Models; namespace DiscordChatExporter.Domain.Exceptions { @@ -43,17 +42,14 @@ Failed to perform an HTTP request. internal static DiscordChatExporterException NotFound() { - const string message = "Not found."; + const string message = "Requested resource does not exist."; return new DiscordChatExporterException(message); } - internal static DiscordChatExporterException ChannelEmpty(string channel) + internal static DiscordChatExporterException ChannelIsEmpty(string channel) { var message = $"Channel '{channel}' contains no messages for the specified period."; return new DiscordChatExporterException(message); } - - internal static DiscordChatExporterException ChannelEmpty(Channel channel) => - ChannelEmpty(channel.Name); } } \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Exporting/ChannelExporter.cs b/DiscordChatExporter.Domain/Exporting/ChannelExporter.cs index d995ab8..75f501e 100644 --- a/DiscordChatExporter.Domain/Exporting/ChannelExporter.cs +++ b/DiscordChatExporter.Domain/Exporting/ChannelExporter.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Text; using System.Threading.Tasks; using DiscordChatExporter.Domain.Discord; using DiscordChatExporter.Domain.Discord.Models; @@ -12,7 +10,7 @@ using DiscordChatExporter.Domain.Utilities; namespace DiscordChatExporter.Domain.Exporting { - public partial class ChannelExporter + public class ChannelExporter { private readonly DiscordClient _discord; @@ -20,49 +18,38 @@ namespace DiscordChatExporter.Domain.Exporting public ChannelExporter(AuthToken token) : this(new DiscordClient(token)) {} - public async Task ExportAsync( - Guild guild, - Channel channel, - string outputPath, - ExportFormat format, - string dateFormat, - int? partitionLimit, - DateTimeOffset? after = null, - DateTimeOffset? before = null, - IProgress? progress = null) + public async Task ExportChannelAsync(ExportRequest request, IProgress? progress = null) { - var baseFilePath = GetFilePathFromOutputPath(guild, channel, outputPath, format, after, before); - - // Options - var options = new ExportOptions(baseFilePath, format, partitionLimit); - - // Context + // Build context var contextMembers = new HashSet(IdBasedEqualityComparer.Instance); - var contextChannels = await _discord.GetGuildChannelsAsync(guild.Id); - var contextRoles = await _discord.GetGuildRolesAsync(guild.Id); + var contextChannels = await _discord.GetGuildChannelsAsync(request.Guild.Id); + var contextRoles = await _discord.GetGuildRolesAsync(request.Guild.Id); var context = new ExportContext( - guild, channel, after, before, dateFormat, - contextMembers, contextChannels, contextRoles + request, + contextMembers, + contextChannels, + contextRoles ); - await using var messageExporter = new MessageExporter(options, context); + // Export messages + await using var messageExporter = new MessageExporter(context); var exportedAnything = false; var encounteredUsers = new HashSet(IdBasedEqualityComparer.Instance); - await foreach (var message in _discord.GetMessagesAsync(channel.Id, after, before, progress)) + await foreach (var message in _discord.GetMessagesAsync(request.Channel.Id, request.After, request.Before, progress)) { // Resolve members for referenced users foreach (var referencedUser in message.MentionedUsers.Prepend(message.Author)) { - if (encounteredUsers.Add(referencedUser)) - { - var member = - await _discord.TryGetGuildMemberAsync(guild.Id, referencedUser) ?? - Member.CreateForUser(referencedUser); + if (!encounteredUsers.Add(referencedUser)) + continue; - contextMembers.Add(member); - } + var member = + await _discord.TryGetGuildMemberAsync(request.Guild.Id, referencedUser) ?? + Member.CreateForUser(referencedUser); + + contextMembers.Add(member); } // Export message @@ -72,75 +59,7 @@ namespace DiscordChatExporter.Domain.Exporting // Throw if no messages were exported if (!exportedAnything) - throw DiscordChatExporterException.ChannelEmpty(channel); - } - } - - public partial class ChannelExporter - { - public static string GetDefaultExportFileName( - Guild guild, - Channel channel, - ExportFormat format, - DateTimeOffset? after = null, - DateTimeOffset? before = null) - { - var buffer = new StringBuilder(); - - // Guild and channel names - buffer.Append($"{guild.Name} - {channel.Category} - {channel.Name} [{channel.Id}]"); - - // Date range - if (after != null || before != null) - { - buffer.Append(" ("); - - // Both 'after' and 'before' are set - if (after != null && before != null) - { - buffer.Append($"{after:yyyy-MM-dd} to {before:yyyy-MM-dd}"); - } - // Only 'after' is set - else if (after != null) - { - buffer.Append($"after {after:yyyy-MM-dd}"); - } - // Only 'before' is set - else - { - buffer.Append($"before {before:yyyy-MM-dd}"); - } - - buffer.Append(")"); - } - - // File extension - buffer.Append($".{format.GetFileExtension()}"); - - // Replace invalid chars - foreach (var invalidChar in Path.GetInvalidFileNameChars()) - buffer.Replace(invalidChar, '_'); - - return buffer.ToString(); - } - - private static string GetFilePathFromOutputPath( - Guild guild, - Channel channel, - string outputPath, - ExportFormat format, - DateTimeOffset? after = null, - DateTimeOffset? before = null) - { - // Output is a directory - if (Directory.Exists(outputPath) || string.IsNullOrWhiteSpace(Path.GetExtension(outputPath))) - { - var fileName = GetDefaultExportFileName(guild, channel, format, after, before); - return Path.Combine(outputPath, fileName); - } - - // Output is a file - return outputPath; + throw DiscordChatExporterException.ChannelIsEmpty(request.Channel.Name); } } } \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Exporting/ExportContext.cs b/DiscordChatExporter.Domain/Exporting/ExportContext.cs index d59ac52..a23e83b 100644 --- a/DiscordChatExporter.Domain/Exporting/ExportContext.cs +++ b/DiscordChatExporter.Domain/Exporting/ExportContext.cs @@ -1,22 +1,17 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Drawing; +using System.IO; using System.Linq; +using System.Threading.Tasks; using DiscordChatExporter.Domain.Discord.Models; namespace DiscordChatExporter.Domain.Exporting { - public class ExportContext + internal class ExportContext { - public Guild Guild { get; } + private readonly MediaDownloader _mediaDownloader; - public Channel Channel { get; } - - public DateTimeOffset? After { get; } - - public DateTimeOffset? Before { get; } - - public string DateFormat { get; } + public ExportRequest Request { get; } public IReadOnlyCollection Members { get; } @@ -25,46 +20,50 @@ namespace DiscordChatExporter.Domain.Exporting public IReadOnlyCollection Roles { get; } public ExportContext( - Guild guild, - Channel channel, - DateTimeOffset? after, - DateTimeOffset? before, - string dateFormat, + ExportRequest request, IReadOnlyCollection members, IReadOnlyCollection channels, IReadOnlyCollection roles) { - Guild = guild; - Channel = channel; - After = after; - Before = before; - DateFormat = dateFormat; + Request = request; Members = members; Channels = channels; Roles = roles; + + _mediaDownloader = new MediaDownloader(request.OutputMediaDirPath); } - public Member? TryGetMentionedMember(string id) => + public Member? TryGetMember(string id) => Members.FirstOrDefault(m => m.Id == id); - public Channel? TryGetMentionedChannel(string id) => + public Channel? TryGetChannel(string id) => Channels.FirstOrDefault(c => c.Id == id); - public Role? TryGetMentionedRole(string id) => + public Role? TryGetRole(string id) => Roles.FirstOrDefault(r => r.Id == id); - public Member? TryGetUserMember(User user) => Members - .FirstOrDefault(m => m.Id == user.Id); - public Color? TryGetUserColor(User user) { - var member = TryGetUserMember(user); + var member = TryGetMember(user.Id); var roles = member?.RoleIds.Join(Roles, i => i, r => r.Id, (_, role) => role); return roles? + .Where(r => r.Color != null) .OrderByDescending(r => r.Position) .Select(r => r.Color) - .FirstOrDefault(c => c != null); + .FirstOrDefault(); + } + + // HACK: ConfigureAwait() is crucial here to enable sync-over-async in HtmlMessageWriter + public async Task ResolveMediaUrlAsync(string url) + { + if (!Request.ShouldDownloadMedia) + return url; + + var filePath = await _mediaDownloader.DownloadAsync(url).ConfigureAwait(false); + + // Return relative path so that the output files can be copied around without breaking + return Path.GetRelativePath(Request.OutputBaseDirPath, filePath); } } } \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Exporting/ExportOptions.cs b/DiscordChatExporter.Domain/Exporting/ExportOptions.cs deleted file mode 100644 index faeb1cb..0000000 --- a/DiscordChatExporter.Domain/Exporting/ExportOptions.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace DiscordChatExporter.Domain.Exporting -{ - public class ExportOptions - { - public string BaseFilePath { get; } - - public ExportFormat Format { get; } - - public int? PartitionLimit { get; } - - public ExportOptions(string baseFilePath, ExportFormat format, int? partitionLimit) - { - BaseFilePath = baseFilePath; - Format = format; - PartitionLimit = partitionLimit; - } - } -} \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Exporting/ExportRequest.cs b/DiscordChatExporter.Domain/Exporting/ExportRequest.cs new file mode 100644 index 0000000..3b4f9f6 --- /dev/null +++ b/DiscordChatExporter.Domain/Exporting/ExportRequest.cs @@ -0,0 +1,136 @@ +using System; +using System.IO; +using System.Text; +using DiscordChatExporter.Domain.Discord.Models; + +namespace DiscordChatExporter.Domain.Exporting +{ + public partial class ExportRequest + { + public Guild Guild { get; } + + public Channel Channel { get; } + + public string OutputPath { get; } + + public string OutputBaseFilePath { get; } + + public string OutputBaseDirPath { get; } + + public string OutputMediaDirPath { get; } + + public ExportFormat Format { get; } + + public DateTimeOffset? After { get; } + + public DateTimeOffset? Before { get; } + + public int? PartitionLimit { get; } + + public bool ShouldDownloadMedia { get; } + + public string DateFormat { get; } + + public ExportRequest( + Guild guild, + Channel channel, + string outputPath, + ExportFormat format, + DateTimeOffset? after, + DateTimeOffset? before, + int? partitionLimit, + bool shouldDownloadMedia, + string dateFormat) + { + Guild = guild; + Channel = channel; + OutputPath = outputPath; + Format = format; + After = after; + Before = before; + PartitionLimit = partitionLimit; + ShouldDownloadMedia = shouldDownloadMedia; + DateFormat = dateFormat; + + OutputBaseFilePath = GetOutputBaseFilePath( + guild, + channel, + outputPath, + format, + after, + before + ); + + OutputBaseDirPath = Path.GetDirectoryName(OutputBaseFilePath) ?? OutputPath; + OutputMediaDirPath = $"{OutputBaseFilePath}_Files{Path.DirectorySeparatorChar}"; + } + } + + public partial class ExportRequest + { + private static string GetOutputBaseFilePath( + Guild guild, + Channel channel, + string outputPath, + ExportFormat format, + DateTimeOffset? after = null, + DateTimeOffset? before = null) + { + // Output is a directory + if (Directory.Exists(outputPath) || string.IsNullOrWhiteSpace(Path.GetExtension(outputPath))) + { + var fileName = GetDefaultOutputFileName(guild, channel, format, after, before); + return Path.Combine(outputPath, fileName); + } + + // Output is a file + return outputPath; + } + + public static string GetDefaultOutputFileName( + Guild guild, + Channel channel, + ExportFormat format, + DateTimeOffset? after = null, + DateTimeOffset? before = null) + { + var buffer = new StringBuilder(); + + // Guild and channel names + buffer.Append($"{guild.Name} - {channel.Category} - {channel.Name} [{channel.Id}]"); + + // Date range + if (after != null || before != null) + { + buffer.Append(" ("); + + // Both 'after' and 'before' are set + if (after != null && before != null) + { + buffer.Append($"{after:yyyy-MM-dd} to {before:yyyy-MM-dd}"); + } + // Only 'after' is set + else if (after != null) + { + buffer.Append($"after {after:yyyy-MM-dd}"); + } + // Only 'before' is set + else + { + buffer.Append($"before {before:yyyy-MM-dd}"); + } + + buffer.Append(")"); + } + + // File extension + buffer.Append($".{format.GetFileExtension()}"); + + // Replace invalid chars + foreach (var invalidChar in Path.GetInvalidFileNameChars()) + buffer.Replace(invalidChar, '_'); + + return buffer.ToString(); + } + } +} \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Exporting/MediaDownloader.cs b/DiscordChatExporter.Domain/Exporting/MediaDownloader.cs new file mode 100644 index 0000000..44e7cce --- /dev/null +++ b/DiscordChatExporter.Domain/Exporting/MediaDownloader.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Net.Http; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; + +namespace DiscordChatExporter.Domain.Exporting +{ + internal partial class MediaDownloader + { + private readonly HttpClient _httpClient = Singleton.HttpClient; + private readonly string _workingDirPath; + + private readonly Dictionary _mediaPathMap = new Dictionary(); + + public MediaDownloader(string workingDirPath) + { + _workingDirPath = workingDirPath; + } + + // HACK: ConfigureAwait() is crucial here to enable sync-over-async in HtmlMessageWriter + public async Task DownloadAsync(string url) + { + if (_mediaPathMap.TryGetValue(url, out var cachedFilePath)) + return cachedFilePath; + + Directory.CreateDirectory(_workingDirPath); + + var extension = Path.GetExtension(GetFileNameFromUrl(url)); + var fileName = $"{Guid.NewGuid()}{extension}"; + var filePath = Path.Combine(_workingDirPath, fileName); + + await _httpClient.DownloadAsync(url, filePath).ConfigureAwait(false); + + return _mediaPathMap[url] = filePath; + } + } + + internal partial class MediaDownloader + { + private static string GetFileNameFromUrl(string url) => + Regex.Match(url, @".+/([^?]*)").Groups[1].Value; + } +} \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Exporting/MessageExporter.cs b/DiscordChatExporter.Domain/Exporting/MessageExporter.cs index 0347b8c..1bb6e6d 100644 --- a/DiscordChatExporter.Domain/Exporting/MessageExporter.cs +++ b/DiscordChatExporter.Domain/Exporting/MessageExporter.cs @@ -8,24 +8,22 @@ namespace DiscordChatExporter.Domain.Exporting { internal partial class MessageExporter : IAsyncDisposable { - private readonly ExportOptions _options; private readonly ExportContext _context; - private long _renderedMessageCount; + private long _messageCount; private int _partitionIndex; private MessageWriter? _writer; - public MessageExporter(ExportOptions options, ExportContext context) + public MessageExporter(ExportContext context) { - _options = options; _context = context; } private bool IsPartitionLimitReached() => - _renderedMessageCount > 0 && - _options.PartitionLimit != null && - _options.PartitionLimit != 0 && - _renderedMessageCount % _options.PartitionLimit == 0; + _messageCount > 0 && + _context.Request.PartitionLimit != null && + _context.Request.PartitionLimit != 0 && + _messageCount % _context.Request.PartitionLimit == 0; private async Task ResetWriterAsync() { @@ -50,13 +48,13 @@ namespace DiscordChatExporter.Domain.Exporting if (_writer != null) return _writer; - var filePath = GetPartitionFilePath(_options.BaseFilePath, _partitionIndex); + var filePath = GetPartitionFilePath(_context.Request.OutputBaseFilePath, _partitionIndex); - var dirPath = Path.GetDirectoryName(_options.BaseFilePath); + var dirPath = Path.GetDirectoryName(_context.Request.OutputBaseFilePath); if (!string.IsNullOrWhiteSpace(dirPath)) Directory.CreateDirectory(dirPath); - var writer = CreateMessageWriter(filePath, _options.Format, _context); + var writer = CreateMessageWriter(filePath, _context.Request.Format, _context); await writer.WritePreambleAsync(); return _writer = writer; @@ -66,7 +64,7 @@ namespace DiscordChatExporter.Domain.Exporting { var writer = await GetWriterAsync(); await writer.WriteMessageAsync(message); - _renderedMessageCount++; + _messageCount++; } public async ValueTask DisposeAsync() => await ResetWriterAsync(); diff --git a/DiscordChatExporter.Domain/Exporting/Writers/CsvMessageWriter.cs b/DiscordChatExporter.Domain/Exporting/Writers/CsvMessageWriter.cs index d7c0a25..61b8084 100644 --- a/DiscordChatExporter.Domain/Exporting/Writers/CsvMessageWriter.cs +++ b/DiscordChatExporter.Domain/Exporting/Writers/CsvMessageWriter.cs @@ -1,11 +1,10 @@ -using System.IO; -using System.Linq; +using System.Collections.Generic; +using System.IO; using System.Text; using System.Threading.Tasks; using DiscordChatExporter.Domain.Discord.Models; using DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors; -using DiscordChatExporter.Domain.Internal; -using Tyrrrz.Extensions; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Exporting.Writers { @@ -25,19 +24,65 @@ namespace DiscordChatExporter.Domain.Exporting.Writers public override async Task WritePreambleAsync() => await _writer.WriteLineAsync("AuthorID,Author,Date,Content,Attachments,Reactions"); - public override async Task WriteMessageAsync(Message message) + private async Task WriteAttachmentsAsync(IReadOnlyList attachments) { var buffer = new StringBuilder(); - buffer - .Append(CsvEncode(message.Author.Id)).Append(',') - .Append(CsvEncode(message.Author.FullName)).Append(',') - .Append(CsvEncode(message.Timestamp.ToLocalString(Context.DateFormat))).Append(',') - .Append(CsvEncode(FormatMarkdown(message.Content))).Append(',') - .Append(CsvEncode(message.Attachments.Select(a => a.Url).JoinToString(","))).Append(',') - .Append(CsvEncode(message.Reactions.Select(r => $"{r.Emoji.Name} ({r.Count})").JoinToString(","))); + foreach (var attachment in attachments) + { + buffer + .AppendIfNotEmpty(',') + .Append(await Context.ResolveMediaUrlAsync(attachment.Url)); + } + + await _writer.WriteAsync(CsvEncode(buffer.ToString())); + } + + private async Task WriteReactionsAsync(IReadOnlyList reactions) + { + var buffer = new StringBuilder(); + + foreach (var reaction in reactions) + { + buffer + .AppendIfNotEmpty(',') + .Append(reaction.Emoji.Name) + .Append(' ') + .Append('(') + .Append(reaction.Count) + .Append(')'); + } + + await _writer.WriteAsync(CsvEncode(buffer.ToString())); + } + + public override async Task WriteMessageAsync(Message message) + { + // Author ID + await _writer.WriteAsync(CsvEncode(message.Author.Id)); + await _writer.WriteAsync(','); + + // Author name + await _writer.WriteAsync(CsvEncode(message.Author.FullName)); + await _writer.WriteAsync(','); + + // Message timestamp + await _writer.WriteAsync(CsvEncode(message.Timestamp.ToLocalString(Context.Request.DateFormat))); + await _writer.WriteAsync(','); + + // Message content + await _writer.WriteAsync(CsvEncode(FormatMarkdown(message.Content))); + await _writer.WriteAsync(','); + + // Attachments + await WriteAttachmentsAsync(message.Attachments); + await _writer.WriteAsync(','); + + // Reactions + await WriteReactionsAsync(message.Reactions); - await _writer.WriteLineAsync(buffer.ToString()); + // Finish row + await _writer.WriteLineAsync(); } public override async ValueTask DisposeAsync() diff --git a/DiscordChatExporter.Domain/Exporting/Resources/HtmlCore.css b/DiscordChatExporter.Domain/Exporting/Writers/Html/Core.css similarity index 100% rename from DiscordChatExporter.Domain/Exporting/Resources/HtmlCore.css rename to DiscordChatExporter.Domain/Exporting/Writers/Html/Core.css diff --git a/DiscordChatExporter.Domain/Exporting/Resources/HtmlDark.css b/DiscordChatExporter.Domain/Exporting/Writers/Html/Dark.css similarity index 100% rename from DiscordChatExporter.Domain/Exporting/Resources/HtmlDark.css rename to DiscordChatExporter.Domain/Exporting/Writers/Html/Dark.css diff --git a/DiscordChatExporter.Domain/Exporting/Resources/HtmlLayoutTemplate.html b/DiscordChatExporter.Domain/Exporting/Writers/Html/LayoutTemplate.html similarity index 67% rename from DiscordChatExporter.Domain/Exporting/Resources/HtmlLayoutTemplate.html rename to DiscordChatExporter.Domain/Exporting/Writers/Html/LayoutTemplate.html index ff20806..6f11eb6 100644 --- a/DiscordChatExporter.Domain/Exporting/Resources/HtmlLayoutTemplate.html +++ b/DiscordChatExporter.Domain/Exporting/Writers/Html/LayoutTemplate.html @@ -3,7 +3,7 @@ {{~ # Metadata ~}} - {{ Context.Guild.Name | html.escape }} - {{ Context.Channel.Name | html.escape }} + {{ Context.Request.Guild.Name | html.escape }} - {{ Context.Request.Channel.Name | html.escape }} @@ -58,24 +58,24 @@ {{~ # Preamble ~}}
- Guild icon + Guild icon
-
{{ Context.Guild.Name | html.escape }}
-
{{ Context.Channel.Category | html.escape }} / {{ Context.Channel.Name | html.escape }}
+
{{ Context.Request.Guild.Name | html.escape }}
+
{{ Context.Request.Channel.Category | html.escape }} / {{ Context.Request.Channel.Name | html.escape }}
- {{~ if Context.Channel.Topic ~}} -
{{ Context.Channel.Topic | html.escape }}
+ {{~ if Context.Request.Channel.Topic ~}} +
{{ Context.Request.Channel.Topic | html.escape }}
{{~ end ~}} - {{~ if Context.After || Context.Before ~}} + {{~ if Context.Request.After || Context.Request.Before ~}}
- {{~ if Context.After && Context.Before ~}} - Between {{ Context.After | FormatDate | html.escape }} and {{ Context.Before | FormatDate | html.escape }} - {{~ else if Context.After ~}} - After {{ Context.After | FormatDate | html.escape }} - {{~ else if Context.Before ~}} - Before {{ Context.Before | FormatDate | html.escape }} + {{~ if Context.Request.After && Context.Request.Before ~}} + Between {{ Context.Request.After | FormatDate | html.escape }} and {{ Context.Request.Before | FormatDate | html.escape }} + {{~ else if Context.Request.After ~}} + After {{ Context.Request.After | FormatDate | html.escape }} + {{~ else if Context.Request.Before ~}} + Before {{ Context.Request.Before | FormatDate | html.escape }} {{~ end ~}}
{{~ end ~}} diff --git a/DiscordChatExporter.Domain/Exporting/Resources/HtmlLight.css b/DiscordChatExporter.Domain/Exporting/Writers/Html/Light.css similarity index 100% rename from DiscordChatExporter.Domain/Exporting/Resources/HtmlLight.css rename to DiscordChatExporter.Domain/Exporting/Writers/Html/Light.css diff --git a/DiscordChatExporter.Domain/Exporting/MessageGroup.cs b/DiscordChatExporter.Domain/Exporting/Writers/Html/MessageGroup.cs similarity index 67% rename from DiscordChatExporter.Domain/Exporting/MessageGroup.cs rename to DiscordChatExporter.Domain/Exporting/Writers/Html/MessageGroup.cs index 4c1b165..e747f51 100644 --- a/DiscordChatExporter.Domain/Exporting/MessageGroup.cs +++ b/DiscordChatExporter.Domain/Exporting/Writers/Html/MessageGroup.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; +using System.Linq; using DiscordChatExporter.Domain.Discord.Models; -namespace DiscordChatExporter.Domain.Exporting +namespace DiscordChatExporter.Domain.Exporting.Writers.Html { // Used for grouping contiguous messages in HTML export internal partial class MessageGroup @@ -23,9 +24,20 @@ namespace DiscordChatExporter.Domain.Exporting internal partial class MessageGroup { - public static bool CanGroup(Message message1, Message message2) => + public static bool CanJoin(Message message1, Message message2) => string.Equals(message1.Author.Id, message2.Author.Id, StringComparison.Ordinal) && string.Equals(message1.Author.FullName, message2.Author.FullName, StringComparison.Ordinal) && (message2.Timestamp - message1.Timestamp).Duration().TotalMinutes <= 7; + + public static MessageGroup Join(IReadOnlyList messages) + { + var first = messages.First(); + + return new MessageGroup( + first.Author, + first.Timestamp, + messages + ); + } } } \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Exporting/Resources/HtmlMessageGroupTemplate.html b/DiscordChatExporter.Domain/Exporting/Writers/Html/MessageGroupTemplate.html similarity index 92% rename from DiscordChatExporter.Domain/Exporting/Resources/HtmlMessageGroupTemplate.html rename to DiscordChatExporter.Domain/Exporting/Writers/Html/MessageGroupTemplate.html index 0550f5b..71d5657 100644 --- a/DiscordChatExporter.Domain/Exporting/Resources/HtmlMessageGroupTemplate.html +++ b/DiscordChatExporter.Domain/Exporting/Writers/Html/MessageGroupTemplate.html @@ -1,7 +1,7 @@
{{~ # Avatar ~}}
- Avatar + Avatar
{{~ # Author name and timestamp ~}} @@ -39,16 +39,16 @@ {{~ if attachment.IsSpoiler ~}}
- - Attachment + + Attachment
{{~ else ~}} - + {{ # Non-spoiler image }} {{~ if attachment.IsImage ~}} - Attachment + Attachment {{~ # Non-image ~}} {{~ else ~}} Attachment: {{ attachment.FileName }} ({{ attachment.FileSize }}) @@ -73,7 +73,7 @@ {{~ if embed.Author ~}}
{{~ if embed.Author.IconUrl ~}} - Author icon + Author icon {{~ end ~}} {{~ if embed.Author.Name ~}} @@ -124,8 +124,8 @@ {{~ # Thumbnail ~}} {{~ if embed.Thumbnail ~}}
- - Thumbnail + + Thumbnail
{{~ end ~}} @@ -134,8 +134,8 @@ {{~ # Image ~}} {{~ if embed.Image ~}}
- - Image + + Image
{{~ end ~}} @@ -145,7 +145,7 @@
{{~ if embed.Footer ~}} {{~ if embed.Footer.Text && embed.Footer.IconUrl ~}} - Footer icon + Footer icon {{~ end ~}} {{~ end ~}} @@ -172,7 +172,7 @@
{{~ for reaction in message.Reactions ~}}
- {{ reaction.Emoji.Name }} + {{ reaction.Emoji.Name }} {{ reaction.Count }}
{{~ end ~}} diff --git a/DiscordChatExporter.Domain/Exporting/Writers/HtmlMessageWriter.cs b/DiscordChatExporter.Domain/Exporting/Writers/HtmlMessageWriter.cs index c7d870c..63a8158 100644 --- a/DiscordChatExporter.Domain/Exporting/Writers/HtmlMessageWriter.cs +++ b/DiscordChatExporter.Domain/Exporting/Writers/HtmlMessageWriter.cs @@ -6,8 +6,9 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using DiscordChatExporter.Domain.Discord.Models; +using DiscordChatExporter.Domain.Exporting.Writers.Html; using DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; using Scriban; using Scriban.Runtime; using Tyrrrz.Extensions; @@ -18,6 +19,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers { private readonly TextWriter _writer; private readonly string _themeName; + private readonly List _messageGroupBuffer = new List(); private readonly Template _preambleTemplate; @@ -37,12 +39,6 @@ namespace DiscordChatExporter.Domain.Exporting.Writers _postambleTemplate = Template.Parse(GetPostambleTemplateCode()); } - private MessageGroup GetCurrentMessageGroup() - { - var firstMessage = _messageGroupBuffer.First(); - return new MessageGroup(firstMessage.Author, firstMessage.Timestamp, _messageGroupBuffer); - } - private TemplateContext CreateTemplateContext(IReadOnlyDictionary? constants = null) { // Template context @@ -72,7 +68,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers // Functions scriptObject.Import("FormatDate", - new Func(d => d.ToLocalString(Context.DateFormat))); + new Func(d => d.ToLocalString(Context.Request.DateFormat))); scriptObject.Import("FormatColorRgb", new Func(c => c != null ? $"rgb({c?.R}, {c?.G}, {c?.B})" : null)); @@ -81,7 +77,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers new Func(Context.TryGetUserColor)); scriptObject.Import("TryGetUserNick", - new Func(u => Context.TryGetUserMember(u)?.Nick)); + new Func(u => Context.TryGetMember(u.Id)?.Nick)); scriptObject.Import("FormatMarkdown", new Func(m => FormatMarkdown(m))); @@ -89,6 +85,11 @@ namespace DiscordChatExporter.Domain.Exporting.Writers scriptObject.Import("FormatEmbedMarkdown", new Func(m => FormatMarkdown(m, false))); + // HACK: Scriban doesn't support async, so we have to resort to this and be careful about deadlocks. + // TODO: move to Razor. + scriptObject.Import("ResolveUrl", + new Func(u => Context.ResolveMediaUrlAsync(u).GetAwaiter().GetResult())); + // Push model templateContext.PushGlobal(scriptObject); @@ -101,11 +102,11 @@ namespace DiscordChatExporter.Domain.Exporting.Writers private string FormatMarkdown(string? markdown, bool isJumboAllowed = true) => HtmlMarkdownVisitor.Format(Context, markdown ?? "", isJumboAllowed); - private async Task RenderCurrentMessageGroupAsync() + private async Task WriteCurrentMessageGroupAsync() { var templateContext = CreateTemplateContext(new Dictionary { - ["MessageGroup"] = GetCurrentMessageGroup() + ["MessageGroup"] = MessageGroup.Join(_messageGroupBuffer) }); await templateContext.EvaluateAsync(_messageGroupTemplate.Page); @@ -120,14 +121,14 @@ namespace DiscordChatExporter.Domain.Exporting.Writers public override async Task WriteMessageAsync(Message message) { // If message group is empty or the given message can be grouped, buffer the given message - if (!_messageGroupBuffer.Any() || MessageGroup.CanGroup(_messageGroupBuffer.Last(), message)) + if (!_messageGroupBuffer.Any() || MessageGroup.CanJoin(_messageGroupBuffer.Last(), message)) { _messageGroupBuffer.Add(message); } // Otherwise, flush the group and render messages else { - await RenderCurrentMessageGroupAsync(); + await WriteCurrentMessageGroupAsync(); _messageGroupBuffer.Clear(); _messageGroupBuffer.Add(message); @@ -141,7 +142,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers { // Flush current message group if (_messageGroupBuffer.Any()) - await RenderCurrentMessageGroupAsync(); + await WriteCurrentMessageGroupAsync(); var templateContext = CreateTemplateContext(new Dictionary { @@ -161,28 +162,28 @@ namespace DiscordChatExporter.Domain.Exporting.Writers internal partial class HtmlMessageWriter { private static readonly Assembly ResourcesAssembly = typeof(HtmlMessageWriter).Assembly; - private static readonly string ResourcesNamespace = $"{ResourcesAssembly.GetName().Name}.Exporting.Resources"; + private static readonly string ResourcesNamespace = $"{ResourcesAssembly.GetName().Name}.Exporting.Writers.Html"; private static string GetCoreStyleSheetCode() => ResourcesAssembly - .GetManifestResourceString($"{ResourcesNamespace}.HtmlCore.css"); + .GetManifestResourceString($"{ResourcesNamespace}.Core.css"); private static string GetThemeStyleSheetCode(string themeName) => ResourcesAssembly - .GetManifestResourceString($"{ResourcesNamespace}.Html{themeName}.css"); + .GetManifestResourceString($"{ResourcesNamespace}.{themeName}.css"); private static string GetPreambleTemplateCode() => ResourcesAssembly - .GetManifestResourceString($"{ResourcesNamespace}.HtmlLayoutTemplate.html") + .GetManifestResourceString($"{ResourcesNamespace}.LayoutTemplate.html") .SubstringUntil("{{~ %SPLIT% ~}}"); private static string GetMessageGroupTemplateCode() => ResourcesAssembly - .GetManifestResourceString($"{ResourcesNamespace}.HtmlMessageGroupTemplate.html"); + .GetManifestResourceString($"{ResourcesNamespace}.MessageGroupTemplate.html"); private static string GetPostambleTemplateCode() => ResourcesAssembly - .GetManifestResourceString($"{ResourcesNamespace}.HtmlLayoutTemplate.html") + .GetManifestResourceString($"{ResourcesNamespace}.LayoutTemplate.html") .SubstringAfter("{{~ %SPLIT% ~}}"); } } \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Exporting/Writers/JsonMessageWriter.cs b/DiscordChatExporter.Domain/Exporting/Writers/JsonMessageWriter.cs index 41c4346..5b1a410 100644 --- a/DiscordChatExporter.Domain/Exporting/Writers/JsonMessageWriter.cs +++ b/DiscordChatExporter.Domain/Exporting/Writers/JsonMessageWriter.cs @@ -3,7 +3,7 @@ using System.Text.Json; using System.Threading.Tasks; using DiscordChatExporter.Domain.Discord.Models; using DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; namespace DiscordChatExporter.Domain.Exporting.Writers { @@ -25,62 +25,75 @@ namespace DiscordChatExporter.Domain.Exporting.Writers private string FormatMarkdown(string? markdown) => PlainTextMarkdownVisitor.Format(Context, markdown ?? ""); - private void WriteAttachment(Attachment attachment) + private async Task WriteAttachmentAsync(Attachment attachment) { _writer.WriteStartObject(); _writer.WriteString("id", attachment.Id); - _writer.WriteString("url", attachment.Url); + _writer.WriteString("url", await Context.ResolveMediaUrlAsync(attachment.Url)); _writer.WriteString("fileName", attachment.FileName); _writer.WriteNumber("fileSizeBytes", attachment.FileSize.TotalBytes); _writer.WriteEndObject(); + await _writer.FlushAsync(); } - private void WriteEmbedAuthor(EmbedAuthor embedAuthor) + private async Task WriteEmbedAuthorAsync(EmbedAuthor embedAuthor) { _writer.WriteStartObject("author"); _writer.WriteString("name", embedAuthor.Name); _writer.WriteString("url", embedAuthor.Url); - _writer.WriteString("iconUrl", embedAuthor.IconUrl); + + if (!string.IsNullOrWhiteSpace(embedAuthor.IconUrl)) + _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedAuthor.IconUrl)); _writer.WriteEndObject(); + await _writer.FlushAsync(); } - private void WriteEmbedThumbnail(EmbedImage embedThumbnail) + private async Task WriteEmbedThumbnailAsync(EmbedImage embedThumbnail) { _writer.WriteStartObject("thumbnail"); - _writer.WriteString("url", embedThumbnail.Url); + if (!string.IsNullOrWhiteSpace(embedThumbnail.Url)) + _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedThumbnail.Url)); + _writer.WriteNumber("width", embedThumbnail.Width); _writer.WriteNumber("height", embedThumbnail.Height); _writer.WriteEndObject(); + await _writer.FlushAsync(); } - private void WriteEmbedImage(EmbedImage embedImage) + private async Task WriteEmbedImageAsync(EmbedImage embedImage) { _writer.WriteStartObject("image"); - _writer.WriteString("url", embedImage.Url); + if (!string.IsNullOrWhiteSpace(embedImage.Url)) + _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedImage.Url)); + _writer.WriteNumber("width", embedImage.Width); _writer.WriteNumber("height", embedImage.Height); _writer.WriteEndObject(); + await _writer.FlushAsync(); } - private void WriteEmbedFooter(EmbedFooter embedFooter) + private async Task WriteEmbedFooterAsync(EmbedFooter embedFooter) { _writer.WriteStartObject("footer"); _writer.WriteString("text", embedFooter.Text); - _writer.WriteString("iconUrl", embedFooter.IconUrl); + + if (!string.IsNullOrWhiteSpace(embedFooter.IconUrl)) + _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedFooter.IconUrl)); _writer.WriteEndObject(); + await _writer.FlushAsync(); } - private void WriteEmbedField(EmbedField embedField) + private async Task WriteEmbedFieldAsync(EmbedField embedField) { _writer.WriteStartObject(); @@ -89,9 +102,10 @@ namespace DiscordChatExporter.Domain.Exporting.Writers _writer.WriteBoolean("isInline", embedField.IsInline); _writer.WriteEndObject(); + await _writer.FlushAsync(); } - private void WriteEmbed(Embed embed) + private async Task WriteEmbedAsync(Embed embed) { _writer.WriteStartObject(); @@ -101,29 +115,30 @@ namespace DiscordChatExporter.Domain.Exporting.Writers _writer.WriteString("description", FormatMarkdown(embed.Description)); if (embed.Author != null) - WriteEmbedAuthor(embed.Author); + await WriteEmbedAuthorAsync(embed.Author); if (embed.Thumbnail != null) - WriteEmbedThumbnail(embed.Thumbnail); + await WriteEmbedThumbnailAsync(embed.Thumbnail); if (embed.Image != null) - WriteEmbedImage(embed.Image); + await WriteEmbedImageAsync(embed.Image); if (embed.Footer != null) - WriteEmbedFooter(embed.Footer); + await WriteEmbedFooterAsync(embed.Footer); // Fields _writer.WriteStartArray("fields"); foreach (var field in embed.Fields) - WriteEmbedField(field); + await WriteEmbedFieldAsync(field); _writer.WriteEndArray(); _writer.WriteEndObject(); + await _writer.FlushAsync(); } - private void WriteReaction(Reaction reaction) + private async Task WriteReactionAsync(Reaction reaction) { _writer.WriteStartObject(); @@ -132,12 +147,13 @@ namespace DiscordChatExporter.Domain.Exporting.Writers _writer.WriteString("id", reaction.Emoji.Id); _writer.WriteString("name", reaction.Emoji.Name); _writer.WriteBoolean("isAnimated", reaction.Emoji.IsAnimated); - _writer.WriteString("imageUrl", reaction.Emoji.ImageUrl); + _writer.WriteString("imageUrl", await Context.ResolveMediaUrlAsync(reaction.Emoji.ImageUrl)); _writer.WriteEndObject(); _writer.WriteNumber("count", reaction.Count); _writer.WriteEndObject(); + await _writer.FlushAsync(); } public override async Task WritePreambleAsync() @@ -147,29 +163,28 @@ namespace DiscordChatExporter.Domain.Exporting.Writers // Guild _writer.WriteStartObject("guild"); - _writer.WriteString("id", Context.Guild.Id); - _writer.WriteString("name", Context.Guild.Name); - _writer.WriteString("iconUrl", Context.Guild.IconUrl); + _writer.WriteString("id", Context.Request.Guild.Id); + _writer.WriteString("name", Context.Request.Guild.Name); + _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(Context.Request.Guild.IconUrl)); _writer.WriteEndObject(); // Channel _writer.WriteStartObject("channel"); - _writer.WriteString("id", Context.Channel.Id); - _writer.WriteString("type", Context.Channel.Type.ToString()); - _writer.WriteString("category", Context.Channel.Category); - _writer.WriteString("name", Context.Channel.Name); - _writer.WriteString("topic", Context.Channel.Topic); + _writer.WriteString("id", Context.Request.Channel.Id); + _writer.WriteString("type", Context.Request.Channel.Type.ToString()); + _writer.WriteString("category", Context.Request.Channel.Category); + _writer.WriteString("name", Context.Request.Channel.Name); + _writer.WriteString("topic", Context.Request.Channel.Topic); _writer.WriteEndObject(); // Date range _writer.WriteStartObject("dateRange"); - _writer.WriteString("after", Context.After); - _writer.WriteString("before", Context.Before); + _writer.WriteString("after", Context.Request.After); + _writer.WriteString("before", Context.Request.Before); _writer.WriteEndObject(); // Message array (start) _writer.WriteStartArray("messages"); - await _writer.FlushAsync(); } @@ -193,14 +208,14 @@ namespace DiscordChatExporter.Domain.Exporting.Writers _writer.WriteString("name", message.Author.Name); _writer.WriteString("discriminator", $"{message.Author.Discriminator:0000}"); _writer.WriteBoolean("isBot", message.Author.IsBot); - _writer.WriteString("avatarUrl", message.Author.AvatarUrl); + _writer.WriteString("avatarUrl", await Context.ResolveMediaUrlAsync(message.Author.AvatarUrl)); _writer.WriteEndObject(); // Attachments _writer.WriteStartArray("attachments"); foreach (var attachment in message.Attachments) - WriteAttachment(attachment); + await WriteAttachmentAsync(attachment); _writer.WriteEndArray(); @@ -208,7 +223,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers _writer.WriteStartArray("embeds"); foreach (var embed in message.Embeds) - WriteEmbed(embed); + await WriteEmbedAsync(embed); _writer.WriteEndArray(); @@ -216,15 +231,14 @@ namespace DiscordChatExporter.Domain.Exporting.Writers _writer.WriteStartArray("reactions"); foreach (var reaction in message.Reactions) - WriteReaction(reaction); + await WriteReactionAsync(reaction); _writer.WriteEndArray(); _writer.WriteEndObject(); + await _writer.FlushAsync(); - // Flush every 100 messages - if (_messageCount++ % 100 == 0) - await _writer.FlushAsync(); + _messageCount++; } public override async Task WritePostambleAsync() @@ -236,7 +250,6 @@ namespace DiscordChatExporter.Domain.Exporting.Writers // Root object (end) _writer.WriteEndObject(); - await _writer.FlushAsync(); } diff --git a/DiscordChatExporter.Domain/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs b/DiscordChatExporter.Domain/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs index 5b68304..4e70e28 100644 --- a/DiscordChatExporter.Domain/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs +++ b/DiscordChatExporter.Domain/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs @@ -4,7 +4,6 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; using DiscordChatExporter.Domain.Discord.Models; -using DiscordChatExporter.Domain.Internal; using DiscordChatExporter.Domain.Markdown; using DiscordChatExporter.Domain.Markdown.Ast; @@ -23,13 +22,13 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors _isJumbo = isJumbo; } - public override MarkdownNode VisitText(TextNode text) + protected override MarkdownNode VisitText(TextNode text) { _buffer.Append(HtmlEncode(text.Text)); return base.VisitText(text); } - public override MarkdownNode VisitFormatted(FormattedNode formatted) + protected override MarkdownNode VisitFormatted(FormattedNode formatted) { var (tagOpen, tagClose) = formatted.Formatting switch { @@ -50,7 +49,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors return result; } - public override MarkdownNode VisitInlineCodeBlock(InlineCodeBlockNode inlineCodeBlock) + protected override MarkdownNode VisitInlineCodeBlock(InlineCodeBlockNode inlineCodeBlock) { _buffer .Append("") @@ -60,7 +59,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors return base.VisitInlineCodeBlock(inlineCodeBlock); } - public override MarkdownNode VisitMultiLineCodeBlock(MultiLineCodeBlockNode multiLineCodeBlock) + protected override MarkdownNode VisitMultiLineCodeBlock(MultiLineCodeBlockNode multiLineCodeBlock) { var highlightCssClass = !string.IsNullOrWhiteSpace(multiLineCodeBlock.Language) ? $"language-{multiLineCodeBlock.Language}" @@ -74,7 +73,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors return base.VisitMultiLineCodeBlock(multiLineCodeBlock); } - public override MarkdownNode VisitMention(MentionNode mention) + protected override MarkdownNode VisitMention(MentionNode mention) { if (mention.Type == MentionType.Meta) { @@ -85,7 +84,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors } else if (mention.Type == MentionType.User) { - var member = _context.TryGetMentionedMember(mention.Id); + var member = _context.TryGetMember(mention.Id); var fullName = member?.User.FullName ?? "Unknown"; var nick = member?.Nick ?? "Unknown"; @@ -96,7 +95,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors } else if (mention.Type == MentionType.Channel) { - var channel = _context.TryGetMentionedChannel(mention.Id); + var channel = _context.TryGetChannel(mention.Id); var name = channel?.Name ?? "deleted-channel"; _buffer @@ -106,7 +105,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors } else if (mention.Type == MentionType.Role) { - var role = _context.TryGetMentionedRole(mention.Id); + var role = _context.TryGetRole(mention.Id); var name = role?.Name ?? "deleted-role"; var color = role?.Color; @@ -123,7 +122,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors return base.VisitMention(mention); } - public override MarkdownNode VisitEmoji(EmojiNode emoji) + protected override MarkdownNode VisitEmoji(EmojiNode emoji) { var emojiImageUrl = Emoji.GetImageUrl(emoji.Id, emoji.Name, emoji.IsAnimated); var jumboClass = _isJumbo ? "emoji--large" : ""; @@ -134,7 +133,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors return base.VisitEmoji(emoji); } - public override MarkdownNode VisitLink(LinkNode link) + protected override MarkdownNode VisitLink(LinkNode link) { // Extract message ID if the link points to a Discord message var linkedMessageId = Regex.Match(link.Url, "^https?://discordapp.com/channels/.*?/(\\d+)/?$").Groups[1].Value; diff --git a/DiscordChatExporter.Domain/Exporting/Writers/MarkdownVisitors/PlainTextMarkdownVisitor.cs b/DiscordChatExporter.Domain/Exporting/Writers/MarkdownVisitors/PlainTextMarkdownVisitor.cs index 2ba0609..505783a 100644 --- a/DiscordChatExporter.Domain/Exporting/Writers/MarkdownVisitors/PlainTextMarkdownVisitor.cs +++ b/DiscordChatExporter.Domain/Exporting/Writers/MarkdownVisitors/PlainTextMarkdownVisitor.cs @@ -15,13 +15,13 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors _buffer = buffer; } - public override MarkdownNode VisitText(TextNode text) + protected override MarkdownNode VisitText(TextNode text) { _buffer.Append(text.Text); return base.VisitText(text); } - public override MarkdownNode VisitMention(MentionNode mention) + protected override MarkdownNode VisitMention(MentionNode mention) { if (mention.Type == MentionType.Meta) { @@ -29,21 +29,21 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors } else if (mention.Type == MentionType.User) { - var member = _context.TryGetMentionedMember(mention.Id); + var member = _context.TryGetMember(mention.Id); var name = member?.User.Name ?? "Unknown"; _buffer.Append($"@{name}"); } else if (mention.Type == MentionType.Channel) { - var channel = _context.TryGetMentionedChannel(mention.Id); + var channel = _context.TryGetChannel(mention.Id); var name = channel?.Name ?? "deleted-channel"; _buffer.Append($"#{name}"); } else if (mention.Type == MentionType.Role) { - var role = _context.TryGetMentionedRole(mention.Id); + var role = _context.TryGetRole(mention.Id); var name = role?.Name ?? "deleted-role"; _buffer.Append($"@{name}"); @@ -52,7 +52,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors return base.VisitMention(mention); } - public override MarkdownNode VisitEmoji(EmojiNode emoji) + protected override MarkdownNode VisitEmoji(EmojiNode emoji) { _buffer.Append( emoji.IsCustomEmoji diff --git a/DiscordChatExporter.Domain/Exporting/Writers/PlainTextMessageWriter.cs b/DiscordChatExporter.Domain/Exporting/Writers/PlainTextMessageWriter.cs index fc132a3..1677a27 100644 --- a/DiscordChatExporter.Domain/Exporting/Writers/PlainTextMessageWriter.cs +++ b/DiscordChatExporter.Domain/Exporting/Writers/PlainTextMessageWriter.cs @@ -1,12 +1,11 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; using System.Threading.Tasks; using DiscordChatExporter.Domain.Discord.Models; using DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors; -using DiscordChatExporter.Domain.Internal; +using DiscordChatExporter.Domain.Internal.Extensions; +using Tyrrrz.Extensions; namespace DiscordChatExporter.Domain.Exporting.Writers { @@ -25,135 +24,124 @@ namespace DiscordChatExporter.Domain.Exporting.Writers private string FormatMarkdown(string? markdown) => PlainTextMarkdownVisitor.Format(Context, markdown ?? ""); - private string FormatMessageHeader(Message message) + private async Task WriteMessageHeaderAsync(Message message) { - var buffer = new StringBuilder(); - // Timestamp & author - buffer - .Append($"[{message.Timestamp.ToLocalString(Context.DateFormat)}]") - .Append(' ') - .Append($"{message.Author.FullName}"); + await _writer.WriteAsync($"[{message.Timestamp.ToLocalString(Context.Request.DateFormat)}]"); + await _writer.WriteAsync($" {message.Author.FullName}"); // Whether the message is pinned if (message.IsPinned) - buffer.Append(' ').Append("(pinned)"); + await _writer.WriteAsync(" (pinned)"); - return buffer.ToString(); + await _writer.WriteLineAsync(); } - private string FormatAttachments(IReadOnlyList attachments) + private async Task WriteAttachmentsAsync(IReadOnlyList attachments) { if (!attachments.Any()) - return ""; + return; - var buffer = new StringBuilder(); + await _writer.WriteLineAsync("{Attachments}"); - buffer - .AppendLine("{Attachments}") - .AppendJoin(Environment.NewLine, attachments.Select(a => a.Url)) - .AppendLine(); + foreach (var attachment in attachments) + await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(attachment.Url)); - return buffer.ToString(); + await _writer.WriteLineAsync(); } - private string FormatEmbeds(IReadOnlyList embeds) + private async Task WriteEmbedsAsync(IReadOnlyList embeds) { - if (!embeds.Any()) - return ""; - - var buffer = new StringBuilder(); - foreach (var embed in embeds) { - buffer - .AppendLine("{Embed}") - .AppendLineIfNotNullOrWhiteSpace(embed.Author?.Name) - .AppendLineIfNotNullOrWhiteSpace(embed.Url) - .AppendLineIfNotNullOrWhiteSpace(FormatMarkdown(embed.Title)) - .AppendLineIfNotNullOrWhiteSpace(FormatMarkdown(embed.Description)); + await _writer.WriteLineAsync("{Embed}"); + + if (!string.IsNullOrWhiteSpace(embed.Author?.Name)) + await _writer.WriteLineAsync(embed.Author.Name); + + if (!string.IsNullOrWhiteSpace(embed.Url)) + await _writer.WriteLineAsync(embed.Url); + + if (!string.IsNullOrWhiteSpace(embed.Title)) + await _writer.WriteLineAsync(FormatMarkdown(embed.Title)); + + if (!string.IsNullOrWhiteSpace(embed.Description)) + await _writer.WriteLineAsync(FormatMarkdown(embed.Description)); foreach (var field in embed.Fields) { - buffer - .AppendLineIfNotNullOrWhiteSpace(FormatMarkdown(field.Name)) - .AppendLineIfNotNullOrWhiteSpace(FormatMarkdown(field.Value)); + if (!string.IsNullOrWhiteSpace(field.Name)) + await _writer.WriteLineAsync(FormatMarkdown(field.Name)); + + if (!string.IsNullOrWhiteSpace(field.Value)) + await _writer.WriteLineAsync(FormatMarkdown(field.Value)); } - buffer - .AppendLineIfNotNullOrWhiteSpace(embed.Thumbnail?.Url) - .AppendLineIfNotNullOrWhiteSpace(embed.Image?.Url) - .AppendLineIfNotNullOrWhiteSpace(embed.Footer?.Text) - .AppendLine(); - } + if (!string.IsNullOrWhiteSpace(embed.Thumbnail?.Url)) + await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Thumbnail.Url)); + + if (!string.IsNullOrWhiteSpace(embed.Image?.Url)) + await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Image.Url)); - return buffer.ToString(); + if (!string.IsNullOrWhiteSpace(embed.Footer?.Text)) + await _writer.WriteLineAsync(embed.Footer.Text); + + await _writer.WriteLineAsync(); + } } - private string FormatReactions(IReadOnlyList reactions) + private async Task WriteReactionsAsync(IReadOnlyList reactions) { if (!reactions.Any()) - return ""; + return; - var buffer = new StringBuilder(); - - buffer.AppendLine("{Reactions}"); + await _writer.WriteLineAsync("{Reactions}"); foreach (var reaction in reactions) { - buffer.Append(reaction.Emoji.Name); + await _writer.WriteAsync(reaction.Emoji.Name); if (reaction.Count > 1) - buffer.Append($" ({reaction.Count})"); + await _writer.WriteAsync($" ({reaction.Count})"); - buffer.Append(" "); + await _writer.WriteAsync(' '); } - buffer.AppendLine(); - - return buffer.ToString(); - } - - private string FormatMessage(Message message) - { - var buffer = new StringBuilder(); - - buffer - .AppendLine(FormatMessageHeader(message)) - .AppendLineIfNotNullOrWhiteSpace(FormatMarkdown(message.Content)) - .AppendLine() - .AppendLineIfNotNullOrWhiteSpace(FormatAttachments(message.Attachments)) - .AppendLineIfNotNullOrWhiteSpace(FormatEmbeds(message.Embeds)) - .AppendLineIfNotNullOrWhiteSpace(FormatReactions(message.Reactions)); - - return buffer.Trim().ToString(); + await _writer.WriteLineAsync(); } public override async Task WritePreambleAsync() { - var buffer = new StringBuilder(); - - buffer.Append('=', 62).AppendLine(); - buffer.AppendLine($"Guild: {Context.Guild.Name}"); - buffer.AppendLine($"Channel: {Context.Channel.Category} / {Context.Channel.Name}"); - - if (!string.IsNullOrWhiteSpace(Context.Channel.Topic)) - buffer.AppendLine($"Topic: {Context.Channel.Topic}"); + await _writer.WriteLineAsync('='.Repeat(62)); + await _writer.WriteLineAsync($"Guild: {Context.Request.Guild.Name}"); + await _writer.WriteLineAsync($"Channel: {Context.Request.Channel.Category} / {Context.Request.Channel.Name}"); - if (Context.After != null) - buffer.AppendLine($"After: {Context.After.Value.ToLocalString(Context.DateFormat)}"); + if (!string.IsNullOrWhiteSpace(Context.Request.Channel.Topic)) + await _writer.WriteLineAsync($"Topic: {Context.Request.Channel.Topic}"); - if (Context.Before != null) - buffer.AppendLine($"Before: {Context.Before.Value.ToLocalString(Context.DateFormat)}"); + if (Context.Request.After != null) + await _writer.WriteLineAsync($"After: {Context.Request.After.Value.ToLocalString(Context.Request.DateFormat)}"); - buffer.Append('=', 62).AppendLine(); + if (Context.Request.Before != null) + await _writer.WriteLineAsync($"Before: {Context.Request.Before.Value.ToLocalString(Context.Request.DateFormat)}"); - await _writer.WriteLineAsync(buffer.ToString()); + await _writer.WriteLineAsync('='.Repeat(62)); + await _writer.WriteLineAsync(); } public override async Task WriteMessageAsync(Message message) { - await _writer.WriteLineAsync(FormatMessage(message)); + await WriteMessageHeaderAsync(message); + + if (!string.IsNullOrWhiteSpace(message.Content)) + await _writer.WriteLineAsync(FormatMarkdown(message.Content)); + + await _writer.WriteLineAsync(); + + await WriteAttachmentsAsync(message.Attachments); + await WriteEmbedsAsync(message.Embeds); + await WriteReactionsAsync(message.Reactions); + await _writer.WriteLineAsync(); _messageCount++; @@ -161,15 +149,9 @@ namespace DiscordChatExporter.Domain.Exporting.Writers public override async Task WritePostambleAsync() { - var buffer = new StringBuilder(); - - buffer - .Append('=', 62).AppendLine() - .AppendLine($"Exported {_messageCount:N0} message(s)") - .Append('=', 62).AppendLine() - .AppendLine(); - - await _writer.WriteLineAsync(buffer.ToString()); + await _writer.WriteLineAsync('='.Repeat(62)); + await _writer.WriteLineAsync($"Exported {_messageCount:N0} message(s)"); + await _writer.WriteLineAsync('='.Repeat(62)); } public override async ValueTask DisposeAsync() diff --git a/DiscordChatExporter.Domain/Internal/ColorExtensions.cs b/DiscordChatExporter.Domain/Internal/Extensions/ColorExtensions.cs similarity index 85% rename from DiscordChatExporter.Domain/Internal/ColorExtensions.cs rename to DiscordChatExporter.Domain/Internal/Extensions/ColorExtensions.cs index 68a8871..53bd71d 100644 --- a/DiscordChatExporter.Domain/Internal/ColorExtensions.cs +++ b/DiscordChatExporter.Domain/Internal/Extensions/ColorExtensions.cs @@ -1,6 +1,6 @@ using System.Drawing; -namespace DiscordChatExporter.Domain.Internal +namespace DiscordChatExporter.Domain.Internal.Extensions { internal static class ColorExtensions { diff --git a/DiscordChatExporter.Domain/Internal/DateExtensions.cs b/DiscordChatExporter.Domain/Internal/Extensions/DateExtensions.cs similarity index 89% rename from DiscordChatExporter.Domain/Internal/DateExtensions.cs rename to DiscordChatExporter.Domain/Internal/Extensions/DateExtensions.cs index cb926ab..857dfe9 100644 --- a/DiscordChatExporter.Domain/Internal/DateExtensions.cs +++ b/DiscordChatExporter.Domain/Internal/Extensions/DateExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Globalization; -namespace DiscordChatExporter.Domain.Internal +namespace DiscordChatExporter.Domain.Internal.Extensions { internal static class DateExtensions { diff --git a/DiscordChatExporter.Domain/Internal/GenericExtensions.cs b/DiscordChatExporter.Domain/Internal/Extensions/GenericExtensions.cs similarity index 86% rename from DiscordChatExporter.Domain/Internal/GenericExtensions.cs rename to DiscordChatExporter.Domain/Internal/Extensions/GenericExtensions.cs index a98f6f4..f11d4d0 100644 --- a/DiscordChatExporter.Domain/Internal/GenericExtensions.cs +++ b/DiscordChatExporter.Domain/Internal/Extensions/GenericExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace DiscordChatExporter.Domain.Internal +namespace DiscordChatExporter.Domain.Internal.Extensions { internal static class GenericExtensions { diff --git a/DiscordChatExporter.Domain/Internal/Extensions/HttpClientExtensions.cs b/DiscordChatExporter.Domain/Internal/Extensions/HttpClientExtensions.cs new file mode 100644 index 0000000..eb4a6d8 --- /dev/null +++ b/DiscordChatExporter.Domain/Internal/Extensions/HttpClientExtensions.cs @@ -0,0 +1,28 @@ +using System.IO; +using System.Net.Http; +using System.Text.Json; +using System.Threading.Tasks; + +namespace DiscordChatExporter.Domain.Internal.Extensions +{ + internal static class HttpClientExtensions + { + // HACK: ConfigureAwait() is crucial here to enable sync-over-async in HtmlMessageWriter + public static async Task DownloadAsync(this HttpClient httpClient, string uri, string outputFilePath) + { + await using var input = await httpClient.GetStreamAsync(uri).ConfigureAwait(false); + var output = File.Create(outputFilePath); + + await input.CopyToAsync(output).ConfigureAwait(false); + await output.DisposeAsync().ConfigureAwait(false); + } + + public static async Task ReadAsJsonAsync(this HttpContent content) + { + await using var stream = await content.ReadAsStreamAsync(); + using var doc = await JsonDocument.ParseAsync(stream); + + return doc.RootElement.Clone(); + } + } +} \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Internal/JsonElementExtensions.cs b/DiscordChatExporter.Domain/Internal/Extensions/JsonElementExtensions.cs similarity index 86% rename from DiscordChatExporter.Domain/Internal/JsonElementExtensions.cs rename to DiscordChatExporter.Domain/Internal/Extensions/JsonElementExtensions.cs index 89d1b6a..304c8c3 100644 --- a/DiscordChatExporter.Domain/Internal/JsonElementExtensions.cs +++ b/DiscordChatExporter.Domain/Internal/Extensions/JsonElementExtensions.cs @@ -1,6 +1,6 @@ using System.Text.Json; -namespace DiscordChatExporter.Domain.Internal +namespace DiscordChatExporter.Domain.Internal.Extensions { internal static class JsonElementExtensions { diff --git a/DiscordChatExporter.Domain/Internal/Extensions/StringExtensions.cs b/DiscordChatExporter.Domain/Internal/Extensions/StringExtensions.cs new file mode 100644 index 0000000..9134491 --- /dev/null +++ b/DiscordChatExporter.Domain/Internal/Extensions/StringExtensions.cs @@ -0,0 +1,12 @@ +using System.Text; + +namespace DiscordChatExporter.Domain.Internal.Extensions +{ + internal static class StringExtensions + { + public static StringBuilder AppendIfNotEmpty(this StringBuilder builder, char value) => + builder.Length > 0 + ? builder.Append(value) + : builder; + } +} \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Internal/Utf8JsonWriterExtensions.cs b/DiscordChatExporter.Domain/Internal/Extensions/Utf8JsonWriterExtensions.cs similarity index 92% rename from DiscordChatExporter.Domain/Internal/Utf8JsonWriterExtensions.cs rename to DiscordChatExporter.Domain/Internal/Extensions/Utf8JsonWriterExtensions.cs index ca7557b..0bf25bd 100644 --- a/DiscordChatExporter.Domain/Internal/Utf8JsonWriterExtensions.cs +++ b/DiscordChatExporter.Domain/Internal/Extensions/Utf8JsonWriterExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Text.Json; -namespace DiscordChatExporter.Domain.Internal +namespace DiscordChatExporter.Domain.Internal.Extensions { internal static class Utf8JsonWriterExtensions { diff --git a/DiscordChatExporter.Domain/Internal/HttpClientExtensions.cs b/DiscordChatExporter.Domain/Internal/HttpClientExtensions.cs deleted file mode 100644 index ce617d5..0000000 --- a/DiscordChatExporter.Domain/Internal/HttpClientExtensions.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Net.Http; -using System.Text.Json; -using System.Threading.Tasks; - -namespace DiscordChatExporter.Domain.Internal -{ - internal static class HttpClientExtensions - { - public static async Task ReadAsJsonAsync(this HttpContent content) - { - await using var stream = await content.ReadAsStreamAsync(); - using var doc = await JsonDocument.ParseAsync(stream); - - return doc.RootElement.Clone(); - } - } -} \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Internal/Singleton.cs b/DiscordChatExporter.Domain/Internal/Singleton.cs new file mode 100644 index 0000000..594c988 --- /dev/null +++ b/DiscordChatExporter.Domain/Internal/Singleton.cs @@ -0,0 +1,23 @@ +using System; +using System.Net; +using System.Net.Http; + +namespace DiscordChatExporter.Domain.Internal +{ + internal static class Singleton + { + private static readonly Lazy LazyHttpClient = new Lazy(() => + { + var handler = new HttpClientHandler(); + + if (handler.SupportsAutomaticDecompression) + handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate; + + handler.UseCookies = false; + + return new HttpClient(handler, true); + }); + + public static HttpClient HttpClient { get; } = LazyHttpClient.Value; + } +} \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Internal/StringExtensions.cs b/DiscordChatExporter.Domain/Internal/StringExtensions.cs deleted file mode 100644 index d9884f5..0000000 --- a/DiscordChatExporter.Domain/Internal/StringExtensions.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Text; - -namespace DiscordChatExporter.Domain.Internal -{ - internal static class StringExtensions - { - public static StringBuilder AppendLineIfNotNullOrWhiteSpace(this StringBuilder builder, string? value) => - !string.IsNullOrWhiteSpace(value) ? builder.AppendLine(value) : builder; - - public static StringBuilder Trim(this StringBuilder builder) - { - while (builder.Length > 0 && char.IsWhiteSpace(builder[0])) - builder.Remove(0, 1); - - while (builder.Length > 0 && char.IsWhiteSpace(builder[^1])) - builder.Remove(builder.Length - 1, 1); - - return builder; - } - } -} \ No newline at end of file diff --git a/DiscordChatExporter.Domain/Discord/UrlBuilder.cs b/DiscordChatExporter.Domain/Internal/UrlBuilder.cs similarity index 80% rename from DiscordChatExporter.Domain/Discord/UrlBuilder.cs rename to DiscordChatExporter.Domain/Internal/UrlBuilder.cs index de701c7..4cdf9bf 100644 --- a/DiscordChatExporter.Domain/Discord/UrlBuilder.cs +++ b/DiscordChatExporter.Domain/Internal/UrlBuilder.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Net; using System.Text; -namespace DiscordChatExporter.Domain.Discord +namespace DiscordChatExporter.Domain.Internal { internal class UrlBuilder { @@ -19,8 +19,11 @@ namespace DiscordChatExporter.Domain.Discord return this; } - public UrlBuilder SetQueryParameter(string key, string? value) + public UrlBuilder SetQueryParameter(string key, string? value, bool ignoreUnsetValue = true) { + if (ignoreUnsetValue && string.IsNullOrWhiteSpace(value)) + return this; + var keyEncoded = WebUtility.UrlEncode(key); var valueEncoded = WebUtility.UrlEncode(value); _queryParameters[keyEncoded] = valueEncoded; @@ -28,11 +31,6 @@ namespace DiscordChatExporter.Domain.Discord return this; } - public UrlBuilder SetQueryParameterIfNotNullOrWhiteSpace(string key, string? value) => - !string.IsNullOrWhiteSpace(value) - ? SetQueryParameter(key, value) - : this; - public string Build() { var buffer = new StringBuilder(); diff --git a/DiscordChatExporter.Domain/Markdown/MarkdownVisitor.cs b/DiscordChatExporter.Domain/Markdown/MarkdownVisitor.cs index 69abcba..40e3a38 100644 --- a/DiscordChatExporter.Domain/Markdown/MarkdownVisitor.cs +++ b/DiscordChatExporter.Domain/Markdown/MarkdownVisitor.cs @@ -6,23 +6,23 @@ namespace DiscordChatExporter.Domain.Markdown { internal abstract class MarkdownVisitor { - public virtual MarkdownNode VisitText(TextNode text) => text; + protected virtual MarkdownNode VisitText(TextNode text) => text; - public virtual MarkdownNode VisitFormatted(FormattedNode formatted) + protected virtual MarkdownNode VisitFormatted(FormattedNode formatted) { Visit(formatted.Children); return formatted; } - public virtual MarkdownNode VisitInlineCodeBlock(InlineCodeBlockNode inlineCodeBlock) => inlineCodeBlock; + protected virtual MarkdownNode VisitInlineCodeBlock(InlineCodeBlockNode inlineCodeBlock) => inlineCodeBlock; - public virtual MarkdownNode VisitMultiLineCodeBlock(MultiLineCodeBlockNode multiLineCodeBlock) => multiLineCodeBlock; + protected virtual MarkdownNode VisitMultiLineCodeBlock(MultiLineCodeBlockNode multiLineCodeBlock) => multiLineCodeBlock; - public virtual MarkdownNode VisitLink(LinkNode link) => link; + protected virtual MarkdownNode VisitLink(LinkNode link) => link; - public virtual MarkdownNode VisitEmoji(EmojiNode emoji) => emoji; + protected virtual MarkdownNode VisitEmoji(EmojiNode emoji) => emoji; - public virtual MarkdownNode VisitMention(MentionNode mention) => mention; + protected virtual MarkdownNode VisitMention(MentionNode mention) => mention; public MarkdownNode Visit(MarkdownNode node) => node switch { diff --git a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj index b94e002..dc56f1a 100644 --- a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj +++ b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj @@ -19,7 +19,7 @@ - + diff --git a/DiscordChatExporter.Gui/Services/SettingsService.cs b/DiscordChatExporter.Gui/Services/SettingsService.cs index e34f137..b26133b 100644 --- a/DiscordChatExporter.Gui/Services/SettingsService.cs +++ b/DiscordChatExporter.Gui/Services/SettingsService.cs @@ -20,6 +20,8 @@ namespace DiscordChatExporter.Gui.Services public int? LastPartitionLimit { get; set; } + public bool LastShouldDownloadMedia { get; set; } + public SettingsService() { Configuration.StorageSpace = StorageSpace.Instance; diff --git a/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs index 9f9f6ae..5a38e1c 100644 --- a/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs @@ -32,6 +32,16 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs public int? PartitionLimit { get; set; } + public bool ShouldDownloadMedia { get; set; } + + // Whether to show the "advanced options" by default when the dialog opens. + // This is active if any of the advanced options are set to non-default values. + public bool IsAdvancedSectionDisplayedByDefault => + After != default || + Before != default || + PartitionLimit != default || + ShouldDownloadMedia != default; + public ExportSetupViewModel(DialogManager dialogManager, SettingsService settingsService) { _dialogManager = dialogManager; @@ -40,6 +50,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs // Persist preferences SelectedFormat = _settingsService.LastExportFormat; PartitionLimit = _settingsService.LastPartitionLimit; + ShouldDownloadMedia = _settingsService.LastShouldDownloadMedia; } public void Confirm() @@ -47,6 +58,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs // Persist preferences _settingsService.LastExportFormat = SelectedFormat; _settingsService.LastPartitionLimit = PartitionLimit; + _settingsService.LastShouldDownloadMedia = ShouldDownloadMedia; // Clamp 'after' and 'before' values if (After > Before) @@ -57,23 +69,18 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs // If single channel - prompt file path if (IsSingleChannel) { - // Get single channel var channel = Channels.Single(); + var defaultFileName = ExportRequest.GetDefaultOutputFileName(Guild!, channel, SelectedFormat, After, Before); - // Generate default file name - var defaultFileName = ChannelExporter.GetDefaultExportFileName(Guild!, channel, SelectedFormat, After, Before); - - // Generate filter + // Filter var ext = SelectedFormat.GetFileExtension(); var filter = $"{ext.ToUpperInvariant()} files|*.{ext}"; - // Prompt user OutputPath = _dialogManager.PromptSaveFilePath(filter, defaultFileName); } // If multiple channels - prompt dir path else { - // Prompt user OutputPath = _dialogManager.PromptDirectoryPath(); } @@ -81,7 +88,6 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs if (string.IsNullOrWhiteSpace(OutputPath)) return; - // Close dialog Close(true); } } diff --git a/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs b/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs index db7fc75..fac6f0b 100644 --- a/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs @@ -190,9 +190,19 @@ namespace DiscordChatExporter.Gui.ViewModels try { - await exporter.ExportAsync(dialog.Guild!, channel!, - dialog.OutputPath!, dialog.SelectedFormat, _settingsService.DateFormat, - dialog.PartitionLimit, dialog.After, dialog.Before, operation); + var request = new ExportRequest( + dialog.Guild!, + channel!, + dialog.OutputPath!, + dialog.SelectedFormat, + dialog.After, + dialog.Before, + dialog.PartitionLimit, + dialog.ShouldDownloadMedia, + _settingsService.DateFormat + ); + + await exporter.ExportChannelAsync(request, operation); Interlocked.Increment(ref successfulExportCount); } diff --git a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml index 8a4d338..498d46c 100644 --- a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml +++ b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml @@ -74,54 +74,100 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - - - + + + + + - -