Merge

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -170,56 +170,61 @@ protected async ValueTask ExportAsync(IConsole console, IReadOnlyList<Channel> c
         var errorsByChannel = new ConcurrentDictionary<Channel, string>();
 
         await console.Output.WriteLineAsync($"Exporting {channels.Count} channel(s)...");
-        await console.CreateProgressTicker().StartAsync(async progressContext =>
-        {
-            await Parallel.ForEachAsync(
-                channels,
-                new ParallelOptions
-                {
-                    MaxDegreeOfParallelism = Math.Max(1, ParallelLimit),
-                    CancellationToken = cancellationToken
-                },
-                async (channel, innerCancellationToken) =>
-                {
-                    try
+        await console
+            .CreateProgressTicker()
+            .StartAsync(async progressContext =>
+            {
+                await Parallel.ForEachAsync(
+                    channels,
+                    new ParallelOptions
                     {
-                        await progressContext.StartTaskAsync(
-                            $"{channel.Category} / {channel.Name}",
-                            async progress =>
-                            {
-                                var guild = await Discord.GetGuildAsync(channel.GuildId, innerCancellationToken);
-
-                                var request = new ExportRequest(
-                                    guild,
-                                    channel,
-                                    OutputPath,
-                                    AssetsDirPath,
-                                    ExportFormat,
-                                    After,
-                                    Before,
-                                    PartitionLimit,
-                                    MessageFilter,
-                                    ShouldFormatMarkdown,
-                                    ShouldDownloadAssets,
-                                    ShouldReuseAssets,
-                                    DateFormat
-                                );
-
-                                await Exporter.ExportChannelAsync(
-                                    request,
-                                    progress.ToPercentageBased(),
-                                    innerCancellationToken
-                                );
-                            }
-                        );
-                    }
-                    catch (DiscordChatExporterException ex) when (!ex.IsFatal)
+                        MaxDegreeOfParallelism = Math.Max(1, ParallelLimit),
+                        CancellationToken = cancellationToken
+                    },
+                    async (channel, innerCancellationToken) =>
                     {
-                        errorsByChannel[channel] = ex.Message;
+                        try
+                        {
+                            await progressContext.StartTaskAsync(
+                                $"{channel.ParentNameWithFallback} / {channel.Name}",
+                                async progress =>
+                                {
+                                    var guild = await Discord.GetGuildAsync(
+                                        channel.GuildId,
+                                        innerCancellationToken
+                                    );
+
+                                    var request = new ExportRequest(
+                                        guild,
+                                        channel,
+                                        OutputPath,
+                                        AssetsDirPath,
+                                        ExportFormat,
+                                        After,
+                                        Before,
+                                        PartitionLimit,
+                                        MessageFilter,
+                                        ShouldFormatMarkdown,
+                                        ShouldDownloadAssets,
+                                        ShouldReuseAssets,
+                                        DateFormat
+                                    );
+
+                                    await Exporter.ExportChannelAsync(
+                                        request,
+                                        progress.ToPercentageBased(),
+                                        innerCancellationToken
+                                    );
+                                }
+                            );
+                        }
+                        catch (DiscordChatExporterException ex) when (!ex.IsFatal)
+                        {
+                            errorsByChannel[channel] = ex.Message;
+                        }
                     }
-                }
-            );
-        });
+                );
+            });
 
         // Print the result
         using (console.WithForegroundColor(ConsoleColor.White))
