implement updating sensors/commands if they have more properties

UserInterface/ViewModels/AddCommandViewModel.cs

@@ -11,6 +11,8 @@ namespace UserInterface.ViewModels
         private bool _showCommandInput;
         private bool _showKeyInput;
         private string _moreInfoLink;
+        private string _command;
+        private string _key;
 
         public AvailableCommands SelectedType { get => _selectedType; set => this.RaiseAndSetIfChanged(ref _selectedType, value); }
         public string Name { get => _name; set => this.RaiseAndSetIfChanged(ref _name, value); }
@@ -18,7 +20,7 @@ namespace UserInterface.ViewModels
         public bool ShowCommandInput { get => _showCommandInput; set => this.RaiseAndSetIfChanged(ref _showCommandInput, value); }
         public bool ShowKeyInput { get => _showKeyInput; set => this.RaiseAndSetIfChanged(ref _showKeyInput, value); }
         public string MoreInfoLink { get => _moreInfoLink; set => this.RaiseAndSetIfChanged(ref _moreInfoLink, value); }
-        public string Command { get; set; }
-        public string Key { get; set; }
+        public string Command { get => _command; set => this.RaiseAndSetIfChanged(ref _command, value); }
+        public string Key { get => _key; set => this.RaiseAndSetIfChanged(ref _key, value); }
     }
 }

UserInterface/ViewModels/AddSensorViewModel.cs

@@ -11,8 +11,9 @@ namespace UserInterface.ViewModels
         private string _description;
         private bool _showQueryInput;
         private bool _showWindowNameInput;
-        private bool _showDetectionModeOptions;
         private string _moreInfoLink;
+        private string _query;
+        private string _windowName;
 
         public AvailableSensors SelectedType { get => _selectedType; set => this.RaiseAndSetIfChanged(ref _selectedType, value); }
         public string Name { get => _name; set => this.RaiseAndSetIfChanged(ref _name, value); }
@@ -20,9 +21,8 @@ namespace UserInterface.ViewModels
         public string Description { get => _description; set => this.RaiseAndSetIfChanged(ref _description, value); }
         public bool ShowQueryInput { get => _showQueryInput; set => this.RaiseAndSetIfChanged(ref _showQueryInput, value); }
         public bool ShowWindowNameInput { get => _showWindowNameInput; set => this.RaiseAndSetIfChanged(ref _showWindowNameInput, value); }
-        public bool ShowDetectionModeOptions { get => _showDetectionModeOptions; set => this.RaiseAndSetIfChanged(ref _showDetectionModeOptions, value); }
         public string MoreInfoLink { get => _moreInfoLink; set => this.RaiseAndSetIfChanged(ref _moreInfoLink, value); }
-        public string Query { get; set; }
-        public string WindowName { get; set; }
+        public string Query { get => _query; set => this.RaiseAndSetIfChanged(ref _query, value); }
+        public string WindowName { get => _windowName; set => this.RaiseAndSetIfChanged(ref _windowName, value); }
     }
 }

UserInterface/Views/AddCommandDialog.axaml.cs

@@ -47,7 +47,7 @@ namespace UserInterface.Views
 
             // create client
             _client = clientFactory.CreateClient("addCommand");
-            Title = "Add sensor";
+            Title = "Add command";
 
         }
 
@@ -66,9 +66,9 @@ namespace UserInterface.Views
             var item = (AddCommandViewModel)DataContext;
             item.SelectedType = command.Type;
             item.Name = command.Name;
-            //item.UpdateInterval = command.UpdateInterval;
-            //item.WindowName =
-            //item.Query =
+            item.Command = command.Command;
+            item.Key = command.Key;
+            
         }
 
         public async void Save(object sender, RoutedEventArgs args)

UserInterface/Views/AddSensorDialog.axaml.cs

@@ -57,7 +57,7 @@ namespace UserInterface.Views
 
         private async void GetSensorInfo(Guid sensorId)
         {
-            var sensor = await _client.InvokeAsync(x => x.GetConfiguredSensor(sensorId));
+            ConfiguredSensorModel sensor = await _client.InvokeAsync(x => x.GetConfiguredSensor(sensorId));
 
             ComboBox.SelectedItem = sensor.Type;
             FillDefaultValues();
@@ -66,8 +66,10 @@ namespace UserInterface.Views
             item.SelectedType = sensor.Type;
             item.Name = sensor.Name;
             item.UpdateInterval = sensor.UpdateInterval;
-            //item.WindowName =
-            //item.Query =
+            item.Query = sensor.Query;
+            item.WindowName = sensor.WindowName;
+
+            Title = $"Edit {sensor.Name}";
         }
 
         public async void Save(object sender, RoutedEventArgs args)
