From f8d55f406c1b70e02be008276ccc0d810cce5832 Mon Sep 17 00:00:00 2001 From: Tyrrrz Date: Fri, 16 Apr 2021 23:39:36 +0300 Subject: [PATCH] [GUI] Cleanup ExportSetupViewModel & RootViewModel --- .../ViewModels/Dialogs/ExportSetupViewModel.cs | 5 +++++ DiscordChatExporter.Gui/ViewModels/RootViewModel.cs | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs index 654b9cb..13f0702 100644 --- a/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs @@ -4,6 +4,7 @@ using System.Linq; using DiscordChatExporter.Core.Discord; using DiscordChatExporter.Core.Discord.Data; using DiscordChatExporter.Core.Exporting; +using DiscordChatExporter.Core.Exporting.Partitioning; using DiscordChatExporter.Core.Utils.Extensions; using DiscordChatExporter.Gui.Services; using DiscordChatExporter.Gui.ViewModels.Framework; @@ -48,6 +49,10 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs public string? PartitionLimitValue { get; set; } + public PartitionLimit PartitionLimit => !string.IsNullOrWhiteSpace(PartitionLimitValue) + ? PartitionLimit.Parse(PartitionLimitValue) + : NullPartitionLimit.Instance; + public bool ShouldDownloadMedia { get; set; } // Whether to show the "advanced options" by default when the dialog opens. diff --git a/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs b/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs index 4ecb095..83eb3dd 100644 --- a/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs @@ -7,7 +7,6 @@ using DiscordChatExporter.Core.Discord; using DiscordChatExporter.Core.Discord.Data; using DiscordChatExporter.Core.Exceptions; using DiscordChatExporter.Core.Exporting; -using DiscordChatExporter.Core.Exporting.Partitioning; using DiscordChatExporter.Core.Utils.Extensions; using DiscordChatExporter.Gui.Services; using DiscordChatExporter.Gui.Utils; @@ -205,10 +204,6 @@ namespace DiscordChatExporter.Gui.ViewModels try { - var partitionLimit = !string.IsNullOrWhiteSpace(dialog.PartitionLimitValue) - ? PartitionLimit.Parse(dialog.PartitionLimitValue) - : NullPartitionLimit.Instance; - var request = new ExportRequest( dialog.Guild!, channel!, @@ -216,7 +211,7 @@ namespace DiscordChatExporter.Gui.ViewModels dialog.SelectedFormat, dialog.After?.Pipe(Snowflake.FromDate), dialog.Before?.Pipe(Snowflake.FromDate), - partitionLimit, + dialog.PartitionLimit, dialog.ShouldDownloadMedia, _settingsService.ShouldReuseMedia, _settingsService.DateFormat