Merge branch 'dev' into ui_wpf_modern

Author: Jack251970

.github/workflows/default_plugins.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 9.0.x
 

.github/workflows/dotnet.yml

@@ -29,7 +29,7 @@ jobs:
             "**/SolutionAssemblyInfo.cs"
           version: ${{ env.FlowVersion }}.${{ env.BUILD_NUMBER }}
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 9.0.x
 #          cache: true

.github/workflows/release_pr.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
 

.github/workflows/stale.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           stale-issue-message: 'This issue is stale because it has been open ${{ env.days-before-stale }} days with no activity. Remove stale label or comment or this will be closed in ${{ env.days-before-stale }} days.\n\nAlternatively this issue can be kept open by adding one of the following labels:\n${{ env.exempt-issue-labels }}'
           days-before-stale: ${{ env.days-before-stale }}

Flow.Launcher.Core/ExternalPlugins/Environments/PythonEnvironment.cs

@@ -11,6 +11,8 @@ namespace Flow.Launcher.Core.ExternalPlugins.Environments
 {
     internal class PythonEnvironment : AbstractPluginEnvironment
     {
+        private static readonly string ClassName = nameof(PythonEnvironment);
+
         internal override string Language => AllowedLanguage.Python;
 
         internal override string EnvName => DataLocation.PythonEnvironmentName;
@@ -39,9 +41,20 @@ internal override void InstallEnvironment()
 
             // Python 3.11.4 is no longer Windows 7 compatible. If user is on Win 7 and
             // uses Python plugin they need to custom install and use v3.8.9
-            JTF.Run(() => DroplexPackage.Drop(App.python_3_11_4_embeddable, InstallPath));
+            JTF.Run(async () =>
+            {
+                try
+                {
+                    await DroplexPackage.Drop(App.python_3_11_4_embeddable, InstallPath);
 
-            PluginsSettingsFilePath = ExecutablePath;
+                    PluginsSettingsFilePath = ExecutablePath;
+                }
+                catch (System.Exception e)
+                {
+                    API.ShowMsgError(API.GetTranslation("failToInstallPythonEnv"));
+                    API.LogException(ClassName, "Failed to install Python environment", e);
+                }
+            });
         }
 
         internal override PluginPair CreatePluginPair(string filePath, PluginMetadata metadata)

Flow.Launcher.Core/ExternalPlugins/Environments/TypeScriptEnvironment.cs

@@ -11,6 +11,8 @@ namespace Flow.Launcher.Core.ExternalPlugins.Environments
 {
     internal class TypeScriptEnvironment : AbstractPluginEnvironment
     {
+        private static readonly string ClassName = nameof(TypeScriptEnvironment);
+
         internal override string Language => AllowedLanguage.TypeScript;
 
         internal override string EnvName => DataLocation.NodeEnvironmentName;
@@ -34,9 +36,20 @@ internal override void InstallEnvironment()
         {
             FilesFolders.RemoveFolderIfExists(InstallPath, (s) => API.ShowMsgBox(s));
 
-            JTF.Run(() => DroplexPackage.Drop(App.nodejs_16_18_0, InstallPath));
+            JTF.Run(async () =>
+            {
+                try
+                {
+                    await DroplexPackage.Drop(App.nodejs_16_18_0, InstallPath);
 
-            PluginsSettingsFilePath = ExecutablePath;
+                    PluginsSettingsFilePath = ExecutablePath;
+                }
+                catch (System.Exception e)
+                {
+                    API.ShowMsgError(API.GetTranslation("failToInstallTypeScriptEnv"));
+                    API.LogException(ClassName, "Failed to install TypeScript environment", e);
+                }
+            });
         }
 
         internal override PluginPair CreatePluginPair(string filePath, PluginMetadata metadata)

Flow.Launcher.Core/ExternalPlugins/Environments/TypeScriptV2Environment.cs

@@ -11,6 +11,8 @@ namespace Flow.Launcher.Core.ExternalPlugins.Environments
 {
     internal class TypeScriptV2Environment : AbstractPluginEnvironment
     {
+        private static readonly string ClassName = nameof(TypeScriptV2Environment);
+
         internal override string Language => AllowedLanguage.TypeScriptV2;
 
         internal override string EnvName => DataLocation.NodeEnvironmentName;
@@ -34,9 +36,20 @@ internal override void InstallEnvironment()
         {
             FilesFolders.RemoveFolderIfExists(InstallPath, (s) => API.ShowMsgBox(s));
 
-            JTF.Run(() => DroplexPackage.Drop(App.nodejs_16_18_0, InstallPath));
+            JTF.Run(async () =>
+            {
+                try
+                {
+                    await DroplexPackage.Drop(App.nodejs_16_18_0, InstallPath);
 
-            PluginsSettingsFilePath = ExecutablePath;
+                    PluginsSettingsFilePath = ExecutablePath;
+                }
+                catch (System.Exception e)
+                {
+                    API.ShowMsgError(API.GetTranslation("failToInstallTypeScriptEnv"));
+                    API.LogException(ClassName, "Failed to install TypeScript environment", e);
+                }
+            });
         }
 
         internal override PluginPair CreatePluginPair(string filePath, PluginMetadata metadata)

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Plugin;
+using Flow.Launcher.Infrastructure;
 
 namespace Flow.Launcher.Core.ExternalPlugins
 {
@@ -12,10 +13,10 @@ public static class PluginsManifest
         private static readonly string ClassName = nameof(PluginsManifest);
 
         private static readonly CommunityPluginStore mainPluginStore =
-            new("https://raw.githubusercontent.com/Flow-Launcher/Flow.Launcher.PluginsManifest/plugin_api_v2/plugins.json",
-                "https://fastly.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@plugin_api_v2/plugins.json",
-                "https://gcore.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@plugin_api_v2/plugins.json",
-                "https://cdn.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@plugin_api_v2/plugins.json");
+            new("https://raw.githubusercontent.com/Flow-Launcher/Flow.Launcher.PluginsManifest/main/plugins.json",
+                "https://fastly.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@main/plugins.json",
+                "https://gcore.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@main/plugins.json",
+                "https://cdn.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@main/plugins.json");
 
         private static readonly SemaphoreSlim manifestUpdateLock = new(1);
 
@@ -39,13 +40,23 @@ public static async Task<bool> UpdateManifestAsync(bool usePrimaryUrlOnly = fals
                     var results = await mainPluginStore.FetchAsync(token, usePrimaryUrlOnly).ConfigureAwait(false);
 
                     // If the results are empty, we shouldn't update the manifest because the results are invalid.
-                    if (results.Count != 0)
-                    {
-                        UserPlugins = results;
-                        lastFetchedAt = DateTime.Now;
+                    if (results.Count == 0)
+                        return false;
 
-                        return true;
+                    var updatedPluginResults = new List<UserPlugin>();
+                    var appVersion = SemanticVersioning.Version.Parse(Constant.Version);
+                    
+                    for (int i = 0; i < results.Count; i++)
+                    {
+                        if (IsMinimumAppVersionSatisfied(results[i], appVersion))
+                            updatedPluginResults.Add(results[i]);
                     }
+
+                    UserPlugins = updatedPluginResults;
+
+                    lastFetchedAt = DateTime.Now;
+
+                    return true;
                 }
             }
             catch (Exception e)
@@ -59,5 +70,28 @@ public static async Task<bool> UpdateManifestAsync(bool usePrimaryUrlOnly = fals
 
             return false;
         }
+
+        private static bool IsMinimumAppVersionSatisfied(UserPlugin plugin, SemanticVersioning.Version appVersion)
+        {
+            if (string.IsNullOrEmpty(plugin.MinimumAppVersion))
+                return true;
+
+            try
+            {
+                if (appVersion >= SemanticVersioning.Version.Parse(plugin.MinimumAppVersion))
+                    return true;
+            }
+            catch (Exception e)
+            {
+                API.LogException(ClassName, $"Failed to parse the minimum app version {plugin.MinimumAppVersion} for plugin {plugin.Name}. "
+                    + "Plugin excluded from manifest", e);
+                return false;
+            }
+
+            API.LogInfo(ClassName, $"Plugin {plugin.Name} requires minimum Flow Launcher version {plugin.MinimumAppVersion}, "
+                    + $"but current version is {Constant.Version}. Plugin excluded from manifest.");
+
+            return false;
+        }
     }
 }

Flow.Launcher.Core/Plugin/PluginInstaller.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;

Flow.Launcher.Core/Plugin/PluginsLoader.cs

@@ -124,13 +124,9 @@ private static IEnumerable<PluginPair> DotNetPlugins(List<PluginMetadata> source
                     API.GetTranslation("pluginsHaveErrored") :
                     API.GetTranslation("pluginHasErrored");
 
-                _ = Task.Run(() =>
-                {
-                    API.ShowMsgBox($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +
-                                    $"{errorPluginString}{Environment.NewLine}{Environment.NewLine}" +
-                                    API.GetTranslation("referToLogs"), string.Empty,
-                        MessageBoxButton.OK, MessageBoxImage.Warning);
-                });
+                API.ShowMsgError($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +
+                    $"{errorPluginString}{Environment.NewLine}{Environment.NewLine}" +
+                    API.GetTranslation("referToLogs"));
             }
 
             return plugins;