h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 04:02:57 +08:00
Code Issues Releases Wiki Activity

Simplify ExportAsync, remove weird dedupe logic and unnecessary return success code

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

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

@ -45,9 +45,6 @@ namespace osu.Game.Database
public Action<Notification>? PostNotification { get; set; } public Action<Notification>? PostNotification { get; set; }
// Store the model being exporting.
private static readonly List<Live<TModel>> exporting_models = new List<Live<TModel>>();
/// <summary> /// <summary>
/// Construct exporter. /// Construct exporter.
/// Create a new exporter for each export, otherwise it will cause confusing notifications. /// Create a new exporter for each export, otherwise it will cause confusing notifications.
@ -69,10 +66,8 @@ namespace osu.Game.Database
/// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken. /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
/// </param> /// </param>
/// <returns></returns> /// <returns></returns>
public Task<bool> ExportAsync(TModel model, RealmAccess realm, CancellationToken cancellationToken = default) public Task ExportAsync(TModel model, RealmAccess realm, CancellationToken cancellationToken = default) =>
{ ExportAsync(model.ToLive(realm), cancellationToken);
return ExportAsync(model.ToLive(realm), cancellationToken);
}
/// <summary> /// <summary>
/// Export the model to default folder. /// Export the model to default folder.
@ -83,71 +78,46 @@ namespace osu.Game.Database
/// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken. /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
/// </param> /// </param>
/// <returns></returns> /// <returns></returns>
public async Task<bool> ExportAsync(Live<TModel> model, CancellationToken cancellationToken = default) public async Task ExportAsync(Live<TModel> model, CancellationToken cancellationToken = default)
{ {
// check if the model is being exporting already
if (!exporting_models.Contains(model))
{
exporting_models.Add(model);
}
else
{
// model is being exported
return false;
}
string itemFilename = model.PerformRead(s => GetFilename(s).GetValidFilename()); string itemFilename = model.PerformRead(s => GetFilename(s).GetValidFilename());
if (itemFilename.Length > MAX_FILENAME_LENGTH - FileExtension.Length) if (itemFilename.Length > MAX_FILENAME_LENGTH - FileExtension.Length)
itemFilename = itemFilename.Remove(MAX_FILENAME_LENGTH - FileExtension.Length); itemFilename = itemFilename.Remove(MAX_FILENAME_LENGTH - FileExtension.Length);
IEnumerable<string> existingExports = IEnumerable<string> existingExports = exportStorage
exportStorage .GetFiles(string.Empty, $"{itemFilename}*{FileExtension}")
.GetFiles(string.Empty, $"{itemFilename}*{FileExtension}") .Concat(exportStorage.GetDirectories(string.Empty));
.Concat(exportStorage.GetDirectories(string.Empty));
string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}"); string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
bool success;
ProgressNotification notification = new ProgressNotification ProgressNotification notification = new ProgressNotification
{ {
State = ProgressNotificationState.Active, State = ProgressNotificationState.Active,
Text = $"Exporting {itemFilename}...", Text = $"Exporting {itemFilename}...",
}; };
PostNotification?.Invoke(notification); PostNotification?.Invoke(notification);
try try
{ {
using (var stream = exportStorage.CreateFileSafely(filename)) using (var stream = exportStorage.CreateFileSafely(filename))
{ {
success = await ExportToStreamAsync(model, stream, notification, await ExportToStreamAsync(model, stream, notification, cancellationToken == CancellationToken.None ? notification.CancellationToken : cancellationToken).ConfigureAwait(false);
cancellationToken == CancellationToken.None ? notification.CancellationToken : cancellationToken).ConfigureAwait(false);
} }
} }
catch catch
{ {
notification.State = ProgressNotificationState.Cancelled; notification.State = ProgressNotificationState.Cancelled;
// cleanup if export is failed or canceled.
exportStorage.Delete(filename);
throw; throw;
} }
finally
{
// Determines whether to export repeatedly, so he must be removed from the list at the end whether there is a error.
exporting_models.Remove(model);
}
// cleanup if export is failed or canceled. notification.CompletionText = $"Exported {itemFilename}! Click to view.";
if (!success) notification.CompletionClickAction = () => exportStorage.PresentFileExternally(filename);
{ notification.State = ProgressNotificationState.Completed;
notification.State = ProgressNotificationState.Cancelled;
exportStorage.Delete(filename);
}
else
{
notification.CompletionText = $"Exported {itemFilename}! Click to view.";
notification.CompletionClickAction = () => exportStorage.PresentFileExternally(filename);
notification.State = ProgressNotificationState.Completed;
}
return success;
} }
/// <summary> /// <summary>