calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-05-02 02:28:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework architecture

Browse Source
This commit is contained in:
Alexey Golub
2020-04-21 21:30:42 +03:00
parent 130c0b6fe2
commit 8685a3d7e3
119 changed files with 1520 additions and 1560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DiscordChatExporter.Gui/Bootstrapper.cs
View File

@@ -1,4 +1,4 @@
using DiscordChatExporter.Core.Services;
using DiscordChatExporter.Gui.Services;
using DiscordChatExporter.Gui.ViewModels;
using DiscordChatExporter.Gui.ViewModels.Framework;
using Stylet;
@@ -17,9 +17,6 @@ namespace DiscordChatExporter.Gui
{
base.ConfigureIoC(builder);
// Autobind the .Services assembly
builder.Autobind(typeof(DataService).Assembly);
// Bind settings as singleton
builder.Bind<SettingsService>().ToSelf().InSingletonScope();

2
DiscordChatExporter.Gui/Converters/ExportFormatToStringConverter.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Globalization;
using System.Windows.Data;
using DiscordChatExporter.Core.Models;
using DiscordChatExporter.Domain.Exporting;
namespace DiscordChatExporter.Gui.Converters
{

6
DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
View File

@@ -21,14 +21,12 @@
<PackageReference Include="Onova" Version="2.5.2" />
<PackageReference Include="Stylet" Version="1.3.0" />
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
<PackageReference Include="Tyrrrz.Settings" Version="1.3.4" />
<PackageReference Include="PropertyChanged.Fody" Version="3.2.5" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DiscordChatExporter.Core.Markdown\DiscordChatExporter.Core.Markdown.csproj" />
<ProjectReference Include="..\DiscordChatExporter.Core.Models\DiscordChatExporter.Core.Models.csproj" />
<ProjectReference Include="..\DiscordChatExporter.Core.Rendering\DiscordChatExporter.Core.Rendering.csproj" />
<ProjectReference Include="..\DiscordChatExporter.Core.Services\DiscordChatExporter.Core.Services.csproj" />
<ProjectReference Include="..\DiscordChatExporter.Domain\DiscordChatExporter.Domain.csproj" />
</ItemGroup>
<Target Name="Format XAML" AfterTargets="BeforeBuild">

32
DiscordChatExporter.Gui/Services/SettingsService.cs Normal file
View File

@@ -0,0 +1,32 @@
using DiscordChatExporter.Domain.Discord;
using DiscordChatExporter.Domain.Exporting;
using Tyrrrz.Settings;
namespace DiscordChatExporter.Gui.Services
{
public class SettingsService : SettingsManager
{
public string DateFormat { get; set; } = "dd-MMM-yy hh:mm tt";
public bool IsAutoUpdateEnabled { get; set; } = true;
public bool IsTokenPersisted { get; set; } = true;
public int ParallelLimit { get; set; } = 1;
public AuthToken? LastToken { get; set; }
public ExportFormat LastExportFormat { get; set; } = ExportFormat.HtmlDark;
public int? LastPartitionLimit { get; set; }
public SettingsService()
{
Configuration.StorageSpace = StorageSpace.Instance;
Configuration.SubDirectoryPath = "";
Configuration.FileName = "Settings.dat";
}
public bool ShouldSerializeLastToken() => IsTokenPersisted;
}
}

1
DiscordChatExporter.Gui/Services/UpdateService.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Threading.Tasks;
using DiscordChatExporter.Core.Services;
using Onova;
using Onova.Exceptions;
using Onova.Services;

2
DiscordChatExporter.Gui/ViewModels/Components/ChannelViewModel.cs
View File

@@ -1,4 +1,4 @@
using DiscordChatExporter.Core.Models;
using DiscordChatExporter.Domain.Discord.Models;
using Stylet;
namespace DiscordChatExporter.Gui.ViewModels.Components

2
DiscordChatExporter.Gui/ViewModels/Components/GuildViewModel.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using DiscordChatExporter.Core.Models;
using DiscordChatExporter.Domain.Discord.Models;
using Stylet;
namespace DiscordChatExporter.Gui.ViewModels.Components

7
DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs
View File

@@ -1,9 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using DiscordChatExporter.Core.Models;
using DiscordChatExporter.Core.Services;
using DiscordChatExporter.Core.Services.Logic;
using DiscordChatExporter.Domain.Exporting;
using DiscordChatExporter.Gui.Services;
using DiscordChatExporter.Gui.ViewModels.Components;
using DiscordChatExporter.Gui.ViewModels.Framework;
@@ -62,7 +61,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
var channel = Channels.Single();
// Generate default file name
var defaultFileName = ExportLogic.GetDefaultExportFileName(SelectedFormat, Guild!, channel!, After, Before);
var defaultFileName = Exporter.GetDefaultExportFileName(SelectedFormat, Guild!, channel!, After, Before);
// Generate filter
var ext = SelectedFormat.GetFileExtension();

2
DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs
View File

@@ -1,4 +1,4 @@
using DiscordChatExporter.Core.Services;
using DiscordChatExporter.Gui.Services;
using DiscordChatExporter.Gui.ViewModels.Framework;
using Tyrrrz.Extensions;

2
DiscordChatExporter.Gui/ViewModels/Framework/Extensions.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using DiscordChatExporter.Core.Models;
using DiscordChatExporter.Domain.Discord.Models;
using DiscordChatExporter.Gui.ViewModels.Components;
using DiscordChatExporter.Gui.ViewModels.Dialogs;

73
DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
View File

@@ -1,13 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Threading;
using System.Threading.Tasks;
using DiscordChatExporter.Core.Models;
using DiscordChatExporter.Core.Models.Exceptions;
using DiscordChatExporter.Core.Services;
using DiscordChatExporter.Core.Services.Exceptions;
using DiscordChatExporter.Domain.Discord;
using DiscordChatExporter.Domain.Discord.Models;
using DiscordChatExporter.Domain.Exceptions;
using DiscordChatExporter.Domain.Exporting;
using DiscordChatExporter.Domain.Utilities;
using DiscordChatExporter.Gui.Services;
using DiscordChatExporter.Gui.ViewModels.Components;
using DiscordChatExporter.Gui.ViewModels.Framework;
@@ -24,8 +24,6 @@ namespace DiscordChatExporter.Gui.ViewModels
private readonly DialogManager _dialogManager;
private readonly SettingsService _settingsService;
private readonly UpdateService _updateService;
private readonly DataService _dataService;
private readonly ExportService _exportService;
public ISnackbarMessageQueue Notifications { get; } = new SnackbarMessageQueue(TimeSpan.FromSeconds(5));
@@ -45,16 +43,16 @@ namespace DiscordChatExporter.Gui.ViewModels
public IReadOnlyList<ChannelViewModel>? SelectedChannels { get; set; }
public RootViewModel(IViewModelFactory viewModelFactory, DialogManager dialogManager,
SettingsService settingsService, UpdateService updateService, DataService dataService,
ExportService exportService)
public RootViewModel(
IViewModelFactory viewModelFactory,
DialogManager dialogManager,
SettingsService settingsService,
UpdateService updateService)
{
_viewModelFactory = viewModelFactory;
_dialogManager = dialogManager;
_settingsService = settingsService;
_updateService = updateService;
_dataService = dataService;
_exportService = exportService;
// Set title
DisplayName = $"{App.Name} v{App.VersionString}";
@@ -67,6 +65,10 @@ namespace DiscordChatExporter.Gui.ViewModels
(sender, args) => IsProgressIndeterminate = ProgressManager.IsActive && ProgressManager.Progress.IsEither(0, 1));
}
private DiscordClient GetDiscordClient(AuthToken token) => new DiscordClient(token);
private Exporter GetExporter(AuthToken token) => new Exporter(GetDiscordClient(token));
private async Task HandleAutoUpdateAsync()
{
try
@@ -160,7 +162,7 @@ namespace DiscordChatExporter.Gui.ViewModels
// Get direct messages
{
var guild = Guild.DirectMessages;
var channels = await _dataService.GetDirectMessageChannelsAsync(token);
var channels = await GetDiscordClient(token).GetDirectMessageChannelsAsync();
// Create channel view models
var channelViewModels = new List<ChannelViewModel>();
@@ -187,12 +189,12 @@ namespace DiscordChatExporter.Gui.ViewModels
}
// Get guilds
var guilds = await _dataService.GetUserGuildsAsync(token);
var guilds = await GetDiscordClient(token).GetUserGuildsAsync();
foreach (var guild in guilds)
{
var channels = await _dataService.GetGuildChannelsAsync(token, guild.Id);
var channels = await GetDiscordClient(token).GetGuildChannelsAsync(guild.Id);
var categoryChannels = channels.Where(c => c.Type == ChannelType.GuildCategory).ToArray();
var exportableChannels = channels.Where(c => c.Type.IsExportable()).ToArray();
var exportableChannels = channels.Where(c => c.IsTextChannel).ToArray();
// Create channel view models
var channelViewModels = new List<ChannelViewModel>();
@@ -224,15 +226,7 @@ namespace DiscordChatExporter.Gui.ViewModels
// Pre-select first guild
SelectedGuild = AvailableGuilds.FirstOrDefault();
}
catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Unauthorized)
{
Notifications.Enqueue("Unauthorized – make sure the token is valid");
}
catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
{
Notifications.Enqueue("Forbidden – account may be locked by 2FA");
}
catch (DomainException ex)
catch (DiscordChatExporterException ex) when (!ex.IsCritical)
{
Notifications.Enqueue(ex.Message);
}
@@ -261,40 +255,27 @@ namespace DiscordChatExporter.Gui.ViewModels
// Export channels
var successfulExportCount = 0;
using var semaphore = new SemaphoreSlim(_settingsService.ParallelLimit.ClampMin(1));
await Task.WhenAll(dialog.Channels.Select(async (channel, i) =>
await dialog.Channels.Zip(operations).ParallelForEachAsync(async tuple =>
{
var operation = operations[i];
await semaphore.WaitAsync();
var (channel, operation) = tuple;
try
{
await _exportService.ExportChatLogAsync(token, dialog.Guild!, channel!,
dialog.OutputPath!, dialog.SelectedFormat, dialog.PartitionLimit,
dialog.After, dialog.Before, operation);
await GetExporter(token).ExportChatLogAsync(dialog.Guild!, channel!,
dialog.OutputPath!, dialog.SelectedFormat, _settingsService.DateFormat,
dialog.PartitionLimit, dialog.After, dialog.Before, operation);
successfulExportCount++;
Interlocked.Increment(ref successfulExportCount);
}
catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
{
Notifications.Enqueue($"You don't have access to channel [{channel.Model!.Name}]");
}
catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
{
Notifications.Enqueue($"Channel [{channel.Model!.Name}] doesn't exist");
}
catch (DomainException ex)
catch (DiscordChatExporterException ex) when (!ex.IsCritical)
{
Notifications.Enqueue(ex.Message);
}
finally
{
operation.Dispose();
semaphore.Release();
}
}));
}, _settingsService.ParallelLimit.ClampMin(1));
// Notify of overall completion
if (successfulExportCount > 0)