Improves alias list messages after installation.

Fixes #83

Author: zooba

src/manage/install_command.py

@@ -10,7 +10,7 @@
 )
 from .fsutils import ensure_tree, rmtree, unlink
 from .indexutils import Index
-from .logging import CONSOLE_MAX_WIDTH, LOGGER, ProgressPrinter
+from .logging import CONSOLE_MAX_WIDTH, LOGGER, ProgressPrinter, VERBOSE
 from .pathutils import Path, PurePath
 from .tagutils import install_matches_any, tag_or_range
 from .urlutils import (
@@ -286,7 +286,7 @@ def _cleanup_arp_entries(cmd, install_shortcut_pairs):
 }
 
 
-def update_all_shortcuts(cmd, path_warning=True):
+def update_all_shortcuts(cmd):
     LOGGER.debug("Updating global shortcuts")
     alias_written = set()
     shortcut_written = {}
@@ -329,25 +329,43 @@ def update_all_shortcuts(cmd, path_warning=True):
     for k, (_, cleanup) in SHORTCUT_HANDLERS.items():
         cleanup(cmd, shortcut_written.get(k, []))
 
-    if path_warning and cmd.global_dir and cmd.global_dir.is_dir() and any(cmd.global_dir.glob("*.exe")):
+
+def print_cli_shortcuts(cmd):
+    if cmd.global_dir and cmd.global_dir.is_dir() and any(cmd.global_dir.glob("*.exe")):
         try:
             if not any(cmd.global_dir.match(p) for p in os.getenv("PATH", "").split(os.pathsep) if p):
                 LOGGER.info("")
                 LOGGER.info("!B!Global shortcuts directory is not on PATH. " +
-                            "Add it for easy access to global Python commands.!W!")
+                            "Add it for easy access to global Python aliases.!W!")
                 LOGGER.info("!B!Directory to add: !Y!%s!W!", cmd.global_dir)
                 LOGGER.info("")
+                return
         except Exception:
             LOGGER.debug("Failed to display PATH warning", exc_info=True)
+            return
 
-
-def print_cli_shortcuts(cmd):
     installs = cmd.get_installs()
-    seen = set()
+    tags = getattr(cmd, "tags", None)
+    seen = set("python.exe".casefold())
+    verbose = LOGGER.would_log_to_console(VERBOSE)
     for i in installs:
-        aliases = sorted(a["name"] for a in i["alias"] if a["name"].casefold() not in seen)
-        seen.update(n.casefold() for n in aliases)
-        if not install_matches_any(i, cmd.tags):
+        # We only show windowed aliases if -v is enabled. But we log them as
+        # debug info unconditionally. This involves a bit of a dance to keep the
+        # 'windowed' flag around and then drop entries based on whether
+        # LOGGER.verbose would be printed to the console.
+        aliases = sorted((a["name"], a.get("windowed", 0)) for a in i["alias"]
+                         if a["name"].casefold() not in seen)
+        seen.update(n.casefold() for n, *_ in aliases)
+        if not verbose:
+            if i.get("default"):
+                LOGGER.debug("%s will be launched by !G!python.exe!W!", i["display-name"])
+            LOGGER.debug("%s will be launched by %s", i["display-name"],
+                         ", ".join([n for n, *_ in aliases]))
+            aliases = [n for n, w in aliases if not w]
+        else:
+            aliases = [n for n, *_ in aliases]
+
+        if tags and not install_matches_any(i, cmd.tags):
             continue
         if i.get("default") and aliases:
             LOGGER.info("%s will be launched by !G!python.exe!W! and also %s",
@@ -545,6 +563,7 @@ def execute(cmd):
         else:
             LOGGER.info("Refreshing install registrations.")
             update_all_shortcuts(cmd)
+            print_cli_shortcuts(cmd)
             LOGGER.debug("END install_command.execute")
         return
 

src/manage/uninstall_command.py

@@ -127,6 +127,6 @@ def execute(cmd):
             LOGGER.debug("TRACEBACK:", exc_info=True)
 
     if to_uninstall:
-        update_all_shortcuts(cmd, path_warning=False)
+        update_all_shortcuts(cmd)
 
     LOGGER.debug("END uninstall_command.execute")