Set WorkingDirectory for terminal (#1136)

Author: hez2010

Files.Launcher/Program.cs

@@ -1,4 +1,5 @@
 using Files.Common;
+using NLog;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -272,17 +273,19 @@ private static async void Connection_RequestReceived(AppServiceConnection sender
 
         private static void HandleApplicationLaunch(AppServiceRequestReceivedEventArgs args)
         {
-            var arguments = args.Request.Message.Get<string, string, object>("Arguments");
+            var arguments = args.Request.Message.Get("Arguments", "");
+            var workingDirectory = args.Request.Message.Get("WorkingDirectory", "");
 
             try
             {
                 var executable = (string)args.Request.Message["Application"];
                 Process process = new Process();
                 process.StartInfo.UseShellExecute = false;
                 process.StartInfo.FileName = executable;
-                // Show window if arguments (opening terminal)
-                process.StartInfo.CreateNoWindow = string.IsNullOrEmpty(arguments);
+                // Show window if workingDirectory (opening terminal)
+                process.StartInfo.CreateNoWindow = string.IsNullOrEmpty(workingDirectory);
                 process.StartInfo.Arguments = arguments;
+                process.StartInfo.WorkingDirectory = workingDirectory;
                 process.Start();
             }
             catch (Win32Exception)
@@ -294,6 +297,7 @@ private static void HandleApplicationLaunch(AppServiceRequestReceivedEventArgs a
                 process.StartInfo.FileName = executable;
                 process.StartInfo.CreateNoWindow = true;
                 process.StartInfo.Arguments = arguments;
+                process.StartInfo.WorkingDirectory = workingDirectory;
                 try
                 {
                     process.Start();

Files/Assets/terminal/terminal.json

@@ -5,20 +5,20 @@
     {
       "name": "CMD",
       "path": "cmd.exe",
-      "arguments": "/k \"cd /d {0} && title Command Prompt\"",
+      "arguments": "",
       "icon": ""
     }
     /*
     {
       "name": "PowerShell Core 6",
       "path": "pwsh.exe",
-      "arguments": "-WorkingDirectory \"{0}\"",
+      "arguments": "",
       "icon": ""
     },
     {
       "name": "Windows Terminal",
       "path": "wt.exe",
-      "arguments": "-d \"{0}\"",
+      "arguments": "-d .",
       "icon": ""
     }
     */

Files/Interacts/Interaction.cs

@@ -138,9 +138,13 @@ public async void OpenDirectoryInTerminal(object sender, RoutedEventArgs e)
 
             if (App.Connection != null)
             {
-                var value = new ValueSet();
-                value.Add("Application", terminal.Path);
-                value.Add("Arguments", string.Format(terminal.Arguments, CurrentInstance.ViewModel.WorkingDirectory));
+                var value = new ValueSet
+                {
+                    { "WorkingDirectory", CurrentInstance.ViewModel.WorkingDirectory },
+                    { "Application", terminal.Path },
+                    { "Arguments", string.Format(terminal.Arguments,
+                        InstanceTabsView.NormalizePath(CurrentInstance.ViewModel.WorkingDirectory)) }
+                };
                 await App.Connection.SendMessageAsync(value);
             }
         }

Files/View Models/SettingsViewModel.cs

@@ -248,15 +248,15 @@ private async void LoadTerminalApps()
             {
                 Name = "Windows Terminal",
                 Path = "wt.exe",
-                Arguments = "-d \"{0}\"",
+                Arguments = "-d .",
                 Icon = ""
             };
 
             var fluentTerminal = new TerminalModel()
             {
                 Name = "Fluent Terminal",
                 Path = "flute.exe",
-                Arguments = "new \"{0}\"",
+                Arguments = "",
                 Icon = ""
             };
 

Files/Views/SettingsPages/Appearance.xaml.cs

@@ -25,7 +25,7 @@ public Appearance()
             ThemeChooser.SelectedIndex = (int)Enum.Parse(typeof(ElementTheme), ThemeHelper.RootTheme.ToString());
             ThemeChooser.Loaded += (s, e) =>
             {
-                ThemeChooser.SelectionChanged += async (s1, e1) =>
+                ThemeChooser.SelectionChanged += (s1, e1) =>
                 {
                     var themeComboBox = s1 as ComboBox;
 
@@ -56,7 +56,7 @@ public Appearance()
             DateFormatChooser.SelectedIndex = (int)Enum.Parse(typeof(TimeStyle), _selectedFormat.ToString());
             DateFormatChooser.Loaded += (s, e) =>
             {
-                DateFormatChooser.SelectionChanged += async (s1, e1) =>
+                DateFormatChooser.SelectionChanged += (s1, e1) =>
                 {
                     var timeStyleComboBox = s1 as ComboBox;