Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Add reckless replay load button (#26212)
Browse files Browse the repository at this point in the history
* Add reckless replay load button

* A

* More descriptive button
  • Loading branch information
ElectroJr authored Mar 18, 2024
1 parent 7561bef commit 646f7e0
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 10 deletions.
2 changes: 2 additions & 0 deletions Content.Client/Entry/EntryPoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public sealed class EntryPoint : GameClient
[Dependency] private readonly IResourceManager _resourceManager = default!;
[Dependency] private readonly IReplayLoadManager _replayLoad = default!;
[Dependency] private readonly ILogManager _logManager = default!;
[Dependency] private readonly ContentReplayPlaybackManager _replayMan = default!;

public override void Init()
{
Expand Down Expand Up @@ -191,6 +192,7 @@ private void SwitchToDefaultState(bool disconnected = false)
_resourceManager,
ReplayConstants.ReplayZipFolder.ToRootedPath());

_replayMan.LastLoad = (null, ReplayConstants.ReplayZipFolder.ToRootedPath());
_replayLoad.LoadAndStartReplay(reader);
}
else if (_gameController.LaunchState.FromLauncher)
Expand Down
62 changes: 59 additions & 3 deletions Content.Client/Replay/ContentReplayPlaybackManager.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System.IO.Compression;
using Content.Client.Administration.Managers;
using Content.Client.Launcher;
using Content.Client.MainMenu;
using Content.Client.Replay.Spectator;
using Content.Client.Replay.UI.Loading;
using Content.Client.Stylesheets;
using Content.Client.UserInterface.Systems.Chat;
using Content.Shared.Chat;
using Content.Shared.Effects;
Expand All @@ -24,7 +26,13 @@
using Robust.Client.State;
using Robust.Client.Timing;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared;
using Robust.Shared.Configuration;
using Robust.Shared.ContentPack;
using Robust.Shared.Serialization.Markdown.Mapping;
using Robust.Shared.Utility;

namespace Content.Client.Replay;

Expand All @@ -41,6 +49,8 @@ public sealed class ContentReplayPlaybackManager
[Dependency] private readonly IClientAdminManager _adminMan = default!;
[Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly IBaseClient _client = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IResourceManager _resMan = default!;

/// <summary>
/// UI state to return to when stopping a replay or loading fails.
Expand All @@ -50,6 +60,13 @@ public sealed class ContentReplayPlaybackManager
public bool IsScreenshotMode = false;

private bool _initialized;

/// <summary>
/// Most recently loaded file, for re-attempting the load with error tolerance.
/// Required because the zip reader auto-disposes and I'm too lazy to change it so that
/// <see cref="ReplayFileReaderZip"/> can re-open it.
/// </summary>
public (ResPath? Zip, ResPath Folder)? LastLoad;

public void Initialize()
{
Expand All @@ -73,11 +90,50 @@ private void LoadOverride(IReplayFileReader fileReader)

private void OnFinishedLoading(Exception? exception)
{
if (exception != null)
if (exception == null)
{
LastLoad = null;
return;
}

ReturnToDefaultState();

// Show a popup window with the error message
var text = Loc.GetString("replay-loading-failed", ("reason", exception));
var box = new BoxContainer
{
Orientation = BoxContainer.LayoutOrientation.Vertical,
Children = {new Label {Text = text}}
};

var popup = new DefaultWindow { Title = "Error!" };
popup.Contents.AddChild(box);

// Add button for attempting to re-load the replay while ignoring some errors.
if (!_cfg.GetCVar(CVars.ReplayIgnoreErrors) && LastLoad is {} last)
{
ReturnToDefaultState();
_uiMan.Popup(Loc.GetString("replay-loading-failed", ("reason", exception)));
var button = new Button
{
Text = Loc.GetString("replay-loading-retry"),
StyleClasses = { StyleBase.ButtonCaution }
};

button.OnPressed += _ =>
{
_cfg.SetCVar(CVars.ReplayIgnoreErrors, true);
popup.Dispose();

IReplayFileReader reader = last.Zip == null
? new ReplayFileReaderResources(_resMan, last.Folder)
: new ReplayFileReaderZip(new(_resMan.UserData.OpenRead(last.Zip.Value)), last.Folder);

_loadMan.LoadAndStartReplay(reader);
};

box.AddChild(button);
}

popup.OpenCentered();
}

public void ReturnToDefaultState()
Expand Down
15 changes: 9 additions & 6 deletions Content.Replay/Menu/ReplayMainMenu.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.IO.Compression;
using System.Linq;
using Content.Client.Message;
using Content.Client.Replay;
using Content.Client.UserInterface.Systems.EscapeMenu;
using Robust.Client;
using Robust.Client.Replays.Loading;
Expand Down Expand Up @@ -31,6 +32,7 @@ public sealed class ReplayMainScreen : State
[Dependency] private readonly IGameController _controllerProxy = default!;
[Dependency] private readonly IClientRobustSerializer _serializer = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly ContentReplayPlaybackManager _replayMan = default!;

private ReplayMainMenuControl _mainMenuControl = default!;
private SelectReplayWindow? _selectWindow;
Expand Down Expand Up @@ -207,12 +209,13 @@ private void OnFolderPressed(BaseButton.ButtonEventArgs obj)

private void OnLoadPressed(BaseButton.ButtonEventArgs obj)
{
if (_selected.HasValue)
{
var fileReader = new ReplayFileReaderZip(
new ZipArchive(_resMan.UserData.OpenRead(_selected.Value)), ReplayZipFolder);
_loadMan.LoadAndStartReplay(fileReader);
}
if (!_selected.HasValue)
return;

_replayMan.LastLoad = (_selected.Value, ReplayZipFolder);
var fileReader = new ReplayFileReaderZip(
new ZipArchive(_resMan.UserData.OpenRead(_selected.Value)), ReplayZipFolder);
_loadMan.LoadAndStartReplay(fileReader);
}

private void RefreshReplays()
Expand Down
3 changes: 2 additions & 1 deletion Resources/Locale/en-US/replays/replays.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ replay-loading-processing = Processing Files
replay-loading-spawning = Spawning Entities
replay-loading-initializing = Initializing Entities
replay-loading-starting= Starting Entities
replay-loading-failed = Failed to load replay:
replay-loading-failed = Failed to load replay. Error:
{$reason}
replay-loading-retry = Try load with more exception tolerance - MAY CAUSE BUGS!
# Main Menu
replay-menu-subtext = Replay Client
Expand Down

0 comments on commit 646f7e0

Please sign in to comment.