Merge pull request #2665 from nicehash/master_localPluginVersions

Local plugin versions prioritized
nicehash · Apr 20, 2022 · ebaca06 · ebaca06
2 parents b2d7518 + 4d33fc5
commit ebaca06
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 13 deletions.
diff --git a/src/Miners/Excavator/ExcavatorPlugin.cs b/src/Miners/Excavator/ExcavatorPlugin.cs
@@ -44,7 +44,7 @@ public ExcavatorPlugin()
             };
             PluginMetaInfo = new PluginMetaInfo
             {
-                PluginDescription = "Excavator NVIDIA GPU miner from NiceHash",
+                PluginDescription = "Excavator NVIDIA/AMD GPU miner from NiceHash",
                 SupportedDevicesAlgorithms = SupportedDevicesAlgorithmsDict()
             };
         }

diff --git a/src/NHM.MinerPluginToolkitV1/Checkers.cs b/src/NHM.MinerPluginToolkitV1/Checkers.cs
@@ -37,6 +37,7 @@ public static bool IsGcn2(AMDDevice dev)
         }
 
         private static int[] _supportedMajorVersions = new int[] { 16, 17 };
+        public static int GetLatestSupportedVersion => _supportedMajorVersions.Max();
         public static IEnumerable<int> SupportedMajorVersions => _supportedMajorVersions;
         public static bool IsMajorVersionSupported(int major) => _supportedMajorVersions.Contains(major);
 

diff --git a/src/NHMCore/Mining/Plugins/MinerPluginsManager.cs b/src/NHMCore/Mining/Plugins/MinerPluginsManager.cs
@@ -666,6 +666,11 @@ private static void CrossReferenceInstalledWithOnlineEthlargementIntegratedPlugi
             }
         }
 
+        private static string ConstructLocalPluginDescription(PluginBase plugin)
+        {
+            var binVersion = plugin.GetMinerBinaryVersion();
+            return $"Miner Binary Version '{binVersion}'.\n\n" + plugin.GetPluginMetaInfo().PluginDescription;
+        }
         public static void CrossReferenceInstalledWithOnline()
         {
             // EthlargementIntegratedPlugin special case
@@ -687,6 +692,19 @@ public static void CrossReferenceInstalledWithOnline()
                     PluginVersion = installed.Version,
                     // other stuff is not inside the plugin
                 };
