Merge branch 'dev' into release_branch

Plugins/Wox.Plugin.PluginIndicator/Main.cs

@@ -13,8 +13,7 @@ public List<Result> Query(Query query)
             var results = from keyword in PluginManager.NonGlobalPlugins.Keys
                           where keyword.StartsWith(query.Terms[0])
                           let metadata = PluginManager.NonGlobalPlugins[keyword].Metadata
-                          let disabled = PluginManager.Settings.Plugins[metadata.ID].Disabled
-                          where !disabled
+                          where !metadata.Disabled
                           select new Result
                           {
                               Title = keyword,

Plugins/Wox.Plugin.Sys/Main.cs

@@ -234,6 +234,20 @@ private List<Result> Commands()
                             context.API.GetTranslation("wox_plugin_sys_dlgtext_all_applicableplugins_reloaded"));
                         return true;
                     }
+                },
+                new Result
+                {
+                    Title = "Check For Update",
+                    SubTitle = "Check for new Wox update",
+                    IcoPath = "Images\\checkupdate.png",
+                    Action = c =>
+                    {
+                        Application.Current.MainWindow.Hide();
+                        context.API.CheckForNewUpdate();
+                        context.API.ShowMsg("Please wait...",
+                            "Checking for new update");
+                        return true;
+                    }
                 }
             });
             return results;

Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj

@@ -71,9 +71,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Images\checkupdate.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="Images\recyclebin.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="Images\shutdown.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="Images\sleep.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

Wox.Core/Plugin/PluginManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -92,21 +93,36 @@ public static void LoadPlugins(PluginsSettings settings)
             Settings.UpdatePluginSettings(_metadatas);
             AllPlugins = PluginsLoader.Plugins(_metadatas, Settings);
         }
+
+        /// <summary>
+        /// Call initialize for all plugins
+        /// </summary>
+        /// <returns>return the list of failed to init plugins or null for none</returns>
         public static void InitializePlugins(IPublicAPI api)
         {
             API = api;
+            var failedPlugins = new ConcurrentQueue<PluginPair>();
             Parallel.ForEach(AllPlugins, pair =>
             {
-                var milliseconds = Stopwatch.Debug($"|PluginManager.InitializePlugins|Init method time cost for <{pair.Metadata.Name}>", () =>
+                try
                 {
-                    pair.Plugin.Init(new PluginInitContext
+                    var milliseconds = Stopwatch.Debug($"|PluginManager.InitializePlugins|Init method time cost for <{pair.Metadata.Name}>", () =>
                     {
-                        CurrentPluginMetadata = pair.Metadata,
-                        API = API
+                        pair.Plugin.Init(new PluginInitContext
+                        {
+                            CurrentPluginMetadata = pair.Metadata,
+                            API = API
+                        });
                     });
-                });
-                pair.Metadata.InitTime += milliseconds;
-                Log.Info($"|PluginManager.InitializePlugins|Total init cost for <{pair.Metadata.Name}> is <{pair.Metadata.InitTime}ms>");
+                    pair.Metadata.InitTime += milliseconds;
+                    Log.Info($"|PluginManager.InitializePlugins|Total init cost for <{pair.Metadata.Name}> is <{pair.Metadata.InitTime}ms>");
+                }
+                catch (Exception e)
+                {
+                    Log.Exception(nameof(PluginManager), $"Fail to Init plugin: {pair.Metadata.Name}", e);
+                    pair.Metadata.Disabled = true; 
+                    failedPlugins.Enqueue(pair);
+                }
             });
 
             _contextMenuPlugins = GetPluginsForInterface<IContextMenu>();
@@ -121,42 +137,18 @@ public static void InitializePlugins(IPublicAPI api)
                                                 .ForEach(x => NonGlobalPlugins[x] = plugin);
             }
 
