calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-04-25 23:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Tyrrrz
2023-07-16 22:55:36 +03:00
parent 0ee1107638
commit e175c93038
19 changed files with 106 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs
View File

@@ -11,7 +11,6 @@ using DiscordChatExporter.Cli.Commands.Converters;
using DiscordChatExporter.Cli.Utils.Extensions;
using DiscordChatExporter.Core.Discord;
using DiscordChatExporter.Core.Discord.Data;
using DiscordChatExporter.Core.Discord.Data.Common;
using DiscordChatExporter.Core.Exceptions;
using DiscordChatExporter.Core.Exporting;
using DiscordChatExporter.Core.Exporting.Filtering;
@@ -137,7 +136,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
private ChannelExporter? _channelExporter;
protected ChannelExporter Exporter => _channelExporter ??= new ChannelExporter(Discord);
protected async ValueTask ExecuteAsync(IConsole console, IReadOnlyList<IChannel> channels)
protected async ValueTask ExecuteAsync(IConsole console, IReadOnlyList<Channel> channels)
{
// Asset reuse can only be enabled if the download assets option is set
// https://github.com/Tyrrrz/DiscordChatExporter/issues/425
@@ -176,9 +175,9 @@ public abstract class ExportCommandBase : DiscordCommandBase
);
}
// Export channels
// Export
var cancellationToken = console.RegisterCancellationHandler();
var channelErrors = new ConcurrentDictionary<IChannel, string>();
var errors = new ConcurrentDictionary<Channel, string>();
await console.Output.WriteLineAsync($"Exporting {channels.Count} channel(s)...");
await console.CreateProgressTicker().StartAsync(async progressContext =>
@@ -195,7 +194,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
try
{
await progressContext.StartTaskAsync(
$"{channel.ParentName} / {channel.Name}",
$"{channel.Category} / {channel.Name}",
async progress =>
{
var guild = await Discord.GetGuildAsync(channel.GuildId, innerCancellationToken);
@@ -226,7 +225,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
}
catch (DiscordChatExporterException ex) when (!ex.IsFatal)
{
channelErrors[channel] = ex.Message;
errors[channel] = ex.Message;
}
}
);
@@ -236,25 +235,25 @@ public abstract class ExportCommandBase : DiscordCommandBase
using (console.WithForegroundColor(ConsoleColor.White))
{
await console.Output.WriteLineAsync(
$"Successfully exported {channels.Count - channelErrors.Count} channel(s)."
$"Successfully exported {channels.Count - errors.Count} channel(s)."
);
}
// Print errors
if (channelErrors.Any())
if (errors.Any())
{
await console.Output.WriteLineAsync();
using (console.WithForegroundColor(ConsoleColor.Red))
{
await console.Error.WriteLineAsync(
$"Failed to export {channelErrors.Count} channel(s):"
$"Failed to export {errors.Count} channel(s):"
);
}
foreach (var (channel, error) in channelErrors)
foreach (var (channel, error) in errors)
{
await console.Error.WriteAsync($"{channel.ParentName} / {channel.Name}: ");
await console.Error.WriteAsync($"{channel.Category} / {channel.Name}: ");
using (console.WithForegroundColor(ConsoleColor.Red))
await console.Error.WriteLineAsync(error);
@@ -265,7 +264,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
// Fail the command only if ALL channels failed to export.
// If only some channels failed to export, it's okay.
if (channelErrors.Count >= channels.Count)
if (errors.Count >= channels.Count)
throw new CommandException("Export failed.");
}
@@ -291,7 +290,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
foreach (var guildChannel in guildChannels)
{
if (guildChannel.Category.Id == channel.Id)
if (guildChannel.Parent?.Id == channel.Id)
channels.Add(guildChannel);
}

3
DiscordChatExporter.Cli/Commands/Converters/TruthyBooleanBindingConverter.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Globalization;
using System.Globalization;
using CliFx.Extensibility;
namespace DiscordChatExporter.Cli.Commands.Converters;

1
DiscordChatExporter.Cli/Commands/ExportAllCommand.cs
View File

@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO.Compression;
using System.Text.Json;

3
DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Threading.Tasks;
using System.Threading.Tasks;
using CliFx.Attributes;
using CliFx.Infrastructure;
using DiscordChatExporter.Cli.Commands.Base;

5
DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Linq;
using System.Linq;
using System.Threading.Tasks;
using CliFx.Attributes;
using CliFx.Infrastructure;
@@ -19,7 +18,7 @@ public class ExportGuildCommand : ExportCommandBase
Description = "Guild ID."
)]
public required Snowflake GuildId { get; init; }
[CommandOption(
"include-vc",
Description = "Include voice channels."

16
DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs
View File

@@ -32,7 +32,7 @@ public class GetChannelsCommand : DiscordCommandBase
var channels = (await Discord.GetGuildChannelsAsync(GuildId, cancellationToken))
.Where(c => c.Kind != ChannelKind.GuildCategory)
.OrderBy(c => c.Category.Position)
.OrderBy(c => c.Parent?.Position)
.ThenBy(c => c.Name)
.ToArray();
@@ -43,7 +43,7 @@ public class GetChannelsCommand : DiscordCommandBase
var threads = IncludeThreads
? (await Discord.GetGuildThreadsAsync(GuildId, cancellationToken)).OrderBy(c => c.Name).ToArray()
: Array.Empty<ChannelThread>();
: Array.Empty<Channel>();
foreach (var channel in channels)
{
@@ -58,22 +58,22 @@ public class GetChannelsCommand : DiscordCommandBase
// Channel category / name
using (console.WithForegroundColor(ConsoleColor.White))
await console.Output.WriteLineAsync($"{channel.Category.Name} / {channel.Name}");
await console.Output.WriteLineAsync($"{channel.Category} / {channel.Name}");
var channelThreads = threads.Where(t => t.ParentId == channel.Id).ToArray();
var channelThreads = threads.Where(t => t.Parent?.Id == channel.Id).ToArray();
var channelThreadIdMaxLength = channelThreads
.Select(t => t.Id.ToString().Length)
.OrderDescending()
.FirstOrDefault();
foreach (var thread in channelThreads)
foreach (var channelThread in channelThreads)
{
// Indent
await console.Output.WriteAsync(" * ");
// Thread ID
await console.Output.WriteAsync(
thread.Id.ToString().PadRight(channelThreadIdMaxLength, ' ')
channelThread.Id.ToString().PadRight(channelThreadIdMaxLength, ' ')
);
// Separator
@@ -82,7 +82,7 @@ public class GetChannelsCommand : DiscordCommandBase
// Thread name
using (console.WithForegroundColor(ConsoleColor.White))
await console.Output.WriteAsync($"Thread / {thread.Name}");
await console.Output.WriteAsync($"Thread / {channelThread.Name}");
// Separator
using (console.WithForegroundColor(ConsoleColor.DarkGray))
@@ -90,7 +90,7 @@ public class GetChannelsCommand : DiscordCommandBase
// Thread status
using (console.WithForegroundColor(ConsoleColor.White))
await console.Output.WriteLineAsync(thread.IsActive ? "Active" : "Archived");
await console.Output.WriteLineAsync(channelThread.IsActive ? "Active" : "Archived");
}
}
}

2
DiscordChatExporter.Cli/Commands/GetDirectChannelsCommand.cs
View File

@@ -40,7 +40,7 @@ public class GetDirectChannelsCommand : DiscordCommandBase
// Channel category / name
using (console.WithForegroundColor(ConsoleColor.White))
await console.Output.WriteLineAsync($"{channel.Category.Name} / {channel.Name}");
await console.Output.WriteLineAsync($"{channel.Category} / {channel.Name}");
}
}
}