Moved common files to external library. Support for Secondary Enter b…

…ehaviour
BarRaider · Jan 17, 2019 · 559c69f · 559c69f
1 parent f91fa84
commit 559c69f
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 86 deletions.
diff --git a/DelayedText/DelayedText.csproj b/DelayedText/DelayedText.csproj
@@ -33,6 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="barraider-sdtools">
+      <HintPath>..\..\barraider-sdtools\barraider-sdtools\bin\Release\barraider-sdtools.dll</HintPath>
+    </Reference>
     <Reference Include="CommandLine, Version=2.4.3.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
       <HintPath>..\packages\CommandLineParser.2.4.3\lib\netstandard2.0\CommandLine.dll</HintPath>
     </Reference>
@@ -63,7 +66,6 @@
     <Compile Include="PluginContainer.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StreamDeckOptions.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

diff --git a/DelayedText/DelayedTextInput.cs b/DelayedText/DelayedTextInput.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using BarRaider.SdTools;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -10,9 +11,9 @@
 
 namespace Delayedtext
 {
-    public class DelayedTextInput
+    public class DelayedTextInput : IPluginable
     {
-        private class InspectorSettings
+        private class InspectorSettings : SettingsBase
         {
             public static InspectorSettings CreateDefaultSettings()
             {
@@ -24,22 +25,6 @@ public static InspectorSettings CreateDefaultSettings()
                 return instance;
             }
 
-            public async void SendToPropertyInspectorAsync()
-            {
-                if (StreamDeckConnection != null && !String.IsNullOrEmpty(ContextId) && !String.IsNullOrEmpty(ActionId))
-                {
-                    await StreamDeckConnection.SendToPropertyInspectorAsync(ActionId, JObject.FromObject(this), this.ContextId);
-                }
-            }
-
-            public async void SetSettingsAsync()
-            {
-                if (StreamDeckConnection != null && !String.IsNullOrEmpty(ContextId) && !String.IsNullOrEmpty(ActionId))
-                {
-                    await StreamDeckConnection.SetSettingsAsync(JObject.FromObject(this), this.ContextId);
-                }
-            }
-
             [JsonProperty(PropertyName = "inputText")]
             public string InputText { get; set; }
 
@@ -48,15 +33,6 @@ public async void SetSettingsAsync()
 
             [JsonProperty(PropertyName = "enterMode")]
             public bool EnterMode { get; set; }
-
-            [JsonIgnore]
-            public string ActionId { private get; set; }
-
-            [JsonIgnore]
-            public string ContextId { private get; set; }
-
-            [JsonIgnore]
-            public streamdeck_client_csharp.StreamDeckConnection StreamDeckConnection { private get; set; }
         }
 
         #region Private members
@@ -96,37 +72,11 @@ public void KeyPressed()
             SendInput();
         }
 
-        private async void SendInput()
+        public void KeyReleased()
         {
-            inputRunning = true;
-            await Task.Run(() =>
-            {
-                InputSimulator iis = new InputSimulator();
-                string text = settings.InputText;
-                int delay   = settings.Delay;
-
-                if (settings.EnterMode)
-                {
-                    text = text.Replace("\r\n", "\n");
-                }
-
-                for (int idx = 0; idx < text.Length; idx++)
-                {
-                    if (settings.EnterMode && text[idx] == '\n')
-                    {
-                        iis.Keyboard.KeyPress(WindowsInput.Native.VirtualKeyCode.RETURN);
-                    }
-                    else
-                    {
-                        iis.Keyboard.TextEntry(text[idx]);
-                    }
-                    Thread.Sleep(delay);
-                }
-            });
-            inputRunning = false;
         }
 
-        public void KeyReleased()
+        public void OnTick()
         {
         }
 
@@ -155,5 +105,38 @@ public void UpdateSettings(JObject payload)
         }
 
         #endregion
