htmlchecker: Drop url-pattern support

It never worked reliably because sorting version and url lists independently may produce an unmatching version/url pair. Prerequisite for #309
flathub-infra · Jun 27, 2022 · a47fb9e · a47fb9e
1 parent c78acd4
commit a47fb9e
Showing 1 changed file with 8 additions and 21 deletions.
diff --git a/src/checkers/htmlchecker.py b/src/checkers/htmlchecker.py
@@ -81,19 +81,15 @@ class HTMLChecker(Checker):
             "url": {"type": "string", "format": "uri"},
             "pattern": {"type": "string", "format": "regex"},
             "version-pattern": {"type": "string", "format": "regex"},
-            "url-pattern": {"type": "string", "format": "regex"},
             "url-template": {"type": "string", "format": "regex"},
             "sort-matches": {"type": "boolean"},
         },
-        "required": ["url"],
-        "anyOf": [
-            {"required": ["pattern"]},
+        "allOf": [
+            {"required": ["url"]},
             {
-                "required": ["version-pattern"],
-                "anyOf": [
-                    {"required": ["url-pattern"]},
-                    {"required": ["url-template"]},
-                ],
+                "if": {"required": ["version-pattern"]},
+                "then": {"required": ["url-template"]},
+                "else": {"required": ["pattern"]},
             },
         ],
     }
@@ -143,10 +139,9 @@ async def check(self, external_data: ExternalBase):
         url = external_data.checker_data["url"]
         combo_pattern = _get_pattern(external_data.checker_data, "pattern", 2)
         version_pattern = _get_pattern(external_data.checker_data, "version-pattern", 1)
-        url_pattern = _get_pattern(external_data.checker_data, "url-pattern", 1)
         url_template = external_data.checker_data.get("url-template")
         sort_matches = external_data.checker_data.get("sort-matches", True)
-        assert combo_pattern or (version_pattern and (url_pattern or url_template))
+        assert combo_pattern or (version_pattern and url_template)
 
         html = await self._get_text(url)
 
@@ -157,21 +152,13 @@ async def check(self, external_data: ExternalBase):
                 (lambda m: LooseVersion(m.group(2))) if sort_matches else None,
             ).group(1, 2)
         else:
-            assert version_pattern
+            assert version_pattern and url_template
             latest_version = _get_latest(
                 html,
                 version_pattern,
                 (lambda m: LooseVersion(m.group(1))) if sort_matches else None,
             ).group(1)
-            if url_template:
-                latest_url = self._substitute_placeholders(url_template, latest_version)
-            else:
-                assert url_pattern
-                latest_url = _get_latest(
-                    html,
-                    url_pattern,
-                    (lambda m: LooseVersion(m.group(1))) if sort_matches else None,
-                ).group(1)
+            latest_url = self._substitute_placeholders(url_template, latest_version)
 
         abs_url = urllib.parse.urljoin(base=url, url=latest_url)