Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 11:16:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

CmdPal: entirely redo the Run page (#39955)

Browse Source 
This entirely rewrites the shell page. It feels a lot more like the old
run dialog now.

* It's got icons for files & exes
* it can handle network paths
* it can handle `commands /with args...`
* it'll suggest files in that path as you type
* it handles `%environmentVariables%`
* it handles `"Paths with\spaces in them"`
* it shows you the path as a suggestion, in the text box, as you move
the selection


References:
Closes #39044
Closes #39419
Closes #38298
Closes #40311


### Remaining todo's
* [x] Remove the `GenerateAppxManifest` change, and file something to
fix that. We are still generating msix's on every build, wtf
* [x] Clean-up code
* [x] Double-check loc
* [x] Remove a bunch of debug printing that we don't need anymore
* [ ] File a separate PR for moving the file (indexer) commands into a
common project, and re-use those here
* [x] Add history support again! I totally tore that out
  * did that in #40427 
* [x] make `shell:` paths and weird URI's just work. Good test is
`x-cmdpal://settings`

### further optimizations that probably aren't blocking
* [x] Our fast up-to-date is clearly broken, but I think that's been
broken since early 0.91
* [x] If the exe doesn't change, we don't need to create a new ListItem
for it. We can just re-use the current one, and just change the args
* [ ] if the directory hasn't changed, but we typed more chars (e.g.
`c:\windows\s` -> `c:\windows\sys`), we should cache the ListItem's from
the first query, and re-use them if possible.
This commit is contained in:
Mike Griese
2025-07-22 14:47:31 -05:00
committed by GitHub
parent 6ff59488eb
commit 6623d0a2ee
24 changed files with 1091 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/ShellListPageHelpers.cs
View File

@@ -4,11 +4,9 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Reflection;
using System.IO;
using System.Text;
using System.Threading.Tasks;
using System.Threading;
using Microsoft.CmdPal.Ext.Shell.Commands;
using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -26,7 +24,7 @@ public class ShellListPageHelpers
private ListItem GetCurrentCmd(string cmd)
{
ListItem result = new ListItem(new ExecuteItem(cmd, _settings))
var result = new ListItem(new ExecuteItem(cmd, _settings))
{
Title = cmd,
Subtitle = Properties.Resources.cmd_plugin_name + ": " + Properties.Resources.cmd_execute_through_shell,
@@ -36,58 +34,6 @@ public class ShellListPageHelpers
return result;
}
private List<ListItem> GetHistoryCmds(string cmd, ListItem result)
{
IEnumerable<ListItem?> history = _settings.Count.Where(o => o.Key.Contains(cmd, StringComparison.CurrentCultureIgnoreCase))
.OrderByDescending(o => o.Value)
.Select(m =>
{
if (m.Key == cmd)
{
// Using CurrentCulture since this is user facing
result.Subtitle = Properties.Resources.cmd_plugin_name + ": " + string.Format(CultureInfo.CurrentCulture, CmdHasBeenExecutedTimes, m.Value);
return null;
}
var ret = new ListItem(new ExecuteItem(m.Key, _settings))
{
Title = m.Key,
// Using CurrentCulture since this is user facing
Subtitle = Properties.Resources.cmd_plugin_name + ": " + string.Format(CultureInfo.CurrentCulture, CmdHasBeenExecutedTimes, m.Value),
Icon = Icons.HistoryIcon,
};
return ret;
}).Where(o => o != null).Take(4);
return history.Select(o => o!).ToList();
}
public List<ListItem> Query(string query)
{
ArgumentNullException.ThrowIfNull(query);
List<ListItem> results = new List<ListItem>();
var cmd = query;
if (string.IsNullOrEmpty(cmd))
{
results = ResultsFromHistory();
}
else
{
var queryCmd = GetCurrentCmd(cmd);
results.Add(queryCmd);
var history = GetHistoryCmds(cmd, queryCmd);
results.AddRange(history);
}
foreach (var currItem in results)
{
currItem.MoreCommands = LoadContextMenus(currItem).ToArray();
}
return results;
}
public List<CommandContextItem> LoadContextMenus(ListItem listItem)
{
var resultList = new List<CommandContextItem>
@@ -99,18 +45,53 @@ public class ShellListPageHelpers
return resultList;
}
private List<ListItem> ResultsFromHistory()
internal static bool FileExistInPath(string filename)
{
IEnumerable<ListItem> history = _settings.Count.OrderByDescending(o => o.Value)
.Select(m => new ListItem(new ExecuteItem(m.Key, _settings))
return FileExistInPath(filename, out var _);
}
internal static bool FileExistInPath(string filename, out string fullPath, CancellationToken? token = null)
{
fullPath = string.Empty;
if (File.Exists(filename))
{
token?.ThrowIfCancellationRequested();
fullPath = Path.GetFullPath(filename);
return true;
}
else
{
var values = Environment.GetEnvironmentVariable("PATH");
if (values != null)
{
Title = m.Key,
foreach (var path in values.Split(';'))
{
var path1 = Path.Combine(path, filename);
if (File.Exists(path1))
{
fullPath = Path.GetFullPath(path1);
return true;
}
// Using CurrentCulture since this is user facing
Subtitle = Properties.Resources.cmd_plugin_name + ": " + string.Format(CultureInfo.CurrentCulture, CmdHasBeenExecutedTimes, m.Value),
Icon = Icons.HistoryIcon,
}).Take(5);
token?.ThrowIfCancellationRequested();
return history.ToList();
var path2 = Path.Combine(path, filename + ".exe");
if (File.Exists(path2))
{
fullPath = Path.GetFullPath(path2);
return true;
}
token?.ThrowIfCancellationRequested();
}
return false;
}
else
{
return false;
}
}
}
}