[cmdpal] Support invoke command in Bookmarks extension

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkSerializationContext.cs

@@ -4,6 +4,7 @@
 
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using Microsoft.CmdPal.Ext.Bookmarks.Models;
 
 namespace Microsoft.CmdPal.Ext.Bookmarks;
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Bookmarks.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
+using Microsoft.CmdPal.Ext.Bookmarks.Models;
 
 namespace Microsoft.CmdPal.Ext.Bookmarks;
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs

@@ -8,10 +8,14 @@
 using System.IO;
 using System.Linq;
 using ManagedCommon;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Models;
 using Microsoft.CmdPal.Ext.Bookmarks.Properties;
 using Microsoft.CmdPal.Ext.Indexer;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Diagnostics.Utilities;
+using Windows.Foundation;
 
 namespace Microsoft.CmdPal.Ext.Bookmarks;
 
@@ -23,10 +27,6 @@ public partial class BookmarksCommandProvider : CommandProvider
 
     private Bookmarks? _bookmarks;
 
-    public static IconInfo DeleteIcon { get; private set; } = new("\uE74D"); // Delete
-
-    public static IconInfo EditIcon { get; private set; } = new("\uE70F"); // Edit
-
     public BookmarksCommandProvider()
     {
         Id = "Bookmarks";
@@ -109,57 +109,23 @@ private void LoadBookmarksFromFile()
 
     private CommandItem BookmarkToCommandItem(BookmarkData bookmark)
     {
-        ICommand command = bookmark.IsPlaceholder ?
-            new BookmarkPlaceholderPage(bookmark) :
-            new UrlCommand(bookmark);
-
-        var listItem = new CommandItem(command) { Icon = command.Icon };
-
-        List<CommandContextItem> contextMenu = [];
-
-        // Add commands for folder types
-        if (command is UrlCommand urlCommand)
+        var deleteAction = () =>
         {
-            if (urlCommand.Type == "folder")
+            if (_bookmarks != null)
             {
-                contextMenu.Add(
-                    new CommandContextItem(new DirectoryPage(urlCommand.Url)));
+                ExtensionHost.LogMessage($"Deleting bookmark ({bookmark.Name},{bookmark.Bookmark})");
 
-                contextMenu.Add(
-                    new CommandContextItem(new OpenInTerminalCommand(urlCommand.Url)));
+                _bookmarks.Data.Remove(bookmark);
+                SaveAndUpdateCommands();
             }
-
-            listItem.Subtitle = urlCommand.Url;
-        }
-
-        var edit = new AddBookmarkPage(bookmark) { Icon = EditIcon };
-        edit.AddedCommand += Edit_AddedCommand;
-        contextMenu.Add(new CommandContextItem(edit));
-
-        var delete = new CommandContextItem(
-            title: Resources.bookmarks_delete_title,
-            name: Resources.bookmarks_delete_name,
-            action: () =>
-            {
-                if (_bookmarks != null)
-                {
-                    ExtensionHost.LogMessage($"Deleting bookmark ({bookmark.Name},{bookmark.Bookmark})");
-
-                    _bookmarks.Data.Remove(bookmark);
-
-                    SaveAndUpdateCommands();
-                }
-            },
-            result: CommandResult.KeepOpen())
-        {
-            IsCritical = true,
-            Icon = DeleteIcon,
         };
-        contextMenu.Add(delete);
 
-        listItem.MoreCommands = contextMenu.ToArray();
+        if (bookmark.IsPlaceholder)
+        {
+            return CreatePlaceholderCommand(bookmark, Edit_AddedCommand, deleteAction);
+        }
 
-        return listItem;
+        return CreateShellCommand(bookmark, Edit_AddedCommand, deleteAction);
     }
 
     public override ICommandItem[] TopLevelCommands()
@@ -180,4 +146,64 @@ internal static string StateJsonPath()
         // now, the state is just next to the exe
         return System.IO.Path.Combine(directory, "bookmarks.json");
     }
