Fix string-based API version comparison in select_ref_for_plugin

The API version comparison used string comparison on the str() of
Version objects (producing '3.0.0.final0'), compared against registry
strings like '3.0' or '4.0'. This worked by coincidence for current
values but would break with multi-digit components:
- str '10.0' < '4.0' is True (wrong: 10 > 4)
- str '3.10' > '3.9' is False (wrong: 3.10 > 3.9)

Use Version.from_string() to parse registry min/max_api_version
strings and compare against the actual Version objects from
api_versions_tuple (the list of supported plugin API versions).

Add regression test that verifies API version 10.0 correctly matches
a ref with min_api_version='4.0'.

Author: zas

picard/plugin3/manager/registry.py

@@ -131,20 +131,20 @@ def select_ref_for_plugin(self, plugin):
         if not refs:
             return None
 
-        # Get current Picard API version as string (e.g., "3.0")
-        current_api = '.'.join(map(str, api_versions_tuple[:2]))
+        # Get latest supported Picard plugin API version
+        current_api = api_versions_tuple[-1] if api_versions_tuple else Version.from_string('0.0')
 
         # Find first compatible ref
         for ref in refs:
             min_api = ref.get('min_api_version')
             max_api = ref.get('max_api_version')
 
             # Skip if below minimum
-            if min_api and current_api < min_api:
+            if min_api and current_api < Version.from_string(min_api):
                 continue
 
             # Skip if above maximum
-            if max_api and current_api > max_api:
+            if max_api and current_api > Version.from_string(max_api):
                 continue
 
             # Compatible ref found

test/plugins3/test_plugin.py

@@ -25,6 +25,11 @@
     patch,
 )
 
+from PyQt6.QtCore import (
+    QCollator,
+    QLocale,
+)
+
 from test.picardtestcase import PicardTestCase
 from test.plugins3.helpers import (
     backend_add_and_commit,
@@ -255,6 +260,11 @@ def test_name_falls_back_to_plugin_id(self):
         self.assertEqual(plugin.name(), 'my-plugin')
 
     def test_lt_compares_by_name(self):
+        import picard.i18n
+
+        QLocale.setDefault(QLocale('en'))
+        picard.i18n._qcollator = QCollator()
+
         p1 = Plugin(Path('/tmp'), 'alpha')
         p1.manifest = Mock()
         p1.manifest.name_i18n.return_value = 'Alpha'

test/plugins3/test_versioning.py

@@ -31,6 +31,7 @@
     _parse_version_safely,
     _strip_to_first_digit,
 )
+from picard.version import Version
 
 
 class TestStripToFirstDigit(PicardTestCase):
@@ -228,7 +229,7 @@ def test_versioning_scheme_no_tags_falls_back(self):
         plugin.refs = [{'name': 'main'}]
         self.assertEqual(mgr.select_ref_for_plugin(plugin), 'main')
 
-    @patch('picard.plugin3.manager.registry.api_versions_tuple', (3, 0))
+    @patch('picard.plugin3.manager.registry.api_versions_tuple', [Version.from_string('3.0')])
     def test_no_versioning_uses_refs(self):
         mgr = PluginRegistryManager(Mock())
         plugin = Mock()
@@ -237,7 +238,7 @@ def test_no_versioning_uses_refs(self):
         plugin.refs = [{'name': 'main', 'min_api_version': '3.0'}]
         self.assertEqual(mgr.select_ref_for_plugin(plugin), 'main')
 
-    @patch('picard.plugin3.manager.registry.api_versions_tuple', (3, 0))
+    @patch('picard.plugin3.manager.registry.api_versions_tuple', [Version.from_string('3.0')])
     def test_api_version_skips_incompatible_refs(self):
         mgr = PluginRegistryManager(Mock())
         plugin = Mock()
@@ -249,7 +250,7 @@ def test_api_version_skips_incompatible_refs(self):
         ]
         self.assertEqual(mgr.select_ref_for_plugin(plugin), 'picard-v3')
 
-    @patch('picard.plugin3.manager.registry.api_versions_tuple', (5, 0))
+    @patch('picard.plugin3.manager.registry.api_versions_tuple', [Version.from_string('5.0')])
     def test_api_version_above_max_skips(self):
         mgr = PluginRegistryManager(Mock())
         plugin = Mock()
@@ -269,7 +270,7 @@ def test_no_refs_returns_none(self):
         plugin.refs = []
         self.assertIsNone(mgr.select_ref_for_plugin(plugin))
 
-    @patch('picard.plugin3.manager.registry.api_versions_tuple', (2, 0))
+    @patch('picard.plugin3.manager.registry.api_versions_tuple', [Version.from_string('2.0')])
     def test_no_compatible_ref_uses_first(self):
         mgr = PluginRegistryManager(Mock())
         plugin = Mock()
@@ -279,3 +280,32 @@ def test_no_compatible_ref_uses_first(self):
             {'name': 'main', 'min_api_version': '3.0'},
         ]
         self.assertEqual(mgr.select_ref_for_plugin(plugin), 'main')
+
+    @patch('picard.plugin3.manager.registry.api_versions_tuple', [Version.from_string('10.0')])
+    def test_api_version_multi_digit_comparison(self):
+        """Ensure API version 10.0 is correctly compared (not string-based)."""
+        mgr = PluginRegistryManager(Mock())
+        plugin = Mock()
+        plugin.versioning_scheme = None
+        plugin.git_url = 'url'
+        plugin.refs = [
+            {'name': 'main', 'min_api_version': '4.0'},
+        ]
+        self.assertEqual(mgr.select_ref_for_plugin(plugin), 'main')
+
+
+class TestApiVersionComparison(PicardTestCase):
+    """Verify Version-based API version comparison works correctly."""
+
+    def test_simple(self):
+        v = Version.from_string('3.0')
+        self.assertEqual(v.major, 3)
+        self.assertEqual(v.minor, 0)
+
+    def test_multi_digit(self):
+        v = Version.from_string('10.0')
+        self.assertEqual(v.major, 10)
+
+    def test_comparison(self):
+        self.assertGreater(Version.from_string('10.0'), Version.from_string('4.0'))
+        self.assertLess(Version.from_string('3.0'), Version.from_string('3.99'))