prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use own update manager, so we can pass proxy #1266

Browse source
This commit is contained in:
bao-qian 2017-03-07 19:23:42 +00:00
parent ade6c46cca
commit 6f42bcfa4f
4 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Wox.Core/Updater.cs
View file

@ -1,10 +1,13 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using System.Net.Sockets;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
using Squirrel;
using Newtonsoft.Json;
using Wox.Core.Resource;
using Wox.Infrastructure;
using Wox.Infrastructure.Http;
@ -16,14 +19,9 @@ namespace Wox.Core
{
public static async Task UpdateApp()
{
var c = new WebClient { Proxy = Http.WebProxy() };
var d = new FileDownloader(c);
try
{
const string url = Constant.Github;
using (var m = await UpdateManager.GitHubUpdateManager(url, urlDownloader: d))
using (var m = await GitHubUpdateManager(Constant.Repository))
{
// UpdateApp CheckForUpdate will return value only if the app is squirrel installed
var e = await m.CheckForUpdate().NonNull();
@ -45,7 +43,6 @@ namespace Wox.Core
catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException)
{
Log.Exception("|Updater.UpdateApp|Network error", e);
}
catch (Exception e)
{
@ -68,5 +65,36 @@ namespace Wox.Core
return tips;
}
class GithubRelease
{
[JsonProperty("prerelease")]
public bool Prerelease { get; set; }
[JsonProperty("published_at")]
public DateTime PublishedAt { get; set; }
[JsonProperty("html_url")]
public string HtmlUrl { get; set; }
}
/// https://github.com/Squirrel/Squirrel.Windows/blob/master/src/Squirrel/UpdateManager.Factory.cs
private static async Task<UpdateManager> GitHubUpdateManager(string repository)
{
var uri = new Uri(repository);
var api = $"https://api.github.com/{uri.AbsolutePath}/releases";
var json = await Http.Get(api);
var releases = JsonConvert.DeserializeObject<List<GithubRelease>>(json);
var latest = releases.Where(r => r.Prerelease).OrderByDescending(r => r.PublishedAt).First();
var latestUrl = latest.HtmlUrl.Replace("/tag/", "/download/");
var client = new WebClient { Proxy = Http.WebProxy() };
var downloader = new FileDownloader(client);
var manager = new UpdateManager(latestUrl, urlDownloader: downloader);
return manager;
}
}
}
}

2
Wox.Infrastructure/Wox.cs
View file

@ -16,7 +16,7 @@ namespace Wox.Infrastructure
public static readonly string DataDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Wox);
public static readonly string PluginsDirectory = Path.Combine(DataDirectory, Plugins);
public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins);
public const string Github = "https://github.com/Wox-launcher/Wox";
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).ProductVersion;

2
Wox/SettingWindow.xaml.cs
View file

@ -272,7 +272,7 @@ namespace Wox
return;
}
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Infrastructure.Constant.Github);
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);

4
Wox/ViewModel/SettingWindowViewModel.cs
View file

@ -206,7 +206,7 @@ namespace Wox.ViewModel
},
new Result
{
Title = $"Open Source: {Constant.Github}",
Title = $"Open Source: {Constant.Repository}",
SubTitle = "Please star it!"
}
};
@ -316,7 +316,7 @@ namespace Wox.ViewModel
#region about
public static string Github => Constant.Github;
public static string Github => Constant.Repository;
public static string ReleaseNotes => @"https://github.com/Wox-launcher/Wox/releases/latest";
public static string Version => Constant.Version;
public string ActivatedTimes => string.Format(_translater.GetTranslation("about_activate_times"), Settings.ActivateTimes);