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

Remove Tyrrrz.Extensions package

Browse Source
This commit is contained in:
Tyrrrz
2021-11-15 18:50:46 +02:00
parent 720e53caab
commit 1db2bb4170
8 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
using DiscordChatExporter.Gui.Services;
using System;
using DiscordChatExporter.Gui.Services;
using DiscordChatExporter.Gui.ViewModels.Framework;
using Tyrrrz.Extensions;
namespace DiscordChatExporter.Gui.ViewModels.Dialogs
{
@@ -35,18 +35,16 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
public int ParallelLimit
{
get => _settingsService.ParallelLimit;
set => _settingsService.ParallelLimit = value.Clamp(1, 10);
set => _settingsService.ParallelLimit = Math.Clamp(value, 1, 10);
}
public bool ShouldReuseMedia
{
get => _settingsService.ShouldReuseMedia;
set => _settingsService.ShouldReuseMedia = value;
}
public SettingsViewModel(SettingsService settingsService)
{
public SettingsViewModel(SettingsService settingsService) =>
_settingsService = settingsService;
}
}
}

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

@@ -15,7 +15,6 @@ using DiscordChatExporter.Gui.ViewModels.Framework;
using Gress;
using MaterialDesignThemes.Wpf;
using Stylet;
using Tyrrrz.Extensions;
namespace DiscordChatExporter.Gui.ViewModels
{
@@ -69,11 +68,11 @@ namespace DiscordChatExporter.Gui.ViewModels
);
ProgressManager.Bind(o => o.IsActive, (_, _) =>
IsProgressIndeterminate = ProgressManager.IsActive && ProgressManager.Progress.IsEither(0, 1)
IsProgressIndeterminate = ProgressManager.IsActive && ProgressManager.Progress is <= 0 or >= 1
);
ProgressManager.Bind(o => o.Progress, (_, _) =>
IsProgressIndeterminate = ProgressManager.IsActive && ProgressManager.Progress.IsEither(0, 1)
IsProgressIndeterminate = ProgressManager.IsActive && ProgressManager.Progress is <= 0 or >= 1
);
}
@@ -243,7 +242,7 @@ namespace DiscordChatExporter.Gui.ViewModels
{
operation.Dispose();
}
}, _settingsService.ParallelLimit.ClampMin(1));
}, Math.Max(1, _settingsService.ParallelLimit));
// Notify of overall completion
if (successfulExportCount > 0)