From 959b1865bf4b87787be0fef3885898be9908ca86 Mon Sep 17 00:00:00 2001
From: Marc Wrobel <marc.wrobel@gmail.com>
Date: Mon, 11 Dec 2023 21:24:02 +0100
Subject: [PATCH] [maven] Refactor script (#234)

Make the script more readable, mostly by:

- using the Product and AutoConfig classes,
- removing the use of functions when unnecessary,
- a little bit of renaming and documentation.

This auto method also now support custom regexes and template.
---
 src/maven.py | 74 +++++++++++++++++-----------------------------------
 1 file changed, 24 insertions(+), 50 deletions(-)

diff --git a/src/maven.py b/src/maven.py
index 1af7f715..97237c1a 100644
--- a/src/maven.py
+++ b/src/maven.py
@@ -1,59 +1,33 @@
 import datetime
-import re
 import sys
 from common import http
 from common import endoflife
 
 METHOD = "maven"
 
-
-# TODO: Add support for custom regexes
-# Hasn't been needed yet, so only write if we need it
-def valid_version(version):
-    if re.match(endoflife.DEFAULT_VERSION_REGEX, version):
-        return True
-    return False
-
-
-def fetch_json(group_id, artifact_id, start):
-    url = f"https://search.maven.org/solrsearch/select?q=g:{group_id}+AND+a:{artifact_id}&core=gav&rows=100&wt=json&start={start}"
-    response = http.fetch_url(url)
-    return response.json()
-
-
-def fetch_releases(package_identifier):
-    releases = {}
-    start = 0
-    group_id, artifact_id = package_identifier.split("/")
-
-    while True:
-        data = fetch_json(group_id, artifact_id, start)
-
-        for row in data["response"]["docs"]:
-            version = row["v"]
-            if valid_version(version):
-                date = datetime.datetime.utcfromtimestamp(row["timestamp"] / 1000).strftime("%Y-%m-%d")
-                releases[version] = date
-                print(f"{version}: {date}")
-
-        start += 100
-        if data["response"]["numFound"] <= start:
-            break
-
-    return releases
-
-
-def update_product(product_name, configs):
-    versions = {}
-
-    for config in configs:
-        versions = versions | fetch_releases(config[METHOD])
-
-    endoflife.write_releases(product_name, versions)
-
-
 p_filter = sys.argv[1] if len(sys.argv) > 1 else None
-for product, configs in endoflife.list_products(METHOD, p_filter).items():
-    print(f"::group::{product}")
-    update_product(product, configs)
+for product_name, configs in endoflife.list_products(METHOD, p_filter).items():
+    print(f"::group::{product_name}")
+    product = endoflife.Product(product_name, load_product_data=True)
+
+    for config in product.get_auto_configs(METHOD):
+        start = 0
+        group_id, artifact_id = config.url.split("/")
+
+        while True:
+            url = f"https://search.maven.org/solrsearch/select?q=g:{group_id}+AND+a:{artifact_id}&core=gav&wt=json&start={start}&rows=100"
+            data = http.fetch_url(url).json()
+
+            for row in data["response"]["docs"]:
+                version_match = config.first_match(row["v"])
+                if version_match:
+                    version = config.render(version_match)
+                    date = datetime.datetime.utcfromtimestamp(row["timestamp"] / 1000)
+                    product.declare_version(version, date)
+
+            start += 100
+            if data["response"]["numFound"] <= start:
+                break
+
+    product.write()
     print("::endgroup::")