Merge pull request #119 from theClueless/deploymentUpdates

jjw24 · web-flow · commit f39144cc51df · 2020-01-15T09:08:45.000+11:00
Auto update improvements: Updater
diff --git a/Wox.Core/Updater.cs b/Wox.Core/Updater.cs
@@ -16,18 +16,23 @@
 
 namespace Wox.Core
 {
-    public static class Updater
+    public class Updater
     {
-        private static readonly Internationalization Translater = InternationalizationManager.Instance;
+        public string GitHubRepository { get; }
 
-        public static async Task UpdateApp()
+        public Updater(string gitHubRepository)
+        {
+            GitHubRepository = gitHubRepository;
+        }
+
+        public async Task UpdateApp()
         {
             UpdateManager m;
             UpdateInfo u;
 
             try
             {
-                m = await GitHubUpdateManager(Constant.Repository);
+                m = await GitHubUpdateManager(GitHubRepository);
             }
             catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException)
             {
@@ -66,8 +71,8 @@ public static async Task UpdateApp()
                 await m.ApplyReleases(u);
                 await m.CreateUninstallerRegistryEntry();
 
-                var newVersionTips = Translater.GetTranslation("newVersionTips");
-                newVersionTips = string.Format(newVersionTips, fr.Version);
+                var newVersionTips = this.NewVersinoTips(fr.Version.ToString());
+                
                 MessageBox.Show(newVersionTips);
                 Log.Info($"|Updater.UpdateApp|Update success:{newVersionTips}");
             }
@@ -90,7 +95,7 @@ private class GithubRelease
         }
 
         /// https://github.com/Squirrel/Squirrel.Windows/blob/master/src/Squirrel/UpdateManager.Factory.cs
-        private static async Task<UpdateManager> GitHubUpdateManager(string repository)
+        private async Task<UpdateManager> GitHubUpdateManager(string repository)
         {
             var uri = new Uri(repository);
             var api = $"https://api.github.com/repos{uri.AbsolutePath}/releases";
@@ -109,7 +114,7 @@ private static async Task<UpdateManager> GitHubUpdateManager(string repository)
             return manager;
         }
 
-        public static string NewVersinoTips(string version)
+        public string NewVersinoTips(string version)
         {
             var translater = InternationalizationManager.Instance;
             var tips = string.Format(translater.GetTranslation("newVersionTips"), version);
diff --git a/Wox.Infrastructure/Http/Http.cs b/Wox.Infrastructure/Http/Http.cs
@@ -13,6 +13,16 @@ public static class Http
     {
         private const string UserAgent = @"Mozilla/5.0 (Trident/7.0; rv:11.0) like Gecko";
 
+        static Http()
+        {
+            // need to be added so it would work on a win10 machine
+            ServicePointManager.Expect100Continue = true;
+            ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls
+                                                    | SecurityProtocolType.Tls11
+                                                    | SecurityProtocolType.Tls12
+                                                    | SecurityProtocolType.Ssl3;
+        }
+
         public static HttpProxy Proxy { private get; set; }
         public static IWebProxy WebProxy()
         {
diff --git a/Wox.Infrastructure/Logger/Log.cs b/Wox.Infrastructure/Logger/Log.cs
@@ -11,18 +11,20 @@ public static class Log
     {
         public const string DirectoryName = "Logs";
 
+        public static string CurrentLogDirectory { get; private set; }
+
         static Log()
         {
-            var path = Path.Combine(Constant.DataDirectory, DirectoryName, Constant.Version);
-            if (!Directory.Exists(path))
+            CurrentLogDirectory = Path.Combine(Constant.DataDirectory, DirectoryName, Constant.Version);
+            if (!Directory.Exists(CurrentLogDirectory))
             {
-                Directory.CreateDirectory(path);
+                Directory.CreateDirectory(CurrentLogDirectory);
             }
 
             var configuration = new LoggingConfiguration();
             var target = new FileTarget();
             configuration.AddTarget("file", target);
-            target.FileName = path.Replace(@"\", "/") + "/${shortdate}.txt";
+            target.FileName = CurrentLogDirectory.Replace(@"\", "/") + "/${shortdate}.txt";
 #if DEBUG
             var rule = new LoggingRule("*", LogLevel.Debug, target);
 #else
diff --git a/Wox.Infrastructure/Wox.cs b/Wox.Infrastructure/Wox.cs
@@ -29,7 +29,6 @@ public static string DetermineDataDirectory()
         public static readonly string DataDirectory = DetermineDataDirectory();
         public static readonly string PluginsDirectory = Path.Combine(DataDirectory, Plugins);
         public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins);
-        public const string Repository = "https://github.com/Wox-launcher/Wox";
         public const string Issue = "https://github.com/Wox-launcher/Wox/issues/new";
         public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
 
diff --git a/Wox/App.config b/Wox/App.config
@@ -1,7 +1,19 @@
 ﻿<?xml version="1.0"?>
 <configuration>
   <!--https://msdn.microsoft.com/en-us/library/dd409252(v=vs.110).aspx-->
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+      <section name="Wox.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
   <runtime>
     <loadFromRemoteSources enabled="true"/>
   </runtime>
+  <applicationSettings>
+    <Wox.Properties.Settings>
+      <setting name="GithubRepo" serializeAs="String">
+        <value>https://github.com/Wox-launcher/Wox</value>
+      </setting>
+    </Wox.Properties.Settings>
+  </applicationSettings>
 </configuration>
diff --git a/Wox/App.xaml.cs b/Wox/App.xaml.cs
@@ -25,6 +25,7 @@ public partial class App : IDisposable, ISingleInstanceApp
         private Settings _settings;
         private MainViewModel _mainVM;
         private SettingWindowViewModel _settingsVM;
+        private readonly Updater _updater = new Updater(Wox.Properties.Settings.Default.GithubRepo);
 
         [STAThread]
         public static void Main()
@@ -50,7 +51,7 @@ private void OnStartup(object sender, StartupEventArgs e)
 
                 ImageLoader.Initialize();
 
-                _settingsVM = new SettingWindowViewModel();
+                _settingsVM = new SettingWindowViewModel(_updater);
                 _settings = _settingsVM.Settings;
 
                 Alphabet.Initialize(_settings);
@@ -111,12 +112,12 @@ private void AutoUpdates()
                     var timer = new Timer(1000 * 60 * 60 * 5);
                     timer.Elapsed += async (s, e) =>
                     {
-                        await Updater.UpdateApp();
+                        await _updater.UpdateApp();
                     };
                     timer.Start();
 
                     // check updates on startup
-                    await Updater.UpdateApp();
+                    await _updater.UpdateApp();
                 }
             });
         }
diff --git a/Wox/Properties/Settings.Designer.cs b/Wox/Properties/Settings.Designer.cs
diff --git a/Wox/Properties/Settings.settings b/Wox/Properties/Settings.settings
@@ -1,7 +1,9 @@
 ﻿<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:_settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Wox.Properties" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="GithubRepo" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">https://github.com/Wox-launcher/Wox</Value>
+    </Setting>
+  </Settings>
 </SettingsFile>
diff --git a/Wox/ReportWindow.xaml.cs b/Wox/ReportWindow.xaml.cs
@@ -23,7 +23,7 @@ public ReportWindow(Exception exception)
 
         private void SetException(Exception exception)
         {
-            string path = Path.Combine(Constant.DataDirectory, Log.DirectoryName, Constant.Version);
+            string path = Log.CurrentLogDirectory;
             var directory = new DirectoryInfo(path);
             var log = directory.GetFiles().OrderByDescending(f => f.LastWriteTime).First();
 
diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs
@@ -260,53 +260,16 @@ private void OnPluginDirecotyClick(object sender, MouseButtonEventArgs e)
         #region Proxy
 
         private void OnTestProxyClick(object sender, RoutedEventArgs e)
-        {
-            if (string.IsNullOrEmpty(_settings.Proxy.Server))
-            {
-                MessageBox.Show(InternationalizationManager.Instance.GetTranslation("serverCantBeEmpty"));
-                return;
-            }
-            if (_settings.Proxy.Port <= 0)
-            {
-                MessageBox.Show(InternationalizationManager.Instance.GetTranslation("portCantBeEmpty"));
-                return;
-            }
-
-            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Infrastructure.Constant.Repository);
-            if (string.IsNullOrEmpty(_settings.Proxy.UserName) || string.IsNullOrEmpty(_settings.Proxy.Password))
-            {
-                request.Proxy = new WebProxy(_settings.Proxy.Server, _settings.Proxy.Port);
-            }
-            else
-            {
-                request.Proxy = new WebProxy(_settings.Proxy.Server, _settings.Proxy.Port)
-                {
-                    Credentials = new NetworkCredential(_settings.Proxy.UserName, _settings.Proxy.Password)
-                };
-            }
-            try
-            {
-                var response = (HttpWebResponse)request.GetResponse();
-                if (response.StatusCode == HttpStatusCode.OK)
-                {
-                    MessageBox.Show(InternationalizationManager.Instance.GetTranslation("proxyIsCorrect"));
-                }
-                else
-                {
-                    MessageBox.Show(InternationalizationManager.Instance.GetTranslation("proxyConnectFailed"));
-                }
-            }
-            catch
-            {
-                MessageBox.Show(InternationalizationManager.Instance.GetTranslation("proxyConnectFailed"));
-            }
+        { // TODO: change to command
+            var msg = _viewModel.TestProxy();
+            MessageBox.Show(msg); // TODO: add message box service
         }
 
         #endregion
 
         private async void OnCheckUpdates(object sender, RoutedEventArgs e)
         {
-            await Updater.UpdateApp();
+            _viewModel.UpdateApp(); // TODO: change to command
         }
 
         private void OnRequestNavigate(object sender, RequestNavigateEventArgs e)
diff --git a/Wox/Settings.cs b/Wox/Settings.cs
@@ -0,0 +1,28 @@
+﻿namespace Wox.Properties {
+    
+    
+    // This class allows you to handle specific events on the settings class:
+    //  The SettingChanging event is raised before a setting's value is changed.
+    //  The PropertyChanged event is raised after a setting's value is changed.
+    //  The SettingsLoaded event is raised after the setting values are loaded.
+    //  The SettingsSaving event is raised before the setting values are saved.
+    internal sealed partial class Settings {
+        
+        public Settings() {
+            // // To add event handlers for saving and changing settings, uncomment the lines below:
+            //
+            // this.SettingChanging += this.SettingChangingEventHandler;
+            //
+            // this.SettingsSaving += this.SettingsSavingEventHandler;
+            //
+        }
+        
+        private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) {
+            // Add code to handle the SettingChangingEvent event here.
+        }
+        
+        private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
+            // Add code to handle the SettingsSaving event here.
+        }
+    }
+}
diff --git a/Wox/ViewModel/SettingWindowViewModel.cs b/Wox/ViewModel/SettingWindowViewModel.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -20,10 +21,12 @@ namespace Wox.ViewModel
 {
     public class SettingWindowViewModel : BaseModel
     {
+        private readonly Updater _updater;
         private readonly WoxJsonStorage<Settings> _storage;
 
-        public SettingWindowViewModel()
+        public SettingWindowViewModel(Updater updater)
         {
+            _updater = updater;
             _storage = new WoxJsonStorage<Settings>();
             Settings = _storage.Load();
             Settings.PropertyChanged += (s, e) =>
@@ -39,6 +42,10 @@ public SettingWindowViewModel()
 
         public Settings Settings { get; set; }
 
+        public async void UpdateApp()
+        {
+            await _updater.UpdateApp();
+        }
 
         public void Save()
         {
@@ -88,6 +95,50 @@ public List<string> QuerySearchPrecisionStrings
         public List<Language> Languages => _translater.LoadAvailableLanguages();
         public IEnumerable<int> MaxResultsRange => Enumerable.Range(2, 16);
 
+        public string TestProxy()
+        {
+            var proxyServer = Settings.Proxy.Server;
+            var proxyUserName = Settings.Proxy.UserName;
+            if (string.IsNullOrEmpty(proxyServer))
+            {
+                return InternationalizationManager.Instance.GetTranslation("serverCantBeEmpty");
+            }
+            if (Settings.Proxy.Port <= 0)
+            {
+                return InternationalizationManager.Instance.GetTranslation("portCantBeEmpty");
+            }
+
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(_updater.GitHubRepository);
+            
+            if (string.IsNullOrEmpty(proxyUserName) || string.IsNullOrEmpty(Settings.Proxy.Password))
+            {
+                request.Proxy = new WebProxy(proxyServer, Settings.Proxy.Port);
+            }
+            else
+            {
+                request.Proxy = new WebProxy(proxyServer, Settings.Proxy.Port)
+                {
+                    Credentials = new NetworkCredential(proxyUserName, Settings.Proxy.Password)
+                };
+            }
+            try
+            {
+                var response = (HttpWebResponse)request.GetResponse();
+                if (response.StatusCode == HttpStatusCode.OK)
+                {
+                    return InternationalizationManager.Instance.GetTranslation("proxyIsCorrect");
+                }
+                else
+                {
+                    return InternationalizationManager.Instance.GetTranslation("proxyConnectFailed");
+                }
+            }
+            catch
+            {
+                return InternationalizationManager.Instance.GetTranslation("proxyConnectFailed");
+            }
+        }
+
         #endregion
 
         #region plugin
@@ -220,7 +271,7 @@ public ResultsViewModel PreviewResults
                     },
                     new Result
                     {
-                        Title = $"Open Source: {Constant.Repository}",
+                        Title = $"Open Source: {_updater.GitHubRepository}",
                         SubTitle = "Please star it!"
                     }
                 };
@@ -330,8 +381,8 @@ public FamilyTypeface SelectedResultFontFaces
 
         #region about
 
-        public static string Github => Constant.Repository;
-        public static string ReleaseNotes => @"https://github.com/Wox-launcher/Wox/releases/latest";
+        public string Github => _updater.GitHubRepository;
+        public string ReleaseNotes => _updater.GitHubRepository +  @"/releases/latest";
         public static string Version => Constant.Version;
         public string ActivatedTimes => string.Format(_translater.GetTranslation("about_activate_times"), Settings.ActivateTimes);
         #endregion
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj

Original file line number	Diff line number	Diff line change
`@@ -16,18 +16,23 @@`
`16`	`16`
`17`	`17`	`namespace Wox.Core`
`18`	`18`	`{`
`19`		`- public static class Updater`
	`19`	`+ public class Updater`
`20`	`20`	`{`
`21`		`- private static readonly Internationalization Translater = InternationalizationManager.Instance;`
	`21`	`+ public string GitHubRepository { get; }`
`22`	`22`
`23`		`- public static async Task UpdateApp()`
	`23`	`+ public Updater(string gitHubRepository)`
	`24`	`+ {`
	`25`	`+ GitHubRepository = gitHubRepository;`
	`26`	`+ }`
	`27`	`+`
	`28`	`+ public async Task UpdateApp()`
`24`	`29`	`{`
`25`	`30`	`UpdateManager m;`
`26`	`31`	`UpdateInfo u;`
`27`	`32`
`28`	`33`	`try`
`29`	`34`	`{`
`30`		`- m = await GitHubUpdateManager(Constant.Repository);`
	`35`	`+ m = await GitHubUpdateManager(GitHubRepository);`
`31`	`36`	`}`
`32`	`37`	`catch (Exception e) when (e is HttpRequestException \|\| e is WebException \|\| e is SocketException)`
`33`	`38`	`{`
`@@ -66,8 +71,8 @@ public static async Task UpdateApp()`
`66`	`71`	`await m.ApplyReleases(u);`
`67`	`72`	`await m.CreateUninstallerRegistryEntry();`
`68`	`73`
`69`		`- var newVersionTips = Translater.GetTranslation("newVersionTips");`
`70`		`- newVersionTips = string.Format(newVersionTips, fr.Version);`
	`74`	`+ var newVersionTips = this.NewVersinoTips(fr.Version.ToString());`
	`75`	`+`
`71`	`76`	`MessageBox.Show(newVersionTips);`
`72`	`77`	`Log.Info($"\|Updater.UpdateApp\|Update success:{newVersionTips}");`
`73`	`78`	`}`
`@@ -90,7 +95,7 @@ private class GithubRelease`
`90`	`95`	`}`
`91`	`96`
`92`	`97`	`/// https://github.com/Squirrel/Squirrel.Windows/blob/master/src/Squirrel/UpdateManager.Factory.cs`
`93`		`- private static async Task<UpdateManager> GitHubUpdateManager(string repository)`
	`98`	`+ private async Task<UpdateManager> GitHubUpdateManager(string repository)`
`94`	`99`	`{`
`95`	`100`	`var uri = new Uri(repository);`
`96`	`101`	`var api = $"https://api.github.com/repos{uri.AbsolutePath}/releases";`
`@@ -109,7 +114,7 @@ private static async Task<UpdateManager> GitHubUpdateManager(string repository)`
`109`	`114`	`return manager;`
`110`	`115`	`}`
`111`	`116`
`112`		`- public static string NewVersinoTips(string version)`
	`117`	`+ public string NewVersinoTips(string version)`
`113`	`118`	`{`
`114`	`119`	`var translater = InternationalizationManager.Instance;`
`115`	`120`	`var tips = string.Format(translater.GetTranslation("newVersionTips"), version);`
Original file line number	Diff line number	Diff line change
`@@ -11,18 +11,20 @@ public static class Log`
`11`	`11`	`{`
`12`	`12`	`public const string DirectoryName = "Logs";`
`13`	`13`
	`14`	`+ public static string CurrentLogDirectory { get; private set; }`
	`15`	`+`
`14`	`16`	`static Log()`
`15`	`17`	`{`
`16`		`- var path = Path.Combine(Constant.DataDirectory, DirectoryName, Constant.Version);`
`17`		`- if (!Directory.Exists(path))`
	`18`	`+ CurrentLogDirectory = Path.Combine(Constant.DataDirectory, DirectoryName, Constant.Version);`
	`19`	`+ if (!Directory.Exists(CurrentLogDirectory))`
`18`	`20`	`{`
`19`		`- Directory.CreateDirectory(path);`
	`21`	`+ Directory.CreateDirectory(CurrentLogDirectory);`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`var configuration = new LoggingConfiguration();`
`23`	`25`	`var target = new FileTarget();`
`24`	`26`	`configuration.AddTarget("file", target);`
`25`		`- target.FileName = path.Replace(@"\", "/") + "/${shortdate}.txt";`
	`27`	`+ target.FileName = CurrentLogDirectory.Replace(@"\", "/") + "/${shortdate}.txt";`
`26`	`28`	`#if DEBUG`
`27`	`29`	`var rule = new LoggingRule("*", LogLevel.Debug, target);`
`28`	`30`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public ReportWindow(Exception exception)`
`23`	`23`
`24`	`24`	`private void SetException(Exception exception)`
`25`	`25`	`{`
`26`		`- string path = Path.Combine(Constant.DataDirectory, Log.DirectoryName, Constant.Version);`
	`26`	`+ string path = Log.CurrentLogDirectory;`
`27`	`27`	`var directory = new DirectoryInfo(path);`
`28`	`28`	`var log = directory.GetFiles().OrderByDescending(f => f.LastWriteTime).First();`
`29`	`29`