@@ -96,7 +98,6 @@ namespace UserInterface.Views
                 case AvailableSensors.UserNotificationStateSensor:
                     item.Description = "This sensor watches the UserNotificationState. This is normally used in applications to determine if it is appropriate to send a notification but we can use it to expose this state. \n ";
                     item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#usernotificationstate";
-                    item.ShowDetectionModeOptions = false;
                     item.ShowQueryInput = false;
                     item.ShowWindowNameInput = false;
                     item.UpdateInterval = 5;
@@ -104,7 +105,6 @@ namespace UserInterface.Views
                 case AvailableSensors.DummySensor:
                     item.Description = "This sensor spits out a random number every second. Useful for testing, maybe you'll find some other use for it.";
                     item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#dummy";
-                    item.ShowDetectionModeOptions = false;
                     item.ShowQueryInput = false;
                     item.ShowWindowNameInput = false;
                     item.UpdateInterval = 1;
@@ -112,7 +112,6 @@ namespace UserInterface.Views
                 case AvailableSensors.CPULoadSensor:
                     item.Description = "This sensor checks the current CPU load. It averages the load on all logical cores every second and rounds the output to two decimals.";
                     item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#cpuload";
-                    item.ShowDetectionModeOptions = false;
                     item.ShowQueryInput = false;
                     item.ShowWindowNameInput = false;
                     item.UpdateInterval = 5;
@@ -120,7 +119,6 @@ namespace UserInterface.Views
                 case AvailableSensors.CurrentClockSpeedSensor:
                     item.Description = "This sensor returns the BIOS configured baseclock for the processor.";
                     item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#currentclockspeed";
-                    item.ShowDetectionModeOptions = false;
                     item.ShowQueryInput = false;
                     item.ShowWindowNameInput = false;
                     item.UpdateInterval = 3600;
@@ -128,7 +126,6 @@ namespace UserInterface.Views
                 case AvailableSensors.WMIQuerySensor:
                     item.Description = "This advanced sensor executes a user defined WMI query and exposes the result. The query should return a single value.";
                     item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#wmiquerysensor";
-                    item.ShowDetectionModeOptions = false;
                     item.ShowQueryInput = true;
                     item.ShowWindowNameInput = false;
                     item.UpdateInterval = 10;
@@ -136,7 +133,6 @@ namespace UserInterface.Views
                 case AvailableSensors.MemoryUsageSensor:
                     item.Description = "This sensor calculates the percentage of used memory.";
                     item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#usedmemory";
-                    item.ShowDetectionModeOptions = false;
                     item.ShowQueryInput = false;
                     item.ShowWindowNameInput = false;
                     item.UpdateInterval = 10;
@@ -144,7 +140,6 @@ namespace UserInterface.Views
                 case AvailableSensors.ActiveWindowSensor:
                     item.Description = "This sensor exposes the name of the currently active window.";
                     item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#activewindow";
-                    item.ShowDetectionModeOptions = false;
                     item.ShowQueryInput = false;
                     item.ShowWindowNameInput = false;
                     item.UpdateInterval = 5;
@@ -152,14 +147,12 @@ namespace UserInterface.Views
                 case AvailableSensors.WebcamActiveSensor:
                     item.Description = "This sensor shows if the webcam is currently being used.";
                     item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#webcamactive";
-                    item.ShowDetectionModeOptions = true;
                     item.ShowQueryInput = false;
                     item.UpdateInterval = 10;
                     break;
                 case AvailableSensors.MicrophoneActiveSensor:
                     item.Description = "This sensor shows if the microphone is currently in use.";
                     item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#microphoneactive";
-                    item.ShowDetectionModeOptions = false;
                     item.ShowQueryInput = false;
                     item.UpdateInterval = 10;
                     break;

hass-workstation-service/Communication/InterProcesCommunication/InterProcessApi.cs

@@ -59,15 +59,7 @@ namespace hass_workstation_service.Communication.InterProcesCommunication
                 if (!Enum.TryParse(s.GetType().Name, out AvailableSensors type))
                     Log.Logger.Error("Unknown sensor");
 
