mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-16 03:37:59 +01:00
## Summary of the Pull Request This fixes few nits with RDC extension: - hides the RDC fallback item from the home page when there’s no query; - fixes MSTSC process working directory (must physically exists or be an empty string) <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx <!-- - [ ] Closes: #yyy (add separate lines for additional resolved issues) --> - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed
83 lines
2.7 KiB
C#
83 lines
2.7 KiB
C#
// 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.Diagnostics;
|
|
using System.Text;
|
|
using Microsoft.CmdPal.Ext.RemoteDesktop.Properties;
|
|
using Microsoft.CommandPalette.Extensions;
|
|
using Microsoft.CommandPalette.Extensions.Toolkit;
|
|
|
|
namespace Microsoft.CmdPal.Ext.RemoteDesktop.Commands;
|
|
|
|
internal sealed partial class OpenRemoteDesktopCommand : BaseObservable, IInvokableCommand
|
|
{
|
|
private static readonly CompositeFormat ProcessErrorFormat =
|
|
CompositeFormat.Parse(Resources.remotedesktop_log_mstsc_error);
|
|
|
|
private static readonly CompositeFormat InvalidHostnameFormat =
|
|
CompositeFormat.Parse(Resources.remotedesktop_log_invalid_hostname);
|
|
|
|
public string Name { get; }
|
|
|
|
public string Id { get; } = "com.microsoft.cmdpal.builtin.remotedesktop.openrdp";
|
|
|
|
public IIconInfo Icon => Icons.RDPIcon;
|
|
|
|
private readonly string _rdpHost;
|
|
|
|
public OpenRemoteDesktopCommand(string rdpHost)
|
|
{
|
|
_rdpHost = rdpHost;
|
|
|
|
Name = string.IsNullOrWhiteSpace(_rdpHost) ?
|
|
Resources.remotedesktop_command_open :
|
|
Resources.remotedesktop_command_connect;
|
|
}
|
|
|
|
public ICommandResult Invoke(object sender)
|
|
{
|
|
using var process = new Process();
|
|
process.StartInfo.UseShellExecute = false;
|
|
process.StartInfo.WorkingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
|
|
process.StartInfo.FileName = "mstsc";
|
|
|
|
if (!string.IsNullOrWhiteSpace(_rdpHost))
|
|
{
|
|
// validate that _rdpHost is a proper hostname or IP address
|
|
if (Uri.CheckHostName(_rdpHost) == UriHostNameType.Unknown)
|
|
{
|
|
return CommandResult.ShowToast(new ToastArgs()
|
|
{
|
|
Message = string.Format(
|
|
System.Globalization.CultureInfo.CurrentCulture,
|
|
InvalidHostnameFormat,
|
|
_rdpHost),
|
|
Result = CommandResult.KeepOpen(),
|
|
});
|
|
}
|
|
|
|
process.StartInfo.Arguments = $"/v:{_rdpHost}";
|
|
}
|
|
|
|
try
|
|
{
|
|
process.Start();
|
|
|
|
return CommandResult.Dismiss();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
return CommandResult.ShowToast(new ToastArgs()
|
|
{
|
|
Message = string.Format(
|
|
System.Globalization.CultureInfo.CurrentCulture,
|
|
ProcessErrorFormat,
|
|
ex.Message),
|
|
Result = CommandResult.KeepOpen(),
|
|
});
|
|
}
|
|
}
|
|
}
|