Addressed logger and memory leak issues FritzAndFriends#73 FritzAndFr…

…iends#114
csharpfritz · Feb 15, 2019 · d4b2f26 · d4b2f26
1 parent 1c9c730
commit d4b2f26
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 6 deletions.
diff --git a/src/SamplePlugin/MySampleAction.cs b/src/SamplePlugin/MySampleAction.cs
@@ -1,3 +1,5 @@
+using Microsoft.Extensions.Logging;
+using Serilog.Core;
 using StreamDeckLib;
 using StreamDeckLib.Messages;
 using System.Threading.Tasks;
@@ -27,6 +29,12 @@ internal class MySampleAction : BaseStreamDeckAction
 
 		public override async Task OnKeyUp(StreamDeckEventPayload args)
 		{
+
+			// Cheer 342 cpayette 15/2/19
+			// Cheer 100 devlead 15/2/19 
+
+			Logger.LogTrace($"Button pressed: {args}");
+
 			_Counter++;
 			await Manager.SetTitleAsync(args.context, _Counter.ToString());
 

diff --git a/src/SamplePlugin/Program.cs b/src/SamplePlugin/Program.cs
@@ -15,6 +15,12 @@ namespace SamplePlugin
 
 	class Program
 	{
+
+		// Cheer 200 careypayette February 14, 2019
+		// Cheer 100 roberttables February 14, 2019
+		// Cheer 100 careypayette February 15, 2019
+		// Cheer 100 devlead 15/2/2019 
+
 		static ILoggerFactory GetLoggerFactory()
 		{
 			var dir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
@@ -88,8 +94,6 @@ await ConnectionManager.Initialize(args, loggerFactory)
 			}
 #endif
 
-			Console.WriteLine("I did a thing...");
-
 		}
 	}
 

diff --git a/src/SamplePlugin/SamplePlugin.cmd b/src/SamplePlugin/SamplePlugin.cmd
@@ -1 +1,2 @@
+cd %appdata%\Elgato\StreamDeck\Plugins\com.csharpfritz.samplePlugin.sdPlugin
 SamplePlugin.exe -break %*
diff --git a/src/StreamDeckLib/BaseStreamDeckAction.cs b/src/StreamDeckLib/BaseStreamDeckAction.cs
@@ -1,3 +1,4 @@
+using Microsoft.Extensions.Logging;
 using StreamDeckLib.Messages;
 using System;
 using System.Threading.Tasks;
@@ -32,6 +33,8 @@ public abstract class BaseStreamDeckAction
     /// <value>The registration key.</value>
     protected internal string RegistrationKey => UUID;
 
+		public ILogger Logger { get; internal set; }
+
     public virtual Task OnKeyDown(StreamDeckEventPayload args) => Task.CompletedTask;
 
     public virtual Task OnKeyUp(StreamDeckEventPayload args) => Task.CompletedTask;

diff --git a/src/StreamDeckLib/ConnectionManager.cs b/src/StreamDeckLib/ConnectionManager.cs
@@ -5,6 +5,7 @@
 using StreamDeckLib.Messages;
 using System;
 using System.IO;
+using System.Linq;
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
@@ -151,6 +152,8 @@ private async Task Run()
 								continue;
 							}
 
+							if (_ActionEventsIgnore.Contains(msg.Event)) { continue; }
+
 							// Make sure we have a registered BaseStreamDeckAction instance registered for the received action (UUID)
 							if (!_ActionsDictionary.ContainsKey(msg.action))
 							{

diff --git a/src/StreamDeckLib/ConnectionManager_Actions.cs b/src/StreamDeckLib/ConnectionManager_Actions.cs
@@ -14,9 +14,13 @@ partial class ConnectionManager
 
 		private static ConnectionManager RegisterActionInternal(ConnectionManager manager, BaseStreamDeckAction action)
 		{
+
+			// Cheer 100 svavablount 15/2/19 
+
 			ValidateActionForRegistration(action);
 
 			action.Manager = manager;
+			action.Logger = _LoggerFactory.CreateLogger(action.UUID);
 
 			_ActionsDictionary.Add(action.RegistrationKey, action);
 

diff --git a/src/StreamDeckLib/ConnectionManager_Events.cs b/src/StreamDeckLib/ConnectionManager_Events.cs
@@ -24,6 +24,10 @@ private static readonly Dictionary<string, Func<BaseStreamDeckAction, StreamDeck
 			["applicationDidTerminate"] = (action, args) => action.OnApplicationDidTerminate(args),
 		};
 
+		private static readonly string[] _ActionEventsIgnore = new[] {
+			"deviceDidConnect", "deviceDidDisconnect", "applicationDidLaunch", "applicationDidTerminate"
+		};
+
 		private static readonly Dictionary<string, Func<BaseStreamDeckAction, PropertyInspectorEventPayload, Task>> _PropertyInspectorActionDictionary
 	= new Dictionary<string, Func<BaseStreamDeckAction, PropertyInspectorEventPayload, Task>>()
 	{

diff --git a/src/StreamDeckToolkit.sln b/src/StreamDeckToolkit.sln
@@ -1,18 +1,32 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.168
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28606.126
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamDeckLib", "StreamDeckLib\StreamDeckLib.csproj", "{19F24D43-79DB-47B6-AEDA-BAEA3B2F1962}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplePlugin", "SamplePlugin\SamplePlugin.csproj", "{7FCB0FEF-FC38-4187-858C-425FB0664F4E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplePlugin", "SamplePlugin\SamplePlugin.csproj", "{7FCB0FEF-FC38-4187-858C-425FB0664F4E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{87F0DB03-6058-40D9-9510-D516FDA578AE}"
 	ProjectSection(SolutionItems) = preProject
 		..\.editorconfig = ..\.editorconfig
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StreamDeckLib.Test", "StreamDeckLib.Test\StreamDeckLib.Test.csproj", "{CAD3C79B-E603-4356-B5BD-5B2E57DFD8BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamDeckLib.Test", "StreamDeckLib.Test\StreamDeckLib.Test.csproj", "{CAD3C79B-E603-4356-B5BD-5B2E57DFD8BE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{A337DDA4-B15C-43B9-AB51-04267D151BB0}"
+	ProjectSection(SolutionItems) = preProject
+		..\scripts\install.ps1 = ..\scripts\install.ps1
+		..\scripts\install.sh = ..\scripts\install.sh
+		..\scripts\uninstall.ps1 = ..\scripts\uninstall.ps1
+		..\scripts\uninstall.sh = ..\scripts\uninstall.sh
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Registration", "Registration", "{403D021A-9770-41ED-8554-34FEE375BADA}"
+	ProjectSection(SolutionItems) = preProject
+		..\scripts\registration\RegisterPluginAndStartStreamDeck.ps1 = ..\scripts\registration\RegisterPluginAndStartStreamDeck.ps1
+		..\scripts\registration\RegisterPluginAndStartStreamDeck.sh = ..\scripts\registration\RegisterPluginAndStartStreamDeck.sh
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -36,6 +50,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{403D021A-9770-41ED-8554-34FEE375BADA} = {A337DDA4-B15C-43B9-AB51-04267D151BB0}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C5036C4A-EAB6-4A37-9D02-1E6D5E77D257}
 	EndGlobalSection
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		cd %appdata%\Elgato\StreamDeck\Plugins\com.csharpfritz.samplePlugin.sdPlugin
		SamplePlugin.exe -break %*