Revert "Improve ui for non-interactive terminals"

This reverts commit 1009ebd.

Reason for revert: see crbug.com/428049900

Original change's description:
> Improve ui for non-interactive terminals
>
> Timer and Countdown:
> - Only show single message line
>
> Spinner:
> - Only print single title and message update lines
> - Avoid an additional sleep on the main thread
>
> Change-Id: Iba56e895638655c23918fa055ffa318d83aa7ce1
> Reviewed-on: https://chromium-review.googlesource.com/c/crossbench/+/6632506
> Commit-Queue: Camillo Bruni <[email protected]>
> Reviewed-by: Patrick Thier <[email protected]>

Bug: 428049900
Change-Id: I56ab6e3235fbb1e2e505f15fc1c604ecf72e475c
Reviewed-on: https://chromium-review.googlesource.com/c/crossbench/+/6695109
Reviewed-by: Camillo Bruni <[email protected]>
Auto-Submit: Victor Vianna <[email protected]>
Commit-Queue: Camillo Bruni <[email protected]>

Author: Victor Vianna

crossbench/cli/ui.py

@@ -21,7 +21,6 @@
 
 colorama.init()
 
-IS_ATTY: Final[bool] = hasattr(sys.stdout, "isatty") and sys.stdout.isatty()
 COLOR_LOGGING: bool = True
 
 
@@ -92,14 +91,12 @@ def clear_indented() -> None:
 @contextlib.contextmanager
 def timer(msg: str = "Elapsed Time",
           update_interval=DEFAULT_INTERVAL_S) -> Iterator[None]:
-  if not IS_ATTY:
-    yield
-    return
-
   start_time = dt.datetime.now()
+
   def print_timer():
     delta = dt.datetime.now() - start_time
     write_indented(f"{msg}: {format_duration(delta)}")
+
   with RepeatTimer(interval=update_interval, function=print_timer):
     yield
   clear_indented()
@@ -109,16 +106,13 @@ def print_timer():
 def countdown(duration: dt.timedelta,
               msg: str = "Waiting",
               update_interval=DEFAULT_INTERVAL_S) -> Iterator[None]:
-  if not IS_ATTY:
-    print(f"{msg}: {format_duration(duration)}")
-    yield
-    return
-
   start_time = dt.datetime.now()
+
   def print_timer():
     delta = dt.datetime.now() - start_time
     time_left = duration - delta
     write_indented(f"{msg}: {format_duration(time_left)}")
+
   with RepeatTimer(interval=update_interval, function=print_timer):
     yield
   clear_indented()
@@ -137,5 +131,5 @@ def __exit__(self, *args, **kwargs) -> None:
     self.cancel()
 
 
-def spinner(sleep: float = 0.5, title: str = "") -> Spinner:
-  return Spinner(IS_ATTY, sleep, title)
+def spinner(*args, **kwargs) -> Spinner:
+  return Spinner(*args, **kwargs)

crossbench/helper/spinner.py

@@ -15,35 +15,34 @@
 class Spinner:
   CURSORS = "◐◓◑◒"
 
-  def __init__(self, is_atty: bool, sleep: float, title: str) -> None:
+  def __init__(self, sleep: float = 0.5, title: str = "") -> None:
     self._is_running: bool = False
-    # Only enable the spinner if the output is an interactive terminal.
-    self._is_atty: bool = is_atty
     self._sleep_time_seconds: float = sleep
     self._title: str = title
     self._message: str = ""
     self._cursor: str = " "
 
   def __enter__(self) -> None:
-    if self._is_atty:
+    # Only enable the spinner if the output is an interactive terminal.
+    is_atty = hasattr(sys.stdout, "isatty") and sys.stdout.isatty()
+    if is_atty:
       self._is_running = True
       threading.Thread(target=self._spin).start()
-    elif self._title:
-      # Write single title line.
-      self._write_message()
 
   def __exit__(self, exc_type, exc_value, traceback) -> None:
-    self._is_running = False
+    if self._is_running:
+      self._is_running = False
+      self._sleep()
 
   def _cursors(self) -> Iterable[str]:
     while True:
       yield from Spinner.CURSORS
 
   def _spin(self) -> None:
     for cursor in self._cursors():
+      self._cursor = cursor
       if not self._is_running:
         return
-      self._cursor = cursor
       self._write_message()
       self._sleep()
 
@@ -64,12 +63,6 @@ def title(self, title: str) -> None:
     self._write_message()
 
   def _write_message(self) -> None:
-    if self._is_atty:
-      self._write_interactive_message()
-    else:
-      print(f"{self._title}{self._message}")
-
-  def _write_interactive_message(self) -> None:
     stdout = sys.stdout
     stdout.write(f"{terminal.STORE_CURSOR_POS} {self._cursor} "
                  f"{self._title}{self._message}{terminal.CLEAR_END}"