-                return new ConfiguredSensorModel()
-                {
-                    Name = s.Name,
-                    Type = type,
-                    Value = s.PreviousPublishedState,
-                    Id = s.Id,
-                    UpdateInterval = s.UpdateInterval,
-                    UnitOfMeasurement = ((SensorDiscoveryConfigModel)s.GetAutoDiscoveryConfig()).Unit_of_measurement
-                };
+                return new ConfiguredSensorModel(s);
             }).ToList();
         }
 
@@ -82,31 +74,18 @@ namespace hass_workstation_service.Communication.InterProcesCommunication
                 if (!Enum.TryParse(s.GetType().Name, out AvailableSensors type))
                     Log.Logger.Error("Unknown sensor");
 
-                return new ConfiguredSensorModel()
-                {
-                    Name = s.Name,
-                    Type = type,
-                    Value = s.PreviousPublishedState,
-                    Id = s.Id,
-                    UpdateInterval = s.UpdateInterval,
-                    UnitOfMeasurement = ((SensorDiscoveryConfigModel)s.GetAutoDiscoveryConfig()).Unit_of_measurement
-                };
+                return new ConfiguredSensorModel(s);
             }
         }
 
         public List<ConfiguredCommandModel> GetConfiguredCommands()
         {
-            return _configurationService.ConfiguredCommands.Select(s =>
+            return _configurationService.ConfiguredCommands.Select(c =>
             {
-                if (!Enum.TryParse(s.GetType().Name, out AvailableCommands type))
+                if (!Enum.TryParse(c.GetType().Name, out AvailableCommands type))
                     Log.Logger.Error("Unknown command");
 
-                return new ConfiguredCommandModel()
-                {
-                    Name = s.Name,
-                    Type = type,
-                    Id = s.Id
-                };
+                return new ConfiguredCommandModel(c);
             }).ToList();
         }
 
@@ -120,12 +99,7 @@ namespace hass_workstation_service.Communication.InterProcesCommunication
                 if (!Enum.TryParse(c.GetType().Name, out AvailableCommands type))
                     Log.Logger.Error("Unknown command");
 
-                return new ConfiguredCommandModel()
-                {
-                    Name = c.Name,
-                    Type = type,
-                    Id = c.Id
-                };
+                return new ConfiguredCommandModel(c);
             }
         }
 
@@ -229,12 +203,12 @@ namespace hass_workstation_service.Communication.InterProcesCommunication
                 AvailableCommands.RestartCommand => new RestartCommand(_publisher, model.Name),
                 AvailableCommands.LogOffCommand => new LogOffCommand(_publisher, model.Name),
                 AvailableCommands.CustomCommand => new CustomCommand(_publisher, model.Command, model.Name),
-                AvailableCommands.PlayPauseCommand => new MediaPlayPauseCommand(_publisher, model.Name),
-                AvailableCommands.NextCommand => new MediaNextCommand(_publisher, model.Name),
-                AvailableCommands.PreviousCommand => new MediaPreviousCommand(_publisher, model.Name),
-                AvailableCommands.VolumeUpCommand => new MediaVolumeUpCommand(_publisher, model.Name),
-                AvailableCommands.VolumeDownCommand => new MediaVolumeDownCommand(_publisher, model.Name),
-                AvailableCommands.MuteCommand => new MediaMuteCommand(_publisher, model.Name),
+                AvailableCommands.PlayPauseCommand => new PlayPauseCommand(_publisher, model.Name),
+                AvailableCommands.NextCommand => new NextCommand(_publisher, model.Name),
+                AvailableCommands.PreviousCommand => new PreviousCommand(_publisher, model.Name),
+                AvailableCommands.VolumeUpCommand => new VolumeUpCommand(_publisher, model.Name),
+                AvailableCommands.VolumeDownCommand => new VolumeDownCommand(_publisher, model.Name),
+                AvailableCommands.MuteCommand => new MuteCommand(_publisher, model.Name),
                 AvailableCommands.KeyCommand => new KeyCommand(_publisher, Convert.ToByte(model.Key, 16), model.Name),
                 _ => null
             };

hass-workstation-service/Communication/InterProcesCommunication/ServiceContractModels.cs

@@ -1,3 +1,5 @@
+using hass_workstation_service.Domain.Commands;
+using hass_workstation_service.Domain.Sensors;
 using System;
 
 namespace hass_workstation_service.Communication.InterProcesCommunication.Models
@@ -23,8 +25,33 @@ namespace hass_workstation_service.Communication.InterProcesCommunication.Models
         public AvailableSensors Type { get; set; }
         public string Name { get; set; }
         public string Value { get; set; }
