Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 11:46:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring updater

Browse Source 
1. move into a separate class
2. remove unused nuget package
This commit is contained in:
bao-qian
2016-05-09 20:40:59 +01:00
parent 05adf6f907
commit 21285f02b8
5 changed files with 138 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Wox/App.xaml.cs
View File

@@ -1,14 +1,12 @@
using System;
using System.Diagnostics;
using System.Net;
using System.Windows;
using Squirrel;
using Wox.Core;
using Wox.Core.Plugin;
using Wox.Helper;
using Wox.Infrastructure.Image;
using Wox.ViewModel;
using Stopwatch = Wox.Infrastructure.Stopwatch;
using Wox.Infrastructure.Logger;
namespace Wox
{
@@ -18,7 +16,6 @@ namespace Wox
public static MainWindow Window { get; private set; }
public static PublicAPIInstance API { get; private set; }
private static bool _disposed;
public static UpdateManager Updater;
[STAThread]
public static void Main()
@@ -56,29 +53,7 @@ namespace Wox
private async void OnActivated(object sender, EventArgs e)
{
try
{
using (Updater = await UpdateManager.GitHubUpdateManager(Infrastructure.Wox.Github))
{
await Updater.UpdateApp();
}
}
catch (WebException ex)
{
Log.Error(ex);
}
catch (Exception exception)
{
const string info = "Update.exe not found, not a Squirrel-installed app?";
if (exception.Message == info)
{
Log.Warn(info);
}
else
{
throw;
}
}
Updater.UpdateApp();
}
private void RegisterExitEvents()
@@ -123,7 +98,6 @@ namespace Wox
if (!_disposed)
{
Save();
Updater?.Dispose();
SingleInstance<App>.Cleanup();
}
}

83
Wox/SettingWindow.xaml.cs
View File

@@ -4,8 +4,6 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net;
using System.Reflection;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
@@ -15,19 +13,15 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using Microsoft.Win32;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NHotkey;
using NHotkey.Wpf;
using Squirrel;
using Wox.Core;
using Wox.Core.Plugin;
using Wox.Core.Resource;
using Wox.Core.UserSettings;
using Wox.Helper;
using Wox.Infrastructure.Hotkey;
using Wox.Infrastructure.Http;
using Wox.Infrastructure.Image;
using Wox.Infrastructure.Logger;
using Wox.Plugin;
using Wox.ViewModel;
using Application = System.Windows.Forms.Application;
@@ -834,15 +828,6 @@ namespace Wox
#endregion
#region About
private void tbWebsite_MouseUp(object sender, MouseButtonEventArgs e)
{
Process.Start(Infrastructure.Wox.Github);
}
#endregion
private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
{
// Hide window with ESC, but make sure it is not pressed as a hotkey
@@ -854,78 +839,20 @@ namespace Wox
private async void OnCheckUpdates(object sender, RoutedEventArgs e)
{
var version = await NewVersion();
var version = await Updater.NewVersion();
if (!string.IsNullOrEmpty(version))
{
var newVersion = NumericVersion(version);
var oldVersion = NumericVersion(Infrastructure.Wox.Version);
var newVersion = Updater.NumericVersion(version);
var oldVersion = Updater.NumericVersion(Infrastructure.Wox.Version);
if (newVersion > oldVersion)
{
NewVersionTips.Text = string.Format(NewVersionTips.Text, version);
NewVersionTips.Visibility = Visibility.Visible;
UpdateApp();
Updater.UpdateApp();
}
}
}
private async void UpdateApp()
{
try
{
using (var updater = await UpdateManager.GitHubUpdateManager(Infrastructure.Wox.Github))
{
// todo 5/9 the return value of UpdateApp() is NULL, fucking useless!
await updater.UpdateApp();
}
}
catch (WebException ex)
{
Log.Error(ex);
}
catch (Exception ex)
{
Log.Error(ex);
}
}
private async Task<string> NewVersion()
{
const string githubAPI = @"https://api.github.com/repos/wox-launcher/wox/releases/latest";
var response = await HttpRequest.Get(githubAPI, HttpProxy.Instance);
if (!string.IsNullOrEmpty(response))
{
JContainer json;
try
{
json = (JContainer)JsonConvert.DeserializeObject(response);
}
catch (JsonSerializationException e)
{
Log.Error(e);
return string.Empty;
}
var version = json?["tag_name"]?.ToString();
if (!string.IsNullOrEmpty(version))
{
return version;
}
else
{
return string.Empty;
}
}
else
{
return string.Empty;
}
}
private
int NumericVersion(string version)
{
var newVersion = version.Replace("v", ".").Replace(".", "").Replace("*", "");
return int.Parse(newVersion);
}
private void OnRequestNavigate(object sender, RequestNavigateEventArgs e)
{
Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));