+            if (failedPlugins.Any())
+            {
+                var failed = string.Join(",", failedPlugins.Select(x => x.Metadata.Name));
+                API.ShowMsg($"Fail to Init Plugins", $"Plugins: {failed} - fail to load and would be disabled, please contact plugin creator for help", "", false);
+            }
         }
 
         public static void InstallPlugin(string path)
         {
             PluginInstaller.Install(path);
         }
 
-        public static Query QueryInit(string text) //todo is that possible to move it into type Query?
-        {
-            // replace multiple white spaces with one white space
-            var terms = text.Split(new[] { Query.TermSeperater }, StringSplitOptions.RemoveEmptyEntries);
-            var rawQuery = string.Join(Query.TermSeperater, terms);
-            var actionKeyword = string.Empty;
-            var search = rawQuery;
-            var actionParameters = terms.ToList();
-            if (terms.Length == 0) return null;
-            if (NonGlobalPlugins.ContainsKey(terms[0]) &&
-                !Settings.Plugins[NonGlobalPlugins[terms[0]].Metadata.ID].Disabled)
-            {
-                actionKeyword = terms[0];
-                actionParameters = terms.Skip(1).ToList();
-                search = string.Join(Query.TermSeperater, actionParameters.ToArray());
-            }
-            var query = new Query
-            {
-                Terms = terms,
-                RawQuery = rawQuery,
-                ActionKeyword = actionKeyword,
-                Search = search,
-                // Obsolete value initialisation
-                ActionName = actionKeyword,
-                ActionParameters = actionParameters
-            };
-            return query;
-        }
-
         public static List<PluginPair> ValidPluginsForQuery(Query query)
         {
             if (NonGlobalPlugins.ContainsKey(query.ActionKeyword))

Wox.Core/Plugin/QueryBuilder.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Wox.Plugin;
+
+namespace Wox.Core.Plugin
+{
+    public static class QueryBuilder
+    {
+        public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalPlugins)
+        {
+            // replace multiple white spaces with one white space
+            var terms = text.Split(new[] { Query.TermSeperater }, StringSplitOptions.RemoveEmptyEntries);
+            if (terms.Length == 0)
+            { // nothing was typed
+                return null;
+            }
+
+            var rawQuery = string.Join(Query.TermSeperater, terms);
+            string actionKeyword, search;
+            string possibleActionKeyword = terms[0];
+            List<string> actionParameters;
+            if (nonGlobalPlugins.TryGetValue(possibleActionKeyword, out var pluginPair) && !pluginPair.Metadata.Disabled)
+            { // use non global plugin for query
+                actionKeyword = possibleActionKeyword;
+                actionParameters = terms.Skip(1).ToList();
+                search = rawQuery.Substring(actionKeyword.Length + 1);
+            }
+            else
+            { // non action keyword
+                actionKeyword = string.Empty;
+                actionParameters = terms.ToList();
+                search = rawQuery;
+            }
+
+            var query = new Query
+            {
+                Terms = terms,
+                RawQuery = rawQuery,
+                ActionKeyword = actionKeyword,
+                Search = search,
+                // Obsolete value initialisation
+                ActionName = actionKeyword,
+                ActionParameters = actionParameters
+            };
+
+            return query;
+        }
+    }
+}

Wox.Core/Updater.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
@@ -10,9 +10,11 @@
 using Squirrel;
 using Newtonsoft.Json;
 using Wox.Core.Resource;
+using Wox.Plugin.SharedCommands;
 using Wox.Infrastructure;
 using Wox.Infrastructure.Http;
 using Wox.Infrastructure.Logger;
+using System.IO;
 
 namespace Wox.Core
 {
@@ -25,14 +27,14 @@ public Updater(string gitHubRepository)
             GitHubRepository = gitHubRepository;
         }
 
