Feature: Improve PowerShell (function & design) (BornToBeRoot#1592)

BornToBeRoot · web-flow · commit dca89d73235c · 2022-10-06T23:11:31.000Z
* Feature: Improve PuTTY profile creation if Theme changes

* Feature: Improve PowerShell / Add command
diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -3227,4 +3227,7 @@ If not set, the default AWS CLI settings are used.</value>
   <data name="SyncIsDisabled" xml:space="preserve">
     <value>Synchronization is disabled!</value>
   </data>
-</root>
+  <data name="Command" xml:space="preserve">
+    <value>Command</value>
+  </data>
+</root>
diff --git a/Source/NETworkManager.Models/PowerShell/PowerShell.cs b/Source/NETworkManager.Models/PowerShell/PowerShell.cs
@@ -6,8 +6,11 @@ public static string BuildCommandLine(PowerShellSessionInfo sessionInfo)
         {
             var command = $"-NoExit -ExecutionPolicy {sessionInfo.ExecutionPolicy} {sessionInfo.AdditionalCommandLine}";
 
+            // Connect to remote host or execute local command if configured
             if (sessionInfo.EnableRemoteConsole)
-                command += $" -Command \"Enter-PSSession -ComputerName {sessionInfo.Host}\"";
+                command += $" -Command \"& {{Enter-PSSession -ComputerName {sessionInfo.Host}}}\"";
+            else if(!string.IsNullOrEmpty(sessionInfo.Command))
+                command += $" -Command \"& {{{sessionInfo.Command}}}\"";
 
             return command;
         }
diff --git a/Source/NETworkManager.Models/PowerShell/PowerShellSessionInfo.cs b/Source/NETworkManager.Models/PowerShell/PowerShellSessionInfo.cs
@@ -7,6 +7,7 @@ public class PowerShellSessionInfo
         public string ApplicationFilePath { get; set; }
         public bool EnableRemoteConsole { get; set; }
         public string Host { get; set; }
+        public string Command { get; set; }
         public string AdditionalCommandLine { get; set; }
         public ExecutionPolicy ExecutionPolicy { get; set; }
 
diff --git a/Source/NETworkManager.Profiles/Application/PowerShell.cs b/Source/NETworkManager.Profiles/Application/PowerShell.cs
@@ -15,6 +15,7 @@ public static PowerShellSessionInfo CreateSessionInfo(ProfileInfo profile)
                 EnableRemoteConsole = profile.PowerShell_EnableRemoteConsole,
                 Host = profile.PowerShell_Host,
                 
+                Command = profile.PowerShell_OverrideCommand ? profile.PowerShell_Command : (group.PowerShell_OverrideCommand ? group.PowerShell_Command : SettingsManager.Current.PowerShell_Command),
                 AdditionalCommandLine = profile.PowerShell_OverrideAdditionalCommandLine ? profile.PowerShell_AdditionalCommandLine : (group.PowerShell_OverrideAdditionalCommandLine ? group.PowerShell_AdditionalCommandLine : SettingsManager.Current.PowerShell_AdditionalCommandLine),
                 ExecutionPolicy = profile.PowerShell_OverrideExecutionPolicy ? profile.PowerShell_ExecutionPolicy : (group.PowerShell_OverrideExecutionPolicy ? group.PowerShell_ExecutionPolicy : SettingsManager.Current.PowerShell_ExecutionPolicy)
             };
diff --git a/Source/NETworkManager.Profiles/GroupInfo.cs b/Source/NETworkManager.Profiles/GroupInfo.cs
@@ -82,6 +82,8 @@ public class GroupInfo
         public bool RemoteDesktop_OverrideVisualStyles { get; set; }
         public bool RemoteDesktop_VisualStyles { get; set; }
 
+        public bool PowerShell_OverrideCommand { get; set; }
+        public string PowerShell_Command { get; set; }
         public bool PowerShell_OverrideAdditionalCommandLine { get; set; }
         public string PowerShell_AdditionalCommandLine { get; set; }
         public bool PowerShell_OverrideExecutionPolicy { get; set; }
