Improve console logging when running inside powershell or other conso…

…le streams.
Squidex · May 5, 2022 · 261ff80 · 261ff80
1 parent e2c6c4e
commit 261ff80
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/cli/Squidex.CLI/Directory.Build.props b/cli/Squidex.CLI/Directory.Build.props
@@ -8,6 +8,6 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/Squidex/squidex/</PackageProjectUrl>
     <PackageTags>Squidex HeadlessCMS</PackageTags>
-    <Version>8.11</Version>
+    <Version>8.12</Version>
   </PropertyGroup>
 </Project>
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ConsoleLogger.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ConsoleLogger.cs
@@ -15,9 +15,18 @@ private sealed class ConsoleLine : ILogLine
         {
             private readonly int consoleTop;
 
+            public bool CanWriteToSameLine => consoleTop >= 0;
+
             public ConsoleLine()
             {
-                consoleTop = Console.CursorTop;
+                try
+                {
+                    consoleTop = Console.CursorTop;
+                }
+                catch
+                {
+                    consoleTop = -1;
+                }
             }
 
             public void Dispose()
@@ -27,7 +36,11 @@ public void Dispose()
             public void WriteLine(string message, params object[] args)
             {
                 Console.WriteLine(message, args);
-                Console.SetCursorPosition(0, consoleTop);
+
+                if (consoleTop >= 0)
+                {
+                    Console.SetCursorPosition(0, consoleTop);
+                }
             }
         }
 

diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ILogLine.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ILogLine.cs
@@ -9,6 +9,8 @@ namespace Squidex.CLI.Commands.Implementation
 {
     public interface ILogLine : IDisposable
     {
+        bool CanWriteToSameLine { get; }
+
         void WriteLine(string message, params object[] args);
     }
 }
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ExportHelper.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ExportHelper.cs
@@ -53,7 +53,10 @@ public static async Task ExportAsync(this ISession session, IExportSettings sett
 
                             await handler(entity);
 
-                            logLine.WriteLine("> Exported: {0} of {1}.", totalRead, total);
+                            if (logLine.CanWriteToSameLine)
+                            {
+                                logLine.WriteLine("> Exported: {0} of {1}.", totalRead, total);
+                            }
                         }
                     }
 

diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ImportHelper.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ImportHelper.cs
@@ -87,7 +87,10 @@ public static async Task ImportAsync(this ISession session, IImportSettings sett
 
                     totalWritten += update.Jobs.Count;
 
-                    logLine.WriteLine("> Imported: {0}.", totalWritten);
+                    if (logLine.CanWriteToSameLine)
+                    {
+                        logLine.WriteLine("> Imported: {0}.", totalWritten);
+                    }
                 }
             }