Implemented possibility to add commandline arguments in the Program P…

…lugin
microsoft · Sep 10, 2020 · 2050815 · 2050815
1 parent ab8bec8
commit 2050815
Show file tree

Hide file tree

Showing 11 changed files with 238 additions and 42 deletions.
diff --git a/...ns/Microsoft.Plugin.Program.UnitTests/ProgramArgumentParser/ProgramArgumentParserTests.cs b/...ns/Microsoft.Plugin.Program.UnitTests/ProgramArgumentParser/ProgramArgumentParserTests.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Plugin.Program.ProgramArgumentParser;
+using NUnit.Framework;
+using Wox.Plugin;
+
+namespace Microsoft.Plugin.Program.UnitTests.ProgramArgumentParser
+{
+    [TestFixture]
+    public class ProgramArgumentParserTests
+    {
+        [TestCase("Microsoft Edge", "Microsoft Edge", null)]
+        [TestCase("Microsoft Edge ---inprivate", "Microsoft Edge ---inprivate", null)]
+        [TestCase("Microsoft Edge -- -inprivate", "Microsoft Edge", "-inprivate")]
+        [TestCase("Microsoft Edge -inprivate", "Microsoft Edge", "-inprivate")]
+        [TestCase("Microsoft Edge /inprivate", "Microsoft Edge", "/inprivate")]
+        [TestCase("edge.exe --inprivate", "edge.exe", "--inprivate")]
+        [TestCase("edge.exe -- --inprivate", "edge.exe", "--inprivate")]
+        [TestCase("edge.exe", "edge.exe", null)]
+        [TestCase("edge", "edge", null)]
+        [TestCase("cmd -c \"ping 1.1.1.1\"", "cmd", "-c \"ping 1.1.1.1\"")]
+        public void ProgramArgumentParserTestsCanParseQuery(string inputQuery, string expectedProgram, string expectedProgramArguments)
+        {
+            // Arrange
+            var argumentParsers = new IProgramArgumentParser[]
+           {
+                new DoubleDashProgramArgumentParser(),
+                new InferedProgramArgumentParser(),
+                new NoArgumentsArgumentParser(),
+           };
+
+            // Basis version oft he Quey parser which can be found at Wox.Core.Plugin.QueryBuilder  but didn't want to conenct this to that project
+            var splittedSearchString = inputQuery?.Split(Query.TermSeparator, System.StringSplitOptions.RemoveEmptyEntries);
+            var cleanQuery = string.Join(Query.TermSeparator, splittedSearchString);
+            var query = new Query(cleanQuery, cleanQuery, splittedSearchString, string.Empty);
+
+            // Act
+            string program = null, programArguments = null;
+            foreach (var argumentParser in argumentParsers)
+            {
+                if (argumentParser.TryParse(query, out program, out programArguments))
+                {
+                    break;
+                }
+            }
+
+            // Assert
+            Assert.AreEqual(expectedProgram, program);
+            Assert.AreEqual(expectedProgramArguments, programArguments);
+        }
+    }
+}
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Programs/Win32Tests.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Programs/Win32Tests.cs
@@ -434,7 +434,7 @@ public void Win32AppsShouldSetNameAsTitleWhileCreatingResult()
             StringMatcher.Instance = new StringMatcher();
 
             // Act
-            var result = _cmderRunCommand.Result("cmder", mock.Object);
+            var result = _cmderRunCommand.Result("cmder", string.Empty, mock.Object);
 
             // Assert
             Assert.IsTrue(result.Title.Equals(_cmderRunCommand.Name, StringComparison.Ordinal));

diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Interface/IProgramArgumentParser.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Interface/IProgramArgumentParser.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Wox.Plugin;
+
+namespace Microsoft.Plugin.Program
+{
+    public interface IProgramArgumentParser
+    {
+        bool Enabled { get; }
+
+        bool TryParse(Query query, out string program, out string programArguments);
+    }
+}
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -7,6 +7,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Plugin.Program.ProgramArgumentParser;
 using Microsoft.Plugin.Program.Programs;
 using Microsoft.Plugin.Program.Storage;
 using Wox.Infrastructure.Logger;