+
+    private static CommandItem CreatePlaceholderCommand(BookmarkData bookmark, TypedEventHandler<object, BookmarkData> addBookmarkFunc, Action deleteAction)
+    {
+        var command = new BookmarkPlaceholderPage(bookmark);
+        var listItem = new CommandItem(command) { Icon = command.Icon };
+        List<CommandContextItem> contextMenu = [];
+
+        var edit = new AddBookmarkPage(bookmark) { Icon = IconHelper.EditIcon };
+        edit.AddedCommand += addBookmarkFunc;
+        contextMenu.Add(new CommandContextItem(edit));
+        var delete = new CommandContextItem(
+            title: Resources.bookmarks_delete_title,
+            name: Resources.bookmarks_delete_name,
+            action: deleteAction,
+            result: CommandResult.KeepOpen())
+        {
+            IsCritical = true,
+            Icon = IconHelper.DeleteIcon,
+        };
+        contextMenu.Add(delete);
+        listItem.MoreCommands = contextMenu.ToArray();
+        return listItem;
+    }
+
+    private static CommandItem CreateShellCommand(BookmarkData bookmark, TypedEventHandler<object, BookmarkData> addBookmarkFunc, Action deleteAction)
+    {
+        var invokableCommand = new Command.ShellCommand(bookmark);
+        var listItem = new CommandItem(invokableCommand) { Icon = invokableCommand.Icon };
+
+        List<CommandContextItem> contextMenu = [];
+
+        if (bookmark.Type == BookmarkType.Folder)
+        {
+            contextMenu.Add(
+                new CommandContextItem(new DirectoryPage(bookmark.Bookmark)));
+            contextMenu.Add(
+                new CommandContextItem(new OpenInTerminalCommand(bookmark.Bookmark)));
+        }
+
+        listItem.Subtitle = invokableCommand.BookmarkData.Bookmark;
+
+        var edit = new AddBookmarkPage(bookmark) { Icon = IconHelper.EditIcon };
+        edit.AddedCommand += addBookmarkFunc;
+        contextMenu.Add(new CommandContextItem(edit));
+
+        var delete = new CommandContextItem(
+            title: Resources.bookmarks_delete_title,
+            name: Resources.bookmarks_delete_name,
+            action: deleteAction,
+            result: CommandResult.KeepOpen())
+        {
+            IsCritical = true,
+            Icon = IconHelper.DeleteIcon,
+        };
+        contextMenu.Add(delete);
+
+        listItem.MoreCommands = contextMenu.ToArray();
+
+        return listItem;
+    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/OpenInTerminalCommand.cs → src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Command/OpenInTerminalCommand.cs

@@ -4,6 +4,7 @@
 
 using System;
 using ManagedCommon;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
 using Microsoft.CmdPal.Ext.Bookmarks.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -17,6 +18,7 @@ internal sealed partial class OpenInTerminalCommand : InvokableCommand
     public OpenInTerminalCommand(string folder)
     {
         Name = Resources.bookmarks_open_in_terminal_name;
+        Icon = IconHelper.CommandIcon;
         _folder = folder;
     }
 
@@ -35,7 +37,7 @@ public override ICommandResult Invoke()
         }
         catch (Exception ex)
         {
-            Logger.LogError(ex.Message);
+            ExtensionHost.LogMessage(new LogMessage() { Message = $"Error launching Windows Terminal: {ex.Message}" });
         }
 
         return CommandResult.Dismiss();

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Command/ShellCommand.cs

