Merge branch 'dev' into filewatcher

Author: jjw24

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

@@ -2,6 +2,8 @@
 using Flow.Launcher.Infrastructure.Logger;
 using System;
 using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -10,43 +12,43 @@ 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 const string manifestFileUrl = "https://cdn.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@plugin_api_v2/plugins.json";
 
         private static readonly SemaphoreSlim manifestUpdateLock = new(1);
 
-        public static Task UpdateManifestAsync()
-        {
-            if (manifestUpdateLock.CurrentCount == 0)
-            {
-                return UpdateTask;
-            }
+        private static string latestEtag = "";
 
-            return UpdateTask = DownloadManifestAsync();
-        }
+        public static List<UserPlugin> UserPlugins { get; private set; } = new List<UserPlugin>();
 
-        private static async Task DownloadManifestAsync()
+        public static async Task UpdateManifestAsync(CancellationToken token = default)
         {
             try
             {
-                await manifestUpdateLock.WaitAsync().ConfigureAwait(false);
+                await manifestUpdateLock.WaitAsync(token).ConfigureAwait(false);
+
+                var request = new HttpRequestMessage(HttpMethod.Get, manifestFileUrl);
+                request.Headers.Add("If-None-Match", latestEtag);
+
+                var response = await Http.SendAsync(request, token).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);
+                if (response.StatusCode == HttpStatusCode.OK)
+                {
+                    Log.Info($"|PluginsManifest.{nameof(UpdateManifestAsync)}|Fetched plugins from manifest repo");
 
-                UserPlugins = await JsonSerializer.DeserializeAsync<List<UserPlugin>>(jsonStream).ConfigureAwait(false);
+                    var json = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false);
+
+                    UserPlugins = await JsonSerializer.DeserializeAsync<List<UserPlugin>>(json, cancellationToken: token).ConfigureAwait(false);
+
+                    latestEtag = response.Headers.ETag.Tag;
+                }
+                else if (response.StatusCode != HttpStatusCode.NotModified)
+                {
+                    Log.Warn($"|PluginsManifest.{nameof(UpdateManifestAsync)}|Http response for manifest file was {response.StatusCode}");
+                }
             }
             catch (Exception e)
             {
-                Log.Exception("|PluginManagement.GetManifest|Encountered error trying to download plugins manifest", e);
-
-                UserPlugins = new List<UserPlugin>();
+                Log.Exception($"|PluginsManifest.{nameof(UpdateManifestAsync)}|Http request failed", e);
             }
             finally
             {

Flow.Launcher.Infrastructure/Http/Http.cs

@@ -153,5 +153,13 @@ public static async Task<Stream> GetStreamAsync([NotNull] string url, Cancellati
             var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
             return await response.Content.ReadAsStreamAsync();
         }
+
+        /// <summary>
+        /// Asynchrously send an HTTP request.
+        /// </summary>
+        public static async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken token = default)
+        {
+            return await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token);
+        }
     }
 }

Flow.Launcher.Plugin/Result.cs

@@ -29,6 +29,13 @@ public class Result
         /// </summary>
         public string ActionKeywordAssigned { get; set; }
 
+        /// <summary>
+        /// This holds the text which can be provided by plugin to be copied to the 
+        /// user's clipboard when Ctrl + C is pressed on a result. If the text is a file/directory path
+        /// flow will copy the actual file/folder instead of just the path text.
+        /// </summary>
+        public string CopyText { get; set; } = string.Empty;
+
         /// <summary>
         /// This holds the text which can be provided by plugin to help Flow autocomplete text
         /// for user on the plugin result. If autocomplete action for example is tab, pressing tab will have 

Flow.Launcher/App.xaml.cs

@@ -153,7 +153,6 @@ private void RegisterDispatcherUnhandledException()
             DispatcherUnhandledException += ErrorReporting.DispatcherUnhandledException;
         }
 
-
         /// <summary>
         /// let exception throw as normal is better for Debug
         /// </summary>
@@ -179,4 +178,4 @@ public void OnSecondAppStarted()
             Current.MainWindow.Show();
         }
     }
-}
+}

Flow.Launcher/Flow.Launcher.csproj

@@ -88,6 +88,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="InputSimulator" Version="1.0.4" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageReference Include="ModernWpfUI" Version="0.9.4" />
     <PackageReference Include="NHotkey.Wpf" Version="2.1.0" />
     <PackageReference Include="NuGet.CommandLine" Version="5.4.0">