Merge remote-tracking branch 'origin/develop' into develop

README.md

@@ -47,14 +47,14 @@ Find us on [Discord](https://discord.gg/VraYT2N3wd).
 
 ## Development
 
-Want to develop or build the application yourself? Make sure to install the .NET Runtime [.NET 5 Runtime](https://dotnet.microsoft.com/download/dotnet/current/runtime) and [.NET 5 SDK](https://dotnet.microsoft.com/download/dotnet/current). Run the following commands from the `hass-workstation-service\hass-workstation-service` directory to get you started:
+If you want to help develop Hass Workstation service, make sure to install the .NET Runtime [.NET 5 Runtime](https://dotnet.microsoft.com/download/dotnet/current/runtime) and [.NET 5 SDK](https://dotnet.microsoft.com/download/dotnet/current). Run the following commands from the `hass-workstation-service\hass-workstation-service` directory to get you started:
 
 ```` powershell
 dotnet build
 dotnet publish
 ````
 
-In case you are using Visual Studio Code, open the `hass-workstation-service\hass-workstation-service` folder to take advantage of the predefined build and publish tasks.
+If you are using [Visual Studio](https://visualstudio.microsoft.com/), open the `hass-workstation-service\hass-workstation-service` folder to take advantage of the predefined build and publish tasks, alternatively you can open the project directly from github using the green download button to use the integrated git tools.
 
 ## Sensors
 

UserInterface/Views/AddCommandDialog.axaml.cs

@@ -112,6 +112,12 @@ namespace UserInterface.Views
                     item.ShowCommandInput = false;
                     item.ShowKeyInput = false;
                     break;
+                case AvailableCommands.HibernateCommand:
+                    item.Description = "This command hibernates the PC immediately. ";
+                    item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service/blob/master/documentation/Commands.md#hibernatecommand";
+                    item.ShowCommandInput = false;
+                    item.ShowKeyInput = false;
+                    break;
                 case AvailableCommands.LogOffCommand:
                     item.Description = "This command logs the current user off immediately. ";
                     item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service/blob/master/documentation/Commands.md#logoffcommand";

documentation/Commands.md

@@ -10,6 +10,10 @@ This command shuts down the computer immediately. It runs `shutdown /s`.
 
 This command restarts the computer immediately. It runs `shutdown /r`.
 
+### HibernateCommand
+
+This command hibernates the computer immediately. It runs `shutdown /h`.
+
 ### LogOffCommand
 
 This command logs off the current user. It runs `shutdown /l`.

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

@@ -201,6 +201,7 @@ namespace hass_workstation_service.Communication.InterProcesCommunication
             {
                 AvailableCommands.ShutdownCommand => new ShutdownCommand(_publisher, model.Name),
                 AvailableCommands.RestartCommand => new RestartCommand(_publisher, model.Name),
+                AvailableCommands.HibernateCommand => new HibernateCommand(_publisher, model.Name),
                 AvailableCommands.LogOffCommand => new LogOffCommand(_publisher, model.Name),
                 AvailableCommands.CustomCommand => new CustomCommand(_publisher, model.Command, model.Name),
                 AvailableCommands.PlayPauseCommand => new PlayPauseCommand(_publisher, model.Name),

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

@@ -110,6 +110,7 @@ namespace hass_workstation_service.Communication.InterProcesCommunication.Models
         ShutdownCommand,
         LogOffCommand,
         RestartCommand,
+        HibernateCommand,
         KeyCommand,
         PlayPauseCommand,
         NextCommand,

hass-workstation-service/Data/ConfigurationService.cs

@@ -190,6 +190,9 @@ namespace hass_workstation_service.Data
                     case "RestartCommand":
                         command = new RestartCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
+                    case "HibernateCommand":
+                        command = new HibernateCommand(publisher, configuredCommand.Name, configuredCommand.Id);
+                        break;
                     case "LogOffCommand":
                         command = new LogOffCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;

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

@@ -30,6 +30,11 @@ namespace hass_workstation_service.Domain.Commands
             startInfo.FileName = "cmd.exe";
             startInfo.Arguments = $"/C {this.Command}";
             this.Process.StartInfo = startInfo;
+            
+            // turn off the sensor to guarantee disable the switch
+            // useful if command changes power state of device
+            this.State = "OFF";
+            
             try
             {
                 this.Process.Start();
@@ -39,12 +44,6 @@ namespace hass_workstation_service.Domain.Commands
                 Log.Logger.Error($"Sensor {this.Name} failed", e);
                 this.State = "FAILED";
             }
-            
-            while (!this.Process.HasExited)
-            {
-                await Task.Delay(1000);
-            }
-            this.State = "OFF";
         }
 
 

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

@@ -0,0 +1,17 @@
+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 HibernateCommand : CustomCommand
+    {
+        public HibernateCommand(MqttPublisher publisher, string name = "Hibernate", Guid id = default(Guid)) : base(publisher, "shutdown /h", name ?? "Hibernate", id)
+        {
+            this.State = "OFF";
+        }
+    }
+}