Rename InternalCommandDeduplicateEvents to LuaManagerCommandDeduplica…

…teEvents
dennis · Jan 10, 2021 · 0ff2b96 · 0ff2b96
1 parent b629ae2
commit 0ff2b96
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 17 deletions.
diff --git a/Backend/Plugins/LuaManagerPlugin.cs b/Backend/Plugins/LuaManagerPlugin.cs
@@ -1,6 +1,6 @@
 using Slipstream.Backend.Services;
 using Slipstream.Shared;
-using Slipstream.Shared.Events.Internal;
+using Slipstream.Shared.Events.LuaManager;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -44,14 +44,14 @@ public LuaManagerPlugin(string id, IEventFactory eventFactory, IEventBus eventBu
             EventHandler.OnFileMonitorFileRenamed += EventHandler_OnFileMonitorFileRenamed;
             EventHandler.OnFileMonitorScanCompleted += EventHandler_OnFileMonitorScanCompleted;
             EventHandler.OnInternalPluginState += EventHandler_OnInternalPluginState;
-            EventHandler.OnInternalCommandDeduplicateEvents += (s, e) => EventHandler_OnInternalCommandDeduplicateEvents(e.Event);
+            EventHandler.OnLuaManagerCommandDeduplicateEvents += (s, e) => EventHandler_OnInternalCommandDeduplicateEvents(e.Event);
 
             BootupEventsDeadline = DateTime.Now.AddMilliseconds(500);
 
             EventBus.PublishEvent(EventFactory.CreateFileMonitorCommandScan());
         }
 
-        private void EventHandler_OnInternalCommandDeduplicateEvents(InternalCommandDeduplicateEvents @event)
+        private void EventHandler_OnInternalCommandDeduplicateEvents(LuaManagerCommandDeduplicateEvents @event)
         {
             foreach (var e in EventSerdeService.DeserializeMultiple(@event.Events))
             {

diff --git a/Backend/Plugins/LuaPlugin.cs b/Backend/Plugins/LuaPlugin.cs
@@ -51,7 +51,7 @@ private void StartLua()
             var eventsCaptured = EventBus.CapturedEvents;
             EventBus.StopCapturing();
 
-            EventBus.PublishEvent(EventFactory.CreateInternalCommandDeduplicateEvents(eventsCaptured));
+            EventBus.PublishEvent(EventFactory.CreateLuaManagerCommandDeduplicateEvents(eventsCaptured));
         }
 
         private void HandleLuaException(LuaException e)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,8 @@
    - UICommandWriteToConsole is now UIMethodCollection
    - InternalReconfigured is now InternalCommandReconfigure
    - InternalBootupEvents is now InternalCommandDeduplicateEvents
+   - InternalCommandDeduplicateEvents is now LuaManagerCommandDeduplicateEvents
+ - Plugin renamed: FileTriggerPlugin to LuaManagerPlugin
  - UI: Stores/restores Window position and size
  - Event: Adds TwitchReceivedMessage event (captures all messages, not only commands)
  - Event: Removes TwitchReceivedCommand event as this is already sent as a TwitchReceivedMessage

diff --git a/Shared/EventFactory.cs b/Shared/EventFactory.cs
@@ -3,6 +3,7 @@
 using Slipstream.Shared.Events.FileMonitor;
 using Slipstream.Shared.Events.Internal;
 using Slipstream.Shared.Events.IRacing;
+using Slipstream.Shared.Events.LuaManager;
 using Slipstream.Shared.Events.Twitch;
 using Slipstream.Shared.Events.UI;
 using System;
@@ -75,7 +76,7 @@ public InternalCommandReconfigure CreateInternalCommandReconfigure()
             return new InternalCommandReconfigure();
         }
 
