Fix redirected input

josefpihrt · Nov 23, 2023 · 86581ba · 86581ba
1 parent a4644b1
commit 86581ba
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 12 deletions.
diff --git a/src/CommandLine/CommandLineOptions/CommonReplaceCommandLineOptions.cs b/src/CommandLine/CommandLineOptions/CommonReplaceCommandLineOptions.cs
@@ -93,10 +93,12 @@ public bool TryParse(CommonReplaceCommandOptions options, ParseContext context)
             pipeMode = pipeMode2;
         }
 
+        string? redirectedInput = ConsoleHelpers.ReadRedirectedInput();
+
         if (pipeMode == CommandLine.PipeMode.Paths
             || pipeMode == CommandLine.PipeMode.Text)
         {
-            if (!Console.IsInputRedirected)
+            if (redirectedInput is null)
             {
                 context.WriteError("Redirected/piped input is required "
                     + $"when option '{OptionNames.GetHelpText(OptionNames.Pipe)}' is specified.");
@@ -143,7 +145,7 @@ public bool TryParse(CommonReplaceCommandOptions options, ParseContext context)
 
         if (options.IsDefaultPath()
             && pipeMode != CommandLine.PipeMode.Paths
-            && Console.IsInputRedirected)
+            && redirectedInput is not null)
         {
             if (input is not null)
             {
@@ -161,7 +163,7 @@ public bool TryParse(CommonReplaceCommandOptions options, ParseContext context)
                 return false;
             }
 
-            input = ConsoleHelpers.ReadRedirectedInput();
+            input = redirectedInput;
         }
 
         var displayParts = DisplayParts.None;

diff --git a/src/CommandLine/CommandLineOptions/FileSystemCommandLineOptions.cs b/src/CommandLine/CommandLineOptions/FileSystemCommandLineOptions.cs
@@ -350,11 +350,13 @@ protected virtual bool TryParsePaths(out ImmutableArray<PathInfo> paths, ParseCo
             paths = paths.AddRange(pathsFromFile);
         }
 
-        if (Console.IsInputRedirected
+        ImmutableArray<string> redirectedInput = ConsoleHelpers.ReadRedirectedInputAsLines();
+
+        if (!redirectedInput.IsDefault
             && PipeMode == CommandLine.PipeMode.Paths)
         {
             if (!TryEnsureFullPath(
-                ConsoleHelpers.ReadRedirectedInputAsLines().Where(f => !string.IsNullOrEmpty(f)),
+                redirectedInput.Where(f => !string.IsNullOrEmpty(f)),
                 PathOrigin.RedirectedInput,
                 context,
                 out ImmutableArray<PathInfo> pathsFromInput))

diff --git a/src/CommandLine/CommandLineOptions/FindCommandLineOptions.cs b/src/CommandLine/CommandLineOptions/FindCommandLineOptions.cs
@@ -58,10 +58,12 @@ public bool TryParse(FindCommandOptions options, ParseContext context)
             pipeMode = pipeMode2;
         }
 
+        string? redirectedInput = ConsoleHelpers.ReadRedirectedInput();
+
         if (pipeMode == CommandLine.PipeMode.Paths
             || pipeMode == CommandLine.PipeMode.Text)
         {
-            if (!Console.IsInputRedirected)
+            if (redirectedInput is null)
             {
                 context.WriteError("Redirected/piped input is required "
                     + $"when option '{OptionNames.GetHelpText(OptionNames.Pipe)}' is specified.");
@@ -86,7 +88,7 @@ public bool TryParse(FindCommandOptions options, ParseContext context)
 
         if (options.IsDefaultPath()
             && pipeMode != CommandLine.PipeMode.Paths
-            && Console.IsInputRedirected)
+            && redirectedInput is not null)
         {
             if (options.ContentFilter is null)
             {
@@ -96,7 +98,7 @@ public bool TryParse(FindCommandOptions options, ParseContext context)
                 return false;
             }
 
-            input = ConsoleHelpers.ReadRedirectedInput();
+            input = redirectedInput;
 
             if (options.Paths.Length == 1
                 && options.Paths[0].Origin == PathOrigin.CurrentDirectory

diff --git a/src/CommandLine/ConsoleHelpers.cs b/src/CommandLine/ConsoleHelpers.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace Orang.CommandLine;
 
@@ -29,26 +30,47 @@ public static void WaitForKeyPress(string? message = null)
             using (Stream stream = Console.OpenStandardInput())
             using (var streamReader = new StreamReader(stream, Console.InputEncoding))
             {
-                return streamReader.ReadToEnd();
+                Task<string> readToEndTask = streamReader.ReadToEndAsync();
+
+                // https://github.com/dotnet/runtime/issues/95079
+                if (!readToEndTask.Wait(TimeSpan.FromMilliseconds(500)))
+                    return null;
+
+                return readToEndTask.Result;
             }
         }
 
         return null;
     }
 
-    public static IEnumerable<string> ReadRedirectedInputAsLines()
+    public static ImmutableArray<string> ReadRedirectedInputAsLines()
     {
         if (Console.IsInputRedirected)
         {
+            ImmutableArray<string>.Builder lines = ImmutableArray.CreateBuilder<string>();
+
             using (Stream stream = Console.OpenStandardInput())
             using (var streamReader = new StreamReader(stream, Console.InputEncoding))
             {
+                Task<string?> readLineTask = streamReader.ReadLineAsync();
+
+                // https://github.com/dotnet/runtime/issues/95079
+                if (!readLineTask.Wait(TimeSpan.FromMilliseconds(500)))
+                    return default;
+
+                if (readLineTask.Result is null)
+                    return ImmutableArray<string>.Empty;
+
                 string? line;
 
                 while ((line = streamReader.ReadLine()) is not null)
-                    yield return line;
+                    lines.Add(line);
             }
+
+            return lines.ToImmutableArray();
         }
+
+        return ImmutableArray<string>.Empty;
     }
 
     public static bool AskToExecute(string text, string? indent = null)

diff --git a/src/CommandLine/Properties/launchSettings.json b/src/CommandLine/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "CommandLine": {
       "commandName": "Project",
-      "commandLineArgs": "help -v d"
+      "commandLineArgs": "find -e dll"
     }
   }
 }