Merge pull request #132 from Flow-Launcher/remove_obsolete_code

jjw24 · web-flow · commit 3c85c033811b · 2020-08-16T21:11:01.000+10:00
Remove obsolete methods, properties and classes
diff --git a/Flow.Launcher.Core/Plugin/QueryBuilder.cs b/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;
diff --git a/Flow.Launcher.Infrastructure/Alphabet.cs b/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
diff --git a/Flow.Launcher.Infrastructure/FuzzyMatcher.cs b/Flow.Launcher.Infrastructure/FuzzyMatcher.cs
diff --git a/Flow.Launcher.Infrastructure/StringMatcher.cs b/Flow.Launcher.Infrastructure/StringMatcher.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;
     }
 }
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.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
-    }
 }
diff --git a/Flow.Launcher.Plugin/Feature.cs b/Flow.Launcher.Plugin/Feature.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>
diff --git a/Flow.Launcher.Plugin/Features/IContextMenu.cs b/Flow.Launcher.Plugin/Features/IContextMenu.cs
diff --git a/Flow.Launcher.Plugin/Features/IExclusiveQuery.cs b/Flow.Launcher.Plugin/Features/IExclusiveQuery.cs
diff --git a/Flow.Launcher.Plugin/Features/IInstantQuery.cs b/Flow.Launcher.Plugin/Features/IInstantQuery.cs
diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -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>
diff --git a/Flow.Launcher.Plugin/IPublicAPI.cs b/Flow.Launcher.Plugin/IPublicAPI.cs
@@ -8,15 +8,6 @@ namespace Flow.Launcher.Plugin
     /// </summary>
     public interface IPublicAPI
     {
-        /// <summary>
-        /// Push result to query box
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="plugin"></param>
-        /// <param name="results"></param>
-        [Obsolete("This method will be removed in Flow Launcher 1.3")]
-        void PushResults(Query query, PluginMetadata plugin, List<Result> results);
-
         /// <summary>
         /// Change Flow.Launcher query
         /// </summary>
@@ -27,42 +18,11 @@ public interface IPublicAPI
         /// </param>
         void ChangeQuery(string query, bool requery = false);
 
-        /// <summary>
-        /// Just change the query text, this won't raise search
-        /// </summary>
-        /// <param name="query"></param>
-        [Obsolete]
-        void ChangeQueryText(string query, bool selectAll = false);
-
-        /// <summary>
-        /// Close Flow Launcher
-        /// </summary>
-        [Obsolete]
-        void CloseApp();
-
         /// <summary>
         /// Restart Flow Launcher
         /// </summary>
         void RestartApp();
 
-        /// <summary>
-        /// Restart Flow Launcher
-        /// </summary>
-        [Obsolete("Use RestartApp instead. This method will be removed in Flow Launcher 1.3")]
-        void RestarApp();
-
-        /// <summary>
-        /// Hide Flow Launcher
-        /// </summary>
-        [Obsolete]
-        void HideApp();
-
-        /// <summary>
-        /// Show Flow Launcher
-        /// </summary>
-        [Obsolete]
-        void ShowApp();
-
         /// <summary>
         /// Save all Flow Launcher settings
         /// </summary>
@@ -103,18 +63,6 @@ public interface IPublicAPI
         /// </summary>
         void OpenSettingDialog();
 
-        /// <summary>
-        /// Show loading animation
-        /// </summary>
-        [Obsolete("automatically start")]
-        void StartLoadingBar();
-
-        /// <summary>
-        /// Stop loading animation
-        /// </summary>
-        [Obsolete("automatically stop")]
-        void StopLoadingBar();
-
         /// <summary>
         /// Install Flow Launcher plugin
         /// </summary>
diff --git a/Flow.Launcher.Plugin/PluginMetadata.cs b/Flow.Launcher.Plugin/PluginMetadata.cs
@@ -43,9 +43,6 @@ public override string ToString()
             return Name;
         }
 
-        [Obsolete("Use IcoPath")]
-        public string FullIcoPath => IcoPath;
-
         /// <summary>
         /// Init time include both plugin load time and init time
         /// </summary>
diff --git a/Flow.Launcher.Plugin/Query.cs b/Flow.Launcher.Plugin/Query.cs
@@ -94,14 +94,5 @@ private string SplitSearch(int index)
         }
 
         public override string ToString() => RawQuery;
-
-        [Obsolete("Use ActionKeyword, this property will be removed in v1.3.0")]
-        public string ActionName { get; internal set; }
-
-        [Obsolete("Use Search instead, this property will be removed in v1.3.0")]
-        public List<string> ActionParameters { get; internal set; }
-
-        [Obsolete("Use Search instead, this method will be removed in v1.3.0")]
-        public string GetAllRemainingParameter() => Search;
     }
 }
diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
@@ -104,21 +104,6 @@ public override string ToString()
             return Title + SubTitle;
         }
 
-
-        /// <summary>
-        /// Context menus associate with this result
-        /// </summary>
-        [Obsolete("Use IContextMenu instead")]
-        public List<Result> ContextMenu { get; set; }
-
-        [Obsolete("Use Object initializer instead")]
-        public Result(string Title, string IcoPath, string SubTitle = null)
-        {
-            this.Title = Title;
-            this.IcoPath = IcoPath;
-            this.SubTitle = SubTitle;
-        }
-
         public Result() { }
 
         /// <summary>
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
@@ -48,12 +48,6 @@ public void ChangeQueryText(string query, bool selectAll = false)
             _mainVM.ChangeQueryText(query);
         }
 
-        [Obsolete]
-        public void CloseApp()
-        {
-            Application.Current.MainWindow.Close();
-        }
-
         public void RestartApp()
         {
             _mainVM.MainWindowVisibility = Visibility.Hidden;
@@ -90,18 +84,6 @@ public void ReloadAllPluginData()
             PluginManager.ReloadData();
         }
 
-        [Obsolete]
-        public void HideApp()
-        {
-            _mainVM.MainWindowVisibility = Visibility.Hidden;
-        }
-
-        [Obsolete]
-        public void ShowApp()
-        {
-            _mainVM.MainWindowVisibility = Visibility.Visible;
-        }
-
         public void ShowMsg(string title, string subTitle = "", string iconPath = "")
         {
             ShowMsg(title, subTitle, iconPath, true);
@@ -151,21 +133,6 @@ public List<PluginPair> GetAllPlugins()
 
         public event FlowLauncherGlobalKeyboardEventHandler GlobalKeyboardEvent;
 
-        [Obsolete("This will be removed in Flow Launcher 1.3")]
-        public void PushResults(Query query, PluginMetadata plugin, List<Result> results)
-        {
-            results.ForEach(o =>
-            {
-                o.PluginDirectory = plugin.PluginDirectory;
-                o.PluginID = plugin.ID;
-                o.OriginQuery = query;
-            });
-            Task.Run(() =>
-            {
-                _mainVM.UpdateResultView(results, plugin, query);
-            });
-        }
-
         #endregion
 
         #region Private Methods
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs
