Merge pull request #124 from Flow-Launcher/dev

Release 1.2.0 | Plugin 1.2.0

Author: jjw24

Flow.Launcher.Core/Plugin/QueryBuilder.cs

@@ -29,7 +29,6 @@ public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalP
             else
             { // non action keyword
                 actionKeyword = string.Empty;
-                actionParameters = terms.ToList();
                 search = rawQuery;
             }
 
@@ -38,10 +37,7 @@ public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalP
                 Terms = terms,
                 RawQuery = rawQuery,
                 ActionKeyword = actionKeyword,
-                Search = search,
-                // Obsolete value initialisation
-                ActionName = actionKeyword,
-                ActionParameters = actionParameters
+                Search = search
             };
 
             return query;

Flow.Launcher.Core/Updater.cs

@@ -16,6 +16,7 @@
 using Flow.Launcher.Infrastructure.Logger;
 using System.IO;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Core
 {
@@ -28,11 +29,14 @@ public Updater(string gitHubRepository)
             GitHubRepository = gitHubRepository;
         }
 
-        public async Task UpdateApp(bool silentIfLatestVersion = true)
+        public async Task UpdateApp(IPublicAPI api , bool silentUpdate = true)
         {
             UpdateManager updateManager;
             UpdateInfo newUpdateInfo;
 
+            if (!silentUpdate)
+                api.ShowMsg("Please wait...", "Checking for new update");
+
             try
             {
                 updateManager = await GitHubUpdateManager(GitHubRepository);
@@ -62,12 +66,15 @@ public async Task UpdateApp(bool silentIfLatestVersion = true)
 
             if (newReleaseVersion <= currentVersion)
             {
-                if (!silentIfLatestVersion)
+                if (!silentUpdate)
                     MessageBox.Show("You already have the latest Flow Launcher version");
                 updateManager.Dispose();
                 return;
             }
-            
+
+            if (!silentUpdate)
+                api.ShowMsg("Update found", "Updating...");
+
             try
             {
                 await updateManager.DownloadReleases(newUpdateInfo.ReleasesToApply);
@@ -96,11 +103,15 @@ public async Task UpdateApp(bool silentIfLatestVersion = true)
 
             var newVersionTips = NewVersinoTips(newReleaseVersion.ToString());
 
-            MessageBox.Show(newVersionTips);
             Log.Info($"|Updater.UpdateApp|Update success:{newVersionTips}");
 
             // always dispose UpdateManager
             updateManager.Dispose();
+
+            if (MessageBox.Show(newVersionTips, "New Update", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+            {
+                UpdateManager.RestartApp(Constant.ApplicationFileName);
+            }
         }
 
         [UsedImplicitly]

Flow.Launcher.Infrastructure/Alphabet.cs

@@ -95,27 +95,6 @@ public void Save()
         private static string[] EmptyStringArray = new string[0];
         private static string[][] Empty2DStringArray = new string[0][];
 
-        [Obsolete("Not accurate, eg 音乐 will not return yinyue but returns yinle ")]
-        /// <summary>
-        /// replace chinese character with pinyin, non chinese character won't be modified
-        /// <param name="word"> should be word or sentence, instead of single character. e.g. 微软 </param>
-        /// </summary>
-        public string[] Pinyin(string word)
-        {
-            if (!_settings.ShouldUsePinyin)
-            {
-                return EmptyStringArray;
-            }
-
-            var pinyin = word.Select(c =>
-            {
-                var pinyins = PinyinHelper.toHanyuPinyinStringArray(c);
-                var result = pinyins == null ? c.ToString() : pinyins[0];
-                return result;
-            }).ToArray();
-            return pinyin;
-        }
-
         /// <summmary>
         /// replace chinese character with pinyin, non chinese character won't be modified
         /// Because we don't have words dictionary, so we can only return all possiblie pinyin combination

Flow.Launcher.Infrastructure/Constant.cs

@@ -27,7 +27,6 @@ public static class Constant
         public static readonly string ErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.png");
 
         public static string PythonPath;
-        public static string EverythingSDKPath;
 
         public static readonly string QueryTextBoxIconImagePath = $"{ProgramDirectory}\\Images\\mainsearch.png";
 

Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs

@@ -67,7 +67,6 @@ private static string CreateExceptionReport(System.Exception ex)
             sb.AppendLine($"* IntPtr Length: {IntPtr.Size}");
             sb.AppendLine($"* x64: {Environment.Is64BitOperatingSystem}");
             sb.AppendLine($"* Python Path: {Constant.PythonPath}");
-            sb.AppendLine($"* Everything SDK Path: {Constant.EverythingSDKPath}");
             sb.AppendLine($"* CLR Version: {Environment.Version}");
             sb.AppendLine($"* Installed .NET Framework: ");
             foreach (var result in GetFrameworkVersionFromRegistry())

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

@@ -38,6 +38,7 @@
 
   <ItemGroup>
     <Compile Include="..\SolutionAssemblyInfo.cs" Link="Properties\SolutionAssemblyInfo.cs" />
+    <None Include="FodyWeavers.xml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -55,6 +56,7 @@
     <PackageReference Include="Pinyin4DotNet" Version="2016.4.23.4" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
+    <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
   </ItemGroup>
 
   <ItemGroup>

Flow.Launcher.Infrastructure/FodyWeavers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <PropertyChanged />
+</Weavers>

Flow.Launcher.Infrastructure/FuzzyMatcher.cs

@@ -156,9 +156,8 @@ private static ImageResult GetThumbnailResult(ref string path, bool loadFullImag
             if (Directory.Exists(path))
             {
                 /* Directories can also have thumbnails instead of shell icons.
-                 * Generating thumbnails for a bunch of folders while scrolling through
-                 * results from Everything makes a big impact on performance and 
-                 * Flow.Launcher responsibility. 
+                 * Generating thumbnails for a bunch of folder results while scrolling 
+                 * could have a big impact on performance and Flow.Launcher responsibility. 
                  * - Solution: just load the icon
                  */
                 type = ImageType.Folder;

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -21,18 +21,6 @@ public StringMatcher(IAlphabet alphabet = null)
 
         public static StringMatcher Instance { get; internal set; }
 
-        [Obsolete("This method is obsolete and should not be used. Please use the static function StringMatcher.FuzzySearch")]
-        public static int Score(string source, string target)
-        {
-            return FuzzySearch(target, source).Score;
-        }
-
-        [Obsolete("This method is obsolete and should not be used. Please use the static function StringMatcher.FuzzySearch")]
-        public static bool IsMatch(string source, string target)
-        {
-            return Score(source, target) > 0;
-        }
-
         public static MatchResult FuzzySearch(string query, string stringToCompare)
         {
             return Instance.FuzzyMatch(query, stringToCompare);
@@ -323,18 +311,6 @@ private int ScoreAfterSearchPrecisionFilter(int rawScore)
 
     public class MatchOption
     {
-        /// <summary>
-        /// prefix of match char, use for highlight
-        /// </summary>
-        [Obsolete("this is never used")]
-        public string Prefix { get; set; } = "";
-
-        /// <summary>
-        /// suffix of match char, use for highlight
-        /// </summary>
-        [Obsolete("this is never used")]
-        public string Suffix { get; set; } = "";
-
         public bool IgnoreCase { get; set; } = true;
     }
 }

Flow.Launcher.Infrastructure/Storage/WoxJsonStorage.cs renamed to Flow.Launcher.Infrastructure/Storage/FlowLauncherJsonStorage.cs

@@ -30,5 +30,6 @@ public static bool PortableDataLocationInUse()
         }
 
         public static readonly string PluginsDirectory = Path.Combine(DataDirectory(), Constant.Plugins);
+        public static readonly string PluginSettingsDirectory = Path.Combine(DataDirectory(), "Settings", Constant.Plugins);
     }
 }

Flow.Launcher.Infrastructure/StringMatcher.cs

@@ -15,6 +15,16 @@ public void UpdatePluginSettings(List<PluginMetadata> metadatas)
                 if (Plugins.ContainsKey(metadata.ID))
                 {
                     var settings = Plugins[metadata.ID];
+
+                    // TODO: Remove. This is one off for 1.2.0 release.
+                    // Introduced a new action keyword in Explorer, so need to update plugin setting in the UserData folder.
+                    // This kind of plugin meta update should be handled by a dedicated method trigger by version bump.
+                    if (metadata.ID == "572be03c74c642baae319fc283e561a8" && metadata.ActionKeywords.Count != settings.ActionKeywords.Count)
+                        settings.ActionKeywords = metadata.ActionKeywords;
+
+                    if (string.IsNullOrEmpty(settings.Version))
+                        settings.Version = metadata.Version;
+
                     if (settings.ActionKeywords?.Count > 0)
                     {
                         metadata.ActionKeywords = settings.ActionKeywords;
@@ -28,6 +38,7 @@ public void UpdatePluginSettings(List<PluginMetadata> metadatas)
                     {
                         ID = metadata.ID,
                         Name = metadata.Name,
+                        Version = metadata.Version,
                         ActionKeywords = metadata.ActionKeywords, 
                         Disabled = metadata.Disabled
                     };
@@ -39,6 +50,7 @@ public class Plugin
     {
         public string ID { get; set; }
         public string Name { get; set; }
+        public string Version { get; set; }
         public List<string> ActionKeywords { get; set; } // a reference of the action keywords from plugin manager
 
         /// <summary>

Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs

@@ -70,12 +70,6 @@ public string QuerySearchPrecisionString
         public PluginsSettings PluginSettings { get; set; } = new PluginsSettings();
         public ObservableCollection<CustomPluginHotkey> CustomPluginHotkeys { get; set; } = new ObservableCollection<CustomPluginHotkey>();
 
-        [Obsolete]
-        public double Opacity { get; set; } = 1;
-
-        [Obsolete]
-        public OpacityMode OpacityMode { get; set; } = OpacityMode.Normal;
-
         public bool DontPromptUpdateMsg { get; set; }
         public bool EnableUpdateLog { get; set; }
 
@@ -108,12 +102,4 @@ public enum LastQueryMode
         Empty,
         Preserved
     }
-
-    [Obsolete]
-    public enum OpacityMode
-    {
-        Normal = 0,
-        LayeredWindow = 1,
-        DWM = 2
-    }
 }

Flow.Launcher.Infrastructure/UserSettings/PluginSettings.cs

@@ -11,23 +11,6 @@ public interface IContextMenu : IFeatures
         List<Result> LoadContextMenus(Result selectedResult);
     }
 
-    [Obsolete("If a plugin has a action keyword, then it is exclusive. This interface will be remove in v1.3.0")]
-    public interface IExclusiveQuery : IFeatures
-    {
-        [Obsolete("If a plugin has a action keyword, then it is exclusive. This method will be remove in v1.3.0")]
-        bool IsExclusiveQuery(Query query);
-    }
-
-    /// <summary>
-    /// Represent plugin query will be executed in UI thread directly. Don't do long-running operation in Query method if you implement this interface
-    /// <remarks>This will improve the performance of instant search like websearch or cmd plugin</remarks>
-    /// </summary>
-    [Obsolete("Flow Launcher is fast enough now, executed on ui thread is no longer needed")]
-    public interface IInstantQuery : IFeatures
-    {
-        bool IsInstantQuery(string query);
-    }
-
     /// <summary>
     /// Represent plugins that support internationalization
     /// </summary>

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -14,10 +14,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.1.0</Version>
-    <PackageVersion>1.1.0</PackageVersion>
-    <AssemblyVersion>1.1.0</AssemblyVersion>
-    <FileVersion>1.1.0</FileVersion>
+    <Version>1.2.0</Version>
+    <PackageVersion>1.2.0</PackageVersion>
+    <AssemblyVersion>1.2.0</AssemblyVersion>
+    <FileVersion>1.2.0</FileVersion>
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <Authors>Flow-Launcher</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>