h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-05 10:33:22 +08:00
Code Issues Releases Wiki Activity

Add initial beta release capability

Browse Source
This commit is contained in:
smallketchup82 2024-11-16 16:08:10 -05:00
parent 5b5e2ea418
commit 0c074bcc94
No known key found for this signature in database
GPG Key ID: 7345B7C561243F1E
3 changed files with 64 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,11 @@
using System;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Logging;
using osu.Framework.Platform;
using osu.Game;
using osu.Game.Configuration;
using osu.Game.Overlays;
using osu.Game.Overlays.Notifications;
using osu.Game.Screens.Play;
@ -16,7 +19,7 @@ namespace osu.Desktop.Updater
{
public partial class VelopackUpdateManager : Game.Updater.UpdateManager
{
private readonly UpdateManager updateManager;
private UpdateManager updateManager;
private INotificationOverlay notificationOverlay = null!;
[Resolved]
@ -25,22 +28,45 @@ namespace osu.Desktop.Updater
[Resolved]
private ILocalUserPlayInfo? localUserInfo { get; set; }
[Resolved]
private OsuConfigManager osuConfigManager { get; set; } = null!;
[Resolved]
private Storage storage { get; set; } = null!;
private bool isInGameplay => localUserInfo?.PlayingState.Value != LocalUserPlayingState.NotPlaying;
private UpdateInfo? pendingUpdate;
public VelopackUpdateManager()
{
updateManager = new UpdateManager(new GithubSource(@"https://github.com/ppy/osu", null, false), new UpdateOptions
{
AllowVersionDowngrade = true,
});
}
private Bindable<ReleaseStream> releaseStream => osuConfigManager.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream);
[BackgroundDependencyLoader]
private void load(INotificationOverlay notifications)
{
notificationOverlay = notifications;
UpdateOptions options = new UpdateOptions
{
AllowVersionDowngrade = true,
};
string platform = Environment.OSVersion.Platform switch
{
PlatformID.Win32NT => "win",
PlatformID.Unix => "linux",
PlatformID.MacOSX => "osx",
_ => throw new PlatformNotSupportedException(),
};
if (releaseStream.Value == ReleaseStream.Photon)
{
options.ExplicitChannel = $"{platform}-photon";
Logger.Log("Using photon channel");
}
else if (releaseStream.Value == ReleaseStream.Lazer)
options.ExplicitChannel = platform;
updateManager = new UpdateManager(new GithubSource(@"https://github.com/ppy/osu", null, false), options);
}
protected override async Task<bool> PerformUpdateCheck() => await checkForUpdateAsync().ConfigureAwait(false);

1
osu.Game/Configuration/ReleaseStream.cs
View File

@ -6,6 +6,7 @@ namespace osu.Game.Configuration
public enum ReleaseStream
{
Lazer,
Photon,
//Stable40,
//Beta40,
//Stable

30
osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
View File

@ -13,6 +13,7 @@ using osu.Framework.Screens;
using osu.Framework.Statistics;
using osu.Game.Configuration;
using osu.Game.Localisation;
using osu.Game.Overlays.Dialog;
using osu.Game.Overlays.Notifications;
using osu.Game.Overlays.Settings.Sections.Maintenance;
using osu.Game.Updater;
@ -36,13 +37,40 @@ namespace osu.Game.Overlays.Settings.Sections.General
[Resolved]
private Storage storage { get; set; } = null!;
[Resolved]
private IDialogOverlay dialogOverlay { get; set; } = null!;
[BackgroundDependencyLoader]
private void load(OsuConfigManager config, OsuGame? game)
{
var releaseStream = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream);
Add(new SettingsEnumDropdown<ReleaseStream>
{
LabelText = GeneralSettingsStrings.ReleaseStream,
Current = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
Current = releaseStream,
});
bool debounce = false;
releaseStream.BindValueChanged(r =>
{
if (debounce)
{
debounce = false;
return;
}
if (game?.RestartAppWhenExited() == true)
{
game.AttemptExit();
}
else
{
dialogOverlay.Push(new ConfirmDialog("You must restart after changing release streams. Are you sure about this?", () => game?.AttemptExit(), () =>
{
debounce = true;
releaseStream.Value = r.OldValue;
}));
}
});
if (updateManager?.CanCheckForUpdate == true)