@@ -195,6 +197,8 @@ public GroupInfo(GroupInfo group) : this(group.Name)
             RemoteDesktop_VisualStyles = group.RemoteDesktop_VisualStyles;
 
             // PowerShell
+            PowerShell_OverrideCommand = group.PowerShell_OverrideCommand;
+            PowerShell_Command = group.PowerShell_Command;
             PowerShell_OverrideAdditionalCommandLine = group.PowerShell_OverrideAdditionalCommandLine;
             PowerShell_AdditionalCommandLine = group.PowerShell_AdditionalCommandLine;
             PowerShell_OverrideExecutionPolicy = group.PowerShell_OverrideExecutionPolicy;
diff --git a/Source/NETworkManager.Profiles/ProfileInfo.cs b/Source/NETworkManager.Profiles/ProfileInfo.cs
@@ -3,7 +3,6 @@
 using NETworkManager.Models.RemoteDesktop;
 using NETworkManager.Settings;
 using System.Security;
-using System.Security.RightsManagement;
 using System.Xml.Serialization;
 
 namespace NETworkManager.Profiles
@@ -136,6 +135,8 @@ public class ProfileInfo
         public bool PowerShell_EnableRemoteConsole { get; set; } = true;
         public bool PowerShell_InheritHost { get; set; } = true;
         public string PowerShell_Host { get; set; }
+        public bool PowerShell_OverrideCommand { get; set; }
+        public string PowerShell_Command { get; set; }
         public bool PowerShell_OverrideAdditionalCommandLine { get; set; }
         public string PowerShell_AdditionalCommandLine { get; set; }
         public bool PowerShell_OverrideExecutionPolicy { get; set; }
@@ -312,6 +313,8 @@ public ProfileInfo(ProfileInfo profile)
             PowerShell_EnableRemoteConsole = profile.PowerShell_EnableRemoteConsole;
             PowerShell_InheritHost = profile.PowerShell_InheritHost;
             PowerShell_Host = profile.PowerShell_Host;
+            PowerShell_OverrideCommand = profile.PowerShell_OverrideCommand;
+            PowerShell_Command = profile.PowerShell_Command;
             PowerShell_OverrideAdditionalCommandLine = profile.PowerShell_OverrideAdditionalCommandLine;
             PowerShell_AdditionalCommandLine = profile.PowerShell_AdditionalCommandLine;
             PowerShell_OverrideExecutionPolicy = profile.PowerShell_OverrideExecutionPolicy;
diff --git a/Source/NETworkManager.Settings/GlobalStaticConfiguration.cs b/Source/NETworkManager.Settings/GlobalStaticConfiguration.cs
@@ -119,6 +119,7 @@ public static class GlobalStaticConfiguration
 
         // Application: PowerShell
         public static string PowerShell_ApplicationFileLocationPowerShell => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\WindowsPowerShell\v1.0\powershell.exe");
+        public static string PowerShell_Command => "Set-Location ~";
         public static PowerShell.ExecutionPolicy PowerShell_ExecutionPolicy => PowerShell.ExecutionPolicy.RemoteSigned;
 
         // Application: PuTTY
diff --git a/Source/NETworkManager.Settings/SettingsInfo.cs b/Source/NETworkManager.Settings/SettingsInfo.cs
@@ -2375,6 +2375,21 @@ public string PowerShell_ApplicationFilePath
             }
         }
 
