Merge pull request #23 from LegendaryB/develop

Release v1.3
LegendaryB · Sep 5, 2019 · f00a3c9 · f00a3c9
2 parents cf24569 + e3579dc
commit f00a3c9
Show file tree

Hide file tree

Showing 19 changed files with 180 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ The `appsettings.json` file resides in the same folder as the application.
     "InputPollingRate": 0
   },
   "Actions": {
+    "PreventSleep": true,
     "HideDesktopIcons": true,
     "HideTaskBar": true,
     "HideApplicationWindows": true

diff --git a/src/Kirei.Application/IInputHandler.cs b/src/Kirei.Application/IInputHandler.cs
diff --git a/src/Kirei.Application/IDesktop.cs → ...ication/System/Desktop/IDesktopService.cs b/src/Kirei.Application/IDesktop.cs → ...ication/System/Desktop/IDesktopService.cs
@@ -1,6 +1,6 @@
-namespace Kirei.Application
+namespace Kirei.Application.System.Desktop
 {
-    public interface IDesktop
+    public interface IDesktopService
     {
         void ToggleWindows();
         void ToggleIcons();

diff --git a/src/Kirei.Application/System/IHibernationService.cs b/src/Kirei.Application/System/IHibernationService.cs
@@ -0,0 +1,7 @@
+namespace Kirei.Application.System
+{
+    public interface IHibernationService
+    {
+        void PreventSleep();
+    }
+}
diff --git a/src/Kirei.Application/System/Input/IInputActionMapper.cs b/src/Kirei.Application/System/Input/IInputActionMapper.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Kirei.Application.System.Input
+{
+    public interface IInputActionMapper
+    {
+        void HandleInput();
+        void RegisterAction(Action action, Func<bool> condition);
+    }
+}
diff --git a/src/Kirei.Application/System/Input/IInputListener.cs b/src/Kirei.Application/System/Input/IInputListener.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Kirei.Application.System.Input
+{
+    public interface IInputListener
+    {
+        void Listen(IInputActionMapper inputActionMapper);
+    }
+}
diff --git a/src/Kirei.Domain/Configuration/ActionsSection.cs b/src/Kirei.Domain/Configuration/ActionsSection.cs
@@ -2,6 +2,7 @@
 {
     public class ActionsSection
     {
+        public bool PreventSleep { get; set; }
         public bool HideDesktopIcons { get; set; }
         public bool HideTaskBar { get; set; }
         public bool HideApplicationWindows { get; set; }

diff --git a/src/Kirei.Domain/Native/Enums/ExecutionStates.cs b/src/Kirei.Domain/Native/Enums/ExecutionStates.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Kirei.Domain.Native.Enums
+{
+    [Flags]
+    public enum ExecutionStates : uint
+    {
+        ES_DISPLAY_REQUIRED = 0x00000002,
+        ES_CONTINUOUS = 0x80000000
+    }
+}
diff --git a/...ei.Domain/DesktopAPI/TaskBarDescriptor.cs → ...omain/System/Desktop/TaskBarDescriptor.cs b/...ei.Domain/DesktopAPI/TaskBarDescriptor.cs → ...omain/System/Desktop/TaskBarDescriptor.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace Kirei.Domain.DesktopAPI
+namespace Kirei.Domain.System.Desktop
 {
     public class TaskBarDescriptor
     {

diff --git a/src/Kirei.Infrastructure/Native/Kernel32.cs b/src/Kirei.Infrastructure/Native/Kernel32.cs
@@ -0,0 +1,12 @@
+using Kirei.Domain.Native.Enums;
+
+using System.Runtime.InteropServices;
+
+namespace Kirei.Infrastructure.Native
+{
+    internal static class Kernel32
+    {
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        internal static extern ExecutionStates SetThreadExecutionState(ExecutionStates esFlags);
+    }
+}
diff --git a/...irei.Infrastructure/DesktopAPI/Desktop.cs → ...tructure/System/Desktop/DesktopService.cs b/...irei.Infrastructure/DesktopAPI/Desktop.cs → ...tructure/System/Desktop/DesktopService.cs
@@ -1,17 +1,17 @@
-using Kirei.Application;
+using Kirei.Application.System.Desktop;
 
-namespace Kirei.Infrastructure.DesktopAPI
+namespace Kirei.Infrastructure.System.Desktop
 {
-    public class Desktop :
-        IDesktop
+    public class DesktopService :
+        IDesktopService
     {
         private readonly Shell _shell;
         private readonly TaskBar _taskBar;
 
         private bool windowsMinimized = false;
         private bool taskBarHidden = false;
 
-        public Desktop()
+        public DesktopService()
         {
             _shell = new Shell();
             _taskBar = new TaskBar();

diff --git a/src/Kirei.Infrastructure/DesktopAPI/Shell.cs → ...ei.Infrastructure/System/Desktop/Shell.cs b/src/Kirei.Infrastructure/DesktopAPI/Shell.cs → ...ei.Infrastructure/System/Desktop/Shell.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Kirei.Infrastructure.DesktopAPI
+namespace Kirei.Infrastructure.System.Desktop
 {
     internal class Shell
     {

diff --git a/...irei.Infrastructure/DesktopAPI/TaskBar.cs → ....Infrastructure/System/Desktop/TaskBar.cs b/...irei.Infrastructure/DesktopAPI/TaskBar.cs → ....Infrastructure/System/Desktop/TaskBar.cs
@@ -1,12 +1,13 @@
 using Kirei.Infrastructure.Native;
 using Kirei.Domain.Native.Enums;
 using Kirei.Domain.Native.Structures;
-using Kirei.Domain.DesktopAPI;
+using Kirei.Domain.System.Desktop;
 
 using System;
 using System.Collections.Generic;
 
-namespace Kirei.Infrastructure.DesktopAPI
+
+namespace Kirei.Infrastructure.System.Desktop
 {
     internal class TaskBar
     {

diff --git a/src/Kirei.Infrastructure/System/HibernationService.cs b/src/Kirei.Infrastructure/System/HibernationService.cs
@@ -0,0 +1,27 @@
+using Kirei.Application.System;
+using Kirei.Domain.Native.Enums;
+using Kirei.Infrastructure.Native;
+
+using System.Threading.Tasks;
+
+namespace Kirei.Infrastructure.System
+{
+    public class HibernationService : IHibernationService
+    {
+        public void PreventSleep()
+        {
+            Task.Run(async () =>
+            {
+                while (true)
+                {
+                    Kernel32.SetThreadExecutionState(
+                      ExecutionStates.ES_CONTINUOUS |
+                      ExecutionStates.ES_DISPLAY_REQUIRED);
+
+                    await Task.Delay(5000);
+                }
+            });
+        }
+
+    }
+}
diff --git a/src/Kirei.Infrastructure/System/Input/InputActionMapper.cs b/src/Kirei.Infrastructure/System/Input/InputActionMapper.cs
@@ -0,0 +1,33 @@
+using Kirei.Application.System.Input;
+
+using System;
+using System.Collections.Generic;
+
+namespace Kirei.Infrastructure.System.Input
+{
+    public class InputActionMapper : IInputActionMapper
+    {
+        private readonly List<Action> _actionsOnInput;
+
+        public InputActionMapper()
+        {
+            _actionsOnInput = new List<Action>();
+        }
+
+        public void HandleInput()
+        {
+            foreach (var action in _actionsOnInput)
+                action?.Invoke();
+        }
+
+        public void RegisterAction(
+            Action action,
+            Func<bool> condition)
+        {
+            if (action == null || condition?.Invoke() != true)
+                return;
+
+            _actionsOnInput.Add(action);
+        }
+    }
+}
diff --git a/src/Kirei.Infrastructure/InputHandler.cs → ...rastructure/System/Input/InputListener.cs b/src/Kirei.Infrastructure/InputHandler.cs → ...rastructure/System/Input/InputListener.cs
@@ -1,36 +1,36 @@
-using Kirei.Application;
+using Kirei.Application.System.Input;
 using Kirei.Infrastructure.Configuration;
 using Kirei.Infrastructure.Native;
 
-using System;
 using System.Threading;
 
-namespace Kirei.Infrastructure
+namespace Kirei.Infrastructure.System.Input
 {
-    public class InputHandler :
-        IInputHandler
+    public class InputListener :
+        IInputListener
     {
+        private IInputActionMapper _inputActionMapper;
         private bool hasIconsBeenHidden = false;
 
-        public Action Handler { get; set; }
-
-        public void Handle()
+        public void Listen(IInputActionMapper inputActionMapper)
         {
+            _inputActionMapper = inputActionMapper;
+
             while (true)
             {
                 var lastInputInMilliseconds = User32.GetUserIdleTime();
                 var inactiveAfterMs = ConfigurationProvider.Configuration.Application.InactiveAfterMs;
 
                 if (lastInputInMilliseconds >= inactiveAfterMs && !hasIconsBeenHidden)
                 {
-                    Handler?.Invoke();
+                    _inputActionMapper.HandleInput();
                     hasIconsBeenHidden = true;
                 }
                 else if (lastInputInMilliseconds < inactiveAfterMs && hasIconsBeenHidden)
                 {
-                    Handler?.Invoke();
+                    _inputActionMapper.HandleInput();
                     hasIconsBeenHidden = false;
-                }
+                }                
 
                 Thread.Sleep(ConfigurationProvider.Configuration.Application.InputPollingRate);
             }

diff --git a/src/Kirei/App.cs b/src/Kirei/App.cs
@@ -1,42 +1,57 @@
 using Kirei.Application;
+using Kirei.Application.System;
+using Kirei.Application.System.Desktop;
+using Kirei.Application.System.Input;
 using Kirei.Infrastructure.Configuration;
 
 namespace Kirei
 {
     internal class App
     {
-        private readonly IInstallWizard _installWizard;
-        private readonly IDesktop _desktopAPI;
-        private readonly IInputHandler _inputHandler;
+        private readonly IInstallWizard _installWizard;        
+        private readonly IInputListener _inputListener;
+        private readonly IInputActionMapper _inputActionMapper;
+        private readonly IDesktopService _desktopService;
+        private readonly IHibernationService _hibernationService;
 
         public App(IInstallWizard installWizard,
-            IDesktop desktopAPI,
-            IInputHandler inputHandler)
+            IInputListener inputListener,
+            IInputActionMapper inputActionMapper,
+            IDesktopService desktopService,
+            IHibernationService hibernationService)
         {
-            _installWizard = installWizard;
-            _desktopAPI = desktopAPI;
-            _inputHandler = inputHandler;
+            _installWizard = installWizard;            
+            _inputListener = inputListener;
+            _inputActionMapper = inputActionMapper;
+            _desktopService = desktopService;
+            _hibernationService = hibernationService;
         }
 
         internal void Run()
         {
             if (ConfigurationProvider.Configuration.Application.ShouldRunOnStartup)
                 _installWizard.RunOnStartup();
 
-            _inputHandler.Handler = OnUserActiveOrInactive;
-            _inputHandler.Handle();
-        }
+            var cfg = ConfigurationProvider
+                .Configuration
+                .Actions;
 
-        private void OnUserActiveOrInactive()
-        {
-            if (ConfigurationProvider.Configuration.Actions.HideDesktopIcons)
-                _desktopAPI.ToggleIcons();
+            _inputActionMapper.RegisterAction(
+                _desktopService.ToggleIcons, 
+                () => cfg.HideDesktopIcons);
+
+            _inputActionMapper.RegisterAction(
+                _desktopService.ToggleTaskBar,
+                () => cfg.HideTaskBar);
+
+            _inputActionMapper.RegisterAction(
+                _desktopService.ToggleWindows,
+                () => cfg.HideApplicationWindows);
 
-            if (ConfigurationProvider.Configuration.Actions.HideTaskBar)
-                _desktopAPI.ToggleTaskBar();
+            if (cfg.PreventSleep)
+                _hibernationService.PreventSleep();
 
-            if (ConfigurationProvider.Configuration.Actions.HideApplicationWindows)
-                _desktopAPI.ToggleWindows();
+            _inputListener.Listen(_inputActionMapper);
         }
     }
 }
diff --git a/src/Kirei/Program.cs b/src/Kirei/Program.cs
@@ -1,6 +1,11 @@
 using Kirei.Application;
+using Kirei.Application.System;
+using Kirei.Application.System.Desktop;
+using Kirei.Application.System.Input;
 using Kirei.Infrastructure;
-using Kirei.Infrastructure.DesktopAPI;
+using Kirei.Infrastructure.System;
+using Kirei.Infrastructure.System.Desktop;
+using Kirei.Infrastructure.System.Input;
 
 using Microsoft.Extensions.DependencyInjection;
 
@@ -20,8 +25,10 @@ private static ServiceProvider ConfigureServices()
         {
             return new ServiceCollection()
                 .AddSingleton<IInstallWizard, InstallWizard>()
-                .AddSingleton<IDesktop, Desktop>()
-                .AddSingleton<IInputHandler, InputHandler>()
+                .AddSingleton<IDesktopService, DesktopService>()
+                .AddSingleton<IInputActionMapper, InputActionMapper>()
+                .AddSingleton<IInputListener, InputListener>()
+                .AddSingleton<IHibernationService, HibernationService>()
                 .AddSingleton<App>()
                 .BuildServiceProvider();
         }

diff --git a/src/Kirei/appsettings.json b/src/Kirei/appsettings.json
@@ -1,10 +1,11 @@
 {
   "Application": {
     "ShouldRunOnStartup": true,
-    "InactiveAfter": 0,
+    "InactiveAfter": 5,
     "InputPollingRate": 0
   },
   "Actions": {
+    "PreventSleep":  true,
     "HideDesktopIcons": true,
     "HideTaskBar": true,
     "HideApplicationWindows": true