Migrate to using a reporter method

microsoft · Jun 19, 2022 · fbc7bf9 · fbc7bf9
1 parent 3ebf20c
commit fbc7bf9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/src/AppInstallerCLICore/Command.cpp b/src/AppInstallerCLICore/Command.cpp
@@ -820,7 +820,7 @@ namespace AppInstaller::CLI
         }
         if (context.Args.Contains(Execution::Args::Type::Wait))
         {
-            system("pause");
+            context.Reporter.PromptForAnyKey(Resource::String::PressAnyKeyToContinue);
         }
     }
 

diff --git a/src/AppInstallerCLICore/Commands/RootCommand.cpp b/src/AppInstallerCLICore/Commands/RootCommand.cpp
@@ -163,7 +163,7 @@ namespace AppInstaller::CLI
 
         if (context.Args.Contains(Execution::Args::Type::Wait))
         {
-            system("pause");
+            context.Reporter.PromptForAnyKey(Resource::String::PressAnyKeyToContinue);
         }
     }
 

diff --git a/src/AppInstallerCLICore/ExecutionReporter.cpp b/src/AppInstallerCLICore/ExecutionReporter.cpp
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 #include "pch.h"
 #include "ExecutionReporter.h"
+#include <conio.h>
 
 
 namespace AppInstaller::CLI::Execution
@@ -155,6 +156,13 @@ namespace AppInstaller::CLI::Execution
         }
     }
 
+    int Reporter::PromptForAnyKey(Resource::LocString message, Level level)
+    {
+        auto out = GetOutputStream(level);
+        out << message << std::endl;
+        return _getch();
+    }
+
     void Reporter::ShowIndefiniteProgress(bool running)
     {
         if (m_spinner)

diff --git a/src/AppInstallerCLICore/ExecutionReporter.h b/src/AppInstallerCLICore/ExecutionReporter.h
@@ -99,6 +99,9 @@ namespace AppInstaller::CLI::Execution
         // Prompts the user, return true if they consented.
         bool PromptForBoolResponse(Resource::LocString message, Level level = Level::Info);
 
+        // Prompts the user, returns the key they pressed
+        int PromptForAnyKey(Resource::LocString message, Level level = Level::Info);
+
         // Used to show indefinite progress. Currently an indefinite spinner is the form of
         // showing indefinite progress.
         // running: shows indefinite progress if set to true, stops indefinite progress if set to false

diff --git a/src/AppInstallerCLICore/Resources.h b/src/AppInstallerCLICore/Resources.h
@@ -219,6 +219,7 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(PortableRegistryCollisionOverridden);
         WINGET_DEFINE_RESOURCE_STRINGID(PositionArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(PreserveArgumentDescription);
+        WINGET_DEFINE_RESOURCE_STRINGID(PressAnyKeyToContinue);
         WINGET_DEFINE_RESOURCE_STRINGID(PrivacyStatement);
         WINGET_DEFINE_RESOURCE_STRINGID(ProductCodeArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(PromptOptionNo);

diff --git a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
@@ -1281,6 +1281,9 @@ Please specify one of them using the `--source` option to proceed.</value>
   <data name="PurgeArgumentDescription" xml:space="preserve">
     <value>Deletes all files and directories in the package directory (portable)</value>
   </data>
+  <data name="PressAnyKeyToContinue" xml:space="preserve">
+    <value>Press any key to continue . . .</value>
+  </data>
   <data name="RenameArgumentDescription" xml:space="preserve">
     <value>The value to rename the executable file (portable)</value>
   </data>
-Original file line number
+Diff line change
@@ Expand Up / @@ -820,7 +820,7 @@ namespace AppInstaller::CLI @@
             }
             if (context.Args.Contains(Execution::Args::Type::Wait))
             {
-                system("pause");
+                context.Reporter.PromptForAnyKey(Resource::String::PressAnyKeyToContinue);
             }
         }
@@ Expand Down @@