From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 4 May 2022 01:20:01 +0000 (+1000)
Subject: tools: don't print a carriage return if we're not on a tty
X-Git-Tag: 1.21.0~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f22d1938796a57c378e9ca5353beb1f0b0e99eb1;p=platform%2Fupstream%2Flibinput.git

tools: don't print a carriage return if we're not on a tty

Otherwise redirecting the output to a file leaves us with ugly ^M

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/tools/libinput-analyze-recording.py b/tools/libinput-analyze-recording.py
index 892bb453..c95e393b 100755
--- a/tools/libinput-analyze-recording.py
+++ b/tools/libinput-analyze-recording.py
@@ -30,6 +30,7 @@
 # Input is a libinput record yaml file
 
 import argparse
+import os
 import sys
 import yaml
 import libevdev
@@ -95,6 +96,8 @@ def main(argv):
     ignored_axes = [libevdev.evbit(axis) for axis in args.ignore.split(",") if axis]
     only_axes = [libevdev.evbit(axis) for axis in args.only.split(",") if axis]
 
+    cr = "\r" if os.isatty(sys.stdout.fileno()) else ""
+
     yml = yaml.safe_load(open(args.path[0]))
     if yml["ndevices"] > 1:
         print(f"WARNING: Using only first {yml['ndevices']} devices in recording")
@@ -182,7 +185,7 @@ def main(argv):
                 print(" | ".join(fields))
             else:
                 continuation_count += 1
-                print(f"\r ... +{continuation_count}", end="", flush=True)
+                print(f"{cr} ... +{continuation_count}", end="", flush=True)
 
     # Print out any rel/abs axes that not generate events in
     # this recording