Merge remote-tracking branch 'origin/dev' into PluginSearchTextBox

# Conflicts:
#	Flow.Launcher/Languages/en.xaml

Author: taooceros

.github/workflows/stale.yml

@@ -0,0 +1,23 @@
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v4
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
+          days-before-stale: 30
+          days-before-close: 5
+          days-before-pr-close: -1
+          exempt-all-milestones: true
+          close-issue-message: 'This issue was closed because it has been stale for 5 days with no activity. If you feel this issue still needs attention please feel free to reopen.'

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 async static 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.Core/Flow.Launcher.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
     <OutputType>Library</OutputType>
@@ -53,7 +53,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Droplex" Version="1.4.0" />
+    <PackageReference Include="Droplex" Version="1.4.1" />
     <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" />

Flow.Launcher.Core/Plugin/ExecutablePlugin.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -22,18 +21,23 @@ public ExecutablePlugin(string filename)
                 RedirectStandardOutput = true,
                 RedirectStandardError = true
             };
+            
+            // required initialisation for below request calls 
+            _startInfo.ArgumentList.Add(string.Empty);
         }
 
         protected override Task<Stream> RequestAsync(JsonRPCRequestModel request, CancellationToken token = default)
         {
-            _startInfo.Arguments = $"\"{request}\"";
+            // since this is not static, request strings will build up in ArgumentList if index is not specified
+            _startInfo.ArgumentList[0] = request.ToString();
             return ExecuteAsync(_startInfo, token);
         }
 
         protected override string Request(JsonRPCRequestModel rpcRequest, CancellationToken token = default)
         {
-            _startInfo.Arguments = $"\"{rpcRequest}\"";
+            // since this is not static, request strings will build up in ArgumentList if index is not specified
+            _startInfo.ArgumentList[0] = rpcRequest.ToString();
             return Execute(_startInfo);
         }
     }
-}
+}

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

@@ -354,7 +354,9 @@ public virtual async Task InitAsync(PluginInitContext context)
             this.context = context;
             await InitSettingAsync();
         }
-        private static readonly Thickness settingControlMargin = new(10);
+        private static readonly Thickness settingControlMargin = new(10, 4, 10, 4);
+        private static readonly Thickness settingPanelMargin = new(15, 20, 15, 20);
+        private static readonly Thickness settingTextBlockMargin = new(10, 4, 10, 4);
         private JsonRpcConfigurationModel _settingsTemplate;
         public Control CreateSettingPanel()
         {
@@ -363,7 +365,7 @@ public Control CreateSettingPanel()
             var settingWindow = new UserControl();
             var mainPanel = new StackPanel
             {
-                Margin = settingControlMargin,
+                Margin = settingPanelMargin,
                 Orientation = Orientation.Vertical
             };
             settingWindow.Content = mainPanel;
@@ -375,10 +377,13 @@ public Control CreateSettingPanel()
                     Orientation = Orientation.Horizontal,
                     Margin = settingControlMargin
                 };
-                var name = new Label()
+                var name = new TextBlock()
                 {
-                    Content = attribute.Label,
-                    Margin = settingControlMargin
+                    Text = attribute.Label,
+                    Width = 120,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    Margin = settingControlMargin,
+                    TextWrapping = TextWrapping.WrapWithOverflow
                 };
 
                 FrameworkElement contentControl;
@@ -390,8 +395,8 @@ public Control CreateSettingPanel()
                             contentControl = new TextBlock
                             {
                                 Text = attribute.Description.Replace("\\r\\n", "\r\n"),
-                                Margin = settingControlMargin,
-                                MaxWidth = 400,
+                                Margin = settingTextBlockMargin,
+                                MaxWidth = 500,
                                 TextWrapping = TextWrapping.WrapWithOverflow
                             };
                             break;

Flow.Launcher.Core/Plugin/PluginAssemblyLoader.cs

@@ -15,20 +15,6 @@ internal class PluginAssemblyLoader : AssemblyLoadContext
 
         private readonly AssemblyName assemblyName;
 
