new logic for version_to_tag method

Author: sacca97

prospector/git/version_to_tag.py

@@ -6,14 +6,15 @@
 
 def clean_tag(tag: str) -> str:
     """Clean a tag name returning only the numeric part separated by dots."""
-    return re.sub(
-        r"^[a-zA-Z]+|[a-zA-Z]+$",
-        "",
-        ".".join(
-            [n for n in re.split(r"[^0-9a-zA-Z]+", tag) if not n.isalpha()]
-            # bool(re.search(r"\d", n))
-        ),
-    )
+    return re.sub(r"[^0-9a-zA-Z]+", ".", tag, flags=re.IGNORECASE)
+    # return re.sub(
+    #     r"^[a-zA-Z]+|[a-zA-Z]+$",
+    #     "",
+    #     ".".join(
+    #         [n for n in re.split(r"[^0-9a-zA-Z]+", tag) if not n.isalpha()]
+    #         # bool(re.search(r"\d", n))
+    #     ),
+    # )
 
 
 def get_possible_missing_tag(
@@ -37,27 +38,48 @@ def get_possible_missing_tag(
 
 def get_possible_tags(tags: list[str], versions: str):
     """Given a list of tags and a version interval, return the possible tag interval that matches."""
-    tags_mapping: dict[str, list[str]] = dict()
-    # Create a mapping between cleaned tags and the original tags (one stripped tag can match multiple tags)
-    for tag in tags:
-        stripped_tag = clean_tag(tag)
-        if stripped_tag not in tags_mapping:
-            tags_mapping[stripped_tag] = [tag]
-        else:
-            tags_mapping[stripped_tag].append(tag)
+    prev_version, next_version = versions.split(":")
 
-    tags_mapping.pop("", None)
+    prev_tag = [
+        tag
+        for tag in tags
+        if prev_version in clean_tag(tag)
+        and not bool(re.search(r"rc\d+|\d{9,}", tag, flags=re.IGNORECASE))
+    ]
+    next_tag = [
+        tag
+        for tag in tags
+        if next_version in clean_tag(tag)
+        and not bool(re.search(r"rc\d+|\d{9,}", tag, flags=re.IGNORECASE))
+    ]
+    # TODO: Remove this print
+    print(prev_tag, next_tag)
+    # if len(prev_tag) == 0 or len(next_tag) == 0:
+    #     tags_mapping: dict[str, list[str]] = dict()
+    #     # Create a mapping between cleaned tags and the original tags (one stripped tag can match multiple tags)
+    #     for tag in tags:
+    #         stripped_tag = clean_tag(tag)
+
+    #         if stripped_tag not in tags_mapping:
+    #             tags_mapping[stripped_tag] = [tag]
+    #         else:
+    #             tags_mapping[stripped_tag].append(tag)
+
+    #     tags_mapping.pop("", None)
+    #     if len(prev_tag) == 0:
+    #         prev_tag = tags_mapping.get(prev_version, [])
+    #     if len(next_tag) == 0:
+    #         next_tag = tags_mapping.get(next_version, [])
 
-    prev_version, next_version = versions.split(":")
-    prev_tag = tags_mapping.get(prev_version, [])
-    next_tag = tags_mapping.get(next_version, [])
     # If there are two exact matches, return them
     if len(prev_tag) == 1 and len(next_tag) == 1:
         return prev_tag[0], next_tag[0]
     # If there is one exact match, and multiple candidates for the other tag, return the most similar
     elif len(prev_tag) == 1 and len(next_tag) > 1:
+        next_tag = [tag for tag in next_tag if tag > prev_tag[0]]
         return prev_tag[0], difflib.get_close_matches(prev_tag[0], next_tag, n=1)[0]
     elif len(prev_tag) > 1 and len(next_tag) == 1:
+        prev_tag = [tag for tag in prev_tag if tag < next_tag[0]]
         return difflib.get_close_matches(next_tag[0], prev_tag, n=1)[0], next_tag[0]
     # If there is one exact match but no candidates for the other tag, exit and hint the user with possible candidates
     elif len(prev_tag) == 0 and len(next_tag) == 1: