Merge pull request #823 from Garulf/install-from-url

Detect URL and install using Plugin Manager

Author: jjw24

Flow.Launcher.Core/Plugin/PluginConfig.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
@@ -45,8 +45,56 @@ public static List<PluginMetadata> Parse(string[] pluginDirectories)
                     }
                 }
             }
- 
-            return allPluginMetadata;
+
+            (List<PluginMetadata> uniqueList, List<PluginMetadata> duplicateList) = GetUniqueLatestPluginMetadata(allPluginMetadata);
+
+            duplicateList
+                .ForEach(
+                    x => Log.Warn("PluginConfig",
+                                    string.Format("Duplicate plugin name: {0}, id: {1}, version: {2} " +
+                                                    "not loaded due to version not the highest of the duplicates",
+                                                    x.Name, x.ID, x.Version),
+                                                    "GetUniqueLatestPluginMetadata"));
+
+            return uniqueList;
+        }
+
+        internal static (List<PluginMetadata>, List<PluginMetadata>) GetUniqueLatestPluginMetadata(List<PluginMetadata> allPluginMetadata)
+        {
+            var duplicate_list = new List<PluginMetadata>();
+            var unique_list = new List<PluginMetadata>();
+
+            var duplicateGroups = allPluginMetadata.GroupBy(x => x.ID).Where(g => g.Count() > 1).Select(y => y).ToList();
+
+            foreach (var metadata in allPluginMetadata)
+            {
+                var duplicatesExist = false;
+                foreach (var group in duplicateGroups)
+                {
+                    if (metadata.ID == group.Key)
+                    {
+                        duplicatesExist = true;
+
+                        // If metadata's version greater than each duplicate's version, CompareTo > 0
+                        var count = group.Where(x => metadata.Version.CompareTo(x.Version) > 0).Count();
+                        
+                        // Only add if the meatadata's version is the highest of all duplicates in the group
+                        if (count == group.Count() - 1)
+                        {
+                            unique_list.Add(metadata);
+                        }
+                        else
+                        {
+                            duplicate_list.Add(metadata);
+                        }
+                    }
+                }
+                
+                if (!duplicatesExist)
+                    unique_list.Add(metadata);
+            }
+
+            return (unique_list, duplicate_list);
         }
 
         private static PluginMetadata GetPluginMetadata(string pluginDirectory)

Flow.Launcher.Test/PluginLoadTest.cs

@@ -0,0 +1,92 @@
+using NUnit.Framework;
+using Flow.Launcher.Core.Plugin;
+using Flow.Launcher.Plugin;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Flow.Launcher.Test
+{
+    [TestFixture]
+    class PluginLoadTest
+    {
+        [Test]
+        public void GivenDuplicatePluginMetadatasWhenLoadedThenShouldReturnOnlyUniqueList()
+        {
+            // Given
+            var duplicateList = new List<PluginMetadata>
+            {
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.1"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.2"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "ABC0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "ABC0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                }
+            };
+
+            // When
+            (var unique, var duplicates) = PluginConfig.GetUniqueLatestPluginMetadata(duplicateList);
+            
+            // Then
+            Assert.True(unique.FirstOrDefault().ID == "CEA0TYUC6D3B4085823D60DC76F28855" && unique.FirstOrDefault().Version == "1.0.2");
+            Assert.True(unique.Count() == 1);
+
+            Assert.False(duplicates.Any(x => x.Version == "1.0.2" && x.ID == "CEA0TYUC6D3B4085823D60DC76F28855"));
+            Assert.True(duplicates.Count() == 6);
+        }
+
+        [Test]
+        public void GivenDuplicatePluginMetadatasWithNoUniquePluginWhenLoadedThenShouldReturnEmptyList()
+        {
+            // Given
+            var duplicateList = new List<PluginMetadata>
+            {
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                }
+            };
+
+            // When
+            (var unique, var duplicates) = PluginConfig.GetUniqueLatestPluginMetadata(duplicateList);
+
+            // Then
+            Assert.True(unique.Count() == 0);
+            Assert.True(duplicates.Count() == 2);
+        }
+    }
+}

Flow.Launcher.Test/Plugins/PluginInitTest.cs

@@ -4,13 +4,16 @@
 
     <!--Dialogues-->
     <system:String x:Key="plugin_pluginsmanager_downloading_plugin">Downloading plugin</system:String>
