Implement color management and and S

Author: pablogsal

Lib/profiling/sampling/live_collector/collector.py

@@ -8,6 +8,7 @@
 import sys
 import sysconfig
 import time
+import _colorize
 
 from ..collector import Collector
 from ..constants import (
@@ -120,6 +121,9 @@ def __init__(
         self._footer_widget = None
         self._help_widget = None
 
+        # Color mode
+        self._can_colorize = _colorize.can_colorize()
+
     def _get_common_path_prefixes(self):
         """Get common path prefixes to strip from file paths."""
         prefixes = []
@@ -373,8 +377,12 @@ def _update_display(self):
         except Exception:
             pass
 
-    def _cycle_sort(self):
-        """Cycle through different sort modes in column order (left to right)."""
+    def _cycle_sort(self, reverse=False):
+        """Cycle through different sort modes in column order.
+
+        Args:
+            reverse: If True, cycle backwards (right to left), otherwise forward (left to right)
+        """
         sort_modes = [
             "nsamples",
             "sample_pct",
@@ -384,18 +392,23 @@ def _cycle_sort(self):
         ]
         try:
             current_idx = sort_modes.index(self.sort_by)
-            self.sort_by = sort_modes[(current_idx + 1) % len(sort_modes)]
+            if reverse:
+                self.sort_by = sort_modes[(current_idx - 1) % len(sort_modes)]
+            else:
+                self.sort_by = sort_modes[(current_idx + 1) % len(sort_modes)]
         except ValueError:
             self.sort_by = "nsamples"
 
     def _setup_colors(self):
         """Set up color pairs and return color attributes."""
+
         A_BOLD = self.display.get_attr("A_BOLD")
         A_REVERSE = self.display.get_attr("A_REVERSE")
         A_UNDERLINE = self.display.get_attr("A_UNDERLINE")
         A_NORMAL = self.display.get_attr("A_NORMAL")
 
-        if self.display.has_colors():
+        # Check both curses color support and _colorize.can_colorize()
+        if self.display.has_colors() and self._can_colorize:
             with contextlib.suppress(Exception):
                 # Color constants (using curses values for compatibility)
                 COLOR_CYAN = 6
@@ -685,8 +698,11 @@ def _handle_input(self):
         if ch == ord("q") or ch == ord("Q"):
             self.running = False
 
-        elif ch == ord("s") or ch == ord("S"):
-            self._cycle_sort()
+        elif ch == ord("s"):
+            self._cycle_sort(reverse=False)
+
+        elif ch == ord("S"):
+            self._cycle_sort(reverse=True)
 
         elif ch == ord("h") or ch == ord("H") or ch == ord("?"):
             self.show_help = not self.show_help

Lib/profiling/sampling/live_collector/widgets.py

@@ -850,7 +850,8 @@ def render(self, line, width, **kwargs):
             ("Tachyon Profiler - Interactive Commands", A_BOLD),
             ("", A_NORMAL),
             ("Navigation & Display:", A_BOLD),
-            ("  s           - Cycle through sort modes", A_NORMAL),
+            ("  s           - Cycle through sort modes (forward)", A_NORMAL),
+            ("  S           - Cycle through sort modes (backward)", A_NORMAL),
             ("  +           - Faster display refresh rate", A_NORMAL),
             ("  -           - Slower display refresh rate", A_NORMAL),
             ("", A_NORMAL),