Merge pull request Flow-Launcher#3572 from Flow-Launcher/plugin_store_item_vm_null

Fix separation of Plugin Store and Plugins Manager plugin

Author: jjw24

.github/actions/spelling/expect.txt

@@ -99,3 +99,7 @@ pluginsmanager
 alreadyexists
 Softpedia
 img
+Reloadable
+metadatas
+WMP
+VSTHRD

.github/actions/spelling/patterns.txt

@@ -133,3 +133,4 @@
 \bPortuguês (Brasil)\b
 \bčeština\b
 \bPortuguês\b
+\bIoc\b

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -3,22 +3,19 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
-using Flow.Launcher.Plugin.SharedCommands;
-using IRemovable = Flow.Launcher.Core.Storage.IRemovable;
 using ISavable = Flow.Launcher.Plugin.ISavable;
 
 namespace Flow.Launcher.Core.Plugin
 {
     /// <summary>
-    /// The entry for managing Flow Launcher plugins
+    /// Class for co-ordinating and managing all plugin lifecycle.
     /// </summary>
     public static class PluginManager
     {

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -23,8 +23,8 @@ public interface IPublicAPI
         /// </summary>
         /// <param name="query">query text</param>
         /// <param name="requery">
-        /// Force requery. By default, Flow Launcher will not fire query if your query is same with existing one. 
-        /// Set this to <see langword="true"/> to force Flow Launcher requerying
+        /// Force requery. By default, Flow Launcher will not fire query if your query is same with existing one.
+        /// Set this to <see langword="true"/> to force Flow Launcher re-querying
         /// </param>
         void ChangeQuery(string query, bool requery = false);
 
@@ -49,7 +49,7 @@ public interface IPublicAPI
         /// </summary>
         /// <param name="text">Text to save on clipboard</param>
         /// <param name="directCopy">When true it will directly copy the file/folder from the path specified in text</param>
-        /// <param name="showDefaultNotification">Whether to show the default notification from this method after copy is done. 
+        /// <param name="showDefaultNotification">Whether to show the default notification from this method after copy is done.
         ///                                         It will show file/folder/text is copied successfully.
         ///                                         Turn this off to show your own notification after copy is done.</param>>
         public void CopyToClipboard(string text, bool directCopy = false, bool showDefaultNotification = true);
@@ -65,7 +65,7 @@ public interface IPublicAPI
         void SavePluginSettings();
 
         /// <summary>
-        /// Reloads any Plugins that have the 
+        /// Reloads any Plugins that have the
         /// IReloadable implemented. It refeshes
         /// Plugin's in memory data with new content
         /// added by user.
@@ -110,7 +110,7 @@ public interface IPublicAPI
         bool IsMainWindowVisible();
 
         /// <summary>
-        /// Invoked when the visibility of the main window has changed. Currently, the plugin will continue to be subscribed even if it is turned off. 
+        /// Invoked when the visibility of the main window has changed. Currently, the plugin will continue to be subscribed even if it is turned off.
         /// </summary>
         event VisibilityChangedEventHandler VisibilityChanged;
 
@@ -166,7 +166,7 @@ public interface IPublicAPI
         string GetTranslation(string key);
 
         /// <summary>
-        /// Get all loaded plugins 
+        /// Get all loaded plugins
         /// </summary>
         /// <returns></returns>
         List<PluginPair> GetAllPlugins();
@@ -271,8 +271,8 @@ public interface IPublicAPI
         void LogError(string className, string message, [CallerMemberName] string methodName = "");
 
         /// <summary>
-        /// Log an Exception. Will throw if in debug mode so developer will be aware, 
-        /// otherwise logs the eror message. This is the primary logging method used for Flow 
+        /// Log an Exception. Will throw if in debug mode so developer will be aware,
+        /// otherwise logs the eror message. This is the primary logging method used for Flow
         /// </summary>
         void LogException(string className, string message, Exception e, [CallerMemberName] string methodName = "");
 
@@ -359,7 +359,7 @@ public interface IPublicAPI
 
         /// <summary>
         /// Reloads the query.
-        /// When current results are from context menu or history, it will go back to query results before requerying.
+        /// When current results are from context menu or history, it will go back to query results before re-querying.
         /// </summary>
         /// <param name="reselect">Choose the first result after reload if true; keep the last selected result if false. Default is true.</param>
         public void ReQuery(bool reselect = true);
@@ -509,7 +509,7 @@ public interface IPublicAPI
         bool IsApplicationDarkTheme();
 
         /// <summary>
-        /// Invoked when the actual theme of the application has changed. Currently, the plugin will continue to be subscribed even if it is turned off. 
+        /// Invoked when the actual theme of the application has changed. Currently, the plugin will continue to be subscribed even if it is turned off.
         /// </summary>
         event ActualApplicationThemeChangedEventHandler ActualApplicationThemeChanged;
     }

Flow.Launcher/ProgressBoxEx.xaml.cs

@@ -19,32 +19,32 @@ private ProgressBoxEx(Action cancelProgress)
 
         public static async Task ShowAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action cancelProgress = null)
         {
-            ProgressBoxEx prgBox = null;
+            ProgressBoxEx progressBox = null;
             try
             {
                 if (!Application.Current.Dispatcher.CheckAccess())
                 {
                     await Application.Current.Dispatcher.InvokeAsync(() =>
                     {
-                        prgBox = new ProgressBoxEx(cancelProgress)
+                        progressBox = new ProgressBoxEx(cancelProgress)
                         {
                             Title = caption
                         };
-                        prgBox.TitleTextBlock.Text = caption;
-                        prgBox.Show();
+                        progressBox.TitleTextBlock.Text = caption;
+                        progressBox.Show();
                     });
                 }
                 else
                 {
-                    prgBox = new ProgressBoxEx(cancelProgress)
+                    progressBox = new ProgressBoxEx(cancelProgress)
                     {
                         Title = caption
                     };
-                    prgBox.TitleTextBlock.Text = caption;
-                    prgBox.Show();
+                    progressBox.TitleTextBlock.Text = caption;
+                    progressBox.Show();
                 }
 
-                await reportProgressAsync(prgBox.ReportProgress).ConfigureAwait(false);
+                await reportProgressAsync(progressBox.ReportProgress).ConfigureAwait(false);
             }
             catch (Exception e)
             {
@@ -58,12 +58,12 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
                     await Application.Current.Dispatcher.InvokeAsync(() =>
                     {
-                        prgBox?.Close();
+                        progressBox?.Close();
                     });
                 }
                 else
                 {
-                    prgBox?.Close();
+                    progressBox?.Close();
                 }
             }
         }

Flow.Launcher/ViewModel/PluginViewModel.cs

@@ -1,5 +1,4 @@
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;

Flow.Launcher/ViewModel/SelectBrowserViewModel.cs

@@ -1,6 +1,5 @@
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Windows;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;