Merge pull request r00telement#21 from zakuciael/master

AutoUpdater changes + code cleanup
dannylin0711 · Feb 7, 2020 · 17072f5 · 17072f5
2 parents 87c69b1 + 8ca7e4b
commit 17072f5
Show file tree

Hide file tree

Showing 45 changed files with 170 additions and 151 deletions.
diff --git a/SmartHunter/App.xaml.cs b/SmartHunter/App.xaml.cs
@@ -1,13 +1,15 @@
-using SmartHunter.Core;
-using SmartHunter.Game;
-using SmartHunter.Game.Data.ViewModels;
-using SmartHunter.Game.Helpers;
-using SmartHunter.Ui.Windows;
-using System;
+using System;
 using System.IO;
 using System.Reflection;
+using System.Text;
 using System.Windows;
 using System.Xaml;
+using SmartHunter.Core;
+using SmartHunter.Game;
+using SmartHunter.Game.Data.ViewModels;
+using SmartHunter.Game.Helpers;
+using SmartHunter.Ui.Windows;
+using XamlReader = System.Windows.Markup.XamlReader;
 
 namespace SmartHunter
 {
@@ -42,28 +44,17 @@ protected override void OnStartup(StartupEventArgs e)
             try
             {
                 string[] files = Directory.GetFiles(".");
-                string v = ConfigHelper.Versions.Values.SmartHunter;
                 foreach (string file in files)
                 {
-                    if (Path.GetExtension(file).Equals(".exe"))
+                    if (Path.GetExtension(file).Equals(".exe") && file.Contains("SmartHunter_"))
                     {
-                        if (file.Contains("SmartHunter_"))
-                        {
-                            if (!file.Contains(v))
-                            {
-                                File.Delete(file);
-                            }
-                        }
-                        else if (file.Contains("SmartHunter"))
-                        {
-                            File.Delete(file); // i feel dirty for this but didn't want to do something else :P
-                        }
+                        File.Delete(file);
                     }
                 }
             }
             catch
             {
-
+                
             }
 
             m_Overlay = new MhwOverlay(new ConsoleWindow(), new TeamWidgetWindow(), new MonsterWidgetWindow(), new PlayerWidgetWindow());
@@ -105,16 +96,16 @@ void LoadSkin()
             {
                 ResourceDictionary resourceDictionary = null;
 
-                using (var streamReader = new StreamReader(m_SkinFile.FullPathFileName, System.Text.Encoding.UTF8))
+                using (var streamReader = new StreamReader(m_SkinFile.FullPathFileName, Encoding.UTF8))
                 {
                     var xmlReaderSettings = new XamlXmlReaderSettings
                     {
                         LocalAssembly = Assembly.GetExecutingAssembly()
                     };
 
-                    using (var xamlReader = new XamlXmlReader(streamReader.BaseStream, System.Windows.Markup.XamlReader.GetWpfSchemaContext(), xmlReaderSettings))
+                    using (var xamlReader = new XamlXmlReader(streamReader.BaseStream, XamlReader.GetWpfSchemaContext(), xmlReaderSettings))
                     {
-                        resourceDictionary = System.Windows.Markup.XamlReader.Load(xamlReader) as ResourceDictionary;
+                        resourceDictionary = XamlReader.Load(xamlReader) as ResourceDictionary;
                     }
                 }
 

diff --git a/SmartHunter/Core/AddressRange.cs b/SmartHunter/Core/AddressRange.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace SmartHunter.Core
+namespace SmartHunter.Core
 {
     public class AddressRange
     {

diff --git a/SmartHunter/Core/BytePattern.cs b/SmartHunter/Core/BytePattern.cs
@@ -1,7 +1,7 @@
-using SmartHunter.Game.Config;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
+using SmartHunter.Game.Config;
 
 namespace SmartHunter.Core
 {

diff --git a/SmartHunter/Core/Config/ConfigContainer.cs b/SmartHunter/Core/Config/ConfigContainer.cs
@@ -1,7 +1,10 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
+using System;
+using System.ComponentModel;
 using System.IO;
+using System.Text;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;
 
 namespace SmartHunter.Core.Config
 {
@@ -13,14 +16,14 @@ public class ConfigContainer<T> : FileContainer
 
         public ConfigContainer(string fileName) : base(fileName)
         {
-            bool isDesignInstance = System.ComponentModel.LicenseManager.UsageMode == System.ComponentModel.LicenseUsageMode.Designtime;
+            bool isDesignInstance = LicenseManager.UsageMode == LicenseUsageMode.Designtime;
             if (!isDesignInstance)
             {
                 Load();
             }
         }
 
-        public void HandleDeserializationError(object sender, Newtonsoft.Json.Serialization.ErrorEventArgs args)
+        public void HandleDeserializationError(object sender, ErrorEventArgs args)
         {
             Log.WriteException(args.ErrorContext.Error);
             args.ErrorContext.Handled = true;
@@ -40,7 +43,7 @@ void Load()
                     string contents = null;
                     using (FileStream stream = File.Open(FullPathFileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                     {
-                        using (StreamReader reader = new StreamReader(stream, System.Text.Encoding.UTF8))
+                        using (StreamReader reader = new StreamReader(stream, Encoding.UTF8))
                         {
                             contents = reader.ReadToEnd();
                         }
@@ -56,7 +59,7 @@ void Load()
                     // https://stackoverflow.com/questions/27848547/explanation-for-objectcreationhandling-using-newtonsoft-json
                     // This has been moved to ContractResolver to target Dictionaries specifically
                     // settings.ObjectCreationHandling = ObjectCreationHandling.Replace;
-                    settings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
+                    settings.Converters.Add(new StringEnumConverter());
                     settings.Converters.Add(new StringFloatConverter());
 
                     JsonConvert.PopulateObject(contents, Values, settings);
@@ -90,7 +93,7 @@ public void Save()
                 settings.NullValueHandling = NullValueHandling.Ignore;
                 settings.ContractResolver = new ContractResolver();
 
-                settings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
+                settings.Converters.Add(new StringEnumConverter());
                 settings.Converters.Add(new StringFloatConverter());
 
                 var jsonString = JsonConvert.SerializeObject(Values, settings);

diff --git a/SmartHunter/Core/Config/ContractResolver.cs b/SmartHunter/Core/Config/ContractResolver.cs
@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 
 namespace SmartHunter.Core.Config
 {

diff --git a/SmartHunter/Core/Config/StringFloatConverter.cs b/SmartHunter/Core/Config/StringFloatConverter.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Globalization;
+using Newtonsoft.Json;
 
 namespace SmartHunter.Core.Config
 {

diff --git a/SmartHunter/Core/Data/Bindable.cs b/SmartHunter/Core/Data/Bindable.cs
@@ -16,7 +16,7 @@ public void NotifyPropertyChanged(string propertyName)
 
         protected bool SetProperty<T>(ref T storage, T value, [CallerMemberName] string propertyName = null)
         {
-            if (object.Equals(storage, value))
+            if (Equals(storage, value))
             {
                 return false;
             }

diff --git a/SmartHunter/Core/FileContainer.cs b/SmartHunter/Core/FileContainer.cs
@@ -1,5 +1,7 @@
 using System;
+using System.ComponentModel;
 using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 using System.Windows;
 
@@ -33,7 +35,7 @@ public FileContainer(string fileName)
         {
             FileName = fileName;
 
-            bool isDesignInstance = System.ComponentModel.LicenseManager.UsageMode == System.ComponentModel.LicenseUsageMode.Designtime;
+            bool isDesignInstance = LicenseManager.UsageMode == LicenseUsageMode.Designtime;
             if (!isDesignInstance)
             {
                 WatchFile(true);
@@ -127,7 +129,7 @@ virtual protected void OnChanged() { }
 
         public static string GetFullPath()
         {
-            return Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase).Replace("file:\\", "") + "\\";
+            return Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetName().CodeBase).Replace("file:\\", "") + "\\";
         }
 
         public static string GetFullPathFileName(string fileName)

diff --git a/SmartHunter/Core/Helpers/MemoryHelper.cs b/SmartHunter/Core/Helpers/MemoryHelper.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace SmartHunter.Core.Helpers
 {    
@@ -256,7 +257,7 @@ public static string ReadString(Process process, ulong address, uint length)
             if (nullTerminatorIndex >= 0)
             {
                 Array.Resize(ref bytes, nullTerminatorIndex);
-                return System.Text.Encoding.UTF8.GetString(bytes);
+                return Encoding.UTF8.GetString(bytes);
             }
 
             return null;

diff --git a/SmartHunter/Core/Helpers/Updater.cs b/SmartHunter/Core/Helpers/Updater.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net;
 using Newtonsoft.Json.Linq;
-using System.IO;
 using SmartHunter.Game.Helpers;
 
 namespace SmartHunter.Core.Helpers
@@ -82,7 +82,7 @@ public bool DownloadUpdates()
                         client.Headers["User-Agent"] = _dummyUserAgent;
                         if (Path.GetExtension(fileNamePath).Equals(".exe"))
                         {
-                            client.DownloadFile(url, $"{fileNamePathWithNoExtension}_{hash}.exe");
+                            client.DownloadFile(url, $"{fileNamePathWithNoExtension}_NEW.exe");
                         }
                         else
                         {

diff --git a/SmartHunter/Core/Log.cs b/SmartHunter/Core/Log.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.IO;
 using System.Security.AccessControl;
 
@@ -20,7 +21,7 @@ public static void WriteLine(string message)
                 LineReceived(null, new GenericEventArgs<string>(line));
             }
 
-            bool isDesignInstance = System.ComponentModel.LicenseManager.UsageMode == System.ComponentModel.LicenseUsageMode.Designtime;
+            bool isDesignInstance = LicenseManager.UsageMode == LicenseUsageMode.Designtime;
             if (!isDesignInstance)
             {
                 try

diff --git a/SmartHunter/Core/MemoryUpdater.cs b/SmartHunter/Core/MemoryUpdater.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
+using System.Reflection;
 using System.Windows;
 using System.Windows.Threading;
-using System.Net;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System.IO;
 using SmartHunter.Core.Helpers;
 using SmartHunter.Game.Helpers;
 
@@ -131,12 +128,15 @@ void CreateStateMachine()
                         () =>
                         {
                             Log.WriteLine("Restarting Application!");
-                            string file = $".\\SmartHunter_{ConfigHelper.Versions.Values.SmartHunter}.exe";
-                            if (File.Exists(file))
+                            string update = ".\\SmartHunter_NEW.exe";
+                            string exec = Assembly.GetEntryAssembly()?.Location;
+                            if (File.Exists(update) && exec != null && File.Exists(exec))
                             {
-                               Process.Start(file);
+                                File.Move(exec, "SmartHunter_OLD.exe");
+                                File.Move(update, "SmartHunter.exe");
+                                Process.Start("SmartHunter.exe");
                             }
-                            System.Environment.Exit(1);
+                            Environment.Exit(1);
                         })
                }));
 
@@ -290,7 +290,7 @@ private void Initialize(bool processExited = false)
             if (processExited && ShutdownWhenProcessExits)
             {
                 Log.WriteLine("Process exited. Shutting down.");
-                System.Windows.Application.Current.Shutdown();
+                Application.Current.Shutdown();
             }
         }
 

diff --git a/SmartHunter/Core/Overlay.cs b/SmartHunter/Core/Overlay.cs
@@ -1,7 +1,8 @@
-using SmartHunter.Core.Helpers;
-using SmartHunter.Core.Windows;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Input;
+using SmartHunter.Core.Helpers;
+using SmartHunter.Core.Windows;
 
 namespace SmartHunter.Core
 {
@@ -31,7 +32,7 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
             UpdateWidgetsFromConfig();
         }
 
-        private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        private void MainWindow_Closing(object sender, CancelEventArgs e)
         {
             foreach (var widgetWindow in WidgetWindows)
             {

diff --git a/SmartHunter/Core/ThreadedMemoryScan.cs b/SmartHunter/Core/ThreadedMemoryScan.cs
@@ -1,11 +1,11 @@
-using SmartHunter.Core.Helpers;
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using SmartHunter.Core.Helpers;
 
 namespace SmartHunter.Core
 {

diff --git a/SmartHunter/Core/Windows/WidgetWindow.cs b/SmartHunter/Core/Windows/WidgetWindow.cs
@@ -1,7 +1,7 @@
-using SmartHunter.Core.Data;
-using System;
+using System;
 using System.Windows;
 using System.Windows.Input;
+using SmartHunter.Core.Data;
 
 namespace SmartHunter.Core.Windows
 {

diff --git a/SmartHunter/Game/Config/LocalizationConfig.cs b/SmartHunter/Game/Config/LocalizationConfig.cs
@@ -1,5 +1,5 @@
-using SmartHunter.Core.Config;
 using System.Collections.Generic;
+using SmartHunter.Core.Config;
 
 namespace SmartHunter.Config
 {

diff --git a/SmartHunter/Game/Config/MainConfig.cs b/SmartHunter/Game/Config/MainConfig.cs
@@ -1,6 +1,6 @@
-using SmartHunter.Core.Config;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Windows.Input;
+using SmartHunter.Core.Config;
 
 namespace SmartHunter.Game.Config
 {

diff --git a/SmartHunter/Game/Config/MonsterWidgetConfig.cs b/SmartHunter/Game/Config/MonsterWidgetConfig.cs
@@ -1,5 +1,5 @@
-using SmartHunter.Core.Config;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
+using SmartHunter.Core.Config;
 
 namespace SmartHunter.Game.Config
 {

diff --git a/SmartHunter/Game/Config/PlayerWidgetConfig.cs b/SmartHunter/Game/Config/PlayerWidgetConfig.cs
@@ -1,5 +1,5 @@
-using SmartHunter.Core.Config;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
+using SmartHunter.Core.Config;
 
 namespace SmartHunter.Game.Config
 {

diff --git a/SmartHunter/Game/Data/Monster.cs b/SmartHunter/Game/Data/Monster.cs
@@ -1,10 +1,10 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
 using SmartHunter.Core;
 using SmartHunter.Core.Data;
 using SmartHunter.Game.Config;
 using SmartHunter.Game.Helpers;
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
 
 namespace SmartHunter.Game.Data
 {