Use Windows Terminal as initial default if present (#6623)

Author: lukeblevins

Files/Controllers/TerminalController.cs

@@ -1,11 +1,13 @@
 using Files.DataModels;
 using Files.Enums;
+using Files.Extensions;
 using Files.Filesystem;
 using Files.Helpers;
 using Newtonsoft.Json;
 using System;
-using System.Diagnostics;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Core;
 using Windows.Storage;
@@ -138,64 +140,64 @@ private async Task<TerminalFileModel> GetDefaultTerminalFileModel()
             {
                 StorageFile defaultFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri(defaultTerminalPath));
                 var defaultContent = await FileIO.ReadTextAsync(defaultFile);
-                return JsonConvert.DeserializeObject<TerminalFileModel>(defaultContent);
+                var model = JsonConvert.DeserializeObject<TerminalFileModel>(defaultContent);
+                await GetInstalledTerminalsAsync(model);
+                model.ResetToDefaultTerminal();
+                return model;
             }
             catch
             {
                 var model = new TerminalFileModel();
-                model.Terminals.Add(new Terminal()
-                {
-                    Name = "CMD",
-                    Path = "cmd.exe",
-                    Arguments = "",
-                    Icon = ""
-                });
+                await GetInstalledTerminalsAsync(model);
                 model.ResetToDefaultTerminal();
                 return model;
             }
         }
 
-        public async Task GetInstalledTerminalsAsync()
+        private async Task GetInstalledTerminalsAsync()
+        {
+            await GetInstalledTerminalsAsync(Model);
+            SaveModel();
+        }
+
+        private async Task GetInstalledTerminalsAsync(TerminalFileModel model)
         {
-            var windowsTerminal = new Terminal()
+            var terminalDefs = new Dictionary<Terminal, bool>();
+
+            terminalDefs.Add(new Terminal()
             {
                 Name = "Windows Terminal",
                 Path = "wt.exe",
                 Arguments = "-d .",
                 Icon = ""
-            };
+            }, await IsWindowsTerminalBuildInstalled());
 
-            var fluentTerminal = new Terminal()
+            terminalDefs.Add(new Terminal()
             {
                 Name = "Fluent Terminal",
                 Path = "flute.exe",
                 Arguments = "",
                 Icon = ""
-            };
+            }, await PackageHelper.IsAppInstalledAsync("53621FSApps.FluentTerminal_87x1pks76srcp"));
 
-            bool isWindowsTerminalInstalled = await PackageHelper.IsAppInstalledAsync("Microsoft.WindowsTerminal_8wekyb3d8bbwe");
-            bool isWindowsTerminalPreviewInstalled = await PackageHelper.IsAppInstalledAsync("Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe");
-            bool isFluentTerminalInstalled = await PackageHelper.IsAppInstalledAsync("53621FSApps.FluentTerminal_87x1pks76srcp");
-
-            if (isWindowsTerminalInstalled || isWindowsTerminalPreviewInstalled)
-            {
-                Model.AddTerminal(windowsTerminal);
-            }
-            else
+            terminalDefs.Add(new Terminal()
             {
-                Model.RemoveTerminal(windowsTerminal);
-            }
+                Name = "CMD",
+                Path = "cmd.exe",
+                Arguments = "",
+                Icon = ""
+            }, true);    // CMD will always be present (for now at least)
 
-            if (isFluentTerminalInstalled)
-            {
-                Model.AddTerminal(fluentTerminal);
-            }
-            else
-            {
-                Model.RemoveTerminal(fluentTerminal);
-            }
+            terminalDefs.Where(x => x.Value).ForEach(x => model.AddTerminal(x.Key));
+            terminalDefs.Where(x => !x.Value).ForEach(x => model.RemoveTerminal(x.Key));
+        }
 
-            SaveModel();
+        public async static Task<bool> IsWindowsTerminalBuildInstalled()
+        {
+            bool isWindowsTerminalInstalled = await PackageHelper.IsAppInstalledAsync("Microsoft.WindowsTerminal_8wekyb3d8bbwe");
+            bool isWindowsTerminalPreviewInstalled = await PackageHelper.IsAppInstalledAsync("Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe");
+
+            return isWindowsTerminalPreviewInstalled || isWindowsTerminalInstalled;
         }
 
         public void SaveModel()

Files/DataModels/TerminalFileModel.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Files.Controllers;
 
 namespace Files.DataModels
 {
@@ -33,7 +34,14 @@ public Terminal GetDefaultTerminal()
 
         public void ResetToDefaultTerminal()
         {
-            DefaultTerminalName = "cmd";
+            if (Terminals.Any(x => x.Name == "Windows Terminal"))
+            {
+                DefaultTerminalName = "Windows Terminal";
+            }
+            else
+            {
+                DefaultTerminalName = "CMD";
+            }
         }
 
         public void AddTerminal(Terminal terminal)