Merge pull request #3233 from Jack251970/plugins_manifest_reupdate

Fix Plugin Store Page Refresh Issue

Author: Jack251970

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

@@ -1,4 +1,4 @@
-using Flow.Launcher.Infrastructure.Logger;
+using Flow.Launcher.Infrastructure.Logger;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -21,7 +21,7 @@ public static class PluginsManifest
 
         public static List<UserPlugin> UserPlugins { get; private set; }
 
-        public static async Task UpdateManifestAsync(CancellationToken token = default, bool usePrimaryUrlOnly = false)
+        public static async Task<bool> UpdateManifestAsync(CancellationToken token = default, bool usePrimaryUrlOnly = false)
         {
             try
             {
@@ -31,8 +31,14 @@ public static async Task UpdateManifestAsync(CancellationToken token = default,
                 {
                     var results = await mainPluginStore.FetchAsync(token, usePrimaryUrlOnly).ConfigureAwait(false);
 
-                    UserPlugins = results;
-                    lastFetchedAt = DateTime.Now;
+                    // 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;
+
+                        return true;
+                    }
                 }
             }
             catch (Exception e)
@@ -43,6 +49,8 @@ public static async Task UpdateManifestAsync(CancellationToken token = default,
             {
                 manifestUpdateLock.Release();
             }
+
+            return false;
         }
     }
 }

Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs

@@ -13,8 +13,8 @@ public partial class SettingsPanePluginStoreViewModel : BaseModel
 {
     public string FilterText { get; set; } = string.Empty;
 
-    public IList<PluginStoreItemViewModel> ExternalPlugins => PluginsManifest.UserPlugins
-        .Select(p => new PluginStoreItemViewModel(p))
+    public IList<PluginStoreItemViewModel> ExternalPlugins => 
+        PluginsManifest.UserPlugins?.Select(p => new PluginStoreItemViewModel(p))
         .OrderByDescending(p => p.Category == PluginStoreItemViewModel.NewRelease)
         .ThenByDescending(p => p.Category == PluginStoreItemViewModel.RecentlyUpdated)
         .ThenByDescending(p => p.Category == PluginStoreItemViewModel.None)
@@ -24,8 +24,10 @@ public partial class SettingsPanePluginStoreViewModel : BaseModel
     [RelayCommand]
     private async Task RefreshExternalPluginsAsync()
     {
-        await PluginsManifest.UpdateManifestAsync();
-        OnPropertyChanged(nameof(ExternalPlugins));
+        if (await PluginsManifest.UpdateManifestAsync())
+        {
+            OnPropertyChanged(nameof(ExternalPlugins));
+        }
     }
 
     public bool SatisfiesFilter(PluginStoreItemViewModel plugin)