-        public async Task UpdateApp()
+        public async Task UpdateApp(bool silentIfLatestVersion = true)
         {
-            UpdateManager m;
-            UpdateInfo u;
+            UpdateManager updateManager;
+            UpdateInfo newUpdateInfo;
 
             try
             {
-                m = await GitHubUpdateManager(GitHubRepository);
+                updateManager = await GitHubUpdateManager(GitHubRepository);
             }
             catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException)
             {
@@ -43,42 +45,61 @@ public async Task UpdateApp()
             try
             {
                 // UpdateApp CheckForUpdate will return value only if the app is squirrel installed
-                u = await m.CheckForUpdate().NonNull();
+                newUpdateInfo = await updateManager.CheckForUpdate().NonNull();
             }
             catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException)
             {
                 Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to api.github.com.", e);
-                m.Dispose();
+                updateManager.Dispose();
                 return;
             }
 
-            var fr = u.FutureReleaseEntry;
-            var cr = u.CurrentlyInstalledVersion;
-            Log.Info($"|Updater.UpdateApp|Future Release <{fr.Formatted()}>");
-            if (fr.Version > cr.Version)
+            var newReleaseVersion = Version.Parse(newUpdateInfo.FutureReleaseEntry.Version.ToString());
+            var currentVersion = Version.Parse(Constant.Version);
+
+            Log.Info($"|Updater.UpdateApp|Future Release <{newUpdateInfo.FutureReleaseEntry.Formatted()}>");
+
+            if (newReleaseVersion <= currentVersion)
             {
-                try
-                {
-                    await m.DownloadReleases(u.ReleasesToApply);
-                }
-                catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException)
-                {
-                    Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
-                    m.Dispose();
-                    return;
-                }
-
-                await m.ApplyReleases(u);
-                await m.CreateUninstallerRegistryEntry();
-
-                var newVersionTips = this.NewVersinoTips(fr.Version.ToString());
-
-                MessageBox.Show(newVersionTips);
-                Log.Info($"|Updater.UpdateApp|Update success:{newVersionTips}");
+                if (!silentIfLatestVersion)
+                    MessageBox.Show("You already have the latest Wox version");
+                updateManager.Dispose();
+                return;
             }
 
+            try
+            {
+                await updateManager.DownloadReleases(newUpdateInfo.ReleasesToApply);
+            }
+            catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException)
+            {
+                Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
+                updateManager.Dispose();
+                return;
+            }
+
+            await updateManager.ApplyReleases(newUpdateInfo);
+
+            if (Constant.IsPortableMode)
+            {
+                var targetDestination = updateManager.RootAppDirectory + $"\\app-{newReleaseVersion.ToString()}\\{Constant.PortableFolderName}";
+                FilesFolders.Copy(Constant.PortableDataPath, targetDestination);
+                if (!FilesFolders.VerifyBothFolderFilesEqual(Constant.PortableDataPath, targetDestination))
+                    MessageBox.Show(string.Format("Wox was not able to move your user profile data to the new update version. Please manually" +
+                        "move your profile data folder from {0} to {1}", Constant.PortableDataPath, targetDestination));
+            }
+            else
+            {
+                await updateManager.CreateUninstallerRegistryEntry();
+            }
+
+            var newVersionTips = NewVersinoTips(newReleaseVersion.ToString());
+
+            MessageBox.Show(newVersionTips);
+            Log.Info($"|Updater.UpdateApp|Update success:{newVersionTips}");
+
             // always dispose UpdateManager
-            m.Dispose();
+            updateManager.Dispose();
         }
 
         [UsedImplicitly]

Wox.Core/Wox.Core.csproj

@@ -53,6 +53,7 @@
     </Compile>
     <Compile Include="Plugin\ExecutablePlugin.cs" />
     <Compile Include="Plugin\PluginsLoader.cs" />
+    <Compile Include="Plugin\QueryBuilder.cs" />
     <Compile Include="Updater.cs" />
     <Compile Include="Resource\AvailableLanguages.cs" />
     <Compile Include="Resource\Internationalization.cs" />