@@ -0,0 +1,96 @@
+// 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.Data;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Models;
+using Microsoft.CmdPal.Ext.Bookmarks.Properties;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Command;
+
+public sealed partial class ShellCommand : InvokableCommand
+{
+    public BookmarkData BookmarkData { get; }
+
+    public ShellCommand(BookmarkData data)
+    {
+        BookmarkData = data;
+        Name = data.Name;
+        Icon = IconHelper.CreateIcon(data.Bookmark, data.Type, false);
+    }
+
+    public override CommandResult Invoke()
+    {
+        return ShellCommand.Invoke(BookmarkData.Type, BookmarkData.Bookmark);
+    }
+
+    public static CommandResult Invoke(BookmarkType bookmarkType, string bookmarkValue)
+    {
+        if (bookmarkType == BookmarkType.Web)
+        {
+            var uri = OpenInShellHelper.GetUri(bookmarkValue);
+            if (uri != null)
+            {
+                if (!OpenInShellHelper.OpenInShell(uri.ToString(), null, null, OpenInShellHelper.ShellRunAsType.None, false, out var errMsg))
+                {
+                    ExtensionHost.LogMessage($"Failed to open {bookmarkValue} in shell. Ex: {errMsg}");
+                    return CommandResult.ShowToast(new ToastArgs() { Message = Resources.bookmarks_command_invoke_failed_message });
+                }
+
+                return CommandResult.Dismiss();
+            }
+            else
+            {
+                return CommandResult.ShowToast(new ToastArgs() { Message = Resources.bookmarks_command_invoke_failed_message });
+            }
+        }
+
+        // if it's a file or folder bookmark, call them directly.
+        if (bookmarkType == BookmarkType.File || bookmarkType == BookmarkType.Folder)
+        {
+            if (!OpenInShellHelper.OpenInShell(bookmarkValue, null, null, OpenInShellHelper.ShellRunAsType.None, false, out var errMsg))
+            {
+                ExtensionHost.LogMessage($"Failed to open {bookmarkValue} in shell. Ex: {errMsg}");
+                return CommandResult.ShowToast(new ToastArgs() { Message = Resources.bookmarks_command_invoke_failed_message });
+            }
+
+            return CommandResult.Dismiss();
+        }
+
+        // We assume all command bookmarks will follow the same format.
+        // For example: "python test.py" or "pwsh test.ps1"
+        // So, we can split the command and get the first part as the command name.
+        var splittedBookmarkValue = bookmarkValue.Split(" ");
+        if (splittedBookmarkValue.Length == 0)
+        {
+            ExtensionHost.LogMessage($"Failed to open {bookmarkValue} in shell. Empty bookmark value.");
+            return CommandResult.ShowToast(new ToastArgs() { Message = Resources.bookmarks_command_invoke_failed_message });
+        }
+
+        if (splittedBookmarkValue.Length == 1)
+        {
+            // directly call. Because it maybe a command with no args. eg: haproxy.exe or cmd.exe
+            if (!OpenInShellHelper.OpenInShell(splittedBookmarkValue[0], null, null, OpenInShellHelper.ShellRunAsType.None, false, out var errMsg))
+            {
+                ExtensionHost.LogMessage($"Failed to open {bookmarkValue} in shell. Ex: {errMsg}");
+                return CommandResult.ShowToast(new ToastArgs() { Message = Resources.bookmarks_command_invoke_failed_message });
+            }
+
+            return CommandResult.Dismiss();
+        }
+
+        // args = without the first part and join with space
+        var args = splittedBookmarkValue[1..];
+
+        if (!OpenInShellHelper.OpenInShell(splittedBookmarkValue[0], string.Join(" ", args), null, OpenInShellHelper.ShellRunAsType.None, false, out var errorMessage))
+        {
+            ExtensionHost.LogMessage($"Failed to open {bookmarkValue} in shell. Ex: {errorMessage}");
+            return CommandResult.ShowToast(new ToastArgs() { Message = Resources.bookmarks_command_invoke_failed_message });
+        }
+
+        return CommandResult.Dismiss();
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/BookmarkTypeHelper.cs

@@ -0,0 +1,44 @@
+// 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 Microsoft.CmdPal.Ext.Bookmarks.Models;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+public static partial class BookmarkTypeHelper
+{
+    /*
+     * Summary:
+     * If it's a valid uri, we assume it's a Web Link.
+     * Otherwise, we check if it's a existing folder or file.
+     * By default, we assume it's a command type.
+     */
+
+    public static BookmarkType GetBookmarkTypeFromValue(string bookmark)
+    {
+        // judge if the bookmark is a url
+        var uri = OpenInShellHelper.GetUri(bookmark);
+        if (uri?.Scheme == Uri.UriSchemeHttp || uri?.Scheme == Uri.UriSchemeHttps)
+        {
+            return BookmarkType.Web;
+        }
+
+        // judge if the bookmark is a existing folder
+        if (System.IO.Directory.Exists(bookmark))
+        {
+            return BookmarkType.Folder;
+        }
+
+        // ok, fine. Actually, it's also have the possibility to be a shell command.
+        // Such as 'test.cmd' or 'test.ps1'. Try to catch this case.
+        if (System.IO.File.Exists(bookmark))
+        {
+            return BookmarkType.File;
+        }
+
+        // by default. we assume it's a command type
+        return BookmarkType.Command;
+    }
+}