-        private static readonly ConcurrentDictionary<string, byte> loadedAssembly;
-
-        static PluginAssemblyLoader()
-        {
-            var currentAssemblies = AppDomain.CurrentDomain.GetAssemblies();
-            loadedAssembly = new ConcurrentDictionary<string, byte>(
-                currentAssemblies.Select(x => new KeyValuePair<string, byte>(x.FullName, default)));
-
-            AppDomain.CurrentDomain.AssemblyLoad += (sender, args) =>
-            {
-                loadedAssembly[args.LoadedAssembly.FullName] = default;
-            };
-        }
-
         internal PluginAssemblyLoader(string assemblyFilePath)
         {
             dependencyResolver = new AssemblyDependencyResolver(assemblyFilePath);
@@ -47,21 +33,15 @@ protected override Assembly Load(AssemblyName assemblyName)
             // When resolving dependencies, ignore assembly depenedencies that already exits with Flow.Launcher
             // Otherwise duplicate assembly will be loaded and some weird behavior will occur, such as WinRT.Runtime.dll
             // will fail due to loading multiple versions in process, each with their own static instance of registration state
-            if (assemblyPath == null || ExistsInReferencedPackage(assemblyName))
-                return null;
+            var existAssembly = Default.Assemblies.FirstOrDefault(x => x.FullName == assemblyName.FullName);
 
-            return LoadFromAssemblyPath(assemblyPath);
+            return existAssembly ?? (assemblyPath == null ? null : LoadFromAssemblyPath(assemblyPath));
         }
 
         internal Type FromAssemblyGetTypeOfInterface(Assembly assembly, Type type)
         {
             var allTypes = assembly.ExportedTypes;
             return allTypes.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Any(t => t == type));
         }
-
-        internal bool ExistsInReferencedPackage(AssemblyName assemblyName)
-        {
-            return loadedAssembly.ContainsKey(assemblyName.FullName);
-        }
     }
 }

Flow.Launcher.Core/Resource/AvailableLanguages.cs

@@ -19,6 +19,8 @@ internal static class AvailableLanguages
         public static Language Serbian = new Language("sr", "Srpski");
         public static Language Portuguese_Portugal = new Language("pt-pt", "Português");
         public static Language Portuguese_Brazil = new Language("pt-br", "Português (Brasil)");
+        public static Language Spanish = new Language("es", "Spanish");
+        public static Language Spanish_LatinAmerica = new Language("es-419", "Spanish (Latin America)");
         public static Language Italian = new Language("it", "Italiano");
         public static Language Norwegian_Bokmal = new Language("nb-NO", "Norsk Bokmål");
         public static Language Slovak = new Language("sk", "Slovenský");
@@ -43,6 +45,8 @@ public static List<Language> GetAvailableLanguages()
                 Serbian,
                 Portuguese_Portugal,
                 Portuguese_Brazil,
+                Spanish,
+                Spanish_LatinAmerica,
                 Italian,
                 Norwegian_Bokmal,
                 Slovak,

Flow.Launcher.Core/Updater.cs

@@ -91,8 +91,9 @@ public async Task UpdateAppAsync(IPublicAPI api, bool silentUpdate = true)
             catch (Exception e) when (e is HttpRequestException or WebException or SocketException || e.InnerException is TimeoutException)
             {
                 Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
-                api.ShowMsg(api.GetTranslation("update_flowlauncher_fail"),
-                    api.GetTranslation("update_flowlauncher_check_connection"));
+                if (!silentUpdate)
+                    api.ShowMsg(api.GetTranslation("update_flowlauncher_fail"),
+                        api.GetTranslation("update_flowlauncher_check_connection"));
             }
             finally
             {
@@ -124,7 +125,7 @@ private async Task<UpdateManager> GitHubUpdateManager(string repository)
             var releases = await System.Text.Json.JsonSerializer.DeserializeAsync<List<GithubRelease>>(jsonStream).ConfigureAwait(false);
             var latest = releases.Where(r => !r.Prerelease).OrderByDescending(r => r.PublishedAt).First();
             var latestUrl = latest.HtmlUrl.Replace("/tag/", "/download/");
-            
+
             var client = new WebClient
             {
                 Proxy = Http.WebProxy

Flow.Launcher.Infrastructure/Constant.cs

@@ -21,7 +21,7 @@ public static class Constant
         public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins);
         public const string Issue = "https://github.com/Flow-Launcher/Flow.Launcher/issues/new";
         public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
-        public const string Documentation = "https://flow-launcher.github.io/docs/#/usage-tips";
+        public const string Documentation = "https://flowlauncher.com/docs/#/usage-tips";
 
         public static readonly int ThumbnailSize = 64;
         private static readonly string ImagesDirectory = Path.Combine(ProgramDirectory, "Images");
@@ -43,8 +43,8 @@ public static class Constant
         public const string Settings = "Settings";
         public const string Logs = "Logs";
 
-        public const string Website = "https://flow-launcher.github.io";
+        public const string Website = "https://flowlauncher.com";
         public const string GitHub = "https://github.com/Flow-Launcher/Flow.Launcher";
-        public const string Docs = "https://flow-launcher.github.io/docs";
+        public const string Docs = "https://flowlauncher.com/docs";
     }
 }

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <ProjectGuid>{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <UseWpf>true</UseWpf>