Compare commits

...

11 Commits

Author SHA1 Message Date
tyrrrz 31de8a5b06 Apply updated formatting rules 2026-07-04 18:51:27 +03:00
dependabot[bot] efd430ed29 Bump the actions group with 3 updates (#1564)
Signed-off-by: dependabot[bot] <support@github.com>
2026-07-04 18:49:28 +03:00
dependabot[bot] 623c688e1b Bump the nuget group with 14 updates (#1565)
Signed-off-by: dependabot[bot] <support@github.com>
2026-07-04 18:48:21 +03:00
tyrrrz 05f8df51e9 Refactor 2026-06-26 13:31:15 +03:00
Jacob Pfundstein e2c633b004 Include starter message in thread exports and skip placeholder (#1557)
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-26 12:59:20 +03:00
tyrrrz b11a57a825 Fix formatting 2026-06-20 14:33:04 +03:00
Nick f502e577c2 Check for media.discordapp.net in addition to cdn.discordapp.com when stripping signature parameters from media URLs (#1554)
Co-authored-by: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
2026-06-20 14:30:34 +03:00
Nick 8bc9fe7c72 Catch both old uppercase 5-char hash and newer lowercase 5-char hash when migrating to new hash (#1552)
Co-authored-by: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
2026-06-20 14:16:48 +03:00
Jacob Pfundstein 97485c280b Fix output path detection to correctly identify directories and files (#1556) 2026-06-20 13:55:49 +03:00
Jacob Pfundstein 5a57c4202d Validate output path early to prevent errors when exporting multiple channels (#1555)
Co-authored-by: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
2026-06-18 15:37:58 +03:00
tyrrrz acac8f7bbb Update packages 2026-06-08 15:52:10 +03:00
19 changed files with 1232 additions and 1057 deletions
+2 -2
View File
@@ -23,7 +23,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install Docker Buildx - name: Install Docker Buildx
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
@@ -55,7 +55,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install Docker Buildx - name: Install Docker Buildx
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+7 -7
View File
@@ -26,10 +26,10 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install .NET - name: Install .NET
uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0 uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
# Build the project separately to discern between build and format errors # Build the project separately to discern between build and format errors
- name: Build - name: Build
@@ -62,10 +62,10 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install .NET - name: Install .NET
uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0 uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
- name: Run tests - name: Run tests
env: env:
@@ -81,7 +81,7 @@ jobs:
DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
- name: Upload coverage - name: Upload coverage
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
with: with:
token: ${{ secrets.CODECOV_TOKEN }} token: ${{ secrets.CODECOV_TOKEN }}
@@ -117,10 +117,10 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install .NET - name: Install .NET
uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0 uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
- name: Publish app - name: Publish app
run: > run: >
+15 -15
View File
@@ -4,38 +4,38 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageVersion Include="AngleSharp" Version="1.4.0" /> <PackageVersion Include="AngleSharp" Version="1.5.1" />
<PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.8.0" /> <PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.8.0" />
<PackageVersion Include="AsyncKeyedLock" Version="8.0.2" /> <PackageVersion Include="AsyncKeyedLock" Version="8.0.2" />
<PackageVersion Include="Avalonia" Version="12.0.4" /> <PackageVersion Include="Avalonia" Version="12.0.5" />
<PackageVersion Include="Avalonia.Desktop" Version="12.0.4" /> <PackageVersion Include="Avalonia.Desktop" Version="12.0.5" />
<PackageVersion Include="CliFx" Version="3.0.0" /> <PackageVersion Include="CliFx" Version="3.0.0" />
<PackageVersion Include="Cogwheel" Version="2.1.1" /> <PackageVersion Include="Cogwheel" Version="2.1.1" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" /> <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" /> <PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="CSharpier.MsBuild" Version="1.2.6" /> <PackageVersion Include="CSharpier.MsBuild" Version="1.3.0" />
<PackageVersion Include="Deorcify" Version="1.1.0" /> <PackageVersion Include="Deorcify" Version="2.0.1" />
<PackageVersion Include="DialogHost.Avalonia" Version="0.12.2" /> <PackageVersion Include="DialogHost.Avalonia" Version="0.12.2" />
<PackageVersion Include="FluentAssertions" Version="8.10.0" /> <PackageVersion Include="FluentAssertions" Version="8.10.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.4" /> <PackageVersion Include="GitHubActionsTestLogger" Version="3.0.4" />
<PackageVersion Include="Gress" Version="2.2.0" /> <PackageVersion Include="Gress" Version="2.2.0" />
<PackageVersion Include="JsonExtensions" Version="1.2.0" /> <PackageVersion Include="JsonExtensions" Version="1.2.3" />
<PackageVersion Include="Markdig" Version="1.2.0" /> <PackageVersion Include="Markdig" Version="1.3.2" />
<PackageVersion Include="Material.Avalonia" Version="3.16.1" /> <PackageVersion Include="Material.Avalonia" Version="3.16.1" />
<PackageVersion Include="Material.Icons.Avalonia" Version="3.0.2" /> <PackageVersion Include="Material.Icons.Avalonia" Version="3.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.8" /> <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
<PackageVersion <PackageVersion
Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="10.0.8" Version="10.0.9"
/> />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" /> <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" /> <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
<PackageVersion Include="Onova" Version="2.6.13" /> <PackageVersion Include="Onova" Version="2.6.13" />
<PackageVersion Include="Polly" Version="8.6.6" /> <PackageVersion Include="Polly" Version="8.7.0" />
<PackageVersion Include="PowerKit" Version="1.2.0" /> <PackageVersion Include="PowerKit" Version="2.0.2" />
<PackageVersion Include="RazorBlade" Version="1.0.0" /> <PackageVersion Include="RazorBlade" Version="1.0.0" />
<PackageVersion Include="Spectre.Console" Version="0.55.2" /> <PackageVersion Include="Spectre.Console" Version="0.57.1" />
<PackageVersion Include="Superpower" Version="3.1.0" /> <PackageVersion Include="Superpower" Version="3.1.0" />
<PackageVersion Include="ThisAssembly.Project" Version="2.1.2" /> <PackageVersion Include="ThisAssembly.Project" Version="2.1.2" />
<PackageVersion Include="WebMarkupMin.Core" Version="2.21.0" /> <PackageVersion Include="WebMarkupMin.Core" Version="2.21.0" />
@@ -14,13 +14,13 @@
<PackageReference Include="coverlet.collector" PrivateAssets="all" /> <PackageReference Include="coverlet.collector" PrivateAssets="all" />
<PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" /> <PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" />
<PackageReference Include="FluentAssertions" /> <PackageReference Include="FluentAssertions" />
<PackageReference Include="GitHubActionsTestLogger" PrivateAssets="all" /> <PackageReference Include="GitHubActionsTestLogger" />
<PackageReference Include="JsonExtensions" /> <PackageReference Include="JsonExtensions" />
<PackageReference Include="Microsoft.Extensions.Configuration" /> <PackageReference Include="Microsoft.Extensions.Configuration" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" /> <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
<PackageReference Include="Microsoft.NET.Test.Sdk" /> <PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="PowerKit" PrivateAssets="all" /> <PackageReference Include="PowerKit" />
<PackageReference Include="xunit" /> <PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" /> <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
</ItemGroup> </ItemGroup>
@@ -165,6 +165,37 @@ public abstract class ExportCommandBase : DiscordCommandBase
throw new CommandException("Option --media-dir cannot be used without --media."); throw new CommandException("Option --media-dir cannot be used without --media.");
} }
// Make sure the user does not try to export multiple channels into one file.
// Output path must either be a directory or contain template tokens for this to work.
// Validate this up-front, before fetching threads, because thread fetching can take a
// long time and it's frustrating to fail only after it completes.
// https://github.com/Tyrrrz/DiscordChatExporter/issues/799
// https://github.com/Tyrrrz/DiscordChatExporter/issues/917
// https://github.com/Tyrrrz/DiscordChatExporter/issues/1549
var mayExportMultipleChannels =
// Multiple channels were provided explicitly
channels.Count > 1
// Thread inclusion can add more channels to the export
|| ThreadInclusionMode != ThreadInclusionMode.None;
var isValidOutputPath =
// Anything is valid when exporting a single channel
!mayExportMultipleChannels
// When using template tokens, assume the user knows what they're doing
|| OutputPath.Contains('%')
// Otherwise, require an existing directory or an unambiguous directory path
|| Directory.Exists(OutputPath)
|| Path.EndsInDirectorySeparator(OutputPath);
if (!isValidOutputPath)
{
throw new CommandException(
"Attempted to export multiple channels, but the output path is neither a directory nor a template. "
+ "If the provided output path is meant to be treated as a directory, make sure it ends with a slash. "
+ $"Provided output path: '{OutputPath}'."
);
}
var unwrappedChannels = new List<Channel>(channels); var unwrappedChannels = new List<Channel>(channels);
// Unwrap threads // Unwrap threads
@@ -205,28 +236,6 @@ public abstract class ExportCommandBase : DiscordCommandBase
await console.Output.WriteLineAsync($"Fetched {fetchedThreadsCount} thread(s)."); await console.Output.WriteLineAsync($"Fetched {fetchedThreadsCount} thread(s).");
} }
// Make sure the user does not try to export multiple channels into one file.
// Output path must either be a directory or contain template tokens for this to work.
// https://github.com/Tyrrrz/DiscordChatExporter/issues/799
// https://github.com/Tyrrrz/DiscordChatExporter/issues/917
var isValidOutputPath =
// Anything is valid when exporting a single channel
unwrappedChannels.Count <= 1
// When using template tokens, assume the user knows what they're doing
|| OutputPath.Contains('%')
// Otherwise, require an existing directory or an unambiguous directory path
|| Directory.Exists(OutputPath)
|| Path.EndsInDirectorySeparator(OutputPath);
if (!isValidOutputPath)
{
throw new CommandException(
"Attempted to export multiple channels, but the output path is neither a directory nor a template. "
+ "If the provided output path is meant to be treated as a directory, make sure it ends with a slash. "
+ $"Provided output path: '{OutputPath}'."
);
}
// Export // Export
var errorsByChannel = new ConcurrentDictionary<Channel, string>(); var errorsByChannel = new ConcurrentDictionary<Channel, string>();
var warningsByChannel = new ConcurrentDictionary<Channel, string>(); var warningsByChannel = new ConcurrentDictionary<Channel, string>();
@@ -9,9 +9,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="CliFx" /> <PackageReference Include="CliFx" />
<PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" /> <PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" />
<PackageReference Include="Deorcify" PrivateAssets="all" /> <PackageReference Include="Deorcify" />
<PackageReference Include="Gress" /> <PackageReference Include="Gress" />
<PackageReference Include="PowerKit" PrivateAssets="all" /> <PackageReference Include="PowerKit" />
<PackageReference Include="Spectre.Console" /> <PackageReference Include="Spectre.Console" />
</ItemGroup> </ItemGroup>
@@ -13,4 +13,5 @@ public enum MessageKind
GuildMemberJoin = 7, GuildMemberJoin = 7,
ThreadCreated = 18, ThreadCreated = 18,
Reply = 19, Reply = 19,
ThreadStarterMessage = 21,
} }
@@ -30,9 +30,8 @@ public class DiscordClient(
string url, string url,
TokenKind tokenKind, TokenKind tokenKind,
CancellationToken cancellationToken = default CancellationToken cancellationToken = default
) ) =>
{ await Http.ResponseResiliencePipeline.ExecuteAsync(
return await Http.ResponseResiliencePipeline.ExecuteAsync(
async innerCancellationToken => async innerCancellationToken =>
{ {
using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url)); using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url));
@@ -91,7 +90,6 @@ public class DiscordClient(
}, },
cancellationToken cancellationToken
); );
}
private async ValueTask<TokenKind> ResolveTokenKindAsync( private async ValueTask<TokenKind> ResolveTokenKindAsync(
CancellationToken cancellationToken = default CancellationToken cancellationToken = default
@@ -364,6 +362,7 @@ public class DiscordClient(
$"guilds/{guildId}/members/{memberId}", $"guilds/{guildId}/members/{memberId}",
cancellationToken cancellationToken
); );
return response?.Pipe(j => Member.Parse(j, guildId)); return response?.Pipe(j => Member.Parse(j, guildId));
} }
@@ -412,14 +411,12 @@ public class DiscordClient(
?.GetNonWhiteSpaceStringOrNull() ?.GetNonWhiteSpaceStringOrNull()
?.Pipe(Snowflake.Parse); ?.Pipe(Snowflake.Parse);
Channel? parent = null;
if (parentId is not null)
{
// It's possible for the parent channel to be inaccessible, despite the // It's possible for the parent channel to be inaccessible, despite the
// child channel being accessible. // child channel being accessible.
// https://github.com/Tyrrrz/DiscordChatExporter/issues/1108 // https://github.com/Tyrrrz/DiscordChatExporter/issues/1108
parent = await TryGetChannelAsync(parentId.Value, cancellationToken); var parent = parentId is not null
} ? await TryGetChannelAsync(parentId.Value, cancellationToken)
: null;
return Channel.Parse(response.Value, parent); return Channel.Parse(response.Value, parent);
} }
@@ -607,8 +604,12 @@ public class DiscordClient(
.SetQueryParameter("after", (after ?? Snowflake.Zero).ToString()) .SetQueryParameter("after", (after ?? Snowflake.Zero).ToString())
.Build(); .Build();
var response = await GetJsonResponseAsync(url, cancellationToken); // Can be null on channels that the user cannot access
var message = response.EnumerateArray().Select(Message.Parse).FirstOrDefault(); var response = await TryGetJsonResponseAsync(url, cancellationToken);
if (response is null)
return null;
var message = response.Value.EnumerateArray().Select(Message.Parse).FirstOrDefault();
return message; return message;
} }
@@ -625,8 +626,39 @@ public class DiscordClient(
.SetQueryParameter("before", before?.ToString()) .SetQueryParameter("before", before?.ToString())
.Build(); .Build();
var response = await GetJsonResponseAsync(url, cancellationToken); // Can be null on channels that the user cannot access
return response.EnumerateArray().Select(Message.Parse).LastOrDefault(); var response = await TryGetJsonResponseAsync(url, cancellationToken);
if (response is null)
return null;
return response.Value.EnumerateArray().Select(Message.Parse).LastOrDefault();
}
public async ValueTask<Message?> TryGetMessageAsync(
Snowflake channelId,
Snowflake messageId,
CancellationToken cancellationToken = default
)
{
// Use the regular message listing endpoint with the 'around' parameter instead of the
// dedicated single-message endpoint, because the latter is not accessible to user tokens.
var url = new UrlBuilder()
.SetPath($"channels/{channelId}/messages")
.SetQueryParameter("around", messageId.ToString())
.SetQueryParameter("limit", "1")
.Build();
// Can be null on channels that the user cannot access
var response = await TryGetJsonResponseAsync(url, cancellationToken);
if (response is null)
return null;
// The endpoint returns messages around the requested ID, so make sure to only return
// the message that exactly matches it (it may be absent if it has been deleted).
return response
.Value.EnumerateArray()
.Select(Message.Parse)
.FirstOrDefault(m => m.Id == messageId);
} }
public async IAsyncEnumerable<Message> GetMessagesAsync( public async IAsyncEnumerable<Message> GetMessagesAsync(
@@ -701,7 +733,21 @@ public class DiscordClient(
); );
} }
yield return message; // Some messages, for example thread starter messages, are returned by the API as content-less references.
// Try to resolve them to the actual message so that they appear as they do in the Discord client.
var actualMessage =
message.Kind == MessageKind.ThreadStarterMessage
&& message.Reference?.ChannelId is { } referencedChannelId
&& message.Reference?.MessageId is { } referencedMessageId
? await TryGetMessageAsync(
referencedChannelId,
referencedMessageId,
cancellationToken
)
: null;
yield return actualMessage ?? message;
currentAfter = message.Id; currentAfter = message.Id;
} }
} }
@@ -769,7 +815,20 @@ public class DiscordClient(
); );
} }
yield return message; // Some messages, for example thread starter messages, are returned by the API as content-less references.
// Try to resolve them to the actual message so that they appear as they do in the Discord client.
var actualMessage =
message.Kind == MessageKind.ThreadStarterMessage
&& message.Reference?.ChannelId is { } referencedChannelId
&& message.Reference?.MessageId is { } referencedMessageId
? await TryGetMessageAsync(
referencedChannelId,
referencedMessageId,
cancellationToken
)
: null;
yield return actualMessage ?? message;
} }
currentBefore = messages.Last().Id; currentBefore = messages.Last().Id;
@@ -6,7 +6,7 @@
<PackageReference Include="Gress" /> <PackageReference Include="Gress" />
<PackageReference Include="JsonExtensions" /> <PackageReference Include="JsonExtensions" />
<PackageReference Include="Polly" /> <PackageReference Include="Polly" />
<PackageReference Include="PowerKit" PrivateAssets="all" /> <PackageReference Include="PowerKit" />
<PackageReference Include="RazorBlade" /> <PackageReference Include="RazorBlade" />
<PackageReference Include="Superpower" /> <PackageReference Include="Superpower" />
<PackageReference Include="WebMarkupMin.Core" /> <PackageReference Include="WebMarkupMin.Core" />
@@ -38,17 +38,21 @@ internal partial class ExportAssetDownloader(string workingDirPath, bool reuse)
return _previousPathsByUrl[url] = filePath; return _previousPathsByUrl[url] = filePath;
// Check for a file cached by the legacy naming scheme (5-char hash) and rename it // Check for a file cached by the legacy naming scheme (5-char hash) and rename it
// to the new naming scheme to preserve backwards compatibility with existing exports // to the new naming scheme to preserve backwards compatibility with existing exports.
// This will catch both the 5-char lowercase hash and the 5-char uppercase hash variants.
if (reuse) if (reuse)
{ {
var legacyFilePath = Path.Combine(workingDirPath, GetLegacyFileNameFromUrl(url)); var legacyFileNames = GetLegacyFileNamesFromUrl(url);
foreach (var legacyFileName in legacyFileNames)
{
var legacyFilePath = Path.Combine(workingDirPath, legacyFileName);
if (File.Exists(legacyFilePath)) if (File.Exists(legacyFilePath))
{ {
// Overwrite in case the destination file was created concurrently between our // Overwrite in case the destination file was created concurrently between our
// earlier existence check and this move operation // earlier existence check and this move operation
try try
{ {
File.Move(legacyFilePath, filePath, overwrite: true); File.Move(legacyFilePath, filePath, true);
return _previousPathsByUrl[url] = filePath; return _previousPathsByUrl[url] = filePath;
} }
catch (IOException) catch (IOException)
@@ -58,6 +62,7 @@ internal partial class ExportAssetDownloader(string workingDirPath, bool reuse)
} }
} }
} }
}
Directory.CreateDirectory(workingDirPath); Directory.CreateDirectory(workingDirPath);
@@ -87,10 +92,16 @@ internal partial class ExportAssetDownloader
{ {
private static string NormalizeUrl(string url) private static string NormalizeUrl(string url)
{ {
// Remove signature parameters from Discord CDN URLs to normalize them // Remove signature parameters from Discord CDN/media URLs to normalize them
var uri = new Uri(url); var uri = new Uri(url);
if (!string.Equals(uri.Host, "cdn.discordapp.com", StringComparison.OrdinalIgnoreCase))
if (
!string.Equals(uri.Host, "cdn.discordapp.com", StringComparison.OrdinalIgnoreCase)
&& !string.Equals(uri.Host, "media.discordapp.net", StringComparison.OrdinalIgnoreCase)
)
{
return url; return url;
}
var query = HttpUtility.ParseQueryString(uri.Query); var query = HttpUtility.ParseQueryString(uri.Query);
query.Remove("ex"); query.Remove("ex");
@@ -137,13 +148,16 @@ internal partial class ExportAssetDownloader
); );
// Legacy naming used a 5-char hash, kept for backwards compatibility with existing exports // Legacy naming used a 5-char hash, kept for backwards compatibility with existing exports
private static string GetLegacyFileNameFromUrl(string url) => private static IReadOnlyList<string> GetLegacyFileNamesFromUrl(string url)
GetFileNameFromUrl( {
url, var hashData = SHA256.HashData(Encoding.UTF8.GetBytes(NormalizeUrl(url)));
SHA256
.HashData(Encoding.UTF8.GetBytes(NormalizeUrl(url))) return
.Pipe(Convert.ToHexStringLower) [
// 5 chars = 20 bits, reaches 1% collision probability at ~145 files // Lowercase variant (introduced in 2.46.1)
.Truncate(5) GetFileNameFromUrl(url, Convert.ToHexStringLower(hashData).Truncate(5)),
); // Uppercase variant (original)
GetFileNameFromUrl(url, Convert.ToHexString(hashData).Truncate(5)),
];
}
} }
@@ -206,10 +206,15 @@ public partial class ExportRequest
{ {
var actualOutputPath = FormatPath(outputPath, guild, channel, after, before); var actualOutputPath = FormatPath(outputPath, guild, channel, after, before);
// Output is a directory // Determine whether the output path refers to a directory or a file.
// The extension-based heuristic is evaluated on the original, unsubstituted path,
// because the value of a template token (e.g. a guild or channel name) may contain
// a period that would otherwise be mistaken for a file extension, incorrectly causing
// a directory path to be treated as a file.
// https://github.com/Tyrrrz/DiscordChatExporter/issues/1502
if ( if (
Directory.Exists(actualOutputPath) Directory.Exists(actualOutputPath)
|| string.IsNullOrWhiteSpace(Path.GetExtension(actualOutputPath)) || string.IsNullOrWhiteSpace(Path.GetExtension(outputPath))
) )
{ {
var fileName = GetDefaultOutputFileName(guild, channel, format, after, before); var fileName = GetDefaultOutputFileName(guild, channel, format, after, before);
+8 -3
View File
@@ -9,7 +9,8 @@
xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:materialStyles="clr-namespace:Material.Styles.Themes;assembly=Material.Styles" xmlns:materialStyles="clr-namespace:Material.Styles.Themes;assembly=Material.Styles"
Name="DiscordChatExporter" Name="DiscordChatExporter"
ActualThemeVariantChanged="Application_OnActualThemeVariantChanged"> ActualThemeVariantChanged="Application_OnActualThemeVariantChanged"
>
<Application.DataTemplates> <Application.DataTemplates>
<framework:ViewManager /> <framework:ViewManager />
</Application.DataTemplates> </Application.DataTemplates>
@@ -19,7 +20,8 @@
<materialStyles:MaterialTheme <materialStyles:MaterialTheme
BaseTheme="Light" BaseTheme="Light"
PrimaryColor="Grey" PrimaryColor="Grey"
SecondaryColor="DeepOrange" /> SecondaryColor="DeepOrange"
/>
<materialIcons:MaterialIconStyles /> <materialIcons:MaterialIconStyles />
<dialogHostAvalonia:DialogHostStyles /> <dialogHostAvalonia:DialogHostStyles />
@@ -133,7 +135,10 @@
<!-- Toggle switch --> <!-- Toggle switch -->
<Style Selector="ToggleSwitch"> <Style Selector="ToggleSwitch">
<Setter Property="materialAssists:ToggleSwitchAssist.SwitchThumbOffBackground" Value="{DynamicResource ToggleBackgroundBrush}" /> <Setter
Property="materialAssists:ToggleSwitchAssist.SwitchThumbOffBackground"
Value="{DynamicResource ToggleBackgroundBrush}"
/>
</Style> </Style>
<!-- Tooltip --> <!-- Tooltip -->
@@ -31,7 +31,7 @@
<PackageReference Include="Cogwheel" /> <PackageReference Include="Cogwheel" />
<PackageReference Include="CommunityToolkit.Mvvm" /> <PackageReference Include="CommunityToolkit.Mvvm" />
<PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" /> <PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" />
<PackageReference Include="Deorcify" PrivateAssets="all" /> <PackageReference Include="Deorcify" />
<PackageReference Include="DialogHost.Avalonia" /> <PackageReference Include="DialogHost.Avalonia" />
<PackageReference Include="Gress" /> <PackageReference Include="Gress" />
<PackageReference Include="Markdig" /> <PackageReference Include="Markdig" />
@@ -39,7 +39,7 @@
<PackageReference Include="Material.Icons.Avalonia" /> <PackageReference Include="Material.Icons.Avalonia" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Onova" /> <PackageReference Include="Onova" />
<PackageReference Include="PowerKit" PrivateAssets="all" /> <PackageReference Include="PowerKit" />
<PackageReference Include="ThisAssembly.Project" PrivateAssets="all" /> <PackageReference Include="ThisAssembly.Project" PrivateAssets="all" />
</ItemGroup> </ItemGroup>
@@ -9,13 +9,15 @@
xmlns:materialStyles="clr-namespace:Material.Styles.Controls;assembly=Material.Styles" xmlns:materialStyles="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
x:Name="UserControl" x:Name="UserControl"
x:DataType="components:DashboardViewModel" x:DataType="components:DashboardViewModel"
Loaded="UserControl_OnLoaded"> Loaded="UserControl_OnLoaded"
>
<DockPanel> <DockPanel>
<!-- Header --> <!-- Header -->
<StackPanel <StackPanel
Background="{DynamicResource MaterialDarkBackgroundBrush}" Background="{DynamicResource MaterialDarkBackgroundBrush}"
DockPanel.Dock="Top" DockPanel.Dock="Top"
Orientation="Vertical"> Orientation="Vertical"
>
<Grid Margin="12,12,8,12" ColumnDefinitions="*,Auto"> <Grid Margin="12,12,8,12" ColumnDefinitions="*,Auto">
<materialStyles:Card Grid.Column="0"> <materialStyles:Card Grid.Column="0">
<!-- Token --> <!-- Token -->
@@ -26,7 +28,8 @@
PlaceholderText="{Binding LocalizationManager.TokenPlaceholderText}" PlaceholderText="{Binding LocalizationManager.TokenPlaceholderText}"
RevealPassword="{Binding $self.IsFocused}" RevealPassword="{Binding $self.IsFocused}"
Text="{Binding Token}" Text="{Binding Token}"
Theme="{DynamicResource SoloTextBox}"> Theme="{DynamicResource SoloTextBox}"
>
<TextBox.InnerLeftContent> <TextBox.InnerLeftContent>
<materialIcons:MaterialIcon <materialIcons:MaterialIcon
Grid.Column="0" Grid.Column="0"
@@ -34,7 +37,8 @@
Height="24" Height="24"
Margin="4,0,8,0" Margin="4,0,8,0"
Foreground="{DynamicResource PrimaryHueMidBrush}" Foreground="{DynamicResource PrimaryHueMidBrush}"
Kind="Key" /> Kind="Key"
/>
</TextBox.InnerLeftContent> </TextBox.InnerLeftContent>
<TextBox.InnerRightContent> <TextBox.InnerRightContent>
<Button <Button
@@ -44,11 +48,9 @@
Command="{Binding PullGuildsCommand}" Command="{Binding PullGuildsCommand}"
IsDefault="True" IsDefault="True"
Theme="{DynamicResource MaterialFlatButton}" Theme="{DynamicResource MaterialFlatButton}"
ToolTip.Tip="{Binding LocalizationManager.PullGuildsTooltip}"> ToolTip.Tip="{Binding LocalizationManager.PullGuildsTooltip}"
<materialIcons:MaterialIcon >
Width="24" <materialIcons:MaterialIcon Width="24" Height="24" Kind="ArrowRight" />
Height="24"
Kind="ArrowRight" />
</Button> </Button>
</TextBox.InnerRightContent> </TextBox.InnerRightContent>
</TextBox> </TextBox>
@@ -63,11 +65,9 @@
Command="{Binding ShowSettingsCommand}" Command="{Binding ShowSettingsCommand}"
Foreground="{DynamicResource MaterialDarkForegroundBrush}" Foreground="{DynamicResource MaterialDarkForegroundBrush}"
Theme="{DynamicResource MaterialFlatButton}" Theme="{DynamicResource MaterialFlatButton}"
ToolTip.Tip="{Binding LocalizationManager.SettingsTooltip}"> ToolTip.Tip="{Binding LocalizationManager.SettingsTooltip}"
<materialIcons:MaterialIcon >
Width="24" <materialIcons:MaterialIcon Width="24" Height="24" Kind="Settings" />
Height="24"
Kind="Settings" />
</Button> </Button>
</Grid> </Grid>
@@ -76,14 +76,16 @@
Height="2" Height="2"
Background="Transparent" Background="Transparent"
IsIndeterminate="{Binding IsProgressIndeterminate}" IsIndeterminate="{Binding IsProgressIndeterminate}"
Value="{Binding Progress.Current.Fraction, Mode=OneWay}" /> Value="{Binding Progress.Current.Fraction, Mode=OneWay}"
/>
</StackPanel> </StackPanel>
<!-- Body --> <!-- Body -->
<Panel <Panel
Background="{DynamicResource MaterialCardBackgroundBrush}" Background="{DynamicResource MaterialCardBackgroundBrush}"
DockPanel.Dock="Bottom" DockPanel.Dock="Bottom"
IsEnabled="{Binding !IsBusy}"> IsEnabled="{Binding !IsBusy}"
>
<Panel.Styles> <Panel.Styles>
<Style Selector="Panel"> <Style Selector="Panel">
<Style Selector="^:disabled"> <Style Selector="^:disabled">
@@ -97,14 +99,16 @@
<Border <Border
Grid.Column="0" Grid.Column="0"
BorderBrush="{DynamicResource MaterialDividerBrush}" BorderBrush="{DynamicResource MaterialDividerBrush}"
BorderThickness="0,0,1,0"> BorderThickness="0,0,1,0"
>
<ListBox <ListBox
x:Name="AvailableGuildsListBox" x:Name="AvailableGuildsListBox"
ItemsSource="{Binding AvailableGuilds}" ItemsSource="{Binding AvailableGuilds}"
ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"
SelectedItem="{Binding SelectedGuild}" SelectedItem="{Binding SelectedGuild}"
SelectionChanged="AvailableGuildsListBox_OnSelectionChanged" SelectionChanged="AvailableGuildsListBox_OnSelectionChanged"
SelectionMode="Single"> SelectionMode="Single"
>
<ListBox.Styles> <ListBox.Styles>
<Style Selector="ListBox"> <Style Selector="ListBox">
<Style Selector="^ ListBoxItem"> <Style Selector="^ ListBoxItem">
@@ -121,13 +125,11 @@
Width="48" Width="48"
Height="48" Height="48"
Margin="12" Margin="12"
Fill="{DynamicResource MaterialDividerBrush}" /> Fill="{DynamicResource MaterialDividerBrush}"
/>
<!-- Guild icon --> <!-- Guild icon -->
<Ellipse <Ellipse Width="48" Height="48" Margin="12">
Width="48"
Height="48"
Margin="12">
<Ellipse.Fill> <Ellipse.Fill>
<ImageBrush asyncImageLoader:ImageBrushLoader.Source="{Binding IconUrl}" /> <ImageBrush asyncImageLoader:ImageBrushLoader.Source="{Binding IconUrl}" />
</Ellipse.Fill> </Ellipse.Fill>
@@ -146,7 +148,8 @@
SelectedItems="{Binding SelectedChannels}" SelectedItems="{Binding SelectedChannels}"
SelectionChanged="AvailableChannelsTreeView_OnSelectionChanged" SelectionChanged="AvailableChannelsTreeView_OnSelectionChanged"
SelectionMode="Multiple" SelectionMode="Multiple"
TextSearch.Text="Name"> TextSearch.Text="Name"
>
<TreeView.Styles> <TreeView.Styles>
<Style Selector="TreeView"> <Style Selector="TreeView">
<Style Selector="^ TreeViewItem"> <Style Selector="^ TreeViewItem">
@@ -161,7 +164,8 @@
Background="Transparent" Background="Transparent"
Classes.category="{Binding Channel.IsCategory}" Classes.category="{Binding Channel.IsCategory}"
ColumnDefinitions="Auto,*,Auto" ColumnDefinitions="Auto,*,Auto"
DoubleTapped="ChannelGrid_OnDoubleTapped"> DoubleTapped="ChannelGrid_OnDoubleTapped"
>
<Grid.Styles> <Grid.Styles>
<Style Selector="Grid"> <Style Selector="Grid">
<Style Selector="^:not(.category)"> <Style Selector="^:not(.category)">
@@ -169,7 +173,10 @@
<Template> <Template>
<TextBlock> <TextBlock>
<Run Text="{Binding #UserControl.DataContext.LocalizationManager.LastMessageSentTooltip}" /> <Run Text="{Binding #UserControl.DataContext.LocalizationManager.LastMessageSentTooltip}" />
<Run FontWeight="SemiBold" Text="{Binding Channel.LastMessageId, Converter={x:Static converters:SnowflakeToTimestampStringConverter.Instance}, TargetNullValue=never, Mode=OneWay}" /> <Run
FontWeight="SemiBold"
Text="{Binding Channel.LastMessageId, Converter={x:Static converters:SnowflakeToTimestampStringConverter.Instance}, TargetNullValue=never, Mode=OneWay}"
/>
</TextBlock> </TextBlock>
</Template> </Template>
</Setter> </Setter>
@@ -182,7 +189,8 @@
Grid.Column="0" Grid.Column="0"
Margin="0,0,4,0" Margin="0,0,4,0"
Classes.voice="{Binding Channel.IsVoice}" Classes.voice="{Binding Channel.IsVoice}"
IsVisible="{Binding !Channel.IsCategory}"> IsVisible="{Binding !Channel.IsCategory}"
>
<materialIcons:MaterialIcon.Styles> <materialIcons:MaterialIcon.Styles>
<Style Selector="materialIcons|MaterialIcon"> <Style Selector="materialIcons|MaterialIcon">
<Setter Property="Kind" Value="Pound" /> <Setter Property="Kind" Value="Pound" />
@@ -199,7 +207,8 @@
Grid.Column="1" Grid.Column="1"
Margin="0,12" Margin="0,12"
FontSize="14" FontSize="14"
Text="{Binding Channel.Name, Mode=OneWay}" /> Text="{Binding Channel.Name, Mode=OneWay}"
/>
<!-- Checkmark --> <!-- Checkmark -->
<materialIcons:MaterialIcon <materialIcons:MaterialIcon
@@ -208,7 +217,8 @@
Height="24" Height="24"
Margin="16,0" Margin="16,0"
IsVisible="{Binding $parent[TreeViewItem].IsSelected}" IsVisible="{Binding $parent[TreeViewItem].IsSelected}"
Kind="Check" /> Kind="Check"
/>
</Grid> </Grid>
</TreeDataTemplate> </TreeDataTemplate>
</TreeView.ItemTemplate> </TreeView.ItemTemplate>
@@ -227,13 +237,15 @@
Width="18" Width="18"
Height="18" Height="18"
Foreground="{DynamicResource PrimaryHueMidBrush}" Foreground="{DynamicResource PrimaryHueMidBrush}"
Kind="Account" /> Kind="Account"
/>
</InlineUIContainer> </InlineUIContainer>
<Run Text="" /> <Run Text="" />
<Run <Run
FontSize="16" FontSize="16"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="{Binding LocalizationManager.TokenPersonalHeader}" /> Text="{Binding LocalizationManager.TokenPersonalHeader}"
/>
</TextBlock> </TextBlock>
<TextBlock <TextBlock
@@ -241,14 +253,16 @@
FontWeight="Light" FontWeight="Light"
Inlines="{Binding LocalizationManager.TokenPersonalTosWarning, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}" Inlines="{Binding LocalizationManager.TokenPersonalTosWarning, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
LineHeight="23" LineHeight="23"
TextWrapping="Wrap" /> TextWrapping="Wrap"
/>
<TextBlock <TextBlock
FontSize="14" FontSize="14"
FontWeight="Light" FontWeight="Light"
Inlines="{Binding LocalizationManager.TokenPersonalInstructions, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}" Inlines="{Binding LocalizationManager.TokenPersonalInstructions, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
LineHeight="23" LineHeight="23"
TextWrapping="Wrap" /> TextWrapping="Wrap"
/>
<!-- Bot token --> <!-- Bot token -->
<TextBlock Margin="0,12,0,0"> <TextBlock Margin="0,12,0,0">
@@ -257,13 +271,15 @@
Width="18" Width="18"
Height="18" Height="18"
Foreground="{DynamicResource PrimaryHueMidBrush}" Foreground="{DynamicResource PrimaryHueMidBrush}"
Kind="Robot" /> Kind="Robot"
/>
</InlineUIContainer> </InlineUIContainer>
<Run Text="" /> <Run Text="" />
<Run <Run
FontSize="16" FontSize="16"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="{Binding LocalizationManager.TokenBotHeader}" /> Text="{Binding LocalizationManager.TokenBotHeader}"
/>
</TextBlock> </TextBlock>
<TextBlock <TextBlock
@@ -271,7 +287,8 @@
FontWeight="Light" FontWeight="Light"
Inlines="{Binding LocalizationManager.TokenBotInstructions, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}" Inlines="{Binding LocalizationManager.TokenBotInstructions, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
LineHeight="23" LineHeight="23"
TextWrapping="Wrap" /> TextWrapping="Wrap"
/>
<TextBlock <TextBlock
Margin="0,12,0,0" Margin="0,12,0,0"
@@ -279,7 +296,8 @@
FontWeight="Light" FontWeight="Light"
Inlines="{Binding LocalizationManager.TokenHelpText, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}" Inlines="{Binding LocalizationManager.TokenHelpText, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
LineHeight="23" LineHeight="23"
TextWrapping="Wrap" /> TextWrapping="Wrap"
/>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
</Panel> </Panel>
@@ -296,11 +314,9 @@
Command="{Binding ExportCommand}" Command="{Binding ExportCommand}"
Foreground="{DynamicResource MaterialSecondaryMidForegroundBrush}" Foreground="{DynamicResource MaterialSecondaryMidForegroundBrush}"
IsVisible="{Binding $self.IsEffectivelyEnabled}" IsVisible="{Binding $self.IsEffectivelyEnabled}"
Theme="{DynamicResource MaterialIconButton}"> Theme="{DynamicResource MaterialIconButton}"
<materialIcons:MaterialIcon >
Width="32" <materialIcons:MaterialIcon Width="32" Height="32" Kind="Download" />
Height="32"
Kind="Download" />
</Button> </Button>
</Panel> </Panel>
</DockPanel> </DockPanel>
@@ -2,13 +2,15 @@
x:Class="DiscordChatExporter.Gui.Views.Controls.HyperLink" x:Class="DiscordChatExporter.Gui.Views.Controls.HyperLink"
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:DiscordChatExporter.Gui.Views.Controls"> xmlns:controls="clr-namespace:DiscordChatExporter.Gui.Views.Controls"
>
<TextBlock <TextBlock
x:Name="TextBlock" x:Name="TextBlock"
Cursor="Hand" Cursor="Hand"
Foreground="{DynamicResource MaterialSecondaryDarkBrush}" Foreground="{DynamicResource MaterialSecondaryDarkBrush}"
PointerReleased="TextBlock_OnPointerReleased" PointerReleased="TextBlock_OnPointerReleased"
Text="{Binding $parent[controls:HyperLink].Text, Mode=OneWay}"> Text="{Binding $parent[controls:HyperLink].Text, Mode=OneWay}"
>
<TextBlock.Styles> <TextBlock.Styles>
<Style Selector="TextBlock"> <Style Selector="TextBlock">
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
@@ -10,18 +10,13 @@
xmlns:utils="clr-namespace:DiscordChatExporter.Gui.Utils" xmlns:utils="clr-namespace:DiscordChatExporter.Gui.Utils"
x:Name="UserControl" x:Name="UserControl"
Width="380" Width="380"
x:DataType="dialogs:ExportSetupViewModel"> x:DataType="dialogs:ExportSetupViewModel"
>
<Grid RowDefinitions="Auto,*,Auto"> <Grid RowDefinitions="Auto,*,Auto">
<!-- Guild/channel info --> <!-- Guild/channel info -->
<Grid <Grid Grid.Row="0" Margin="16" ColumnDefinitions="Auto,*">
Grid.Row="0"
Margin="16"
ColumnDefinitions="Auto,*">
<!-- Guild icon --> <!-- Guild icon -->
<Ellipse <Ellipse Grid.Column="0" Width="32" Height="32">
Grid.Column="0"
Width="32"
Height="32">
<Ellipse.Fill> <Ellipse.Fill>
<ImageBrush asyncImageLoader:ImageBrushLoader.Source="{Binding Guild.IconUrl}" /> <ImageBrush asyncImageLoader:ImageBrushLoader.Source="{Binding Guild.IconUrl}" />
</Ellipse.Fill> </Ellipse.Fill>
@@ -35,7 +30,8 @@
FontSize="19" FontSize="19"
FontWeight="Light" FontWeight="Light"
IsVisible="{Binding !IsSingleChannel}" IsVisible="{Binding !IsSingleChannel}"
TextTrimming="CharacterEllipsis"> TextTrimming="CharacterEllipsis"
>
<Run Text="{Binding Channels.Count, FallbackValue=0, Mode=OneWay}" /> <Run Text="{Binding Channels.Count, FallbackValue=0, Mode=OneWay}" />
<Run Text="{Binding LocalizationManager.ChannelsSelectedText}" /> <Run Text="{Binding LocalizationManager.ChannelsSelectedText}" />
</TextBlock> </TextBlock>
@@ -49,8 +45,10 @@
FontWeight="Light" FontWeight="Light"
IsVisible="{Binding IsSingleChannel}" IsVisible="{Binding IsSingleChannel}"
TextTrimming="CharacterEllipsis" TextTrimming="CharacterEllipsis"
ToolTip.Tip="{Binding Channels[0], Converter={x:Static converters:ChannelToHierarchicalNameStringConverter.Instance}}"> ToolTip.Tip="{Binding Channels[0], Converter={x:Static converters:ChannelToHierarchicalNameStringConverter.Instance}}"
<Run Text="{Binding Channels[0].Parent.Name, StringFormat='{}{0} / ', FallbackValue='', TargetNullValue='', Mode=OneWay}" /><Run FontWeight="SemiBold" Text="{Binding Channels[0].Name, Mode=OneWay}" /> >
<Run Text="{Binding Channels[0].Parent.Name, StringFormat='{}{0} / ', FallbackValue='', TargetNullValue='', Mode=OneWay}" />
<Run FontWeight="SemiBold" Text="{Binding Channels[0].Name, Mode=OneWay}" />
</TextBlock> </TextBlock>
</Grid> </Grid>
@@ -58,7 +56,8 @@
Grid.Row="1" Grid.Row="1"
Padding="0,8" Padding="0,8"
BorderBrush="{DynamicResource MaterialDividerBrush}" BorderBrush="{DynamicResource MaterialDividerBrush}"
BorderThickness="0,1"> BorderThickness="0,1"
>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"> <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<!-- Output path --> <!-- Output path -->
@@ -66,12 +65,14 @@
Margin="16,8" Margin="16,8"
materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.OutputPathLabel}" materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.OutputPathLabel}"
Text="{Binding OutputPath}" Text="{Binding OutputPath}"
Theme="{DynamicResource FilledTextBox}"> Theme="{DynamicResource FilledTextBox}"
>
<ToolTip.Tip> <ToolTip.Tip>
<TextBlock <TextBlock
MaxWidth="400" MaxWidth="400"
Inlines="{Binding LocalizationManager.OutputPathTooltip, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}" Inlines="{Binding LocalizationManager.OutputPathTooltip, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
TextWrapping="Wrap" /> TextWrapping="Wrap"
/>
</ToolTip.Tip> </ToolTip.Tip>
<TextBox.InnerRightContent> <TextBox.InnerRightContent>
<Button <Button
@@ -79,11 +80,9 @@
Padding="8" Padding="8"
VerticalAlignment="Center" VerticalAlignment="Center"
Command="{Binding ShowOutputPathPromptCommand}" Command="{Binding ShowOutputPathPromptCommand}"
Theme="{DynamicResource MaterialFlatButton}"> Theme="{DynamicResource MaterialFlatButton}"
<materialIcons:MaterialIcon >
Width="20" <materialIcons:MaterialIcon Width="20" Height="20" Kind="FolderOpen" />
Height="20"
Kind="FolderOpen" />
</Button> </Button>
</TextBox.InnerRightContent> </TextBox.InnerRightContent>
</TextBox> </TextBox>
@@ -95,7 +94,8 @@
ItemsSource="{Binding AvailableFormats}" ItemsSource="{Binding AvailableFormats}"
SelectedItem="{Binding SelectedFormat}" SelectedItem="{Binding SelectedFormat}"
Theme="{DynamicResource MaterialFilledComboBox}" Theme="{DynamicResource MaterialFilledComboBox}"
ToolTip.Tip="{Binding LocalizationManager.FormatTooltip}"> ToolTip.Tip="{Binding LocalizationManager.FormatTooltip}"
>
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Converter={x:Static converters:ExportFormatToStringConverter.Instance}}" /> <TextBlock Text="{Binding Converter={x:Static converters:ExportFormatToStringConverter.Instance}}" />
@@ -108,19 +108,17 @@
Margin="16,8" Margin="16,8"
IsVisible="{Binding IsAdvancedSectionDisplayed}" IsVisible="{Binding IsAdvancedSectionDisplayed}"
Orientation="Vertical" Orientation="Vertical"
Spacing="16"> Spacing="16"
>
<!-- Date limits --> <!-- Date limits -->
<Grid <Grid ColumnDefinitions="*,*" ColumnSpacing="16" RowDefinitions="*,*" RowSpacing="16">
ColumnDefinitions="*,*"
ColumnSpacing="16"
RowDefinitions="*,*"
RowSpacing="16">
<DatePicker <DatePicker
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.AfterDateLabel}" materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.AfterDateLabel}"
SelectedDate="{Binding AfterDate}" SelectedDate="{Binding AfterDate}"
ToolTip.Tip="{Binding LocalizationManager.AfterDateTooltip}"> ToolTip.Tip="{Binding LocalizationManager.AfterDateTooltip}"
>
<DatePicker.Styles> <DatePicker.Styles>
<Style Selector="DatePicker"> <Style Selector="DatePicker">
<Style Selector="^ /template/ TextBox#DisplayTextBox"> <Style Selector="^ /template/ TextBox#DisplayTextBox">
@@ -134,7 +132,8 @@
Grid.Column="1" Grid.Column="1"
materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.BeforeDateLabel}" materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.BeforeDateLabel}"
SelectedDate="{Binding BeforeDate}" SelectedDate="{Binding BeforeDate}"
ToolTip.Tip="{Binding LocalizationManager.BeforeDateTooltip}"> ToolTip.Tip="{Binding LocalizationManager.BeforeDateTooltip}"
>
<DatePicker.Styles> <DatePicker.Styles>
<Style Selector="DatePicker"> <Style Selector="DatePicker">
<Style Selector="^ /template/ TextBox#DisplayTextBox"> <Style Selector="^ /template/ TextBox#DisplayTextBox">
@@ -152,7 +151,8 @@
ClockIdentifier="{x:Static utils:Internationalization.AvaloniaClockIdentifier}" ClockIdentifier="{x:Static utils:Internationalization.AvaloniaClockIdentifier}"
IsEnabled="{Binding IsAfterDateSet}" IsEnabled="{Binding IsAfterDateSet}"
SelectedTime="{Binding AfterTime}" SelectedTime="{Binding AfterTime}"
ToolTip.Tip="{Binding LocalizationManager.AfterTimeTooltip}"> ToolTip.Tip="{Binding LocalizationManager.AfterTimeTooltip}"
>
<TimePicker.Styles> <TimePicker.Styles>
<Style Selector="TimePicker"> <Style Selector="TimePicker">
<Style Selector="^ /template/ TextBox#PART_DisplayTextBox"> <Style Selector="^ /template/ TextBox#PART_DisplayTextBox">
@@ -168,7 +168,8 @@
ClockIdentifier="{x:Static utils:Internationalization.AvaloniaClockIdentifier}" ClockIdentifier="{x:Static utils:Internationalization.AvaloniaClockIdentifier}"
IsEnabled="{Binding IsBeforeDateSet}" IsEnabled="{Binding IsBeforeDateSet}"
SelectedTime="{Binding BeforeTime}" SelectedTime="{Binding BeforeTime}"
ToolTip.Tip="{Binding LocalizationManager.BeforeTimeTooltip}"> ToolTip.Tip="{Binding LocalizationManager.BeforeTimeTooltip}"
>
<TimePicker.Styles> <TimePicker.Styles>
<Style Selector="TimePicker"> <Style Selector="TimePicker">
<Style Selector="^ /template/ TextBox#PART_DisplayTextBox"> <Style Selector="^ /template/ TextBox#PART_DisplayTextBox">
@@ -184,30 +185,50 @@
materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.PartitionLimitLabel}" materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.PartitionLimitLabel}"
Text="{Binding PartitionLimitValue}" Text="{Binding PartitionLimitValue}"
Theme="{DynamicResource FilledTextBox}" Theme="{DynamicResource FilledTextBox}"
ToolTip.Tip="{Binding LocalizationManager.PartitionLimitTooltip}" /> ToolTip.Tip="{Binding LocalizationManager.PartitionLimitTooltip}"
/>
<!-- Filtering --> <!-- Filtering -->
<TextBox <TextBox
materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.MessageFilterLabel}" materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.MessageFilterLabel}"
Text="{Binding MessageFilterValue}" Text="{Binding MessageFilterValue}"
Theme="{DynamicResource FilledTextBox}" Theme="{DynamicResource FilledTextBox}"
ToolTip.Tip="{Binding LocalizationManager.MessageFilterTooltip}" /> ToolTip.Tip="{Binding LocalizationManager.MessageFilterTooltip}"
/>
<!-- Reverse message order --> <!-- Reverse message order -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ReverseMessageOrderTooltip}"> <DockPanel
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ReverseMessageOrderLabel}" /> LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.ReverseMessageOrderTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.ReverseMessageOrderLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsReverseMessageOrder}" /> <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsReverseMessageOrder}" />
</DockPanel> </DockPanel>
<!-- Markdown formatting --> <!-- Markdown formatting -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.FormatMarkdownTooltip}"> <DockPanel
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.FormatMarkdownLabel}" /> LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.FormatMarkdownTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.FormatMarkdownLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldFormatMarkdown}" /> <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldFormatMarkdown}" />
</DockPanel> </DockPanel>
<!-- Download assets --> <!-- Download assets -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.DownloadAssetsTooltip}"> <DockPanel
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.DownloadAssetsLabel}" /> LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.DownloadAssetsTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.DownloadAssetsLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldDownloadAssets}" /> <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldDownloadAssets}" />
</DockPanel> </DockPanel>
@@ -215,8 +236,12 @@
<DockPanel <DockPanel
IsEnabled="{Binding ShouldDownloadAssets}" IsEnabled="{Binding ShouldDownloadAssets}"
LastChildFill="False" LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.ReuseAssetsTooltip}"> ToolTip.Tip="{Binding LocalizationManager.ReuseAssetsTooltip}"
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ReuseAssetsLabel}" /> >
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.ReuseAssetsLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldReuseAssets}" /> <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldReuseAssets}" />
</DockPanel> </DockPanel>
@@ -226,18 +251,17 @@
IsEnabled="{Binding ShouldDownloadAssets}" IsEnabled="{Binding ShouldDownloadAssets}"
Text="{Binding AssetsDirPath}" Text="{Binding AssetsDirPath}"
Theme="{DynamicResource FilledTextBox}" Theme="{DynamicResource FilledTextBox}"
ToolTip.Tip="{Binding LocalizationManager.AssetsDirPathTooltip}"> ToolTip.Tip="{Binding LocalizationManager.AssetsDirPathTooltip}"
>
<TextBox.InnerRightContent> <TextBox.InnerRightContent>
<Button <Button
Margin="8,8,8,6" Margin="8,8,8,6"
Padding="8" Padding="8"
VerticalAlignment="Center" VerticalAlignment="Center"
Command="{Binding ShowAssetsDirPathPromptCommand}" Command="{Binding ShowAssetsDirPathPromptCommand}"
Theme="{DynamicResource MaterialFlatButton}"> Theme="{DynamicResource MaterialFlatButton}"
<materialIcons:MaterialIcon >
Width="20" <materialIcons:MaterialIcon Width="20" Height="20" Kind="FolderOpen" />
Height="20"
Kind="FolderOpen" />
</Button> </Button>
</TextBox.InnerRightContent> </TextBox.InnerRightContent>
</TextBox> </TextBox>
@@ -247,16 +271,13 @@
</Border> </Border>
<!-- Buttons --> <!-- Buttons -->
<Grid <Grid Grid.Row="2" Margin="16" ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="8">
Grid.Row="2"
Margin="16"
ColumnDefinitions="Auto,*,Auto,Auto"
ColumnSpacing="8">
<ToggleButton <ToggleButton
Grid.Column="0" Grid.Column="0"
IsChecked="{Binding IsAdvancedSectionDisplayed}" IsChecked="{Binding IsAdvancedSectionDisplayed}"
Theme="{DynamicResource MaterialOutlineButton}" Theme="{DynamicResource MaterialOutlineButton}"
ToolTip.Tip="{Binding LocalizationManager.AdvancedOptionsTooltip}"> ToolTip.Tip="{Binding LocalizationManager.AdvancedOptionsTooltip}"
>
<Button.Styles> <Button.Styles>
<Style Selector="ToggleButton"> <Style Selector="ToggleButton">
<Setter Property="Content" Value="MORE" /> <Setter Property="Content" Value="MORE" />
@@ -273,13 +294,15 @@
Command="{Binding ConfirmCommand}" Command="{Binding ConfirmCommand}"
Content="{Binding LocalizationManager.ExportButton}" Content="{Binding LocalizationManager.ExportButton}"
IsDefault="True" IsDefault="True"
Theme="{DynamicResource MaterialOutlineButton}" /> Theme="{DynamicResource MaterialOutlineButton}"
/>
<Button <Button
Grid.Column="3" Grid.Column="3"
Command="{Binding CloseCommand}" Command="{Binding CloseCommand}"
Content="{Binding LocalizationManager.CancelButton}" Content="{Binding LocalizationManager.CancelButton}"
IsCancel="True" IsCancel="True"
Theme="{DynamicResource MaterialOutlineButton}" /> Theme="{DynamicResource MaterialOutlineButton}"
/>
</Grid> </Grid>
</Grid> </Grid>
</UserControl> </UserControl>
@@ -5,7 +5,8 @@
xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs" xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
xmlns:system="clr-namespace:System;assembly=System.Runtime" xmlns:system="clr-namespace:System;assembly=System.Runtime"
Width="500" Width="500"
x:DataType="dialogs:MessageBoxViewModel"> x:DataType="dialogs:MessageBoxViewModel"
>
<Grid RowDefinitions="Auto,*,Auto"> <Grid RowDefinitions="Auto,*,Auto">
<!-- Title --> <!-- Title -->
<TextBlock <TextBlock
@@ -15,26 +16,22 @@
FontWeight="Light" FontWeight="Light"
Text="{Binding Title}" Text="{Binding Title}"
TextTrimming="CharacterEllipsis" TextTrimming="CharacterEllipsis"
ToolTip.Tip="{Binding Title}" /> ToolTip.Tip="{Binding Title}"
/>
<!-- Message --> <!-- Message -->
<Border <Border
Grid.Row="1" Grid.Row="1"
Padding="0,8" Padding="0,8"
BorderBrush="{DynamicResource MaterialDividerBrush}" BorderBrush="{DynamicResource MaterialDividerBrush}"
BorderThickness="0,1"> BorderThickness="0,1"
>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"> <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<TextBlock <TextBlock Margin="16,8" Text="{Binding Message}" TextWrapping="Wrap" />
Margin="16,8"
Text="{Binding Message}"
TextWrapping="Wrap" />
</ScrollViewer> </ScrollViewer>
</Border> </Border>
<UniformGrid <UniformGrid Grid.Row="2" Margin="8" Columns="{Binding ButtonsCount}">
Grid.Row="2"
Margin="8"
Columns="{Binding ButtonsCount}">
<!-- OK --> <!-- OK -->
<Button <Button
Margin="8" Margin="8"
@@ -43,14 +40,16 @@
IsDefault="True" IsDefault="True"
IsVisible="{Binding IsDefaultButtonVisible}" IsVisible="{Binding IsDefaultButtonVisible}"
Theme="{DynamicResource MaterialOutlineButton}" Theme="{DynamicResource MaterialOutlineButton}"
ToolTip.Tip="{Binding DefaultButtonText}"> ToolTip.Tip="{Binding DefaultButtonText}"
>
<Button.CommandParameter> <Button.CommandParameter>
<system:Boolean>True</system:Boolean> <system:Boolean>True</system:Boolean>
</Button.CommandParameter> </Button.CommandParameter>
<TextBlock <TextBlock
Text="{Binding DefaultButtonText}" Text="{Binding DefaultButtonText}"
TextAlignment="Center" TextAlignment="Center"
TextTrimming="CharacterEllipsis" /> TextTrimming="CharacterEllipsis"
/>
</Button> </Button>
<!-- Cancel --> <!-- Cancel -->
@@ -61,11 +60,13 @@
IsCancel="True" IsCancel="True"
IsVisible="{Binding IsCancelButtonVisible}" IsVisible="{Binding IsCancelButtonVisible}"
Theme="{DynamicResource MaterialOutlineButton}" Theme="{DynamicResource MaterialOutlineButton}"
ToolTip.Tip="{Binding CancelButtonText}"> ToolTip.Tip="{Binding CancelButtonText}"
>
<TextBlock <TextBlock
Text="{Binding CancelButtonText}" Text="{Binding CancelButtonText}"
TextAlignment="Center" TextAlignment="Center"
TextTrimming="CharacterEllipsis" /> TextTrimming="CharacterEllipsis"
/>
</Button> </Button>
</UniformGrid> </UniformGrid>
</Grid> </Grid>
@@ -5,25 +5,25 @@
xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters" xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs" xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
Width="380" Width="380"
x:DataType="dialogs:SettingsViewModel"> x:DataType="dialogs:SettingsViewModel"
>
<Grid RowDefinitions="Auto,*,Auto"> <Grid RowDefinitions="Auto,*,Auto">
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Margin="16" Margin="16"
FontSize="19" FontSize="19"
FontWeight="Light" FontWeight="Light"
Text="{Binding LocalizationManager.SettingsTitle}" /> Text="{Binding LocalizationManager.SettingsTitle}"
/>
<Border <Border
Grid.Row="1" Grid.Row="1"
Padding="0,8" Padding="0,8"
BorderBrush="{DynamicResource MaterialDividerBrush}" BorderBrush="{DynamicResource MaterialDividerBrush}"
BorderThickness="0,1"> BorderThickness="0,1"
>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"> <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<StackPanel <StackPanel Margin="16,8" Orientation="Vertical" Spacing="16">
Margin="16,8"
Orientation="Vertical"
Spacing="16">
<!-- Theme --> <!-- Theme -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ThemeTooltip}"> <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ThemeTooltip}">
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ThemeLabel}" /> <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ThemeLabel}" />
@@ -31,24 +31,30 @@
Width="150" Width="150"
DockPanel.Dock="Right" DockPanel.Dock="Right"
ItemsSource="{Binding AvailableThemes}" ItemsSource="{Binding AvailableThemes}"
SelectedItem="{Binding Theme}" /> SelectedItem="{Binding Theme}"
/>
</DockPanel> </DockPanel>
<!-- Language --> <!-- Language -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.LanguageTooltip}"> <DockPanel
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.LanguageTooltip}"
>
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.LanguageLabel}" /> <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.LanguageLabel}" />
<ComboBox <ComboBox
Width="150" Width="150"
DockPanel.Dock="Right" DockPanel.Dock="Right"
ItemsSource="{Binding AvailableLanguages}" ItemsSource="{Binding AvailableLanguages}"
SelectedItem="{Binding Language}" /> SelectedItem="{Binding Language}"
/>
</DockPanel> </DockPanel>
<!-- Auto-updates --> <!-- Auto-updates -->
<DockPanel <DockPanel
IsVisible="{Binding IsAutoUpdateAvailable}" IsVisible="{Binding IsAutoUpdateAvailable}"
LastChildFill="False" LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.AutoUpdateTooltip}"> ToolTip.Tip="{Binding LocalizationManager.AutoUpdateTooltip}"
>
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.AutoUpdateLabel}" /> <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.AutoUpdateLabel}" />
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsAutoUpdateEnabled}" /> <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsAutoUpdateEnabled}" />
</DockPanel> </DockPanel>
@@ -59,20 +65,31 @@
<TextBlock <TextBlock
MaxWidth="400" MaxWidth="400"
Inlines="{Binding LocalizationManager.PersistTokenTooltip, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}" Inlines="{Binding LocalizationManager.PersistTokenTooltip, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
TextWrapping="Wrap" /> TextWrapping="Wrap"
/>
</ToolTip.Tip> </ToolTip.Tip>
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.PersistTokenLabel}" /> <TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.PersistTokenLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsTokenPersisted}" /> <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsTokenPersisted}" />
</DockPanel> </DockPanel>
<!-- Rate limit preference --> <!-- Rate limit preference -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.RateLimitPreferenceTooltip}"> <DockPanel
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.RateLimitPreferenceLabel}" /> LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.RateLimitPreferenceTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.RateLimitPreferenceLabel}"
/>
<ComboBox <ComboBox
Width="150" Width="150"
DockPanel.Dock="Right" DockPanel.Dock="Right"
ItemsSource="{Binding AvailableRateLimitPreferences}" ItemsSource="{Binding AvailableRateLimitPreferences}"
SelectedItem="{Binding RateLimitPreference}"> SelectedItem="{Binding RateLimitPreference}"
>
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Converter={x:Static converters:RateLimitPreferenceToStringConverter.Instance}}" /> <TextBlock Text="{Binding Converter={x:Static converters:RateLimitPreferenceToStringConverter.Instance}}" />
@@ -82,23 +99,34 @@
</DockPanel> </DockPanel>
<!-- Thread inclusion mode --> <!-- Thread inclusion mode -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ShowThreadsTooltip}"> <DockPanel
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ShowThreadsLabel}" /> LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.ShowThreadsTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.ShowThreadsLabel}"
/>
<ComboBox <ComboBox
Width="150" Width="150"
DockPanel.Dock="Right" DockPanel.Dock="Right"
ItemsSource="{Binding AvailableThreadInclusionModes}" ItemsSource="{Binding AvailableThreadInclusionModes}"
SelectedItem="{Binding ThreadInclusionMode}" /> SelectedItem="{Binding ThreadInclusionMode}"
/>
</DockPanel> </DockPanel>
<!-- Locale --> <!-- Locale -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.LocaleTooltip}"> <DockPanel
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.LocaleTooltip}"
>
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.LocaleLabel}" /> <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.LocaleLabel}" />
<ComboBox <ComboBox
Width="150" Width="150"
DockPanel.Dock="Right" DockPanel.Dock="Right"
ItemsSource="{Binding AvailableLocales}" ItemsSource="{Binding AvailableLocales}"
SelectedItem="{Binding Locale}"> SelectedItem="{Binding Locale}"
>
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Converter={x:Static converters:LocaleToDisplayNameStringConverter.Instance}}" /> <TextBlock Text="{Binding Converter={x:Static converters:LocaleToDisplayNameStringConverter.Instance}}" />
@@ -108,18 +136,27 @@
</DockPanel> </DockPanel>
<!-- UTC normalization --> <!-- UTC normalization -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.NormalizeToUtcTooltip}"> <DockPanel
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.NormalizeToUtcLabel}" /> LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.NormalizeToUtcTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.NormalizeToUtcLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsUtcNormalizationEnabled}" /> <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsUtcNormalizationEnabled}" />
</DockPanel> </DockPanel>
<!-- Parallel limit --> <!-- Parallel limit -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ParallelLimitTooltip}"> <DockPanel
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ParallelLimitLabel}" /> LastChildFill="False"
<StackPanel ToolTip.Tip="{Binding LocalizationManager.ParallelLimitTooltip}"
DockPanel.Dock="Right" >
Orientation="Horizontal" <TextBlock
Spacing="10"> DockPanel.Dock="Left"
Text="{Binding LocalizationManager.ParallelLimitLabel}"
/>
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Spacing="10">
<TextBlock Text="{Binding ParallelLimit}" /> <TextBlock Text="{Binding ParallelLimit}" />
<Slider <Slider
Width="150" Width="150"
@@ -127,7 +164,8 @@
Maximum="10" Maximum="10"
Minimum="1" Minimum="1"
TickFrequency="1" TickFrequency="1"
Value="{Binding ParallelLimit}" /> Value="{Binding ParallelLimit}"
/>
</StackPanel> </StackPanel>
</DockPanel> </DockPanel>
</StackPanel> </StackPanel>
@@ -143,6 +181,7 @@
Content="{Binding LocalizationManager.CloseButton}" Content="{Binding LocalizationManager.CloseButton}"
IsCancel="True" IsCancel="True"
IsDefault="True" IsDefault="True"
Theme="{DynamicResource MaterialOutlineButton}" /> Theme="{DynamicResource MaterialOutlineButton}"
/>
</Grid> </Grid>
</UserControl> </UserControl>
+2 -1
View File
@@ -13,7 +13,8 @@
x:DataType="viewModels:MainViewModel" x:DataType="viewModels:MainViewModel"
Icon="/favicon.ico" Icon="/favicon.ico"
RenderOptions.BitmapInterpolationMode="HighQuality" RenderOptions.BitmapInterpolationMode="HighQuality"
WindowStartupLocation="CenterScreen"> WindowStartupLocation="CenterScreen"
>
<dialogHostAvalonia:DialogHost x:Name="DialogHost" CloseOnClickAway="False"> <dialogHostAvalonia:DialogHost x:Name="DialogHost" CloseOnClickAway="False">
<materialStyles:SnackbarHost HostName="Root" SnackbarMaxCounts="3"> <materialStyles:SnackbarHost HostName="Root" SnackbarMaxCounts="3">
<ContentControl Content="{Binding Dashboard}" /> <ContentControl Content="{Binding Dashboard}" />