fix issue with plugin

insomniachi · Jan 3, 2024 · e290767 · e290767
1 parent 64393fa
commit e290767
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/Totoro.Plugins/PluginInfo.cs b/Totoro.Plugins/PluginInfo.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Totoro.Plugins;
 
@@ -19,3 +20,17 @@ public PluginInfo()
 }
 
 public record PluginInfoSlim(string FileName, string Version, bool Exists = true, string DisplayName = "");
+
+public class PluginInfoEqualityComparer : IEqualityComparer<PluginInfoSlim>
+{
+    public bool Equals(PluginInfoSlim x, PluginInfoSlim y)
+    {
+        return x.FileName == y.FileName &&
+               x.Version == y.Version;
+    }
+
+    public int GetHashCode([DisallowNull] PluginInfoSlim obj)
+    {
+        return HashCode.Combine(obj.FileName, obj.Version);
+    }
+}
diff --git a/Totoro.Plugins/PluginManager.cs b/Totoro.Plugins/PluginManager.cs
@@ -101,9 +101,11 @@ private async Task DownloadOrUpdatePlugins(List<PluginInfoSlim> listedPlugins, I
             return;
         }
 
+        var comparer = new PluginInfoEqualityComparer();
+
         Directory.CreateDirectory(folder);
 
-        var newReleases = listedPlugins.Except(localPlugins).ToList();
+        var newReleases = listedPlugins.Except(localPlugins, comparer).ToList();
         foreach (var item in newReleases)
         {
             var path = Path.Combine(folder, item.FileName);
@@ -131,7 +133,7 @@ private async Task DownloadOrUpdatePlugins(List<PluginInfoSlim> listedPlugins, I
         if (!AllowSideLoadingPlugins)
         {
             localPlugins = Directory.GetFiles(folder).Select(x => new PluginInfoSlim(Path.GetFileName(x), FileVersionInfo.GetVersionInfo(x).FileVersion!));
-            foreach (var item in localPlugins.Except(listedPlugins))
+            foreach (var item in localPlugins.Except(listedPlugins, comparer))
             {
                 this.Log().Info($"Removing plugin : {item.FileName}");
                 File.Delete(Path.Combine(folder, item.FileName));