sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-25 23:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Simplify ExportToStreamAsync implementation

Browse Source
This commit is contained in:
Dean Herbert 2023-05-05 21:01:10 +09:00
parent fc2d2de34c
commit 4ccfebc02b
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Database/LegacyExporter.cs
View File

@ -7,7 +7,6 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using osu.Framework.Logging;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Game.Extensions; using osu.Game.Extensions;
using osu.Game.Overlays.Notifications; using osu.Game.Overlays.Notifications;
@ -159,30 +158,8 @@ namespace osu.Game.Database
/// <param name="notification">The notification will displayed to the user</param> /// <param name="notification">The notification will displayed to the user</param>
/// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param> /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
/// <returns>Whether the export was successful</returns> /// <returns>Whether the export was successful</returns>
public Task<bool> ExportToStreamAsync(Live<TModel> model, Stream stream, ProgressNotification? notification = null, CancellationToken cancellationToken = default) public Task ExportToStreamAsync(Live<TModel> model, Stream stream, ProgressNotification? notification = null, CancellationToken cancellationToken = default) =>
{ Task.Run(() => { model.PerformRead(s => ExportToStream(s, stream, notification, cancellationToken)); }, cancellationToken);
return Task.Run(() =>
{
model.PerformRead(s =>
{
ExportToStream(s, stream, notification, cancellationToken);
});
}, cancellationToken).ContinueWith(t =>
{
if (cancellationToken.IsCancellationRequested)
{
return false;
}
if (t.IsFaulted)
{
Logger.Error(t.Exception, "An error occurred while exporting", LoggingTarget.Database);
throw t.Exception!;
}
return true;
}, CancellationToken.None);
}
/// <summary> /// <summary>
/// Exports model to Stream. /// Exports model to Stream.