Fix split_lizmap_version

Author: rldhont

lizmap/server_lwc.py

@@ -1131,8 +1131,8 @@ def split_lizmap_version(cls, lwc_version: str) -> tuple:
         """ Split a Lizmap Web Client version. """
         lizmap_version_split = lwc_version.split('.')
         items_bugfix = lizmap_version_split[2].split('-')
-        is_pre_package = len(items_bugfix) > 1
-        if not is_pre_package:
+
+        if not len(items_bugfix) > 1:
             # 3.5.2
             return (
                 int(lizmap_version_split[0]),
@@ -1149,13 +1149,40 @@ def split_lizmap_version(cls, lwc_version: str) -> tuple:
                 items_bugfix[1],
             )
 
-        # 3.5.2-pre.5204
+        items_build = lizmap_version_split[3].split('+')
+        if len(items_build) == 1:
+            items_build = lizmap_version_split[3].split('-')
+
+        if not len(items_build) > 1:
+            # 3.5.2-pre.5204
+            return (
+                int(lizmap_version_split[0]),
+                int(lizmap_version_split[1]),
+                int(items_bugfix[0]),
+                items_bugfix[1],
+                int(lizmap_version_split[3]),
+            )
+
+        if len(lizmap_version_split) == 4:
+            # 3.5.2-pre.5204+sha
+            return (
+                int(lizmap_version_split[0]),
+                int(lizmap_version_split[1]),
+                int(items_bugfix[0]),
+                items_bugfix[1],
+                int(items_build[0]),
+                items_build[1],
+            )
+
+        # 3.5.2-pre.5204+sha.5204
         return (
             int(lizmap_version_split[0]),
             int(lizmap_version_split[1]),
             int(items_bugfix[0]),
             items_bugfix[1],
-            int(lizmap_version_split[3]),
+            int(items_build[0]),
+            items_build[1],
+            int(lizmap_version_split[4]),
         )
 
     def display_action(self, row, level, message):

tests/test_version_info.py

@@ -13,7 +13,24 @@ def test_split_lizmap_version(self):
         self.assertTupleEqual(ServerManager.split_lizmap_version("3.5.2"), (3, 5, 2))
         self.assertTupleEqual(ServerManager.split_lizmap_version("3.5.2-pre"), (3, 5, 2, "pre"))
         self.assertTupleEqual(ServerManager.split_lizmap_version("3.5.2-pre.5204"), (3, 5, 2, "pre", 5204))
+        self.assertTupleEqual(
+            ServerManager.split_lizmap_version("3.5.2-alpha.1+sha"),
+            (3, 5, 2, "alpha", 1, "sha"),
+        )
+        self.assertTupleEqual(
+            ServerManager.split_lizmap_version("3.5.2-alpha.1+sha.5204"),
+            (3, 5, 2, "alpha", 1, "sha", 5204),
+        )
         self.assertTupleEqual(ServerManager.split_lizmap_version("3.8.0-rc.4"), (3, 8, 0, "rc", 4))
+        self.assertTupleEqual(
+            ServerManager.split_lizmap_version("5.0.0-alpha.3+pre"),
+            (5, 0, 0, "alpha", 3, "pre"),
+        )
+        # Bad semver version
+        self.assertTupleEqual(
+            ServerManager.split_lizmap_version("5.0.0-alpha.3-pre"),
+            (5, 0, 0, "alpha", 3, "pre"),
+        )
 
     def test_version_info_lizmap_status(self, data: Path):
         """Test version info according to LWC version.