+        public string Query { get; set; }
+        public string WindowName { get; set; }
         public int UpdateInterval { get; set; }
         public string UnitOfMeasurement { get; set; }
+
+        public ConfiguredSensorModel(AbstractSensor sensor)
+        {
+            this.Id = sensor.Id;
+            this.Name = sensor.Name;
+            Enum.TryParse(sensor.GetType().Name, out AvailableSensors type);
+            this.Type = type;
+            this.Value = sensor.PreviousPublishedState;
+            if (sensor is WMIQuerySensor wMIQuerySensor)
+            {
+                this.Query = wMIQuerySensor.Query;
+            }
+            if (sensor is NamedWindowSensor namedWindowSensor)
+            {
+                this.WindowName = namedWindowSensor.WindowName;
+            }
+            this.UpdateInterval = sensor.UpdateInterval;  
+            this.UnitOfMeasurement = ((SensorDiscoveryConfigModel)sensor.GetAutoDiscoveryConfig()).Unit_of_measurement;
+        }
+        public ConfiguredSensorModel()
+        {
+
+        }
     }
 
     public class ConfiguredCommandModel
@@ -33,6 +60,28 @@ namespace hass_workstation_service.Communication.InterProcesCommunication.Models
         public AvailableCommands Type { get; set; }
         public string Name { get; set; }
         public string Command { get; set; }
+        public string Key { get; set; }
+
+        public ConfiguredCommandModel(AbstractCommand command)
+        {
+            this.Id = command.Id;
+            Enum.TryParse(command.GetType().Name, out AvailableCommands type);
+            this.Type = type;
+            this.Name = command.Name;
+            if (command is CustomCommand customCommand)
+            {
+                this.Command = customCommand.Command;
+            }
+            if (command is KeyCommand keyCommand)
+            {
+                this.Key = "0x" + Convert.ToString(keyCommand.KeyCode, 16);
+            }
+        }
+
+        public ConfiguredCommandModel()
+        {
+
+        }
     }
 
     public enum AvailableSensors

hass-workstation-service/Data/ConfigurationService.cs

@@ -184,22 +184,22 @@ namespace hass_workstation_service.Data
                         command = new CustomCommand(publisher, configuredCommand.Command, configuredCommand.Name, configuredCommand.Id);
                         break;
                     case "MediaPlayPauseCommand":
-                        command = new MediaPlayPauseCommand(publisher, configuredCommand.Name, configuredCommand.Id);
+                        command = new PlayPauseCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
                     case "MediaNextCommand":
-                        command = new MediaNextCommand(publisher, configuredCommand.Name, configuredCommand.Id);
+                        command = new NextCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
                     case "MediaPreviousCommand":
-                        command = new MediaPreviousCommand(publisher, configuredCommand.Name, configuredCommand.Id);
+                        command = new PreviousCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
                     case "MediaVolumeUpCommand":
-                        command = new MediaVolumeUpCommand(publisher, configuredCommand.Name, configuredCommand.Id);
+                        command = new VolumeUpCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
                     case "MediaVolumeDownCommand":
-                        command = new MediaVolumeDownCommand(publisher, configuredCommand.Name, configuredCommand.Id);
+                        command = new VolumeDownCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
                     case "MediaMuteCommand":
-                        command = new MediaMuteCommand(publisher, configuredCommand.Name, configuredCommand.Id);
+                        command = new MuteCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
                     case "KeyCommand":
                         command = new KeyCommand(publisher, configuredCommand.KeyCode, configuredCommand.Name, configuredCommand.Id);
@@ -385,6 +385,7 @@ namespace hass_workstation_service.Data
         public async void UpdateConfiguredCommand(Guid id, AbstractCommand command)
         {
             await DeleteCommand(id);
+            await Task.Delay(500);
             AddCommand(command);
             WriteCommandSettingsAsync();
         }

hass-workstation-service/Domain/Commands/MediaPlayPauseCommand.cs

@@ -1,14 +0,0 @@
-using hass_workstation_service.Communication;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace hass_workstation_service.Domain.Commands
-{
-    public class MediaPlayPauseCommand : KeyCommand
-    {
-        public MediaPlayPauseCommand(MqttPublisher publisher, string name = "PlayPause", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_MEDIA_PLAY_PAUSE, name ?? "PlayPause", id) { }
-    }
-}

hass-workstation-service/Domain/Commands/MediaPreviousCommand.cs

