Change update logic

Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj

@@ -36,9 +36,9 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
-      <Private>True</Private>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
@@ -82,6 +82,7 @@
     <Content Include="Images\warning.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="packages.config" />
     <None Include="PortableEverything\Everything.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -93,7 +94,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="plugin.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

Wox.Core/Updater/Release.cs

@@ -0,0 +1,11 @@
+namespace Wox.Core.Updater
+{
+    public class Release
+    {
+        public string version { get; set; }
+        public string download_link { get; set; }
+        public string download_link1 { get; set; }
+        public string download_link2 { get; set; }
+        public string description { get; set; }
+    }
+}

Wox.Core/Updater/SemanticVersion.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Wox.Core.Exception;
 
-namespace Wox.Core.Version
+namespace Wox.Core.Updater
 {
     public class SemanticVersion : IComparable
     {

Wox.Core/Updater/UpdaterManager.cs

@@ -1,13 +1,15 @@
-
+using System;
-using System;
 using System.IO;
+using System.Reflection;
 using System.Windows.Forms;
 using System.Windows.Threading;
 using NAppUpdate.Framework;
 using NAppUpdate.Framework.Common;
 using NAppUpdate.Framework.Sources;
+using Newtonsoft.Json;
 using Wox.Core.i18n;
 using Wox.Core.UserSettings;
+using Wox.Infrastructure.Http;
 using Wox.Infrastructure.Logger;
 
 namespace Wox.Core.Updater
@@ -15,6 +17,9 @@ namespace Wox.Core.Updater
     public class UpdaterManager
     {
         private static UpdaterManager instance;
+        private const string VersionCheckURL = "https://api.getwox.com/release/latest/";
+        private const string UpdateFeedURL = "http://127.0.0.1:8888/Update.xml";
+        private static SemanticVersion currentVersion;
 
         public static UpdaterManager Instance
         {
@@ -33,12 +38,45 @@ namespace Wox.Core.Updater
             UpdateManager.Instance.UpdateSource = GetUpdateSource();
         }
 
-        public bool IsUpdateAvailable()
+        public SemanticVersion CurrentVersion
         {
-            return UpdateManager.Instance.UpdatesAvailable > 0;
+            get
+            {
+                if (currentVersion == null)
+                {
+                    currentVersion = new SemanticVersion(Assembly.GetExecutingAssembly().GetName().Version);
+                }
+                return currentVersion;
+            }
+        }
+
+        private bool IsNewerThanCurrent(Release release)
+        {
+            if (release == null) return false;
+
+            return new SemanticVersion(release.version) > CurrentVersion;
         }
 
         public void CheckUpdate()
+        {
+            string json = HttpRequest.Get(VersionCheckURL, HttpProxy.Instance);
+            if (!string.IsNullOrEmpty(json))
+            {
+                try
+                {
+                    Release newRelease = JsonConvert.DeserializeObject<Release>(json);
+                    if (IsNewerThanCurrent(newRelease))
+                    {
+                        StartUpdate();
+                    }
+                }
+                catch
+                {
+                }
+            }
+        }
+
+        private void StartUpdate()
         {
             UpdateManager updManager = UpdateManager.Instance;
             updManager.BeginCheckForUpdates(asyncResult =>
@@ -104,7 +142,7 @@ namespace Wox.Core.Updater
         {
             // Normally this would be a web based source.
             // But for the demo app, we prepare an in-memory source.
-            var source = new SimpleWebSource("http://127.0.0.1:8888/Update.xml");
+            var source = new SimpleWebSource(UpdateFeedURL);
             return source;
         }
     }

Wox.Core/Version/VersionManager.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-
-namespace Wox.Core.Version
-{
-    public class VersionManager
-    {
-        private static VersionManager versionManager;
-        private static SemanticVersion currentVersion;
-
-        public static VersionManager Instance
-        {
-            get
-            {
-                if (versionManager == null)
-                {
-                    versionManager = new VersionManager();
-                }
-                return versionManager;
-            }
-        }
-
-        private VersionManager() { }
-
-        public SemanticVersion CurrentVersion
-        {
-            get
-            {
-                if (currentVersion == null)
-                {
-                    currentVersion = new SemanticVersion(Assembly.GetExecutingAssembly().GetName().Version);
-                }
-                return currentVersion;
-            }
-        }
-    }
-}

Wox.Core/Wox.Core.csproj

@@ -69,6 +69,7 @@
     <Compile Include="Exception\WoxI18nException.cs" />
     <Compile Include="Exception\WoxJsonRPCException.cs" />
     <Compile Include="Exception\WoxPluginException.cs" />
+    <Compile Include="Updater\Release.cs" />
     <Compile Include="Updater\UpdaterManager.cs" />
     <Compile Include="UserSettings\HttpProxy.cs" />
     <Compile Include="i18n\AvailableLanguages.cs" />
@@ -99,8 +100,7 @@
     <Compile Include="UserSettings\CustomizedPluginConfig.cs" />
     <Compile Include="UserSettings\PluginHotkey.cs" />
     <Compile Include="UserSettings\UserSettingStorage.cs" />
-    <Compile Include="Version\SemanticVersion.cs" />
+    <Compile Include="Updater\SemanticVersion.cs" />
-    <Compile Include="Version\VersionManager.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

Wox.CrashReporter/ReportWindow.xaml.cs

@@ -16,8 +16,8 @@ using Wox.Core;
 using Wox.Core.Exception;
 using Wox.Core.i18n;
 using Wox.Core.UI;
+using Wox.Core.Updater;
 using Wox.Core.UserSettings;
-using Wox.Core.Version;
 using Wox.Infrastructure.Http;
 
 namespace Wox.CrashReporter
@@ -36,7 +36,7 @@ namespace Wox.CrashReporter
         private void SetException(Exception exception)
         {
             tbSummary.AppendText(exception.Message);
-            tbVersion.Text = VersionManager.Instance.CurrentVersion.ToString();
+            tbVersion.Text = UpdaterManager.Instance.CurrentVersion.ToString();
             tbDatetime.Text = DateTime.Now.ToString();
             tbStackTrace.AppendText(exception.StackTrace);
             tbSource.Text = exception.Source;

Wox.Test/SemanticVersionTest.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
-using Wox.Core.Version;
+using Wox.Core.Updater;
 
 namespace Wox.Test
 {

Wox/SettingWindow.xaml.cs

@@ -20,8 +20,8 @@ using System.Windows.Data;
 using Microsoft.Win32;
 using Wox.Core.i18n;
 using Wox.Core.Theme;
+using Wox.Core.Updater;
 using Wox.Core.UserSettings;
-using Wox.Core.Version;
 
 namespace Wox
 {
@@ -217,7 +217,7 @@ namespace Wox
 
             #region About
 
-            tbVersion.Text = VersionManager.Instance.CurrentVersion.ToString();
+            tbVersion.Text = UpdaterManager.Instance.CurrentVersion.ToString();
             string activateTimes = string.Format(InternationalizationManager.Instance.GetTranslation("about_activate_times"),
                 UserSettingStorage.Instance.ActivateTimes);
             tbActivatedTimes.Text = activateTimes;