+
+        #region Private Methods
+
+        private async void SendInput()
+        {
+            inputRunning = true;
+            await Task.Run(() =>
+            {
+                InputSimulator iis = new InputSimulator();
+                string text = settings.InputText;
+                int delay = settings.Delay;
+
+                if (settings.EnterMode)
+                {
+                    text = text.Replace("\r\n", "\n");
+                }
+
+                for (int idx = 0; idx < text.Length; idx++)
+                {
+                    if (settings.EnterMode && text[idx] == '\n')
+                    {
+                        iis.Keyboard.KeyPress(WindowsInput.Native.VirtualKeyCode.RETURN);
+                    }
+                    else
+                    {
+                        iis.Keyboard.TextEntry(text[idx]);
+                    }
+                    Thread.Sleep(delay);
+                }
+            });
+            inputRunning = false;
+        }
+        #endregion
     }
 }
diff --git a/DelayedText/PluginContainer.cs b/DelayedText/PluginContainer.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using BarRaider.SdTools;
+using Newtonsoft.Json;
 using streamdeck_client_csharp;
 using streamdeck_client_csharp.Events;
 using System;
@@ -18,7 +19,7 @@ class PluginContainer
         private SemaphoreSlim instancesLock = new SemaphoreSlim(1);
 
         // Holds all instances of plugin
-        private static Dictionary<string, DelayedTextInput> instances = new Dictionary<string, DelayedTextInput>();
+        private static Dictionary<string, IPluginable> instances = new Dictionary<string, IPluginable>();
 
 
         public void Run(StreamDeckOptions options)

diff --git a/DelayedText/Program.cs b/DelayedText/Program.cs
@@ -1,4 +1,5 @@
-using CommandLine;
+using BarRaider.SdTools;
+using CommandLine;
 using System;
 
 namespace Delayedtext

diff --git a/DelayedText/PropertyInspector/DelayedText/Index.html b/DelayedText/PropertyInspector/DelayedText/Index.html
@@ -11,7 +11,7 @@
 <body>
     <div class="sdpi-wrapper">
         <details class="message info">
-            <summary>For feedback/suggestions contact me at <a href="https://BarRaider.github.io" target="_blank">https://BarRaider.github.io</a> </summary>
+            <summary>For feedback/suggestions contact me at <a href="https://BarRaider.github.io" target="_blank" onclick="openWebsite()">https://BarRaider.github.io</a> </summary>
         </details>
         <div type="textarea" class="sdpi-item" id="inputText_div">
             <div class="sdpi-item-label">Text</div>

diff --git a/DelayedText/PropertyInspector/Index.js b/DelayedText/PropertyInspector/Index.js
@@ -78,6 +78,18 @@ function sendPayloadToPlugin(payload) {
     }
 }
 
+function openWebsite() {
+    if (websocket && (websocket.readyState === 1)) {
+        const json = {
+            'event': 'openUrl',
+            'payload': {
+                'url': 'https://BarRaider.github.io'
+            }
+        };
+        websocket.send(JSON.stringify(json));
+    }
+}
+
 // our method to pass values to the plugin
 function sendValueToPlugin(value, param) {
     if (websocket && (websocket.readyState === 1)) {

diff --git a/DelayedText/StreamDeckOptions.cs b/DelayedText/StreamDeckOptions.cs
diff --git a/DelayedText/manifest.json b/DelayedText/manifest.json
@@ -21,7 +21,7 @@
   "Name": "Delayed Text Input",
   "Icon": "Images/pluginIcon",
   "URL": "https://barraider.github.io/",
-  "Version": "1.0",
+  "Version": "1.01",
   "CodePath": "com.barraider.delayedtext",
   "Category": "BarRaider",
   "CategoryIcon": "Images/categoryIcon",

diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ This library uses the [streamdeck-client-csharp](https://github.com/TyrenDe/stre
 ## Current functionality
 - Simulates keyboard input
 - You can choose the delay between each character (between 1ms to 2000ms)
+- **New in v1.01** Secondary behaviour for ENTER key (to support additional games)
 
 ## Feature roadmap
 Always open to more suggestions.