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

Remove instance logic for BinaryStorage and JsonStorage, part 1

Browse Source 
1. part of #389
2. huge refactoring
This commit is contained in:
bao-qian
2016-04-21 01:53:21 +01:00
parent 0bcb76fa81
commit 8d10c9aa41
52 changed files with 502 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Wox.Core/Updater/UpdaterManager.cs
View File

@@ -22,7 +22,7 @@ namespace Wox.Core.Updater
private const string UpdateFeedURL = "http://upgrade.getwox.com/update.xml";
//private const string UpdateFeedURL = "http://127.0.0.1:8888/update.xml";
private static SemanticVersion currentVersion;
private UserSettingStorage _settings;
public UserSettings.Settings Settings { get; set; }
public event EventHandler PrepareUpdateReady;
public event EventHandler UpdateError;
@@ -44,7 +44,6 @@ namespace Wox.Core.Updater
private UpdaterManager()
{
UpdateManager.Instance.UpdateSource = GetUpdateSource();
_settings = UserSettingStorage.Instance;
}
public SemanticVersion CurrentVersion
@@ -89,7 +88,7 @@ namespace Wox.Core.Updater
try
{
NewRelease = JsonConvert.DeserializeObject<Release>(json);
if (IsNewerThanCurrent(NewRelease) && !_settings.DontPromptUpdateMsg)
if (IsNewerThanCurrent(NewRelease) && !Settings.DontPromptUpdateMsg)
{
StartUpdate();
}
@@ -148,7 +147,7 @@ namespace Wox.Core.Updater
// get out of the way so the console window isn't obstructed
try
{
UpdateManager.Instance.ApplyUpdates(true, _settings.EnableUpdateLog, false);
UpdateManager.Instance.ApplyUpdates(true, Settings.EnableUpdateLog, false);
}
catch (Exception e)
{