swap movie running status to be IMovieRunner property

Eddio0141 · Aug 20, 2024 · 8bd1718 · 8bd1718
1 parent a3f6f49
commit 8bd1718
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 35 deletions.
diff --git a/UniTAS/Patcher/Implementations/GUI/TerminalCommands/MovieStatus.cs b/UniTAS/Patcher/Implementations/GUI/TerminalCommands/MovieStatus.cs
@@ -1,50 +1,25 @@
 using System;
+using JetBrains.Annotations;
 using MoonSharp.Interpreter;
 using UniTAS.Patcher.Interfaces.GUI;
 using UniTAS.Patcher.Services.Movie;
 
 namespace UniTAS.Patcher.Implementations.GUI.TerminalCommands;
 
-public class MovieStatus(IMovieRunnerEvents movieRunnerEvents) : TerminalCmd
+public class MovieStatus(IMovieRunner movieRunner) : TerminalCmd
 {
     public override string Name => "movie_status";
     public override string Description => "gets an object that contains movie status";
     public override Delegate Callback => Execute;
 
     private Status Execute()
     {
-        return new(movieRunnerEvents);
+        return new(movieRunner);
     }
 
-    private class Status : IDisposable
+    [method: MoonSharpHidden]
+    private class Status(IMovieRunner movieRunner)
     {
-        private readonly IMovieRunnerEvents _movieRunnerEvents;
-
-        [MoonSharpHidden]
-        public Status(IMovieRunnerEvents movieRunnerEvents)
-        {
-            _movieRunnerEvents = movieRunnerEvents;
-            movieRunnerEvents.OnMovieSetup += SetupStart;
-            movieRunnerEvents.OnMovieEnd += MovieEnd;
-        }
-
-        private void SetupStart()
-        {
-            BasicallyRunning = true;
-        }
-
-        private void MovieEnd()
-        {
-            BasicallyRunning = false;
-        }
-
-        // ReSharper disable once UnusedAutoPropertyAccessor.Local
-        public bool BasicallyRunning { get; private set; }
-
-        public void Dispose()
-        {
-            _movieRunnerEvents.OnMovieSetup -= SetupStart;
-            _movieRunnerEvents.OnMovieEnd -= MovieEnd;
-        }
+        [UsedImplicitly] public bool BasicallyRunning => movieRunner.SetupOrMovieRunning;
     }
 }
diff --git a/UniTAS/Patcher/Implementations/Movie/MovieRunner.cs b/UniTAS/Patcher/Implementations/Movie/MovieRunner.cs
@@ -23,6 +23,7 @@ public class MovieRunner : IMovieRunner, IOnInputUpdateActual, IMovieRunnerEvent
     private readonly IGameRestart _gameRestart;
 
     public bool MovieEnd { get; private set; } = true;
+    public bool SetupOrMovieRunning { get; private set; }
     private bool _setup;
 
     private readonly IMovieParser _parser;
@@ -63,8 +64,7 @@ public void RunFromInput(string input)
     {
         if (_setup) throw new MovieAlreadySettingUpException();
         _setup = true;
-
-        OnMovieSetup?.Invoke();
+        SetupOrMovieRunning = true;
 
         if (!MovieEnd)
         {
@@ -158,6 +158,7 @@ private void MovieRunningStatusChange(bool running)
         }
         else
         {
+            SetupOrMovieRunning = false;
             OnMovieEnd?.Invoke();
         }
 
@@ -175,5 +176,4 @@ private IEnumerable<CoroutineWait> FinishMovieCleanup()
 
     public event Action OnMovieStart;
     public event Action OnMovieEnd;
-    public event Action OnMovieSetup;
 }
diff --git a/UniTAS/Patcher/Services/Movie/IMovieRunner.cs b/UniTAS/Patcher/Services/Movie/IMovieRunner.cs
@@ -6,6 +6,7 @@ namespace UniTAS.Patcher.Services.Movie;
 public interface IMovieRunner
 {
     bool MovieEnd { get; }
+    bool SetupOrMovieRunning { get; }
     IMovieLogger MovieLogger { get; }
     void RunFromInput(string input);
     UpdateType UpdateType { set; }

diff --git a/UniTAS/Patcher/Services/Movie/IMovieRunnerEvents.cs b/UniTAS/Patcher/Services/Movie/IMovieRunnerEvents.cs
@@ -6,5 +6,4 @@ public interface IMovieRunnerEvents
 {
     event Action OnMovieStart;
     event Action OnMovieEnd;
-    event Action OnMovieSetup;
 }