Close #157 - Add new wildcard 'R'

jibedoubleve · Aug 9, 2021 · 2a34f93 · 2a34f93
1 parent 522af34
commit 2a34f93
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -11,8 +11,6 @@
     - [Create shortcuts (UI)](#create-shortcuts-ui)
   - [Predifined keywords](#predifined-keywords)
   - [Replacement macros](#replacement-macros)
-- [Plugins](/doc/pages/plugins.md)
-- [Data Reconciliation](/doc/pages/data_reconciliation.md)
 - [Print screens](#print-screens)
 - [Acknowledgement](#acknowledgement)
 
@@ -44,8 +42,8 @@ When you've used the shortcut, a window appears.
 For instance, I've configured a google search as follow `? my_search`. In other words, if I want to search 'aeroplane' in google, I write `? aeroplane`.
 
 Here's how the command is configured
-| keyword | file name                                 |
-| ------- | ----------------------------------------- |
+| keyword | file name                                   |
+| ------- | ------------------------------------------- |
 | ?       | https://www.google.com/search?hl=en&q=\$W\$ |
 
 > the use of \$W$\ is defined [HERE](#replacement-macros)
@@ -117,11 +115,12 @@ Some keyword are reserved and have some specific behaviour:
 
 Any occurence of these macro in the `File Name` text box will be replace as follow.
 
-| macro | explanation                                                                      |
-| ----- | -------------------------------------------------------------------------------- |
-| \$C\$ | is replaced with contents of the Clipboard.                                      |
-| \$I\$ | will replace the \$I\$ with typed parameters                                     |
-| \$W\$ | will replace the \$I\$ with typed parameters in the format  most web URLs expect |
+| macro | explanation                                                           |
+| ----- | --------------------------------------------------------------------- |
+| \$C\$ | will replace with the Clipboard in the format most web URLs expect    |
+| \$R\$ | will replace with the Clipboard                                       |
+| \$I\$ | will replace with typed parameters                                    |
+| \$W\$ | will replace with typed parameters in the format most web URLs expect |
 
 
 # Print screens

diff --git a/src/Infrastructure/Probel.Lanceur.Infrastructure/Probel.Lanceur.Infrastructure.csproj b/src/Infrastructure/Probel.Lanceur.Infrastructure/Probel.Lanceur.Infrastructure.csproj
@@ -57,6 +57,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServicesImpl\AliasService.cs" />
     <Compile Include="ServicesImpl\ArgumentHandlers\ClipboardHandler.cs" />
+    <Compile Include="ServicesImpl\ArgumentHandlers\ClipboardRawHandler.cs" />
     <Compile Include="ServicesImpl\ArgumentHandlers\TextHandler.cs" />
     <Compile Include="ServicesImpl\ArgumentHandlers\UriHandler.cs" />
     <Compile Include="ServicesImpl\ArgumentHandlers\_ArgumentHandler.cs" />

diff --git a/...ucture/Probel.Lanceur.Infrastructure/ServicesImpl/ArgumentHandlers/ClipboardRawHandler.cs b/...ucture/Probel.Lanceur.Infrastructure/ServicesImpl/ArgumentHandlers/ClipboardRawHandler.cs
@@ -0,0 +1,29 @@
+using Probel.Lanceur.Core.Services;
+
+namespace Probel.Lanceur.Infrastructure.ServicesImpl.ArgumentHandlers
+{
+    public class ClipboardRawHandler : ArgumentHandler
+    {
+        #region Fields
+
+        private readonly IClipboardService _clipboard;
+
+        #endregion Fields
+
+        #region Constructors
+
+        public ClipboardRawHandler(IClipboardService clipboard) : base(Wildcards.RawClipboard) => _clipboard = clipboard;
+
+        #endregion Constructors
+
+        #region Methods
+
+        protected override string DoHandle(string cmdline, string parameters)
+        {
+            var resolved = cmdline.ToLower().Replace(Wildcard, _clipboard.GetText());
+            return resolved;
+        }
+
+        #endregion Methods
+    }
+}
diff --git a/src/Infrastructure/Probel.Lanceur.Infrastructure/ServicesImpl/ParameterResolver.cs b/src/Infrastructure/Probel.Lanceur.Infrastructure/ServicesImpl/ParameterResolver.cs
@@ -23,7 +23,8 @@ public ParameterResolver(IClipboardService clipboardService, IDataSourceService
             _dataService = dataService;
             _handler = new TextHandler()
                             .SetNext(new UriHandler())
-                            .SetNext(new ClipboardHandler(clipboardService));
+                            .SetNext(new ClipboardHandler(clipboardService))
+                            .SetNext(new ClipboardRawHandler(clipboardService));
         }
 
         #endregion Constructors

diff --git a/src/Infrastructure/Probel.Lanceur.Infrastructure/ServicesImpl/Wildcards.cs b/src/Infrastructure/Probel.Lanceur.Infrastructure/ServicesImpl/Wildcards.cs
@@ -5,6 +5,7 @@ public static class Wildcards
         #region Fields
 
         public const string Clipboard = "$c$";
+        public const string RawClipboard = "$r$";
         public const string Text = "$i$";
         public const string Url = "$w$";