+                if (installed.GetPlugin() is PluginBase pb)
+                {
+                    localPluginInfo.MinerPackageURL = pb.GetMinerBinsUrlsForPlugin().FirstOrDefault();
+                    localPluginInfo.PluginDescription = ConstructLocalPluginDescription(pb);
+                    localPluginInfo.SupportedDevicesAlgorithms = new Dictionary<string, List<string>>();
+                    localPluginInfo.PackagePassword = pb.BinsPackagePassword;
+                    var supportedList = pb.SupportedDevicesAlgorithmsDict();
+                    foreach (var supported in supportedList)
+                    {
+                        var algos = supported.Value.Select(algo => Enum.GetName(typeof(AlgorithmType), algo)).ToList();
+                        localPluginInfo.SupportedDevicesAlgorithms.Add(Enum.GetName(typeof(DeviceType), supported.Key), algos);
+                    }
+                }
                 if (PluginsPackagesInfosCRs.ContainsKey(uuid) == false)
                 {
                     PluginsPackagesInfosCRs[uuid] = new PluginPackageInfoCR(uuid);

diff --git a/src/NHMCore/Mining/Plugins/PluginContainer.cs b/src/NHMCore/Mining/Plugins/PluginContainer.cs
@@ -126,6 +126,10 @@ public bool Enabled
         // algos for NiceHashMiner Client
         private Dictionary<string, List<AlgorithmContainer>> _cachedNiceHashMinerAlgorithms { get; } = new Dictionary<string, List<AlgorithmContainer>>();
 
+        public IMinerPlugin GetPlugin()
+        {
+            return _plugin;
+        }
         public bool InitPluginContainer()
         {
             if (IsInitialized) return true;

diff --git a/src/NHMCore/Mining/Plugins/PluginPackageInfoCR.cs b/src/NHMCore/Mining/Plugins/PluginPackageInfoCR.cs
@@ -88,6 +88,16 @@ public bool Installed
 
         public bool Supported => OnlineSupportedDeviceCount > 0;
 
+        public PluginPackageInfo GetInfoSource()
+        {
+            if (OnlineInfo?.PluginVersion != null &&
+                LocalInfo?.PluginVersion != null &&
+                LocalInfo?.PluginVersion > OnlineInfo?.PluginVersion)
+            {
+                return LocalInfo;
+            }
+            return OnlineInfo;
+        }
         // for plugins that we provide we can know what versions are and are not supported
         public bool CompatibleNHPluginVersion
         {
@@ -106,6 +116,20 @@ public bool CompatibleNHPluginVersion
             }
         }
 
+        public string CompatibilityIssueMessage
+        {
+            get
+            {
+                if (!CompatibleNHPluginVersion)
+                {
+                    var ver = OnlineInfo?.PluginVersion ?? null;
+                    if (ver == null) return string.Empty;
+                    var maxVersion = Checkers.GetLatestSupportedVersion;
+                    return ver.Major > maxVersion ? "Please update NiceHash Miner" : "Plugin not compatible";
+                }
+                return string.Empty;
+            }
+        }
         // PluginPackageInfo region
         public string PluginUUID
         {
@@ -120,7 +144,7 @@ public string PluginPackageHash
         {
             get
             {
-                var hash = LocalInfo?.PluginPackageHash ?? OnlineInfo?.PluginPackageHash ?? "N/A";
+                var hash = OnlineInfo?.PluginPackageHash ?? "N/A";
                 return hash;
             }
         }
@@ -129,7 +153,7 @@ public string BinaryPackageHash
         {
             get
             {
-                var hash = LocalInfo?.BinaryPackageHash ?? OnlineInfo?.BinaryPackageHash ?? "N/A";
+                var hash = OnlineInfo?.BinaryPackageHash ?? "N/A";
                 return hash;
             }
         }
@@ -148,7 +172,7 @@ public Version PluginVersion
         {
             get
             {
-                var ver = LocalInfo?.PluginVersion ?? OnlineInfo?.PluginVersion ?? new Version(0, 0);
+                var ver = GetInfoSource()?.PluginVersion ?? new Version(0, 0);
                 return ver;
             }
         }
@@ -157,8 +181,7 @@ public string PluginPackageURL
         {
             get
             {
-                //var pluginURL = LocalInfo?.PluginPackageURL ?? OnlineInfo?.PluginPackageURL ?? "N/A";
-                var pluginURL = OnlineInfo?.PluginPackageURL ?? "N/A";
+                var pluginURL = GetInfoSource()?.PluginPackageURL ?? "N/A";
                 return pluginURL;
             }
         }
@@ -167,8 +190,7 @@ public string MinerPackageURL
         {
             get
             {
-                //var minerURL = LocalInfo?.MinerPackageURL ?? OnlineInfo?.MinerPackageURL ?? "N/A";
-                var minerURL = OnlineInfo?.MinerPackageURL ?? "N/A";
+                var minerURL = GetInfoSource()?.MinerPackageURL ?? "N/A";
                 return minerURL;
             }
         }
@@ -177,7 +199,7 @@ public Dictionary<string, List<string>> SupportedDevicesAlgorithms
         {
             get
             {
-                var supportedDevicesAlgorithms = LocalInfo?.SupportedDevicesAlgorithms ?? OnlineInfo?.SupportedDevicesAlgorithms ?? new Dictionary<string, List<string>>();
+                var supportedDevicesAlgorithms = GetInfoSource()?.SupportedDevicesAlgorithms ?? new Dictionary<string, List<string>>();
                 var keysWithNoAlgorithms = supportedDevicesAlgorithms
                     .Where(pair => !pair.Value.Any())
                     .Select(pair => pair.Key)
@@ -192,7 +214,7 @@ public string PluginAuthor
         {
             get
             {
-                var author = LocalInfo?.PluginAuthor ?? OnlineInfo?.PluginAuthor ?? "N/A";
+                var author = GetInfoSource()?.PluginAuthor ?? "N/A";
                 return author;
             }
         }
@@ -202,8 +224,7 @@ public string PluginDescription
         {
             get
             {
-                // prefer local over online
-                var desc = LocalInfo?.PluginDescription ?? OnlineInfo?.PluginDescription ?? "N/A";
+                var desc = GetInfoSource()?.PluginDescription ?? "N/A";
                 return desc;
             }
         }

diff --git a/src/NiceHashMiner/ViewModels/Plugins/PluginEntryVM.cs b/src/NiceHashMiner/ViewModels/Plugins/PluginEntryVM.cs
@@ -51,6 +51,7 @@ public string InstallVersionStatus
                 }
                 if (Plugin.Installed && !Plugin.HasNewerVersion && localVer != null && onlineVer != null)
                 {
+                    if(localVer > onlineVer) return Tr("{0}.{1} (Latest)", localVer.Major, localVer.Minor);
                     return Tr("{0}.{1} (Latest)", onlineVer.Major, onlineVer.Minor);
                 }
                 if (localVer != null)

diff --git a/src/NiceHashMiner/Views/Plugins/PluginItem/PluginItem.xaml b/src/NiceHashMiner/Views/Plugins/PluginItem/PluginItem.xaml
@@ -249,7 +249,7 @@
                                FontSize="12"
                                Margin="0,0,16,0"
                                Visibility="{Binding Plugin.CompatibleNHPluginVersion, Converter={StaticResource NulBoolToVisibilityConverterFalse}}"
-                               Text="NOT COMPATIBLE. Update NiceHash Miner" />
+                               Text="{Binding Plugin.CompatibilityIssueMessage}" />
 
 
                 </WrapPanel>