open-source-mirrors
/
DiscordChatExporter
mirror of https://github.com/Tyrrrz/DiscordChatExporter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimize thread inclusion UX across GUI and CLI

Browse Source 
Related to #1119
pull/1125/head
Tyrrrz 1 year ago
parent d430f77ae1
commit 3740d64601
9 changed files with 49 additions and 79 deletions
Show Stats Download Patch File Download Diff File

14
DiscordChatExporter.Cli/Commands/ExportAllCommand.cs
Unescape View File

@ -29,15 +29,11 @@ public class ExportAllCommand : ExportCommandBase
[CommandOption(
"include-threads",
Description = "Specifies which types of threads should be included.",
Description = "Which types of threads should be included.",
Converter = typeof(ThreadInclusionBindingConverter)
)]
public ThreadInclusion ThreadInclusion { get; init; } = ThreadInclusion.None;
private bool IncludeThreads => ThreadInclusion != ThreadInclusion.None;
private bool IncludeArchivedThreads => ThreadInclusion.HasFlag(ThreadInclusion.Archived);
[CommandOption(
"data-package",
Description = "Path to the personal data package (ZIP file) requested from Discord. "
@ -74,12 +70,12 @@ public class ExportAllCommand : ExportCommandBase
}
// Threads
if (IncludeThreads)
if (ThreadInclusion != ThreadInclusion.None)
{
await foreach (
var thread in Discord.GetGuildThreadsAsync(
guild.Id,
IncludeArchivedThreads,
ThreadInclusion == ThreadInclusion.All,
cancellationToken
)
)
@ -136,9 +132,9 @@ public class ExportAllCommand : ExportCommandBase
channels.RemoveAll(c => c.Kind.IsGuild());
if (!IncludeVoiceChannels)
channels.RemoveAll(c => c.Kind.IsVoice());
if (!IncludeThreads)
if (ThreadInclusion == ThreadInclusion.None)
channels.RemoveAll(c => c.Kind.IsThread());
if (!IncludeArchivedThreads)
if (ThreadInclusion != ThreadInclusion.All)
channels.RemoveAll(c => c.Kind.IsThread() && c.IsArchived);
await ExportAsync(console, channels);

10
DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs
Unescape View File

@ -21,15 +21,11 @@ public class ExportGuildCommand : ExportCommandBase
[CommandOption(
"include-threads",
Description = "Specifies which types of threads should be included.",
Description = "Which types of threads should be included.",
Converter = typeof(ThreadInclusionBindingConverter)
)]
public ThreadInclusion ThreadInclusion { get; init; } = ThreadInclusion.None;
private bool IncludeThreads => ThreadInclusion != ThreadInclusion.None;
private bool IncludeArchivedThreads => ThreadInclusion.HasFlag(ThreadInclusion.Archived);
public override async ValueTask ExecuteAsync(IConsole console)
{
await base.ExecuteAsync(console);
@ -52,12 +48,12 @@ public class ExportGuildCommand : ExportCommandBase
}
// Threads
if (IncludeThreads)
if (ThreadInclusion != ThreadInclusion.None)
{
await foreach (
var thread in Discord.GetGuildThreadsAsync(
GuildId,
IncludeArchivedThreads,
ThreadInclusion == ThreadInclusion.All,
cancellationToken
)
)

27
DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs
Unescape View File

@ -23,15 +23,11 @@ public class GetChannelsCommand : DiscordCommandBase
[CommandOption(
"include-threads",
Description = "Specifies which types of threads should be included.",
Description = "Which types of threads should be included.",
Converter = typeof(ThreadInclusionBindingConverter)
)]
public ThreadInclusion ThreadInclusion { get; init; } = ThreadInclusion.None;
private bool IncludeThreads => ThreadInclusion != ThreadInclusion.None;
private bool IncludeArchivedThreads => ThreadInclusion.HasFlag(ThreadInclusion.Archived);
public override async ValueTask ExecuteAsync(IConsole console)
{
await base.ExecuteAsync(console);
@ -50,17 +46,18 @@ public class GetChannelsCommand : DiscordCommandBase
.OrderDescending()
.FirstOrDefault();
var threads = IncludeThreads
? (
await Discord.GetGuildThreadsAsync(
GuildId,
IncludeArchivedThreads,
cancellationToken
var threads =
ThreadInclusion != ThreadInclusion.None
? (
await Discord.GetGuildThreadsAsync(
GuildId,
ThreadInclusion == ThreadInclusion.All,
cancellationToken
)
)
)
.OrderBy(c => c.Name)
.ToArray()
: Array.Empty<Channel>();
.OrderBy(c => c.Name)
.ToArray()
: Array.Empty<Channel>();
foreach (var channel in channels)
{

12
DiscordChatExporter.Cli/Commands/Shared/ThreadInclusion.cs
Unescape View File

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

8
DiscordChatExporter.Gui/Models/ThreadInclusion.cs
Unescape View File

@ -0,0 +1,8 @@
namespace DiscordChatExporter.Gui.Models;
public enum ThreadInclusion
{
None,
Active,
All
}

5
DiscordChatExporter.Gui/Services/SettingsService.cs
Unescape View File

@ -2,6 +2,7 @@
using System.IO;
using Cogwheel;
using DiscordChatExporter.Core.Exporting;
using DiscordChatExporter.Gui.Models;
using Microsoft.Win32;
namespace DiscordChatExporter.Gui.Services;
@ -16,9 +17,7 @@ public partial class SettingsService : SettingsBase
public bool IsTokenPersisted { get; set; } = true;
public bool ShouldShowThreads { get; set; }
public bool ShouldShowArchivedThreads { get; set; }
public ThreadInclusion ThreadInclusion { get; set; } = ThreadInclusion.None;
public string DateFormat { get; set; } = "MM/dd/yyyy h:mm tt";

5
DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs
Unescape View File

@ -8,6 +8,7 @@ using DiscordChatExporter.Core.Discord.Data;
using DiscordChatExporter.Core.Exceptions;
using DiscordChatExporter.Core.Exporting;
using DiscordChatExporter.Core.Utils.Extensions;
using DiscordChatExporter.Gui.Models;
using DiscordChatExporter.Gui.Services;
using DiscordChatExporter.Gui.Utils;
using DiscordChatExporter.Gui.ViewModels.Dialogs;
@ -169,12 +170,12 @@ public class DashboardViewModel : PropertyChangedBase
}
// Threads
if (_settingsService.ShouldShowThreads)
if (_settingsService.ThreadInclusion != ThreadInclusion.None)
{
await foreach (
var thread in _discord.GetGuildThreadsAsync(
SelectedGuild.Id,
_settingsService.ShouldShowArchivedThreads
_settingsService.ThreadInclusion == ThreadInclusion.All
)
)
{

22
DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs
Unescape View File

@ -1,4 +1,6 @@
using System;
using System.Collections.Generic;
using DiscordChatExporter.Gui.Models;
using DiscordChatExporter.Gui.Services;
using DiscordChatExporter.Gui.ViewModels.Framework;
@ -26,23 +28,13 @@ public class SettingsViewModel : DialogScreen
set => _settingsService.IsTokenPersisted = value;
}
public bool ShouldShowThreads
{
get => _settingsService.ShouldShowThreads;
set => _settingsService.ShouldShowThreads = value;
}
public IReadOnlyList<ThreadInclusion> AvailableThreadInclusions { get; } =
Enum.GetValues<ThreadInclusion>();
public bool ShouldShowArchivedThreads
public ThreadInclusion ThreadInclusion
{
get => _settingsService.ShouldShowArchivedThreads;
set
{
_settingsService.ShouldShowArchivedThreads = value;
// Enabling archived threads implicitly enables threads
if (value)
ShouldShowThreads = true;
}
get => _settingsService.ThreadInclusion;
set => _settingsService.ThreadInclusion = value;
}
public string DateFormat

25
DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
Unescape View File

@ -82,36 +82,21 @@
IsChecked="{Binding IsTokenPersisted}" />
</DockPanel>
<!-- Show threads -->
<!-- Thread inclusion -->
<DockPanel
Margin="16,8"
Background="Transparent"
LastChildFill="False"
ToolTip="Pull threads and show them in the channel list">
ToolTip="Which types of threads to show in the channel list">
<TextBlock
VerticalAlignment="Center"
DockPanel.Dock="Left"
Text="Show threads" />
<ToggleButton
VerticalAlignment="Center"
DockPanel.Dock="Right"
IsChecked="{Binding ShouldShowThreads}" />
</DockPanel>
<!-- Show archived threads -->
<DockPanel
Margin="16,8"
Background="Transparent"
LastChildFill="False"
ToolTip="Pull archived threads and show them in the channel list">
<TextBlock
VerticalAlignment="Center"
DockPanel.Dock="Left"
Text="Show archived threads" />
<ToggleButton
<ComboBox
VerticalAlignment="Center"
DockPanel.Dock="Right"
IsChecked="{Binding ShouldShowArchivedThreads}" />
ItemsSource="{Binding AvailableThreadInclusions}"
SelectedItem="{Binding ThreadInclusion}" />
</DockPanel>
<!-- Date format -->

Write Preview
Loading…
Cancel
Save