From e8467ddf589e1bb6231a742ff65ebf830b9c7bec Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Tue, 24 Jan 2017 17:11:39 +0100
Subject: [PATCH] Added WindowsProfile migration to GeneralProfile Added
 default profiles for OverlayProfile

---
 Artemis/Artemis/Artemis.csproj                |   9 ++--
 Artemis/Artemis/DAL/ProfileProvider.cs        |   6 +--
 .../InjectionModules/ManagerModules.cs        |   1 +
 Artemis/Artemis/Managers/MainManager.cs       |   9 ++--
 Artemis/Artemis/Managers/MigrationManager.cs  |  40 ++++++++++++++++++
 Artemis/Artemis/Properties/AssemblyInfo.cs    |   4 +-
 .../Resources/Keyboards/default-profiles.zip  | Bin 434888 -> 448148 bytes
 .../Utilities/Keyboard/KeyboardHook.cs        |  11 ++---
 Artemis/Artemis/packages.config               |   2 +-
 9 files changed, 63 insertions(+), 19 deletions(-)
 create mode 100644 Artemis/Artemis/Managers/MigrationManager.cs

diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index 4642e480e..90b14a29b 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -247,6 +247,10 @@
       <HintPath>..\packages\squirrel.windows.1.4.4\lib\Net45\NuGet.Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Open.WinKeyboardHook, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Open.WinKeyboardHook.1.0.11\lib\net45\Open.WinKeyboardHook.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Process.NET, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Process.NET.1.0.5\lib\Process.NET.dll</HintPath>
       <Private>True</Private>
@@ -298,10 +302,6 @@
       <HintPath>..\packages\WpfExceptionViewer.1.0.0.0\lib\VioletTape.WpfExceptionViewer.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="VirtualInput, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtualInput.1.0.1\lib\net20\VirtualInput.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -354,6 +354,7 @@
     <Compile Include="DeviceProviders\Logitech\Utilities\OrionUtilities.cs" />
     <Compile Include="DeviceProviders\Razer\BlackWidow.cs" />
     <Compile Include="DeviceProviders\Razer\Utilities\RazerUtilities.cs" />
+    <Compile Include="Managers\MigrationManager.cs" />
     <Compile Include="Managers\ModuleManager.cs" />
     <Compile Include="Managers\DeviceManager.cs" />
     <Compile Include="Managers\LoopManager.cs" />
diff --git a/Artemis/Artemis/DAL/ProfileProvider.cs b/Artemis/Artemis/DAL/ProfileProvider.cs
index 2721ae7d6..b1fc66710 100644
--- a/Artemis/Artemis/DAL/ProfileProvider.cs
+++ b/Artemis/Artemis/DAL/ProfileProvider.cs
@@ -21,7 +21,7 @@ namespace Artemis.DAL
     {
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        private static readonly string ProfileFolder =
+        public static readonly string ProfileFolder =
             Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Artemis\profiles";
 
         private static bool _installedDefaults;
@@ -33,7 +33,7 @@ namespace Artemis.DAL
             CheckProfiles();
             InstallDefaults();
         }
-
+        
         public static List<string> GetProfileNames(KeyboardProvider keyboard, ModuleModel module)
         {
             if (keyboard == null || module == null)
@@ -177,7 +177,7 @@ namespace Artemis.DAL
             }
         }
 
-        private static List<ProfileModel> ReadProfiles(string subDirectory)
+        public static List<ProfileModel> ReadProfiles(string subDirectory)
         {
             var profiles = new List<ProfileModel>();
             var directory = ProfileFolder + "/" + subDirectory;
diff --git a/Artemis/Artemis/InjectionModules/ManagerModules.cs b/Artemis/Artemis/InjectionModules/ManagerModules.cs
index 6f6b1c1b3..c1e788ba7 100644
--- a/Artemis/Artemis/InjectionModules/ManagerModules.cs
+++ b/Artemis/Artemis/InjectionModules/ManagerModules.cs
@@ -14,6 +14,7 @@ namespace Artemis.InjectionModules
             Bind<PreviewManager>().ToSelf().InSingletonScope();
             Bind<LuaManager>().ToSelf().InSingletonScope();
             Bind<AudioCaptureManager>().ToSelf().InSingletonScope();
+            Bind<MigrationManager>().ToSelf().InSingletonScope();
         }
     }
 }
