diff --git a/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs b/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs index cecd6842..1823c01e 100644 --- a/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs +++ b/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs @@ -12,7 +12,6 @@ namespace DiscordChatExporter.Cli.Commands.Base { public abstract class ExportCommandBase : TokenCommandBase { - [CommandOption("output", 'o', Description = "Output file or directory path.")] public string OutputPath { get; set; } = Directory.GetCurrentDirectory(); @@ -71,13 +70,6 @@ namespace DiscordChatExporter.Cli.Commands.Base console.Output.WriteLine("Done."); } - public void ExecuteAsync() - { - if (ShouldReuseMedia && !ShouldDownloadMedia) - { - throw new CommandException("The --reuse-media option cannot be used without the --media option."); - } - } protected async ValueTask ExportAsync(IConsole console, Channel channel) { var guild = await GetDiscordClient().GetGuildAsync(channel.GuildId); @@ -89,5 +81,17 @@ namespace DiscordChatExporter.Cli.Commands.Base var channel = await GetDiscordClient().GetChannelAsync(channelId); await ExportAsync(console, channel); } + + public override ValueTask ExecuteAsync(IConsole console) + { + if (ShouldReuseMedia && !ShouldDownloadMedia) + { + throw new CommandException( + "The --reuse-media option cannot be used without the --media option." + ); + } + + return default; + } } } \ No newline at end of file diff --git a/DiscordChatExporter.Cli/Commands/ExportChannelCommand.cs b/DiscordChatExporter.Cli/Commands/ExportChannelCommand.cs index d3d7b246..108f4dcd 100644 --- a/DiscordChatExporter.Cli/Commands/ExportChannelCommand.cs +++ b/DiscordChatExporter.Cli/Commands/ExportChannelCommand.cs @@ -14,7 +14,7 @@ namespace DiscordChatExporter.Cli.Commands public override async ValueTask ExecuteAsync(IConsole console) { - base.ExecuteAsync(); + await base.ExecuteAsync(console); await ExportAsync(console, ChannelId); } }