Remove more plugin installation/uninstallation/update logic

Author: TBM13

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -280,12 +280,7 @@ public static ICollection<PluginPair> ValidPluginsForQuery(Query query)
 
             if (!NonGlobalPlugins.TryGetValue(query.ActionKeyword, out var plugin))
             {
-                return GlobalPlugins.Where(p => !PluginModified(p.Metadata.ID)).ToList();
-            }
-
-            if (API.PluginModified(plugin.Metadata.ID))
-            {
-                return Array.Empty<PluginPair>();
+                return GlobalPlugins.ToList();
             }
 
             return new List<PluginPair>
@@ -296,7 +291,7 @@ public static ICollection<PluginPair> ValidPluginsForQuery(Query query)
 
         public static ICollection<PluginPair> ValidPluginsForHomeQuery()
         {
-            return _homePlugins.Where(p => !PluginModified(p.Metadata.ID)).ToList();
+            return _homePlugins.ToList();
         }
 
         public static async Task<List<Result>> QueryForPluginAsync(PluginPair pair, Query query, CancellationToken token)
@@ -503,201 +498,5 @@ public static void RemoveActionKeyword(string id, string oldActionkeyword)
                 plugin.Metadata.ActionKeyword = string.Empty;
             }
         }
-
-        private static string GetContainingFolderPathAfterUnzip(string unzippedParentFolderPath)
-        {
-            var unzippedFolderCount = Directory.GetDirectories(unzippedParentFolderPath).Length;
-            var unzippedFilesCount = Directory.GetFiles(unzippedParentFolderPath).Length;
-
-            // adjust path depending on how the plugin is zipped up
-            // the recommended should be to zip up the folder not the contents
-            if (unzippedFolderCount == 1 && unzippedFilesCount == 0)
-                // folder is zipped up, unzipped plugin directory structure: tempPath/unzippedParentPluginFolder/pluginFolderName/
-                return Directory.GetDirectories(unzippedParentFolderPath)[0];
-
-            if (unzippedFilesCount > 1)
-                // content is zipped up, unzipped plugin directory structure: tempPath/unzippedParentPluginFolder/
-                return unzippedParentFolderPath;
-
-            return string.Empty;
-        }
-
-        private static bool SameOrLesserPluginVersionExists(string metadataPath)
-        {
-            var newMetadata = JsonSerializer.Deserialize<PluginMetadata>(File.ReadAllText(metadataPath));
-            return AllPlugins.Any(x => x.Metadata.ID == newMetadata.ID
-                          && newMetadata.Version.CompareTo(x.Metadata.Version) <= 0);
-        }
-
-        #region Public functions
-
-        public static bool PluginModified(string id)
-        {
-            return _modifiedPlugins.Contains(id);
-        }
-
-        public static async Task UpdatePluginAsync(PluginMetadata existingVersion, UserPlugin newVersion, string zipFilePath)
-        {
-            InstallPlugin(newVersion, zipFilePath, checkModified: false);
-            await UninstallPluginAsync(existingVersion, removePluginFromSettings: false, removePluginSettings: false, checkModified: false);
-            _modifiedPlugins.Add(existingVersion.ID);
-        }
-
-        public static void InstallPlugin(UserPlugin plugin, string zipFilePath)
-        {
-            InstallPlugin(plugin, zipFilePath, checkModified: true);
-        }
-
-        public static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginSettings = false)
-        {
-            await UninstallPluginAsync(plugin, removePluginFromSettings: true, removePluginSettings: removePluginSettings, checkModified: true);
-        }
-
-        #endregion
-
-        #region Internal functions
-
-        internal static void InstallPlugin(UserPlugin plugin, string zipFilePath, bool checkModified)
-        {
-            if (checkModified && PluginModified(plugin.ID))
-            {
-                // Distinguish exception from installing same or less version
-                throw new ArgumentException($"Plugin {plugin.Name} {plugin.ID} has been modified.", nameof(plugin));
-            }
-
-            // Unzip plugin files to temp folder
-            var tempFolderPluginPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-            System.IO.Compression.ZipFile.ExtractToDirectory(zipFilePath, tempFolderPluginPath);
-
-            if (!plugin.IsFromLocalInstallPath)
-                File.Delete(zipFilePath);
-
-            var pluginFolderPath = GetContainingFolderPathAfterUnzip(tempFolderPluginPath);
-
-            var metadataJsonFilePath = string.Empty;
-            if (File.Exists(Path.Combine(pluginFolderPath, Constant.PluginMetadataFileName)))
-                metadataJsonFilePath = Path.Combine(pluginFolderPath, Constant.PluginMetadataFileName);
-
-            if (string.IsNullOrEmpty(metadataJsonFilePath) || string.IsNullOrEmpty(pluginFolderPath))
-            {
-                throw new FileNotFoundException($"Unable to find plugin.json from the extracted zip file, or this path {pluginFolderPath} does not exist");
-            }
-
-            if (SameOrLesserPluginVersionExists(metadataJsonFilePath))
-            {
-                throw new InvalidOperationException($"A plugin with the same ID and version already exists, or the version is greater than this downloaded plugin {plugin.Name}");
-            }
-
-            var folderName = string.IsNullOrEmpty(plugin.Version) ? $"{plugin.Name}-{Guid.NewGuid()}" : $"{plugin.Name}-{plugin.Version}";
-
-            var defaultPluginIDs = new List<string>
-                {
-                    "0ECADE17459B49F587BF81DC3A125110", // BrowserBookmark
-                    "CEA0FDFC6D3B4085823D60DC76F28855", // Calculator
-                    "572be03c74c642baae319fc283e561a8", // Explorer
-                    "6A122269676E40EB86EB543B945932B9", // PluginIndicator
-                    "b64d0a79-329a-48b0-b53f-d658318a1bf6", // ProcessKiller
-                    "791FC278BA414111B8D1886DFE447410", // Program
-                    "D409510CD0D2481F853690A07E6DC426", // Shell
-                    "CEA08895D2544B019B2E9C5009600DF4", // Sys
-                    "0308FD86DE0A4DEE8D62B9B535370992", // URL
-                    "5043CETYU6A748679OPA02D27D99677A" // WindowsSettings
-                };
-
-            // Treat default plugin differently, it needs to be removable along with each flow release
-            var installDirectory = !defaultPluginIDs.Any(x => x == plugin.ID)
-                                    ? DataLocation.PluginsDirectory
-                                    : Constant.PreinstalledDirectory;
-
-            var newPluginPath = Path.Combine(installDirectory, folderName);
-
-            FilesFolders.CopyAll(pluginFolderPath, newPluginPath, (s) => API.ShowMsgBox(s));
-
-            try
-            {
-                if (Directory.Exists(tempFolderPluginPath))
-                    Directory.Delete(tempFolderPluginPath, true);
-            }
-            catch (Exception e)
-            {
-                API.LogException(ClassName, $"Failed to delete temp folder {tempFolderPluginPath}", e);
-            }
-
-            if (checkModified)
-            {
-                _modifiedPlugins.Add(plugin.ID);
-            }
-        }
-
-        internal static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginFromSettings, bool removePluginSettings, bool checkModified)
-        {
-            if (checkModified && PluginModified(plugin.ID))
-            {
-                throw new ArgumentException($"Plugin {plugin.Name} has been modified");
-            }
-
-            if (removePluginSettings || removePluginFromSettings)
-            {
-                // If we want to remove plugin from AllPlugins,
-                // we need to dispose them so that they can release file handles
-                // which can help FL to delete the plugin settings & cache folders successfully
-                var pluginPairs = AllPlugins.FindAll(p => p.Metadata.ID == plugin.ID);
-                foreach (var pluginPair in pluginPairs)
-                {
-                    await DisposePluginAsync(pluginPair);
-                }
-            }
-
-            if (removePluginSettings)
-            {
-                // For dotnet plugins, we need to remove their PluginJsonStorage and PluginBinaryStorage instances
-                if (AllowedLanguage.IsDotNet(plugin.Language) && API is IRemovable removable)
-                {
-                    removable.RemovePluginSettings(plugin.AssemblyName);
-                    removable.RemovePluginCaches(plugin.PluginCacheDirectoryPath);
-                }
-
-                try
-                {
-                    var pluginSettingsDirectory = plugin.PluginSettingsDirectoryPath;
-                    if (Directory.Exists(pluginSettingsDirectory))
-                        Directory.Delete(pluginSettingsDirectory, true);
-                }
-                catch (Exception e)
-                {
-                    API.LogException(ClassName, $"Failed to delete plugin settings folder for {plugin.Name}", e);
-                    API.ShowMsg(API.GetTranslation("failedToRemovePluginSettingsTitle"),
-                        string.Format(API.GetTranslation("failedToRemovePluginSettingsMessage"), plugin.Name));
-                }
-            }
-
-            if (removePluginFromSettings)
-            {
-                try
-                {
-                    var pluginCacheDirectory = plugin.PluginCacheDirectoryPath;
-                    if (Directory.Exists(pluginCacheDirectory))
-                        Directory.Delete(pluginCacheDirectory, true);
-                }
-                catch (Exception e)
-                {
-                    API.LogException(ClassName, $"Failed to delete plugin cache folder for {plugin.Name}", e);
-                    API.ShowMsg(API.GetTranslation("failedToRemovePluginCacheTitle"),
-                        string.Format(API.GetTranslation("failedToRemovePluginCacheMessage"), plugin.Name));
-                }
-                Settings.RemovePluginSettings(plugin.ID);
-                AllPlugins.RemoveAll(p => p.Metadata.ID == plugin.ID);
-            }
-
-            // Marked for deletion. Will be deleted on next start up
-            using var _ = File.CreateText(Path.Combine(plugin.PluginDirectory, "NeedDelete.txt"));
-
-            if (checkModified)
-            {
-                _modifiedPlugins.Add(plugin.ID);
-            }
-        }
-
-        #endregion
     }
 }

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -476,47 +476,6 @@ public interface IPublicAPI
         /// <returns></returns>
         ValueTask<ImageSource> LoadImageAsync(string path, bool loadFullImage = false, bool cacheImage = true);
 
-        /// <summary>
-        /// Check if the plugin has been modified.
-        /// If this plugin is updated, installed or uninstalled and users do not restart the app,
-        /// it will be marked as modified
-        /// </summary>
-        /// <param name="id">Plugin id</param>
-        /// <returns></returns>
-        public bool PluginModified(string id);
-
-        /// <summary>
-        /// Update a plugin to new version, from a zip file. By default will remove the zip file if update is via url,
-        /// unless it's a local path installation
-        /// </summary>
-        /// <param name="pluginMetadata">The metadata of the old plugin to update</param>
-        /// <param name="plugin">The new plugin to update</param>
-        /// <param name="zipFilePath">
-        /// Path to the zip file containing the plugin. It will be unzipped to the temporary directory, removed and installed.
-        /// </param>
-        /// <returns></returns>
-        public Task UpdatePluginAsync(PluginMetadata pluginMetadata, UserPlugin plugin, string zipFilePath);
-
-        /// <summary>
-        /// Install a plugin. By default will remove the zip file if installation is from url,
-        /// unless it's a local path installation
-        /// </summary>
-        /// <param name="plugin">The plugin to install</param>
-        /// <param name="zipFilePath">
-        /// Path to the zip file containing the plugin. It will be unzipped to the temporary directory, removed and installed.
-        /// </param>
-        public void InstallPlugin(UserPlugin plugin, string zipFilePath);
-
-        /// <summary>
-        /// Uninstall a plugin
-        /// </summary>
-        /// <param name="pluginMetadata">The metadata of the plugin to uninstall</param>
-        /// <param name="removePluginSettings">
-        /// Plugin has their own settings. If this is set to true, the plugin settings will be removed.
-        /// </param>
-        /// <returns></returns>
-        public Task UninstallPluginAsync(PluginMetadata pluginMetadata, bool removePluginSettings = false);
-
         /// <summary>
         /// Log debug message of the time taken to execute a method
         /// Message will only be logged in Debug mode

Flow.Launcher/PublicAPIInstance.cs

@@ -537,17 +537,6 @@ public void SavePluginCaches()
         public ValueTask<ImageSource> LoadImageAsync(string path, bool loadFullImage = false, bool cacheImage = true) =>
             ImageLoader.LoadAsync(path, loadFullImage, cacheImage);
 
-        public bool PluginModified(string id) => PluginManager.PluginModified(id);
-
-        public Task UpdatePluginAsync(PluginMetadata pluginMetadata, UserPlugin plugin, string zipFilePath) =>
-            PluginManager.UpdatePluginAsync(pluginMetadata, plugin, zipFilePath);
-
-        public void InstallPlugin(UserPlugin plugin, string zipFilePath) =>
-            PluginManager.InstallPlugin(plugin, zipFilePath);
-
-        public Task UninstallPluginAsync(PluginMetadata pluginMetadata, bool removePluginSettings = false) =>
-            PluginManager.UninstallPluginAsync(pluginMetadata, removePluginSettings);
-
         public long StopwatchLogDebug(string className, string message, Action action, [CallerMemberName] string methodName = "") =>
             Stopwatch.Debug(className, message, action, methodName);