\ No newline at end of file
diff --git a/Artemis/Artemis/Managers/MainManager.cs b/Artemis/Artemis/Managers/MainManager.cs
index c266bb4d8..dba3b4657 100644
--- a/Artemis/Artemis/Managers/MainManager.cs
+++ b/Artemis/Artemis/Managers/MainManager.cs
@@ -19,12 +19,14 @@ namespace Artemis.Managers
     /// </summary>
     public class MainManager : IDisposable
     {
+        private readonly MigrationManager _migrationManager;
         private readonly Timer _processTimer;
 
         public MainManager(ILogger logger, LoopManager loopManager, DeviceManager deviceManager,
-            ModuleManager moduleManager, PreviewManager previewManager, PipeServer pipeServer,
-            GameStateWebServer gameStateWebServer)
+            ModuleManager moduleManager, PreviewManager previewManager, MigrationManager migrationManager,
+            PipeServer pipeServer, GameStateWebServer gameStateWebServer)
         {
+            _migrationManager = migrationManager;
             Logger = logger;
             LoopManager = loopManager;
             DeviceManager = deviceManager;
@@ -111,6 +113,7 @@ namespace Artemis.Managers
             ProgramEnabled = true;
             await LoopManager.StartAsync();
 
+            _migrationManager.MigrateProfiles();
             RaiseEnabledChangedEvent(new EnabledChangedEventArgs(ProgramEnabled));
         }
 
