RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-04 02:19:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify update process by caching pending update info and early-handling edge case

Browse Source
This commit is contained in:
Dean Herbert 2024-09-03 19:11:34 +09:00
parent cd9b82253e
commit 08224b416e
No known key found for this signature in database
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Desktop/Updater/VelopackUpdateManager.cs
View File

@ -25,11 +25,13 @@ namespace osu.Desktop.Updater
[Resolved]
private ILocalUserPlayInfo? localUserInfo { get; set; }
private UpdateInfo? pendingUpdate;
public VelopackUpdateManager()
{
updateManager = new UpdateManager(new GithubSource(@"https://github.com/ppy/osu", null, false), new UpdateOptions
{
AllowVersionDowngrade = true
AllowVersionDowngrade = true,
});
}
@ -52,33 +54,33 @@ namespace osu.Desktop.Updater
if (localUserInfo?.IsPlaying.Value == true)
return false;
UpdateInfo? info = await updateManager.CheckForUpdatesAsync().ConfigureAwait(false);
// Handle no updates available.
if (info == null)
if (pendingUpdate != null)
{
// If there's no updates pending restart, bail and retry later.
if (!updateManager.IsUpdatePendingRestart) return false;
// If there is an update pending restart, show the notification to restart again.
notificationOverlay.Post(new UpdateApplicationCompleteNotification
{
Activated = () =>
{
restartToApplyUpdate(null);
restartToApplyUpdate();
return true;
}
});
return true;
}
pendingUpdate = await updateManager.CheckForUpdatesAsync().ConfigureAwait(false);
// Handle no updates available.
if (pendingUpdate == null)
return false;
scheduleRecheck = false;
if (notification == null)
{
notification = new UpdateProgressNotification
{
CompletionClickAction = () => restartToApplyUpdate(info),
CompletionClickAction = restartToApplyUpdate,
};
Schedule(() => notificationOverlay.Post(notification));
@ -88,7 +90,7 @@ namespace osu.Desktop.Updater
try
{
await updateManager.DownloadUpdatesAsync(info, p => notification.Progress = p / 100f).ConfigureAwait(false);
await updateManager.DownloadUpdatesAsync(pendingUpdate, p => notification.Progress = p / 100f).ConfigureAwait(false);
notification.State = ProgressNotificationState.Completed;
}
@ -117,9 +119,9 @@ namespace osu.Desktop.Updater
return true;
}
private bool restartToApplyUpdate(UpdateInfo? info)
private bool restartToApplyUpdate()
{
updateManager.WaitExitThenApplyUpdates(info?.TargetFullRelease);
updateManager.WaitExitThenApplyUpdates(pendingUpdate?.TargetFullRelease);
Schedule(() => game.AttemptExit());
return true;
}