@@ -18,6 +19,13 @@ namespace Microsoft.Plugin.Program
 {
     public class Main : IPlugin, IPluginI18n, IContextMenu, ISavable, IReloadable, IDisposable
     {
+        private static readonly IProgramArgumentParser[] _programArgumentParsers = new IProgramArgumentParser[]
+        {
+            new DoubleDashProgramArgumentParser(),
+            new InferedProgramArgumentParser(),
+            new NoArgumentsArgumentParser(),
+        };
+
         internal static ProgramPluginSettings Settings { get; set; }
 
         private static PluginInitContext _context;
@@ -60,22 +68,35 @@ public void Save()
 
         public List<Result> Query(Query query)
         {
-            var results1 = _win32ProgramRepository.AsParallel()
-                .Where(p => p.Enabled)
-                .Select(p => p.Result(query.Search, _context.API));
+            foreach (var programArgumentParser in _programArgumentParsers)
+            {
+                if (!programArgumentParser.Enabled)
+                {
+                    continue;
+                }
+
+                if (!programArgumentParser.TryParse(query, out var program, out var programArguments))
+                {
+                    continue;
+                }
 
-            var results2 = _packageRepository.AsParallel()
-                .Where(p => p.Enabled)
-                .Select(p => p.Result(query.Search, _context.API));
+                var results1 = _win32ProgramRepository.AsParallel()
+                    .Where(p => p.Enabled)
+                    .Select(p => p.Result(program, programArguments, _context.API));
 
-            var result = results1.Concat(results2).Where(r => r != null && r.Score > 0);
-            if (result.Any())
-            {
-                var maxScore = result.Max(x => x.Score);
-                result = result.Where(x => x.Score > Settings.MinScoreThreshold * maxScore);
+                var results2 = _packageRepository.AsParallel()
+                    .Where(p => p.Enabled)
+                    .Select(p => p.Result(program, programArguments, _context.API));
+
+                var result = results1.Concat(results2).Where(r => r != null && r.Score > 0);
+                if (result.Any())
+                {
+                    var maxScore = result.Max(x => x.Score);
+                    result = result.Where(x => x.Score > Settings.MinScoreThreshold * maxScore);
+                }
             }
 
-            return result.ToList();
+            return new List<Result>(0);
         }
 
         public void Init(PluginInitContext context)

diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 <Import Project="..\..\..\..\Version.props" />
 
   <PropertyGroup>
@@ -43,11 +43,11 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Languages\**" />
-    <EmbeddedResource Remove="Languages\**" />
-    <None Remove="Languages\**" />
-    <Page Remove="Languages\**" />
+  <ItemGroup>
+    <Compile Remove="Languages\**" />
+    <EmbeddedResource Remove="Languages\**" />
+    <None Remove="Languages\**" />
+    <Page Remove="Languages\**" />
   </ItemGroup>
 
   <ItemGroup>
@@ -63,9 +63,9 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
@@ -127,17 +127,17 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>
diff --git a/...Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/DoubleDashProgramArgumentParser.cs b/...Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/DoubleDashProgramArgumentParser.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Linq;
+using Wox.Plugin;
+
+namespace Microsoft.Plugin.Program
+{
+    public class DoubleDashProgramArgumentParser : IProgramArgumentParser
+    {
+        private const string DoubleDash = "--";
+
+        public bool Enabled { get; } = true;
+
+        public bool TryParse(Query query, out string program, out string programArguments)
+        {
+            if (!string.IsNullOrEmpty(query?.Search))
+            {
+                // First Argument is always (part of) the programa, 2nd term is possibly  a Program Argument
+                if (query.Terms.Length > 1)
+                {
+                    for (var i = 1; i < query.Terms.Length; i++)
+                    {
+                        if (!string.Equals(query.Terms[i], DoubleDash, StringComparison.Ordinal))
+                        {
+                            continue;
+                        }
+
+                        program = string.Join(Query.TermSeparator, query.Terms.Take(i));
+                        programArguments = string.Join(Query.TermSeparator, query.Terms.Skip(i + 1));
+                        return true;
+                    }
+                }
+            }
+
+            program = null;
+            programArguments = null;
+            return false;
+        }
+    }
+}
diff --git a/...er/Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/InferedProgramArgumentParser.cs b/...er/Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/InferedProgramArgumentParser.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Linq;
+using System.Text.RegularExpressions;
+using Wox.Plugin;
+
+namespace Microsoft.Plugin.Program
+{
+    public class InferedProgramArgumentParser : IProgramArgumentParser
+    {
+        private static readonly Regex ArgumentPrefixRegex = new Regex("^(-|--|/)[a-zA-Z]+", RegexOptions.Compiled);
+
+        public bool Enabled { get; } = true;
+
+        public bool TryParse(Query query, out string program, out string programArguments)
+        {
+            if (!string.IsNullOrEmpty(query?.Search))
+            {
+                // First Argument is always (part of) the programa, 2nd term is possibly  a Program Argument
+                if (query.Terms.Length > 1)
+                {
+                    for (var i = 1; i < query.Terms.Length; i++)
+                    {
+                        if (!ArgumentPrefixRegex.IsMatch(query.Terms[i]))
+                        {
+                            continue;
+                        }
+
+                        program = string.Join(Query.TermSeparator, query.Terms.Take(i));
+                        programArguments = string.Join(Query.TermSeparator, query.Terms.Skip(i));
+                        return true;
+                    }
+                }
+            }
+
+            program = null;
+            programArguments = null;
+            return false;
+        }
+    }
+}
diff --git a/...ncher/Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/NoArgumentsArgumentParser.cs b/...ncher/Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/NoArgumentsArgumentParser.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Wox.Plugin;
+
+namespace Microsoft.Plugin.Program.ProgramArgumentParser
+{
+    public class NoArgumentsArgumentParser : IProgramArgumentParser
+    {
+        public bool Enabled { get; } = true;
+
+        public bool TryParse(Query query, out string program, out string programArguments)
+        {
+            program = query?.Search;
+            programArguments = null;
+            return true;
+        }
+    }
+}
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/IProgram.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/IProgram.cs
@@ -11,7 +11,7 @@ public interface IProgram
     {
         List<ContextMenuResult> ContextMenus(IPublicAPI api);
 
-        Result Result(string query, IPublicAPI api);
+        Result Result(string query, string queryArguments, IPublicAPI api);
 
         string UniqueIdentifier { get; set; }
 

diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWPApplication.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWPApplication.cs
@@ -79,7 +79,7 @@ private static string SetSubtitle()
             return Properties.Resources.powertoys_run_plugin_program_packaged_application;
         }
 
-        public Result Result(string query, IPublicAPI api)
+        public Result Result(string query, string queryArguments, IPublicAPI api)
         {
             if (api == null)
             {
@@ -100,7 +100,7 @@ public Result Result(string query, IPublicAPI api)
                 ContextData = this,
                 Action = e =>
                 {
-                    Launch(api);
+                    Launch(api, queryArguments);
                     return true;
                 },
             };
@@ -195,16 +195,15 @@ public List<ContextMenuResult> ContextMenus(IPublicAPI api)
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentially keeping the process alive, and showing the user an error message")]
-        private async void Launch(IPublicAPI api)
+        private async void Launch(IPublicAPI api, string queryArguments)
         {
             var appManager = new ApplicationActivationHelper.ApplicationActivationManager();
-            const string noArgs = "";
             const ApplicationActivationHelper.ActivateOptions noFlags = ApplicationActivationHelper.ActivateOptions.None;
             await Task.Run(() =>
             {
                 try
                 {
-                    appManager.ActivateApplication(UserModelId, noArgs, noFlags, out uint unusedPid);
+                    appManager.ActivateApplication(UserModelId, queryArguments, noFlags, out var unusedPid);
                 }
                 catch (Exception)
                 {

diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -165,7 +165,7 @@ public bool QueryEqualsNameForRunCommands(string query)
             return true;
         }
 
-        public Result Result(string query, IPublicAPI api)
+        public Result Result(string query, string queryArguments, IPublicAPI api)
         {
             if (api == null)
             {
@@ -211,6 +211,7 @@ public Result Result(string query, IPublicAPI api)
                         FileName = LnkResolvedPath ?? FullPath,
                         WorkingDirectory = ParentDirectory,
                         UseShellExecute = true,
+                        Arguments = queryArguments,
                     };
 
                     Main.StartProcess(Process.Start, info);