From 201c26f7c853c0e758782eff2af18832f9504f32 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Tue, 10 Dec 2019 08:23:34 +1100
Subject: [PATCH] Add run as administrator to Shell plugin settings

---
 Plugins/Wox.Plugin.Program/Programs/Win32.cs |  2 +-
 Plugins/Wox.Plugin.Shell/Main.cs             | 32 +++++++-------------
 Plugins/Wox.Plugin.Shell/Settings.cs         |  2 ++
 Wox.Plugin/SharedCommands/ShellCommand.cs    |  9 +++---
 4 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/Plugins/Wox.Plugin.Program/Programs/Win32.cs b/Plugins/Wox.Plugin.Program/Programs/Win32.cs
index f0697abef3..12b54b524c 100644
--- a/Plugins/Wox.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Wox.Plugin.Program/Programs/Win32.cs
@@ -97,7 +97,7 @@ namespace Wox.Plugin.Program.Programs
                     Title = api.GetTranslation("wox_plugin_program_run_as_administrator"),
                     Action = _ =>
                     {
-                        return Main.StartProcess(ShellCommand.SetCMDRunAsAdministrator(FullPath, ParentDirectory));
+                        return Main.StartProcess(ShellCommand.SetProcessStartInfo(FullPath, ParentDirectory));
                     },
                     IcoPath = "Images/cmd.png"
                 },
diff --git a/Plugins/Wox.Plugin.Shell/Main.cs b/Plugins/Wox.Plugin.Shell/Main.cs
index 1e60ef8c9c..323cfb5cd3 100644
--- a/Plugins/Wox.Plugin.Shell/Main.cs
+++ b/Plugins/Wox.Plugin.Shell/Main.cs
@@ -9,6 +9,7 @@ using WindowsInput.Native;
 using Wox.Infrastructure.Hotkey;
 using Wox.Infrastructure.Logger;
 using Wox.Infrastructure.Storage;
+using Wox.Plugin.SharedCommands;
 using Application = System.Windows.Application;
 using Control = System.Windows.Controls.Control;
 using Keys = System.Windows.Forms.Keys;
@@ -164,16 +165,15 @@ namespace Wox.Plugin.Shell
         {
             command = command.Trim();
             command = Environment.ExpandEnvironmentVariables(command);
+            var workingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+            var runAsAdministratorArg = !runAsAdministrator && !_settings.RunAsAdministrator ? "" : "runas";
 
             ProcessStartInfo info;
             if (_settings.Shell == Shell.Cmd)
             {
                 var arguments = _settings.LeaveShellOpen ? $"/k \"{command}\"" : $"/c \"{command}\" & pause";
-                info = new ProcessStartInfo
-                {
-                    FileName = "cmd.exe",
-                    Arguments = arguments,
-                };
+                
+                info = ShellCommand.SetProcessStartInfo("cmd.exe", workingDirectory, arguments, runAsAdministratorArg);
             }
             else if (_settings.Shell == Shell.Powershell)
             {
@@ -186,11 +186,8 @@ namespace Wox.Plugin.Shell
                 {
                     arguments = $"\"{command} ; Read-Host -Prompt \\\"Press Enter to continue\\\"\"";
                 }
-                info = new ProcessStartInfo
-                {
-                    FileName = "powershell.exe",
-                    Arguments = arguments
-                };
+
+                info = ShellCommand.SetProcessStartInfo("powershell.exe", workingDirectory, arguments, runAsAdministratorArg);
             }
             else if (_settings.Shell == Shell.RunCommand)
             {
@@ -200,21 +197,17 @@ namespace Wox.Plugin.Shell
                     var filename = parts[0];
                     if (ExistInPath(filename))
                     {
-                        var arguemtns = parts[1];
-                        info = new ProcessStartInfo
-                        {
-                            FileName = filename,
-                            Arguments = arguemtns
-                        };
+                        var arguments = parts[1];
+                        info = ShellCommand.SetProcessStartInfo(filename, workingDirectory, arguments, runAsAdministratorArg);
                     }
                     else
                     {
-                        info = new ProcessStartInfo(command);
+                        info = ShellCommand.SetProcessStartInfo(command, verb: runAsAdministratorArg);
                     }
                 }
                 else
                 {
-                    info = new ProcessStartInfo(command);
+                    info = ShellCommand.SetProcessStartInfo(command, verb: runAsAdministratorArg);
                 }
             }
             else
@@ -222,10 +215,7 @@ namespace Wox.Plugin.Shell
                 return;
             }
 
-
             info.UseShellExecute = true;
-            info.WorkingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-            info.Verb = runAsAdministrator ? "runas" : "";
 
             try
             {
diff --git a/Plugins/Wox.Plugin.Shell/Settings.cs b/Plugins/Wox.Plugin.Shell/Settings.cs
index 62eb31f4e3..121875308d 100644
--- a/Plugins/Wox.Plugin.Shell/Settings.cs
+++ b/Plugins/Wox.Plugin.Shell/Settings.cs
@@ -7,6 +7,8 @@ namespace Wox.Plugin.Shell
         public Shell Shell { get; set; } = Shell.Cmd;
         public bool ReplaceWinR { get; set; } = true;
         public bool LeaveShellOpen { get; set; }
+        internal bool RunAsAdministrator { get; set; } = true;
+
         public Dictionary<string, int> Count = new Dictionary<string, int>();
 
         public void AddCmdHistory(string cmdName)
diff --git a/Wox.Plugin/SharedCommands/ShellCommand.cs b/Wox.Plugin/SharedCommands/ShellCommand.cs
index ac3f4e7cba..d7071e7353 100644
--- a/Wox.Plugin/SharedCommands/ShellCommand.cs
+++ b/Wox.Plugin/SharedCommands/ShellCommand.cs
@@ -9,13 +9,14 @@ namespace Wox.Plugin.SharedCommands
 {
     public static class ShellCommand
     {
-        public static ProcessStartInfo SetCMDRunAsAdministrator(this string fullPath, string parentDirectory)
+        public static ProcessStartInfo SetProcessStartInfo(this string fileName, string workingDirectory="", string arguments = "", string verb = "")
         {
             var info = new ProcessStartInfo
             {
-                FileName = fullPath,
-                WorkingDirectory = parentDirectory,
-                Verb = "runas"
+                FileName = fileName,
+                WorkingDirectory = workingDirectory,
+                Arguments = arguments,
+                Verb = verb
             };
 
             return info;