mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-20 09:55:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switched from SemaphoreSlim lock to AsyncNonKeyedLocker (#1184)

Browse source
This commit is contained in:
Mark Cilia Vincenti 2024-04-21 17:32:57 +02:00 • committed by GitHub
parent 12b590d9f9
commit 74f99b4e59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<ItemGroup> <ItemGroup>
<PackageReference Include="AsyncKeyedLock" Version="6.2.4" /> <PackageReference Include="AsyncKeyedLock" Version="6.3.4" />
<PackageReference Include="CSharpier.MsBuild" Version="0.26.7" PrivateAssets="all" /> <PackageReference Include="CSharpier.MsBuild" Version="0.26.7" PrivateAssets="all" />
<PackageReference Include="Gress" Version="2.1.1" /> <PackageReference Include="Gress" Version="2.1.1" />
<PackageReference Include="JsonExtensions" Version="1.2.0" /> <PackageReference Include="JsonExtensions" Version="1.2.0" />
@ -12,4 +12,4 @@
<PackageReference Include="YoutubeExplode" Version="6.3.10" /> <PackageReference Include="YoutubeExplode" Version="6.3.10" />
</ItemGroup> </ItemGroup>
</Project> </Project>

11
DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs
View file

@ -1,7 +1,7 @@
using System; using System;
using System.IO; using System.IO;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using AsyncKeyedLock;
using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf;
using Microsoft.Win32; using Microsoft.Win32;
using Stylet; using Stylet;
@ -10,7 +10,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Framework;
public class DialogManager(IViewManager viewManager) : IDisposable public class DialogManager(IViewManager viewManager) : IDisposable
{ {
private readonly SemaphoreSlim _dialogLock = new(1, 1); private readonly AsyncNonKeyedLocker _dialogLock = new();
public async ValueTask<T?> ShowDialogAsync<T>(DialogScreen<T> dialogScreen) public async ValueTask<T?> ShowDialogAsync<T>(DialogScreen<T> dialogScreen)
{ {
@ -34,16 +34,11 @@ public class DialogManager(IViewManager viewManager) : IDisposable
dialogScreen.Closed += OnScreenClosed; dialogScreen.Closed += OnScreenClosed;
} }
await _dialogLock.WaitAsync(); using (await _dialogLock.LockAsync())
try
{ {
await DialogHost.Show(view, OnDialogOpened); await DialogHost.Show(view, OnDialogOpened);
return dialogScreen.DialogResult; return dialogScreen.DialogResult;
} }
finally
{
_dialogLock.Release();
}
} }
public string? PromptSaveFilePath(string filter = "All files|*.*", string defaultFilePath = "") public string? PromptSaveFilePath(string filter = "All files|*.*", string defaultFilePath = "")