Allow open nvidia drivers to be shown if they are all that is

available for a given version.

Author: mtwebster

usr/lib/linuxmint/mintdrivers/mintdrivers.py

@@ -458,26 +458,39 @@ def gather_device_data(self, device):
         except KeyError:
             pass
 
-        # -open nvidia drivers are recommended now over normal ones. Go thru the list and get the version of the recommended one,
-        # then we can flag the non-'open' one instead.
-        new_recommended = None
+        # - When -open and normal versions of a driver exist, only show the normal one (and set recommendation to match).
+        # - Never show server drivers.
+        # - 02/13/2025: As of nvidia 560, closed source drivers may not be available for a given version.
+        ignored = []
+
         for pkg_driver_name in device['drivers']:
+            # Skip 'server' drivers
+            if pkg_driver_name.endswith(("-server", "-server-open")):
+                print("Ignoring server NVIDIA driver '%s'" % pkg_driver_name)
+                ignored.append(pkg_driver_name)
+
+            is_open = pkg_driver_name.endswith("-open")
             current_driver = device['drivers'][pkg_driver_name]
-            try:
-                if current_driver['recommended'] and current_driver['from_distro']:
-                    driver_status = 'recommended'
-                    if pkg_driver_name.endswith("-open"):
-                        new_recommended = pkg_driver_name.replace("-open", "")
-            except KeyError:
-                pass
+            recommended = current_driver.get("recommended", False) and current_driver.get("from_distro", False)
+
+            if is_open:
+                closed_name = pkg_driver_name.replace("-open", "")
+                has_closed = closed_name in device['drivers']
+                if has_closed:
+                    print("Ignoring open NVIDIA driver '%s' as a closed one exists and is preferred." % pkg_driver_name)
+                    if recommended:
+                        device['drivers'][closed_name]["recommended"] = True
+                    ignored.append(pkg_driver_name)
 
         for pkg_driver_name in device['drivers']:
+            if pkg_driver_name in ignored:
+                continue
             current_driver = device['drivers'][pkg_driver_name]
 
             # get general status
             driver_status = 'alternative'
             try:
-                if (current_driver['recommended'] and current_driver['from_distro']) or pkg_driver_name == new_recommended:
+                if (current_driver['recommended'] and current_driver['from_distro']):
                     driver_status = 'recommended'
             except KeyError:
                 pass
@@ -657,9 +670,6 @@ def show_drivers(self):
                 # define the order of introspection
                 for section in ('recommended', 'alternative', 'manually_installed', 'no_driver'):
                     for driver in sorted(drivers[section], key=lambda x: self.sort_string(drivers[section], x), reverse=True):
-                        if str(driver).startswith("nvidia-driver") and str(driver).endswith(("-server", "-open")):
-                            print("Ignoring server or open NVIDIA driver: ", driver)
-                            continue
                         radio_button = Gtk.RadioButton.new(None)
                         label = Gtk.Label()
                         label.set_markup(drivers[section][driver]['description'])