-        public InternalCommandDeduplicateEvents CreateInternalCommandDeduplicateEvents(IEvent[] events)
+        public LuaManagerCommandDeduplicateEvents CreateLuaManagerCommandDeduplicateEvents(IEvent[] events)
         {
             string json = "";
 
@@ -84,7 +85,7 @@ public InternalCommandDeduplicateEvents CreateInternalCommandDeduplicateEvents(I
                 json += EventSerdeService.Serialize(e) + "\n";
             }
 
-            return new InternalCommandDeduplicateEvents
+            return new LuaManagerCommandDeduplicateEvents
             {
                 Events = json
             };

diff --git a/Shared/EventHandler.cs b/Shared/EventHandler.cs
@@ -37,9 +37,11 @@ public EventHandlerArgs(T e)
 
         public delegate void OnInternalCommandReconfigureHandler(EventHandler source, EventHandlerArgs<Shared.Events.Internal.InternalCommandReconfigure> e);
         public event OnInternalCommandReconfigureHandler? OnInternalCommandReconfigure;
+        #endregion
 
-        public delegate void OnInternalCommandDeduplicateEventsHandler(EventHandler source, EventHandlerArgs<Shared.Events.Internal.InternalCommandDeduplicateEvents> e);
-        public event OnInternalCommandDeduplicateEventsHandler? OnInternalCommandDeduplicateEvents;
+        #region Events: LuaManager
+        public delegate void OnInternalCommandDeduplicateEventsHandler(EventHandler source, EventHandlerArgs<Shared.Events.LuaManager.LuaManagerCommandDeduplicateEvents> e);
+        public event OnInternalCommandDeduplicateEventsHandler? OnLuaManagerCommandDeduplicateEvents;
 
         #endregion
 
@@ -207,11 +209,14 @@ public void HandleEvent(IEvent? ev)
                     else
                         OnInternalCommandReconfigure.Invoke(this, new EventHandlerArgs<Shared.Events.Internal.InternalCommandReconfigure>(tev));
                     break;
-                case Shared.Events.Internal.InternalCommandDeduplicateEvents tev:
-                    if (OnInternalCommandDeduplicateEvents == null)
+
+                // LuaManager
+
+                case Shared.Events.LuaManager.LuaManagerCommandDeduplicateEvents tev:
+                    if (OnLuaManagerCommandDeduplicateEvents == null)
                         OnDefault?.Invoke(this, new EventHandlerArgs<IEvent>(tev));
                     else
-                        OnInternalCommandDeduplicateEvents.Invoke(this, new EventHandlerArgs<Shared.Events.Internal.InternalCommandDeduplicateEvents>(tev));
+                        OnLuaManagerCommandDeduplicateEvents.Invoke(this, new EventHandlerArgs<Shared.Events.LuaManager.LuaManagerCommandDeduplicateEvents>(tev));
                     break;
 
                 // File Monitor

diff --git a/...ernal/InternalCommandDeduplicateEvents.cs → ...ger/LuaManagerCommandDeduplicateEvents.cs b/...ernal/InternalCommandDeduplicateEvents.cs → ...ger/LuaManagerCommandDeduplicateEvents.cs
@@ -1,18 +1,18 @@
 using System.Collections.Generic;
 
-namespace Slipstream.Shared.Events.Internal
+namespace Slipstream.Shared.Events.LuaManager
 {
-    public class InternalCommandDeduplicateEvents : IEvent
+    public class LuaManagerCommandDeduplicateEvents : IEvent
     {
-        public string EventType => "InternalCommandDeduplicateEvents";
+        public string EventType => "LuaManagerCommandDeduplicateEvents";
 
         public bool ExcludeFromTxrx => true;
 
         public string Events { get; set; } = "";
 
         public override bool Equals(object obj)
         {
-            return obj is InternalCommandDeduplicateEvents events &&
+            return obj is LuaManagerCommandDeduplicateEvents events &&
                    EventType == events.EventType &&
                    ExcludeFromTxrx == events.ExcludeFromTxrx &&
                    Events == events.Events;

diff --git a/Shared/IEventFactory.cs b/Shared/IEventFactory.cs
@@ -2,6 +2,7 @@
 using Slipstream.Shared.Events.FileMonitor;
 using Slipstream.Shared.Events.Internal;
 using Slipstream.Shared.Events.IRacing;
+using Slipstream.Shared.Events.LuaManager;
 using Slipstream.Shared.Events.Twitch;
 using Slipstream.Shared.Events.UI;
 
@@ -39,7 +40,7 @@ public enum IRacingSessionStateEnum
         InternalCommandPluginUnregister CreateInternalCommandPluginUnregister(string pluginId);
         InternalPluginState CreateInternalPluginState(string pluginId, string pluginName, string displayName, PluginStatusEnum pluginStatus);
         InternalCommandReconfigure CreateInternalCommandReconfigure();
-        InternalCommandDeduplicateEvents CreateInternalCommandDeduplicateEvents(IEvent[] events);
+        LuaManagerCommandDeduplicateEvents CreateLuaManagerCommandDeduplicateEvents(IEvent[] events);
 
         IRacingCarCompletedLap CreateIRacingCarCompletedLap(double sessionTime, long carIdx, double time, int lapsCompleted, float? fuelDiff, bool localUser);
         IRacingCarInfo CreateIRacingCarInfo(

diff --git a/Slipstream.csproj b/Slipstream.csproj
@@ -171,7 +171,7 @@
     <Compile Include="Shared\EventFactory.cs" />
     <Compile Include="Shared\Events\FileMonitor\FileMonitorCommandScan.cs" />
     <Compile Include="Shared\Events\FileMonitor\FileMonitorScanCompleted.cs" />
-    <Compile Include="Shared\Events\Internal\InternalCommandDeduplicateEvents.cs" />
+    <Compile Include="Shared\Events\LuaManager\LuaManagerCommandDeduplicateEvents.cs" />
     <Compile Include="Shared\Events\Internal\InternalCommandReconfigure.cs" />
     <Compile Include="Shared\Events\Internal\InternalCommandPluginStates.cs" />
     <Compile Include="Shared\Events\IRacing\IRacingCommandSendTrackInfo.cs" />