fix: Disable Escape Sequences when running on CI

mayuki · Aug 2, 2021 · f85a723 · f85a723
1 parent bee2073
commit f85a723
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionPrefix>1.3.1</VersionPrefix>
+    <VersionPrefix>1.3.2</VersionPrefix>
     <LangVersion>latest</LangVersion>
 
     <Authors>Mayuki Sawatari</Authors>

diff --git a/Kurukuru/ConsoleHelper.cs b/Kurukuru/ConsoleHelper.cs
@@ -14,7 +14,11 @@ public static bool ShouldFallback
             }
         }
 
-        public static bool CanAcceptEscapeSequence { get; private set; } = (Environment.OSVersion.Platform != PlatformID.Win32NT);
+        private static bool _canAcceptEscapeSequence = (Environment.OSVersion.Platform != PlatformID.Win32NT);
+        public static bool CanAcceptEscapeSequence
+            => _canAcceptEscapeSequence && !IsRunningOnCI && !Console.IsOutputRedirected;
+
+        public static bool IsRunningOnCI { get; } = !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("CI"));
 
         public static bool TryEnableEscapeSequence()
         {
@@ -25,7 +29,7 @@ public static bool TryEnableEscapeSequence()
                 {
                     if (PInvoke.SetConsoleMode(stdOutput, mode | PInvoke.ConsoleMode.ENABLE_VIRTUAL_TERMINAL_PROCESSING))
                     {
-                        CanAcceptEscapeSequence = true;
+                        _canAcceptEscapeSequence = true;
                         return true;
                     }
                 }

diff --git a/Kurukuru/Spinner.cs b/Kurukuru/Spinner.cs
@@ -48,7 +48,7 @@ public Spinner(string text, Pattern? pattern = null, ConsoleColor? color = null,
             _cancellationTokenSource = new CancellationTokenSource();
             _pattern = pattern ?? DefaultPattern;
             _fallbackPattern = fallbackPattern ?? DefaultPattern;
-            _enabled = enabled && String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("CI")) && !Console.IsOutputRedirected /* isatty */;
+            _enabled = enabled && !ConsoleHelper.IsRunningOnCI && !Console.IsOutputRedirected /* isatty */;
 
             Text = text;
             Color = color;