@@ -243,7 +248,9 @@ await console.Error.WriteLineAsync(
 
             foreach (var (channel, error) in errorsByChannel)
             {
-                await console.Error.WriteAsync($"{channel.Category} / {channel.Name}: ");
+                await console.Error.WriteAsync(
+                    $"{channel.ParentNameWithFallback} / {channel.Name}: "
+                );
 
                 using (console.WithForegroundColor(ConsoleColor.Red))
                     await console.Error.WriteLineAsync(error);

DiscordChatExporter.Cli/Commands/Converters/ThreadInclusionBindingConverter.cs

@@ -0,0 +1,22 @@
+using System;
+using CliFx.Extensibility;
+using DiscordChatExporter.Cli.Commands.Shared;
+
+namespace DiscordChatExporter.Cli.Commands.Converters;
+
+internal class ThreadInclusionBindingConverter : BindingConverter<ThreadInclusion>
+{
+    public override ThreadInclusion Convert(string? rawValue)
+    {
+        // Empty or unset value is treated as 'active' to match the previous behavior
+        if (string.IsNullOrWhiteSpace(rawValue))
+            return ThreadInclusion.Active;
+
+        // Boolean 'true' is treated as 'active', boolean 'false' is treated as 'none'
+        if (bool.TryParse(rawValue, out var boolValue))
+            return boolValue ? ThreadInclusion.Active : ThreadInclusion.None;
+
+        // Otherwise, fall back to regular enum parsing
+        return Enum.Parse<ThreadInclusion>(rawValue, true);
+    }
+}

DiscordChatExporter.Cli/Commands/Converters/TruthyBooleanBindingConverter.cs

@@ -7,19 +7,15 @@ internal class TruthyBooleanBindingConverter : BindingConverter<bool>
 {
     public override bool Convert(string? rawValue)
     {
-        // Null is still considered true, to match the base behavior
-        if (rawValue is null)
-            return true;
-
+        // Empty or unset value is treated as 'true', to match the regular boolean behavior
         if (string.IsNullOrWhiteSpace(rawValue))
-            return false;
-
-        if (bool.TryParse(rawValue, out var boolValue))
-            return boolValue;
+            return true;
 
-        if (int.TryParse(rawValue, CultureInfo.InvariantCulture, out var intValue) && intValue == 0)
-            return false;
+        // Number '1' is treated as 'true', other numbers are treated as 'false'
+        if (int.TryParse(rawValue, CultureInfo.InvariantCulture, out var intValue))
+            return intValue == 1;
 
-        return true;
+        // Otherwise, fall back to regular boolean parsing
+        return bool.Parse(rawValue);
     }
 }

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -6,6 +6,8 @@
 using CliFx.Exceptions;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Cli.Commands.Converters;
+using DiscordChatExporter.Cli.Commands.Shared;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exceptions;
@@ -36,15 +38,14 @@ public class ExportAllCommand : ExportCommandBase
 
     [CommandOption(
         "include-threads",
-        Description = "Include threads."
+        Description = "Specifies which types of threads should be included.",
+        Converter = typeof(ThreadInclusionBindingConverter)
     )]
-    public bool IncludeThreads { get; init; } = false;
+    public ThreadInclusion ThreadInclusion { get; init; } = ThreadInclusion.None;
 
-    [CommandOption(
-        "include-archived-threads",
-        Description = "Include archived threads."
-    )]
-    public bool IncludeArchivedThreads { get; init; } = false;
+    private bool IncludeThreads => ThreadInclusion != ThreadInclusion.None;
+
+    private bool IncludeArchivedThreads => ThreadInclusion.HasFlag(ThreadInclusion.Archived);
 
     [CommandOption(
         "data-package",
@@ -58,14 +59,6 @@ public override async ValueTask ExecuteAsync(IConsole console)
     {
         await base.ExecuteAsync(console);
 
-        // Cannot include archived threads without including active threads as well
-        if (IncludeArchivedThreads && !IncludeThreads)
-        {
-            throw new CommandException(
-                "Option --include-archived-threads can only be used when --include-threads is also specified."
-            );
-        }
-
         var cancellationToken = console.RegisterCancellationHandler();
         var channels = new List<Channel>();
 

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -1,9 +1,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using CliFx.Attributes;
-using CliFx.Exceptions;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Cli.Commands.Converters;
+using DiscordChatExporter.Cli.Commands.Shared;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 
@@ -27,28 +28,19 @@ public class ExportGuildCommand : ExportCommandBase
 
     [CommandOption(
         "include-threads",
-        Description = "Include threads."
+        Description = "Specifies which types of threads should be included.",
+        Converter = typeof(ThreadInclusionBindingConverter)
     )]
-    public bool IncludeThreads { get; init; } = false;
+    public ThreadInclusion ThreadInclusion { get; init; } = ThreadInclusion.None;
 
-    [CommandOption(
-        "include-archived-threads",
-        Description = "Include archived threads."
-    )]
-    public bool IncludeArchivedThreads { get; init; } = false;
+    private bool IncludeThreads => ThreadInclusion != ThreadInclusion.None;
+
+    private bool IncludeArchivedThreads => ThreadInclusion.HasFlag(ThreadInclusion.Archived);
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         await base.ExecuteAsync(console);
 
-        // Cannot include archived threads without including active threads as well
-        if (IncludeArchivedThreads && !IncludeThreads)
-        {
-            throw new CommandException(
-                "Option --include-archived-threads can only be used when --include-threads is also specified."
-            );
-        }
-
         var cancellationToken = console.RegisterCancellationHandler();
         var channels = new List<Channel>();
 

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -2,9 +2,10 @@
 using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Attributes;
-using CliFx.Exceptions;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Cli.Commands.Converters;
+using DiscordChatExporter.Cli.Commands.Shared;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
@@ -29,28 +30,19 @@ public class GetChannelsCommand : DiscordCommandBase
 
     [CommandOption(
         "include-threads",
-        Description = "Include threads."
+        Description = "Specifies which types of threads should be included.",
+        Converter = typeof(ThreadInclusionBindingConverter)
     )]
-    public bool IncludeThreads { get; init; } = false;
+    public ThreadInclusion ThreadInclusion { get; init; } = ThreadInclusion.None;
 
-    [CommandOption(
-        "include-archived-threads",
-        Description = "Include archived threads."
-    )]
-    public bool IncludeArchivedThreads { get; init; } = false;
+    private bool IncludeThreads => ThreadInclusion != ThreadInclusion.None;
+
+    private bool IncludeArchivedThreads => ThreadInclusion.HasFlag(ThreadInclusion.Archived);
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         await base.ExecuteAsync(console);
 
-        // Cannot include archived threads without including active threads as well
-        if (IncludeArchivedThreads && !IncludeThreads)
-        {
-            throw new CommandException(
-                "Option --include-archived-threads can only be used when --include-threads is also specified."
-            );
-        }
-
         var cancellationToken = console.RegisterCancellationHandler();
 
         var channels = (await Discord.GetGuildChannelsAsync(GuildId, cancellationToken))
@@ -84,7 +76,9 @@ await console.Output.WriteAsync(
 
             // Channel category / name
             using (console.WithForegroundColor(ConsoleColor.White))
-                await console.Output.WriteLineAsync($"{channel.Category} / {channel.Name}");
+                await console.Output.WriteLineAsync(
+                    $"{channel.ParentNameWithFallback} / {channel.Name}"
+                );
 
             var channelThreads = threads.Where(t => t.Parent?.Id == channel.Id).ToArray();
             var channelThreadIdMaxLength = channelThreads

DiscordChatExporter.Cli/Commands/GetDirectChannelsCommand.cs

@@ -42,7 +42,9 @@ await console.Output.WriteAsync(
 
             // Channel category / name
             using (console.WithForegroundColor(ConsoleColor.White))
-                await console.Output.WriteLineAsync($"{channel.Category} / {channel.Name}");
+                await console.Output.WriteLineAsync(
+                    $"{channel.ParentNameWithFallback} / {channel.Name}"
+                );
         }
     }
 }

DiscordChatExporter.Cli/Commands/Shared/ThreadInclusion.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace DiscordChatExporter.Cli.Commands.Shared;
+
+[Flags]
+public enum ThreadInclusion
+{
+    None = 0,
+    Active = 1,
+    Archived = 2,
+    All = Active | Archived
+}

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -23,21 +23,26 @@ public partial record Channel(
     // channels without a parent (i.e. mostly DM channels) or channels
     // with an inaccessible parent (i.e. inside private categories) had
     // a fallback category created for them.
-    public string Category => Parent?.Name ?? Kind switch
-    {
-        ChannelKind.GuildCategory => "Category",
-        ChannelKind.GuildTextChat => "Text",
-        ChannelKind.DirectTextChat => "Private",
-        ChannelKind.DirectGroupTextChat => "Group",
-        ChannelKind.GuildPrivateThread => "Private Thread",
-        ChannelKind.GuildPublicThread => "Public Thread",
-        ChannelKind.GuildNews => "News",
-        ChannelKind.GuildNewsThread => "News Thread",
-        _ => "Default"
-    };
+    public string ParentNameWithFallback =>
+        Parent?.Name
+        ?? Kind switch
+        {
+            ChannelKind.GuildCategory => "Category",
+            ChannelKind.GuildTextChat => "Text",
+            ChannelKind.DirectTextChat => "Private",
+            ChannelKind.DirectGroupTextChat => "Group",
+            ChannelKind.GuildPrivateThread => "Private Thread",
+            ChannelKind.GuildPublicThread => "Public Thread",
+            ChannelKind.GuildNews => "News",
+            ChannelKind.GuildNewsThread => "News Thread",
+            _ => "Default"
+        };
 
     // Only needed for WPF data binding. Don't use anywhere else.
     public bool IsVoice => Kind.IsVoice();
+
+    // Only needed for WPF data binding. Don't use anywhere else.
+    public bool IsThread => Kind.IsThread();
 }
 
 public partial record Channel

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -103,7 +103,9 @@ public static string GetDefaultOutputFileName(
         var buffer = new StringBuilder();
 
         // Guild and channel names
-        buffer.Append($"{guild.Name} - {channel.Category} - {channel.Name} [{channel.Id}]");
+        buffer.Append(
+            $"{guild.Name} - {channel.ParentNameWithFallback} - {channel.Name} [{channel.Id}]"
+        );
 
         // Date range
         if (after is not null || before is not null)