WingMan – Diff between revs 5 and 7

Subversion Repositories:

?pathlinks?

Rev 5 – Rev 9 – Go to most recent revision – Details – Blame – Last modification – View Log

-ï»¿using System;
-using System.Collections.Concurrent;
+ï»¿using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet;
-using MQTTnet.Extensions.ManagedClient;
 using WingMan.Communication;
 namespace WingMan.MouseKey
+{
     public class MouseKeyBindingsSynchronizer
+    {
-        public delegate void MouseKeyBindingsSynchronized(object sender, MouseKeyBindingsSynchronizedEventArgs e);
-        public event MouseKeyBindingsSynchronized OnMouseKeyBindingsSynchronized;
-        private MouseKeyBindings MouseKeyBindings { get; set; }
-        private ConcurrentDictionary<string, List<MouseKeyBindingExchange>> SynchronizedMouseKeyBindings { get; set; }
+        public delegate void MouseKeyBindingsSynchronized(object sender, MouseKeyBindingsSynchronizedEventArgs e);
-        private MQTTCommunication MQTTCommunication { get; set; }
-        private CancellationTokenSource SynchronizationCancellationTokenSource { get; set; }
         public MouseKeyBindingsSynchronizer(MouseKeyBindings mouseKeyBindings, MQTTCommunication MQTTCommunication,
-        public MouseKeyBindingsSynchronizer(MouseKeyBindings mouseKeyBindings, MQTTCommunication MQTTCommunication)
+            TaskScheduler taskScheduler, CancellationToken cancellationToken)
+        {
+            MouseKeyBindings = mouseKeyBindings;
+            this.MQTTCommunication = MQTTCommunication;
-            MouseKeyBindings = mouseKeyBindings;
+            CancellationToken = cancellationToken;
-            this.MQTTCommunication = MQTTCommunication;
+            TaskScheduler = taskScheduler;
-            SynchronizedMouseKeyBindings = new ConcurrentDictionary<string, List<MouseKeyBindingExchange>>();
-            MQTTCommunication.OnMessageReceived += MqttCommunicationOnOnMessageReceived;
+            SynchronizedMouseKeyBindings = new ConcurrentDictionary<string, List<MouseKeyBinding>>();
+            MQTTCommunication.OnMessageReceived += MqttCommunicationOnOnMessageReceived;
+            Task.Run(Synchronize, CancellationToken);
+        }
+        private MouseKeyBindings MouseKeyBindings { get; }
+        private ConcurrentDictionary<string, List<MouseKeyBinding>> SynchronizedMouseKeyBindings { get; }
+        private MQTTCommunication MQTTCommunication { get; }
-            SynchronizationCancellationTokenSource = new CancellationTokenSource();
+        private CancellationToken CancellationToken { get; }
         private TaskScheduler TaskScheduler { get; }
-            Task.Run(Synchronize, SynchronizationCancellationTokenSource.Token);
+        public event MouseKeyBindingsSynchronized OnMouseKeyBindingsSynchronized;
         private async void MqttCommunicationOnOnMessageReceived(object sender,
-        private void MqttCommunicationOnOnMessageReceived(object sender, MqttApplicationMessageReceivedEventArgs e)
+            MqttApplicationMessageReceivedEventArgs e)
+        {
-        {
+            if (e.ApplicationMessage.Topic != "exchange")
-            if (e.ApplicationMessage.Topic != "exchange")
+                return;
-                return;
             using (var memoryStream = new MemoryStream(e.ApplicationMessage.Payload))
             using (var memoryStream = new MemoryStream(e.ApplicationMessage.Payload))
                 memoryStream.Position = 0L;
-                memoryStream.Position = 0L;
+                var mouseKeyBindingsExchange =
+                    (MouseKeyBindingExchange) MouseKeyBindingExchange.XmlSerializer.Deserialize(memoryStream);
-                var mouseKeyBindingsExchange = (MouseKeyBindingsExchange)MouseKeyBindingsExchange.XmlSerializer.Deserialize(memoryStream);
+                if (SynchronizedMouseKeyBindings.TryGetValue(mouseKeyBindingsExchange.Nick, out var mouseKeyBinding) &&
+                    mouseKeyBinding.SequenceEqual(mouseKeyBindingsExchange.MouseKeyBindings))
+                    return;
                 if (SynchronizedMouseKeyBindings.TryGetValue(mouseKeyBindingsExchange.Nick, out var mouseKeyBinding) &&
-                    mouseKeyBinding.SequenceEqual(mouseKeyBindingsExchange.ExchangeBindings))
+                // Nick does not exist so the bindings will be added.
-                    return;
+                SynchronizedMouseKeyBindings.AddOrUpdate(mouseKeyBindingsExchange.Nick,
                     mouseKeyBindingsExchange.MouseKeyBindings, (s, list) => mouseKeyBindingsExchange.MouseKeyBindings);
                 // Nick does not exist so the bindings will be added.
-                SynchronizedMouseKeyBindings.AddOrUpdate(mouseKeyBindingsExchange.Nick,
+                await Task.Delay(0)
-                    mouseKeyBindingsExchange.ExchangeBindings, (s, list) => mouseKeyBindingsExchange.ExchangeBindings);
+                    .ContinueWith(
+                        _ => OnMouseKeyBindingsSynchronized?.Invoke(sender,
-                OnMouseKeyBindingsSynchronized?.Invoke(sender,
+                            new MouseKeyBindingsSynchronizedEventArgs(
-                    new MouseKeyBindingsSynchronizedEventArgs(
+                                mouseKeyBindingsExchange)),
-                        mouseKeyBindingsExchange.ExchangeBindings));
+                        CancellationToken, TaskContinuationOptions.None, TaskScheduler);
+            }
-            }
+        }
         private async Task Synchronize()
         private async Task Synchronize()
-        {
             do
+            {
-                await Task.Delay(1000).ConfigureAwait(false);
+                await Task.Delay(1000, CancellationToken).ConfigureAwait(false);