Merge pull request #697 from Flow-Launcher/dev

Release 1.9.0 | Plugin 2.1.0

Author: jjw24

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

@@ -0,0 +1,57 @@
+using Flow.Launcher.Infrastructure.Http;
+using Flow.Launcher.Infrastructure.Logger;
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Flow.Launcher.Core.ExternalPlugins
+{
+    public static class PluginsManifest
+    {
+        static PluginsManifest()
+        {
+            UpdateTask = UpdateManifestAsync();
+        }
+
+        public static List<UserPlugin> UserPlugins { get; private set; } = new List<UserPlugin>();
+
+        public static Task UpdateTask { get; private set; }
+
+        private static readonly SemaphoreSlim manifestUpdateLock = new(1);
+
+        public static Task UpdateManifestAsync()
+        {
+            if (manifestUpdateLock.CurrentCount == 0)
+            {
+                return UpdateTask;
+            }
+
+            return UpdateTask = DownloadManifestAsync();
+        }
+
+        private async static Task DownloadManifestAsync()
+        {
+            try
+            {
+                await manifestUpdateLock.WaitAsync().ConfigureAwait(false);
+
+                await using var jsonStream = await Http.GetStreamAsync("https://raw.githubusercontent.com/Flow-Launcher/Flow.Launcher.PluginsManifest/plugin_api_v2/plugins.json")
+                                 .ConfigureAwait(false);
+
+                UserPlugins = await JsonSerializer.DeserializeAsync<List<UserPlugin>>(jsonStream).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                Log.Exception("|PluginManagement.GetManifest|Encountered error trying to download plugins manifest", e);
+
+                UserPlugins = new List<UserPlugin>();
+            }
+            finally
+            {
+                manifestUpdateLock.Release();
+            }
+        }
+    }
+}

Plugins/Flow.Launcher.Plugin.PluginsManager/Models/UserPlugin.cs renamed to Flow.Launcher.Core/ExternalPlugins/UserPlugin.cs

@@ -1,7 +1,6 @@
-
-namespace Flow.Launcher.Plugin.PluginsManager.Models
+namespace Flow.Launcher.Core.ExternalPlugins
 {
-    public class UserPlugin
+    public record UserPlugin
     {
         public string ID { get; set; }
         public string Name { get; set; }
@@ -12,5 +11,6 @@ public class UserPlugin
         public string Website { get; set; }
         public string UrlDownload { get; set; }
         public string UrlSourceCode { get; set; }
+        public string IcoPath { get; set; }
     }
 }

Flow.Launcher.Core/Flow.Launcher.Core.csproj

@@ -53,8 +53,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Droplex" Version="1.3.1" />
-    <PackageReference Include="FSharp.Core" Version="4.7.1" />
+    <PackageReference Include="Droplex" Version="1.4.0" />
+    <PackageReference Include="FSharp.Core" Version="5.0.2" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.3" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" />
   </ItemGroup>

Flow.Launcher.Core/Plugin/ExecutablePlugin.cs

@@ -24,36 +24,16 @@ public ExecutablePlugin(string filename)
             };
         }
 
-        protected override Task<Stream> ExecuteQueryAsync(Query query, CancellationToken token)
+        protected override Task<Stream> RequestAsync(JsonRPCRequestModel request, CancellationToken token = default)
         {
-            JsonRPCServerRequestModel request = new JsonRPCServerRequestModel
-            {
-                Method = "query",
-                Parameters = new object[] {query.Search},
-            };
-
             _startInfo.Arguments = $"\"{request}\"";
-
             return ExecuteAsync(_startInfo, token);
         }
 
-        protected override string ExecuteCallback(JsonRPCRequestModel rpcRequest)
+        protected override string Request(JsonRPCRequestModel rpcRequest, CancellationToken token = default)
         {
             _startInfo.Arguments = $"\"{rpcRequest}\"";
             return Execute(_startInfo);
         }
-
-        protected override string ExecuteContextMenu(Result selectedResult)
-        {
-            JsonRPCServerRequestModel request = new JsonRPCServerRequestModel
-            {
-                Method = "contextmenu",
-                Parameters = new object[] {selectedResult.ContextData},
-            };
-
-            _startInfo.Arguments = $"\"{request}\"";
-
-            return Execute(_startInfo);
-        }
     }
 }

Flow.Launcher.Core/Plugin/JsonPRCModel.cs

@@ -43,15 +43,19 @@ public class JsonRPCQueryResponseModel : JsonRPCResponseModel
         [JsonPropertyName("result")]
         public new List<JsonRPCResult> Result { get; set; }
 
+        public Dictionary<string, object> SettingsChange { get; set; }
+
         public string DebugMessage { get; set; }
     }
-    
+
     public class JsonRPCRequestModel
     {
         public string Method { get; set; }
 
         public object[] Parameters { get; set; }
 
+        public Dictionary<string, object> Settings { get; set; }
+
         private static readonly JsonSerializerOptions options = new()
         {
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase
@@ -86,5 +90,7 @@ public class JsonRPCClientRequestModel : JsonRPCRequestModel
     public class JsonRPCResult : Result
     {
         public JsonRPCClientRequestModel JsonRPCAction { get; set; }
+
+        public Dictionary<string, object> SettingsChange { get; set; }
     }
 }

Flow.Launcher.Core/Plugin/JsonRPCConfigurationModel.cs

@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+
+namespace Flow.Launcher.Core.Plugin
+{
+    public class JsonRpcConfigurationModel
+    {
+        public List<SettingField> Body { get; set; }
+        public void Deconstruct(out List<SettingField> Body)
+        {
+            Body = this.Body;
+        }
+    }
+
+    public class SettingField
+    {
+        public string Type { get; set; }
+        public FieldAttributes Attributes { get; set; }
+        public void Deconstruct(out string Type, out FieldAttributes attributes)
+        {
+            Type = this.Type;
+            attributes = this.Attributes;
+        }
+    }
+    public class FieldAttributes
+    {
+        public string Name { get; set; }
+        public string Label { get; set; }
+        public string Description { get; set; }
+        public bool Validation { get; set; }
+        public List<string> Options { get; set; }
+        public string DefaultValue { get; set; }
+        public char passwordChar { get; set; }
+        public void Deconstruct(out string Name, out string Label, out string Description, out bool Validation, out List<string> Options, out string DefaultValue)
+        {
+            Name = this.Name;
+            Label = this.Label;
+            Description = this.Description;
+            Validation = this.Validation;
+            Options = this.Options;
+            DefaultValue = this.DefaultValue;
+        }
+    }
+}