+        private string _powerShell_Command = GlobalStaticConfiguration.PowerShell_Command;
+        public string PowerShell_Command
+        {
+            get => _powerShell_Command;
+            set
+            {
+                if (value == _powerShell_Command)
+                    return;
+
+                _powerShell_Command = value;
+                OnPropertyChanged();
+                SettingsChanged = true;
+            }
+        }
+
         private string _powerShell_AdditionalCommandLine;
         public string PowerShell_AdditionalCommandLine
         {
diff --git a/Source/NETworkManager/Controls/AWSSessionManagerControl.xaml b/Source/NETworkManager/Controls/AWSSessionManagerControl.xaml
@@ -18,7 +18,7 @@
     </UserControl.Resources>
     <Grid SizeChanged="WindowGrid_SizeChanged">
         <!-- Background color will prevent flickering when app inside the panel is closed -->
-        <WindowsFormsHost Visibility="{Binding IsConnected, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Background="{DynamicResource MahApps.Brushes.Window.Background}">  
+        <WindowsFormsHost Visibility="{Binding IsConnected, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Background="{DynamicResource MahApps.Brushes.Window.Background}" Margin="10">
             <windowsForms:Panel x:Name="WindowHost" />
         </WindowsFormsHost>
         <Grid VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.TextAlignment="Center" Visibility="{Binding IsConnected, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
diff --git a/Source/NETworkManager/Controls/PowerShellControl.xaml b/Source/NETworkManager/Controls/PowerShellControl.xaml
@@ -18,7 +18,7 @@
     </UserControl.Resources>
     <Grid SizeChanged="WindowGrid_SizeChanged">
         <!-- Background color will prevent flickering when app inside the panel is closed -->
-        <WindowsFormsHost Visibility="{Binding IsConnected, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Background="{DynamicResource MahApps.Brushes.Window.Background}">  
+        <WindowsFormsHost Visibility="{Binding IsConnected, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Background="{DynamicResource MahApps.Brushes.Window.Background}" Margin="10">
             <windowsForms:Panel x:Name="WindowHost" />
         </WindowsFormsHost>
         <Grid VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.TextAlignment="Center" Visibility="{Binding IsConnected, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
diff --git a/Source/NETworkManager/MainWindow.xaml.cs b/Source/NETworkManager/MainWindow.xaml.cs
@@ -1099,7 +1099,9 @@ private async Task SwitchProfile(ProfileFileInfo info)
 
                 IsProfileFileLocked = false;
 
-                OnProfilesLoaded(SelectedApplication.Name);
+                // Null if profile is loaded before application is loaded
+                if (SelectedApplication != null)
+                    OnProfilesLoaded(SelectedApplication.Name);
             }
             catch (System.Security.Cryptography.CryptographicException)
             {
diff --git a/Source/NETworkManager/ProfileDialogManager.cs b/Source/NETworkManager/ProfileDialogManager.cs
@@ -330,6 +330,8 @@ public static ProfileInfo ParseProfileInfo(ProfileViewModel instance)
                 PowerShell_EnableRemoteConsole = instance.PowerShell_EnableRemoteConsole,
                 PowerShell_InheritHost = instance.PowerShell_InheritHost,
                 PowerShell_Host = instance.PowerShell_InheritHost ? instance.Host?.Trim() : instance.PowerShell_Host?.Trim(),
+                PowerShell_OverrideCommand = instance.PowerShell_OverrideCommand,
+                PowerShell_Command = instance.PowerShell_Command,
                 PowerShell_OverrideAdditionalCommandLine = instance.PowerShell_OverrideAdditionalCommandLine,
                 PowerShell_AdditionalCommandLine = instance.PowerShell_AdditionalCommandLine,
                 PowerShell_OverrideExecutionPolicy = instance.PowerShell_OverrideExecutionPolicy,
@@ -473,6 +475,8 @@ public static GroupInfo ParseGroupInfo(GroupViewModel instance)
                 RemoteDesktop_VisualStyles = instance.RemoteDesktop_VisualStyles,
 
                 // PowerShell
+                PowerShell_OverrideCommand = instance.PowerShell_OverrideCommand,
+                PowerShell_Command = instance.PowerShell_Command,
                 PowerShell_OverrideAdditionalCommandLine = instance.PowerShell_OverrideAdditionalCommandLine,
                 PowerShell_AdditionalCommandLine = instance.PowerShell_AdditionalCommandLine,
                 PowerShell_OverrideExecutionPolicy = instance.PowerShell_OverrideExecutionPolicy,
diff --git a/Source/NETworkManager/ViewModels/GroupViewModel.cs b/Source/NETworkManager/ViewModels/GroupViewModel.cs
@@ -810,6 +810,34 @@ public bool RemoteDesktop_VisualStyles
         #endregion
 
         #region PowerShell
+        private bool _powerShell_OverrideCommand;
+        public bool PowerShell_OverrideCommand
+        {
+            get => _powerShell_OverrideCommand;
+            set
+            {
+                if (value == _powerShell_OverrideCommand)
+                    return;
+
+                _powerShell_OverrideCommand = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private string _powerShell_Command;
+        public string PowerShell_Command
+        {
+            get => _powerShell_Command;
+            set
+            {
+                if (value == _powerShell_Command)
+                    return;
+
+                _powerShell_Command = value;
+                OnPropertyChanged();
+            }
+        }
+
         private bool _powerShell_OverrideAdditionalCommandLine;
         public bool PowerShell_OverrideAdditionalCommandLine
         {
@@ -1278,6 +1306,8 @@ public GroupViewModel(Action<GroupViewModel> saveCommand, Action<GroupViewModel>
             RemoteDesktop_VisualStyles = groupInfo.RemoteDesktop_VisualStyles;
 
             // PowerShell
+            PowerShell_OverrideCommand = groupInfo.PowerShell_OverrideCommand;
+            PowerShell_Command = groupInfo.PowerShell_Command;
             PowerShell_OverrideAdditionalCommandLine = groupInfo.PowerShell_OverrideAdditionalCommandLine;
             PowerShell_AdditionalCommandLine = groupInfo.PowerShell_AdditionalCommandLine;
             PowerShell_ExecutionPolicies = Enum.GetValues(typeof(PowerShell.ExecutionPolicy)).Cast<PowerShell.ExecutionPolicy>().ToList();
diff --git a/Source/NETworkManager/ViewModels/PowerShellConnectViewModel.cs b/Source/NETworkManager/ViewModels/PowerShellConnectViewModel.cs
@@ -45,6 +45,20 @@ public string Host
 
         public ICollectionView HostHistoryView { get; }
 
+        private string _command;
+        public string Command
+        {
+            get => _command;
+            set
+            {
+                if (value == _command)
+                    return;
+
+                _command = value;
+                OnPropertyChanged();
+            }
+        }
+
         private string _additionalCommandLine;
         public string AdditionalCommandLine
         {
@@ -105,13 +119,9 @@ public PowerShellConnectViewModel(Action<PowerShellConnectViewModel> connectComm
 
         private void LoadSettings()
         {
+            Command = SettingsManager.Current.PowerShell_Command;
             AdditionalCommandLine = SettingsManager.Current.PowerShell_AdditionalCommandLine;
-            
-            LoadExecutionPolicies();
-        }
-
-        private void LoadExecutionPolicies()
-        {
+                        
             ExecutionPolicies = Enum.GetValues(typeof(PowerShell.ExecutionPolicy)).Cast<PowerShell.ExecutionPolicy>().ToList();
             ExecutionPolicy = ExecutionPolicies.FirstOrDefault(x => x == SettingsManager.Current.PowerShell_ExecutionPolicy);
         }
diff --git a/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs b/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs
@@ -225,7 +225,7 @@ public PowerShellHostViewModel(IDialogCoordinator instance)
             Profiles.SortDescriptions.Add(new SortDescription(nameof(ProfileInfo.Name), ListSortDirection.Ascending));
             Profiles.Filter = o =>
             {
-                if (!(o is ProfileInfo info))
+                if (o is not ProfileInfo info)
                     return false;
 
                 if (string.IsNullOrEmpty(Search))
@@ -432,6 +432,7 @@ private async Task Connect(string host = null)
                 {
                     EnableRemoteConsole = instance.EnableRemoteConsole,
                     Host = instance.Host,
+                    Command = instance.Command,
                     AdditionalCommandLine = instance.AdditionalCommandLine,
                     ExecutionPolicy = instance.ExecutionPolicy
                 };
diff --git a/Source/NETworkManager/ViewModels/PowerShellSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PowerShellSettingsViewModel.cs
@@ -38,6 +38,23 @@ public string ApplicationFilePath
             }
         }
 
+        private string _command;
+        public string Command
+        {
+            get => _command;
+            set
+            {
+                if (value == _command)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.PowerShell_Command = value;
+
+                _command = value;
+                OnPropertyChanged();
+            }
+        }
+
         private string _additionalCommandLine;
         public string AdditionalCommandLine
         {
@@ -117,6 +134,7 @@ private void LoadSettings()
         {
             ApplicationFilePath = SettingsManager.Current.PowerShell_ApplicationFilePath;
             IsConfigured = File.Exists(ApplicationFilePath);
+            Command = SettingsManager.Current.PowerShell_Command;
             AdditionalCommandLine = SettingsManager.Current.PowerShell_AdditionalCommandLine;
 
             LoadExecutionPolicies();
diff --git a/Source/NETworkManager/ViewModels/ProfileViewModel.cs b/Source/NETworkManager/ViewModels/ProfileViewModel.cs
@@ -1355,6 +1355,34 @@ public string PowerShell_Host
             }
         }
 
+        private bool _powerShell_OverrideCommand;
+        public bool PowerShell_OverrideCommand
+        {
+            get => _powerShell_OverrideCommand;
+            set
+            {
+                if (value == _powerShell_OverrideCommand)
+                    return;
+
+                _powerShell_OverrideCommand = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private string _powerShell_Command;
+        public string PowerShell_Command
+        {
+            get => _powerShell_Command;
+            set
+            {
+                if (value == _powerShell_Command)
+                    return;
+
+                _powerShell_Command = value;
+                OnPropertyChanged();
+            }
+        }
+
         private bool _powerShell_OverrideAdditionalCommandLine;
         public bool PowerShell_OverrideAdditionalCommandLine
         {
@@ -2293,6 +2321,8 @@ public ProfileViewModel(Action<ProfileViewModel> saveCommand, Action<ProfileView
             PowerShell_EnableRemoteConsole = profileInfo.PowerShell_EnableRemoteConsole;
             PowerShell_InheritHost = profileInfo.PowerShell_InheritHost;
             PowerShell_Host = profileInfo.PowerShell_Host;
+            PowerShell_OverrideCommand = profileInfo.PowerShell_OverrideCommand;
+            PowerShell_Command = profileInfo.PowerShell_Command;
             PowerShell_OverrideAdditionalCommandLine = profileInfo.PowerShell_OverrideAdditionalCommandLine;
             PowerShell_AdditionalCommandLine = profileInfo.PowerShell_AdditionalCommandLine;
             PowerShell_ExecutionPolicies = Enum.GetValues(typeof(PowerShell.ExecutionPolicy)).Cast<PowerShell.ExecutionPolicy>().ToList();
diff --git a/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
diff --git a/Source/NETworkManager/Views/GroupDialog.xaml b/Source/NETworkManager/Views/GroupDialog.xaml
diff --git a/Source/NETworkManager/Views/PowerShellConnectDialog.xaml b/Source/NETworkManager/Views/PowerShellConnectDialog.xaml
diff --git a/Source/NETworkManager/Views/PowerShellSettingsView.xaml b/Source/NETworkManager/Views/PowerShellSettingsView.xaml
diff --git a/Source/NETworkManager/Views/ProfileDialog.xaml b/Source/NETworkManager/Views/ProfileDialog.xaml
diff --git a/Source/NETworkManager/Views/SettingsAppearanceView.xaml b/Source/NETworkManager/Views/SettingsAppearanceView.xaml

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,11 @@ public static string BuildCommandLine(PowerShellSessionInfo sessionInfo)`
`6`	`6`	`{`
`7`	`7`	`var command = $"-NoExit -ExecutionPolicy {sessionInfo.ExecutionPolicy} {sessionInfo.AdditionalCommandLine}";`
`8`	`8`
	`9`	`+ // Connect to remote host or execute local command if configured`
`9`	`10`	`if (sessionInfo.EnableRemoteConsole)`
`10`		`- command += $" -Command \"Enter-PSSession -ComputerName {sessionInfo.Host}\"";`
	`11`	`+ command += $" -Command \"& {{Enter-PSSession -ComputerName {sessionInfo.Host}}}\"";`
	`12`	`+ else if(!string.IsNullOrEmpty(sessionInfo.Command))`
	`13`	`+ command += $" -Command \"& {{{sessionInfo.Command}}}\"";`
`11`	`14`
`12`	`15`	`return command;`
`13`	`16`	`}`