@@ -1,14 +0,0 @@
-using hass_workstation_service.Communication;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace hass_workstation_service.Domain.Commands
-{
-    public class MediaPreviousCommand : KeyCommand
-    {
-        public MediaPreviousCommand(MqttPublisher publisher, string name = "Previous", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_MEDIA_PREV_TRACK, name ?? "Previous", id) { }
-    }
-}

hass-workstation-service/Domain/Commands/MediaVolumeDownCommand.cs

@@ -1,14 +0,0 @@
-using hass_workstation_service.Communication;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace hass_workstation_service.Domain.Commands
-{
-    public class MediaVolumeDownCommand : KeyCommand
-    {
-        public MediaVolumeDownCommand(MqttPublisher publisher, string name = "VolumeDown", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_VOLUME_DOWN, name ?? "VolumeDown", id) { }
-    }
-}

hass-workstation-service/Domain/Commands/MediaVolumeUpCommand.cs

@@ -1,14 +0,0 @@
-using hass_workstation_service.Communication;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace hass_workstation_service.Domain.Commands
-{
-    public class MediaVolumeUpCommand : KeyCommand
-    {
-        public MediaVolumeUpCommand(MqttPublisher publisher, string name = "VolumeUp", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_VOLUME_UP, name ?? "VolumeUp", id) { }
-    }
-}

hass-workstation-service/Domain/Commands/MuteCommand.cs

@@ -7,8 +7,8 @@ using System.Threading.Tasks;
 
 namespace hass_workstation_service.Domain.Commands
 {
-    public class MediaMuteCommand : KeyCommand
+    public class MuteCommand : KeyCommand
     {
-        public MediaMuteCommand(MqttPublisher publisher, string name = "Mute", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_VOLUME_MUTE, name ?? "Mute", id) { }
+        public MuteCommand(MqttPublisher publisher, string name = "Mute", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_VOLUME_MUTE, name ?? "Mute", id) { }
     }
 }

hass-workstation-service/Domain/Commands/NextCommand.cs

@@ -7,8 +7,8 @@ using System.Threading.Tasks;
 
 namespace hass_workstation_service.Domain.Commands
 {
-    public class MediaNextCommand : KeyCommand
+    public class NextCommand : KeyCommand
     {
-        public MediaNextCommand(MqttPublisher publisher, string name = "Next", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_MEDIA_NEXT_TRACK, name ?? "Next", id) { }
+        public NextCommand(MqttPublisher publisher, string name = "Next", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_MEDIA_NEXT_TRACK, name ?? "Next", id) { }
     }
 }

hass-workstation-service/Domain/Commands/PlayPauseCommand.cs

@@ -0,0 +1,14 @@
+using hass_workstation_service.Communication;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace hass_workstation_service.Domain.Commands
+{
+    public class PlayPauseCommand : KeyCommand
+    {
+        public PlayPauseCommand(MqttPublisher publisher, string name = "PlayPause", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_MEDIA_PLAY_PAUSE, name ?? "PlayPause", id) { }
+    }
+}

hass-workstation-service/Domain/Commands/PreviousCommand.cs

@@ -0,0 +1,14 @@
+using hass_workstation_service.Communication;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace hass_workstation_service.Domain.Commands
+{
+    public class PreviousCommand : KeyCommand
+    {
+        public PreviousCommand(MqttPublisher publisher, string name = "Previous", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_MEDIA_PREV_TRACK, name ?? "Previous", id) { }
+    }
+}

hass-workstation-service/Domain/Commands/VolumeDownCommand.cs

@@ -0,0 +1,14 @@
+using hass_workstation_service.Communication;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace hass_workstation_service.Domain.Commands
+{
+    public class VolumeDownCommand : KeyCommand
+    {
+        public VolumeDownCommand(MqttPublisher publisher, string name = "VolumeDown", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_VOLUME_DOWN, name ?? "VolumeDown", id) { }
+    }
+}

hass-workstation-service/Domain/Commands/VolumeUpCommand.cs

@@ -0,0 +1,14 @@
+using hass_workstation_service.Communication;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace hass_workstation_service.Domain.Commands
+{
+    public class VolumeUpCommand : KeyCommand
+    {
+        public VolumeUpCommand(MqttPublisher publisher, string name = "VolumeUp", Guid id = default(Guid)) : base(publisher, KeyCommand.VK_VOLUME_UP, name ?? "VolumeUp", id) { }
+    }
+}