Improved sort algorithm for alias names

Author: zooba

src/manage/installs.py

@@ -3,7 +3,7 @@
 from .exceptions import NoInstallFoundError, NoInstallsError
 from .logging import DEBUG, LOGGER
 from .pathutils import Path
-from .tagutils import CompanyTag, tag_or_range, companies_match
+from .tagutils import CompanyTag, tag_or_range, companies_match, split_platform
 from .verutils import Version
 
 
@@ -121,23 +121,22 @@ def get_installs(
 
 
 def _make_alias_key(alias):
-    from .tagutils import SUPPORTED_PLATFORM_SUFFIXES
     n1, sep, n3 = alias.rpartition(".")
     n2 = ""
     n3 = sep + n3
-    if n1.endswith(SUPPORTED_PLATFORM_SUFFIXES):
-        n1, sep, plat = n1.rpartition("-")
-        plat = sep + plat
-    else:
-        plat = ""
+
+    n1, plat = split_platform(n1)
 
     while n1 and n1[-1] in "0123456789.-":
         n2 = n1[-1] + n2
         n1 = n1[:-1]
-    w = ""
+
     if n1 and n1[-1].casefold() == "w".casefold():
         w = "w"
         n1 = n1[:-1]
+    else:
+        w = ""
+
     return n1, w, n2, plat, n3
 
 
@@ -149,6 +148,26 @@ def _make_opt_part(parts):
     return "[{}]".format("|".join(sorted(p for p in parts if p)))
 
 
+def _sk_sub(m):
+    n = m.group(1)
+    if not n:
+        return ""
+    if n == ".":
+        return "-"
+    if n == "-":
+        return "."
+    try:
+        return f"{int(n):020}"
+    except ValueError:
+        pass
+    return n
+
+
+def _make_alias_name_sortkey(n):
+    import re
+    return re.sub(r"(\d+|.|-)", _sk_sub, n)
+
+
 def get_install_alias_names(aliases, friendly=True, windowed=True):
     if not windowed:
         aliases = [a for a in aliases if not a.get("windowed")]
@@ -173,7 +192,7 @@ def get_install_alias_names(aliases, friendly=True, windowed=True):
             _make_opt_part(plats.get(k)),
             n3,
         ]))
-    return sorted(result)
+    return sorted(result, key=_make_alias_name_sortkey)
 
 
 def _patch_install_to_run(i, run_for):

src/manage/list_command.py

@@ -11,7 +11,10 @@ def _format_alias(i, seen):
     from manage.installs import get_install_alias_names
     aliases = [a for a in i.get("alias", ()) if a["name"].casefold() not in seen]
     seen.update(a["name"].casefold() for a in aliases)
-    return ", ".join(get_install_alias_names(aliases))
+
+    include_w = LOGGER.would_log_to_console(logging.VERBOSE)
+    names = get_install_alias_names(aliases, windowed=include_w)
+    return ", ".join(names)
 
 
 def _format_tag_with_co(cmd, i):

src/manage/tagutils.py

@@ -123,7 +123,7 @@ def __lt__(self, other):
         return self.sortkey > other.sortkey
 
 
-def _split_platform(tag):
+def split_platform(tag):
     if tag.endswith(SUPPORTED_PLATFORM_SUFFIXES):
         for t in SUPPORTED_PLATFORM_SUFFIXES:
             if tag.endswith(t):
@@ -178,7 +178,7 @@ def __init__(self, company_or_tag, tag=None, *, loose_company=True):
         else:
             assert isinstance(company_or_tag, _CompanyKey)
             self._company = company_or_tag
-        self.tag, self.platform = _split_platform(tag)
+        self.tag, self.platform = split_platform(tag)
         self._sortkey = _sort_tag(self.tag)
 
     @property

tests/test_installs.py

@@ -128,6 +128,10 @@ def test_get_install_to_run_with_range(patched_installs):
     assert i["executable"].match("python.exe")
 
 
+def test_install_alias_make_alias_sortkey():
+    assert ("pythonw00000000000000000003.00000000000000000064-exe"
+            == installs._make_alias_name_sortkey("pythonw3-64.exe"))
+
 def test_install_alias_make_alias_key():
     assert ("python", "w", "3", "-64", ".exe") == installs._make_alias_key("pythonw3-64.exe")
     assert ("python", "w", "3", "", ".exe") == installs._make_alias_key("pythonw3.exe")