-    <system:String x:Key="plugin_pluginsmanager_please_wait">Please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_download_success">Successfully downloaded</system:String>
+    <system:String x:Key="plugin_pluginsmanager_download_error">Error: Unable to download the plugin</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_prompt">{0} by {1} {2}{3}Would you like to uninstall this plugin? After the uninstallation Flow will automatically restart.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3}Would you like to install this plugin? After the installation Flow will automatically restart.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_title">Plugin Install</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_from_web">Download and install {0}</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_title">Plugin Uninstall</system:String>
-    <system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">Install failed: unable to find the plugin.json metadata file from the new plugin</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_success_restart">Plugin successfully installed. Restarting Flow, please wait...</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">Unable to find the plugin.json metadata file from the extracted zip file.</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_error_duplicate">Error: A plugin which has the same or greater version with {0} already exists.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_error_title">Error installing plugin</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_error_subtitle">Error occured while trying to install {0}</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_noresult_title">No update available</system:String>
@@ -21,12 +24,15 @@
     <system:String x:Key="plugin_pluginsmanager_update_alreadyexists">This plugin is already installed</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_failed_title">Plugin Manifest Download Failed</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_failed_subtitle">Please check if you can connect to github.com. This error means you may not be able to install or update plugins.</system:String>
-    
+    <system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning_title">Installing from an unknown source</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning">You are installing this plugin from an unknown source and it may contain potential risks!{0}{0}Please ensure you understand where this plugin is from and that it is safe.{0}{0}Would you like to continue still?{0}{0}(You can switch off this warning via settings)</system:String>
+
     <!--Controls-->
 
     <!--Plugin Infos-->
     <system:String x:Key="plugin_pluginsmanager_plugin_name">Plugins Manager</system:String>
     <system:String x:Key="plugin_pluginsmanager_plugin_description">Management of installing, uninstalling or updating Flow Launcher plugins</system:String>
+    <system:String x:Key="plugin_pluginsmanager_unknown_author">Unknown Author</system:String>
 
     <!--Context menu items-->
     <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_openwebsite_title">Open website</system:String>
@@ -36,6 +42,8 @@
     <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_newissue_title">Suggest an enhancement or submit an issue</system:String>
     <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_newissue_subtitle">Suggest an enhancement or submit an issue to the plugin developer</system:String>
     <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_title">Go to Flow's plugins repository</system:String>
-    <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_subtitle">Visit the PluginsManifest repository to see comunity-made plugin submissions</system:String>
-    
+    <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_subtitle">Visit the PluginsManifest repository to see community-made plugin submissions</system:String>
+
+    <!--Settings menu items-->
+    <system:String x:Key="plugin_pluginsmanager_plugin_settings_unknown_source">Install from unknown source warning</system:String>
 </ResourceDictionary>

Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml

@@ -4,7 +4,6 @@
 
     <!--Dialogues-->
     <system:String x:Key="plugin_pluginsmanager_downloading_plugin">Sťahovanie pluginu</system:String>
-    <system:String x:Key="plugin_pluginsmanager_please_wait">Čakajte, prosím…</system:String>
     <system:String x:Key="plugin_pluginsmanager_download_success">Úspešne stiahnuté</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_prompt">{0} od {1} {2}{3}Chcete odinštalovať tento plugin? Po odinštalovaní sa Flow automaticky reštartuje.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3}Chcete nainštalovať tento plugin? Po nainštalovaní sa Flow automaticky reštartuje.</system:String>

Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/sk.xaml

@@ -4,7 +4,6 @@
 
     <!--Dialogues-->
     <system:String x:Key="plugin_pluginsmanager_downloading_plugin">下载插件</system:String>
-    <system:String x:Key="plugin_pluginsmanager_please_wait">请稍等...</system:String>
     <system:String x:Key="plugin_pluginsmanager_download_success">下载完成</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_prompt">{0} by {1} {2}{3} 您要卸载此插件吗？ 卸载后，Flow Launcher 将自动重启。</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3} 您要安装此插件吗？ 安装后，Flow Launcher 将自动重启</system:String>

Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/zh-cn.xaml

@@ -55,7 +55,7 @@ public List<Result> LoadContextMenus(Result selectedResult)
 
         public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
         {
-            var search = query.Search.ToLower();
+            var search = query.Search;
 
             if (string.IsNullOrWhiteSpace(search))
                 return pluginManager.GetDefaultHotKeys();
@@ -70,9 +70,13 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
 
             return search switch
             {
-                var s when s.StartsWith(Settings.HotKeyInstall) => await pluginManager.RequestInstallOrUpdate(s, token),
-                var s when s.StartsWith(Settings.HotkeyUninstall) => pluginManager.RequestUninstall(s),
-                var s when s.StartsWith(Settings.HotkeyUpdate) => await pluginManager.RequestUpdate(s, token),
+                //search could be url, no need ToLower() when passed in
+                var s when s.StartsWith(Settings.HotKeyInstall, StringComparison.OrdinalIgnoreCase)
+                                => await pluginManager.RequestInstallOrUpdate(search, token),
+                var s when s.StartsWith(Settings.HotkeyUninstall, StringComparison.OrdinalIgnoreCase)
+                                => pluginManager.RequestUninstall(search),
+                var s when s.StartsWith(Settings.HotkeyUpdate, StringComparison.OrdinalIgnoreCase) 
+                                => await pluginManager.RequestUpdate(search, token),
                 _ => pluginManager.GetDefaultHotKeys().Where(hotkey =>
                 {
                     hotkey.Score = StringMatcher.FuzzySearch(search, hotkey.Title).Score;