@@ -121,10 +124,8 @@ namespace Artemis.Managers
         {
             Logger.Debug("Disabling program");
             foreach (var overlayModule in ModuleManager.OverlayModules)
-            {
                 if (overlayModule.Settings.IsEnabled)
                     overlayModule.Dispose();
-            }
             LoopManager.Stop();
             ProgramEnabled = false;
             RaiseEnabledChangedEvent(new EnabledChangedEventArgs(ProgramEnabled));
diff --git a/Artemis/Artemis/Managers/MigrationManager.cs b/Artemis/Artemis/Managers/MigrationManager.cs
new file mode 100644
index 000000000..b314b6952
--- /dev/null
+++ b/Artemis/Artemis/Managers/MigrationManager.cs
@@ -0,0 +1,40 @@
+using System.IO;
+using Artemis.DAL;
+
+namespace Artemis.Managers
+{
+    public class MigrationManager
+    {
+        private readonly DeviceManager _deviceManager;
+
+        public MigrationManager(DeviceManager deviceManager)
+        {
+            _deviceManager = deviceManager;
+        }
+
+        /// <summary>
+        ///     Migrates old versions of profiles to new versions
+        /// </summary>
+        public void MigrateProfiles()
+        {
+            // 1.8.0.0 - Rename WindowsProfile to GeneralProfile
+            foreach (var keyboardProvider in _deviceManager.KeyboardProviders)
+            {
+                var folder = ProfileProvider.ProfileFolder + "/" + keyboardProvider.Slug + "/WindowsProfile";
+                if (!Directory.Exists(folder))
+                    continue;
+
+                // Get all the profiles
+                var profiles = ProfileProvider.ReadProfiles(keyboardProvider.Slug + "/WindowsProfile");
+                foreach (var profile in profiles)
+                {
+                    // Change their GameName and save, effectively moving them to the new folder
+                    profile.GameName = "GeneralProfile";
+                    ProfileProvider.AddOrUpdate(profile);
+                }
+                // Delete the old profiles
+                Directory.Delete(folder, true);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Artemis/Artemis/Properties/AssemblyInfo.cs b/Artemis/Artemis/Properties/AssemblyInfo.cs
index 7205a0d2c..b89de5c2b 100644
--- a/Artemis/Artemis/Properties/AssemblyInfo.cs
+++ b/Artemis/Artemis/Properties/AssemblyInfo.cs
@@ -53,7 +53,7 @@ using System.Windows;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.7.1.0")]
-[assembly: AssemblyFileVersion("1.7.1.0")]
+[assembly: AssemblyVersion("1.8.0.0")]
+[assembly: AssemblyFileVersion("1.8.0.0")]
 [assembly: InternalsVisibleTo("Artemis.Explorables")]
 
diff --git a/Artemis/Artemis/Resources/Keyboards/default-profiles.zip b/Artemis/Artemis/Resources/Keyboards/default-profiles.zip
index a675632a6fb9d7f03d39c03073bb0a56ddaff366..9520a5698ed6ae6c72bd0ecbc286e4d7ed69978f 100644
GIT binary patch
delta 12494
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
XAX!8Jbkmryn6NlnFfdk6pqKv-iQeDR

delta 48
zcmbQTR{F$IsfHHD7N!>F7M2#)Eo|}u+w-g0rUr?yvM~U`A0V6>#K0gM0OA4wiQWxQ

diff --git a/Artemis/Artemis/Utilities/Keyboard/KeyboardHook.cs b/Artemis/Artemis/Utilities/Keyboard/KeyboardHook.cs
index 326552cae..13555234f 100644
--- a/Artemis/Artemis/Utilities/Keyboard/KeyboardHook.cs
+++ b/Artemis/Artemis/Utilities/Keyboard/KeyboardHook.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using VirtualInput;
+using Open.WinKeyboardHook;
 
 namespace Artemis.Utilities.Keyboard
 {
@@ -10,13 +10,14 @@ namespace Artemis.Utilities.Keyboard
 
         static KeyboardHook()
         {
-            VirtualKeyboard.StartInterceptor();
-            VirtualKeyboard.KeyDown += VirtualKeyboardOnKeyDown;
+            var interceptor = new KeyboardInterceptor();
+            interceptor.KeyDown += VirtualKeyboardOnKeyDown;
+            interceptor.StartCapturing();
         }
 
-        private static void VirtualKeyboardOnKeyDown(object sender, KeyEventArgs keyEventArgs)
+        private static async void VirtualKeyboardOnKeyDown(object sender, KeyEventArgs keyEventArgs)
         {
-            Task.Factory.StartNew(() => { KeyDownCallback?.Invoke(keyEventArgs); });
+            await Task.Factory.StartNew(() => { KeyDownCallback?.Invoke(keyEventArgs); });
         }
 
         public static event KeyDownCallbackHandler KeyDownCallback;
diff --git a/Artemis/Artemis/packages.config b/Artemis/Artemis/packages.config
index 55b725806..5afbe906d 100644
--- a/Artemis/Artemis/packages.config
+++ b/Artemis/Artemis/packages.config
@@ -23,12 +23,12 @@
   <package id="Ninject.Extensions.Logging.nlog4" version="3.2.3.0" targetFramework="net452" />
   <package id="NLog" version="4.4.1" targetFramework="net461" />
   <package id="NLog.Schema" version="4.4.1" targetFramework="net461" />
+  <package id="Open.WinKeyboardHook" version="1.0.11" targetFramework="net461" />
   <package id="Process.NET" version="1.0.5" targetFramework="net461" />
   <package id="SharpDX" version="3.1.1" targetFramework="net461" />
   <package id="SharpDX.Direct3D9" version="3.1.1" targetFramework="net461" />
   <package id="Splat" version="2.0.0" targetFramework="net461" />
   <package id="SpotifyAPI-NET" version="2.12.0" targetFramework="net461" />
   <package id="squirrel.windows" version="1.4.4" targetFramework="net461" />
-  <package id="VirtualInput" version="1.0.1" targetFramework="net452" />
   <package id="WpfExceptionViewer" version="1.0.0.0" targetFramework="net452" />
 </packages>
\ No newline at end of file