mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-22 10:55:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix incorrect replace order

Browse source
This commit is contained in:
Tyrrrz 2023-01-03 10:44:31 +02:00
parent 67b31c5f68
commit 506bc0176b
1 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
DiscordChatExporter.Core/Exporting/ExportRequest.cs
View file

@ -91,27 +91,25 @@ public partial record ExportRequest
Snowflake? before = null) Snowflake? before = null)
{ {
// Format path // Format path
var actualOutputPath = PathEx.EscapeFileName( var actualOutputPath = Regex.Replace(
Regex.Replace( outputPath,
outputPath, "%.",
"%.", m => PathEx.EscapeFileName(m.Value switch
m => m.Value switch {
{ "%g" => guild.Id.ToString(),
"%g" => guild.Id.ToString(), "%G" => guild.Name,
"%G" => guild.Name, "%t" => channel.Category.Id.ToString(),
"%t" => channel.Category.Id.ToString(), "%T" => channel.Category.Name,
"%T" => channel.Category.Name, "%c" => channel.Id.ToString(),
"%c" => channel.Id.ToString(), "%C" => channel.Name,
"%C" => channel.Name, "%p" => channel.Position?.ToString() ?? "0",
"%p" => channel.Position?.ToString() ?? "0", "%P" => channel.Category.Position?.ToString() ?? "0",
"%P" => channel.Category.Position?.ToString() ?? "0", "%a" => after?.ToDate().ToString("yyyy-MM-dd") ?? "",
"%a" => after?.ToDate().ToString("yyyy-MM-dd") ?? "", "%b" => before?.ToDate().ToString("yyyy-MM-dd") ?? "",
"%b" => before?.ToDate().ToString("yyyy-MM-dd") ?? "", "%d" => DateTimeOffset.Now.ToString("yyyy-MM-dd"),
"%d" => DateTimeOffset.Now.ToString("yyyy-MM-dd"), "%%" => "%",
"%%" => "%", _ => m.Value
_ => m.Value })
}
)
); );
// Output is a directory // Output is a directory