Remove terminal from json if terminal app has been removed (#914)

Author: tsvietOK

Files/DataModels/TerminalFileModel.cs

@@ -1,6 +1,9 @@
-using Newtonsoft.Json;
+using Files.Helpers;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace Files.DataModels
 {
@@ -23,5 +26,29 @@ public TerminalModel GetDefaultTerminal()
             }
             return Terminals.First();
         }
+
+        public void ResetToDefaultTerminal()
+        {
+            DefaultTerminalId = 1;
+        }
+
+        public async Task<bool> AddTerminal(TerminalModel terminal, string packageName)
+        {
+            bool isChanged = false;
+            bool isInstalled = await PackageHelper.IsAppInstalledAsync(packageName);
+            //Ensure terminal is not already in List
+            if (Terminals.FirstOrDefault(x => x.Path.Equals(terminal.Path, StringComparison.OrdinalIgnoreCase)) == null && isInstalled)
+            {
+                Terminals.Add(terminal);
+                isChanged = true;
+            }
+            else if (!isInstalled)
+            {
+                Terminals.Remove(Terminals.FirstOrDefault(x => x.Path.Equals(terminal.Path, StringComparison.OrdinalIgnoreCase)));
+                ResetToDefaultTerminal();
+                isChanged = true;
+            }
+            return isChanged;
+        }
     }
 }

Files/Files.csproj

@@ -155,6 +155,7 @@
     <Compile Include="Helpers\DispatcherHelper.cs" />
     <Compile Include="Helpers\ItemsDataTemplateSelector.cs" />
     <Compile Include="Helpers\NaturalStringComparer.cs" />
+    <Compile Include="Helpers\PackageHelper.cs" />
     <Compile Include="Helpers\StringExtensions.cs" />
     <Compile Include="Helpers\ThemeHelper.cs" />
     <Compile Include="Program.cs" />

Files/Helpers/PackageHelper.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Windows.System;
+
+namespace Files.Helpers
+{
+    public static class PackageHelper
+    {
+        private static readonly Uri dummyUri = new Uri("mailto:[email protected]");
+
+        /// <summary>
+        /// Check if target <paramref name="packageName"/> is installed on this device.
+        /// </summary>
+        /// <param name="packageName">Package name in format: "949FFEAB.Email.cz_refxrrjvvv3cw"</param>
+        /// <returns>True is app is installed on this device, false otherwise.</returns>
+        public static async Task<bool> IsAppInstalledAsync(string packageName)
+        {
+            try
+            {
+                bool appInstalled;
+                LaunchQuerySupportStatus result = await Launcher.QueryUriSupportAsync(dummyUri, LaunchQuerySupportType.Uri, packageName);
+                switch (result)
+                {
+                    case LaunchQuerySupportStatus.Available:
+                    case LaunchQuerySupportStatus.NotSupported:
+                        appInstalled = true;
+                        break;
+                    //case LaunchQuerySupportStatus.AppNotInstalled:
+                    //case LaunchQuerySupportStatus.AppUnavailable:
+                    //case LaunchQuerySupportStatus.Unknown:
+                    default:
+                        appInstalled = false;
+                        break;
+                }
+
+                Debug.WriteLine($"App {packageName}, query status: {result}, installed: {appInstalled}");
+                return appInstalled;
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Error checking if app {packageName} is installed. Error: {ex}");
+                return false;
+            }
+        }
+    }
+}

Files/View Models/SettingsViewModel.cs

@@ -14,10 +14,8 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using Windows.Foundation.Collections;
 using Windows.Storage;
-using Windows.System;
 
 namespace Files.View_Models
 {
@@ -277,43 +275,6 @@ public TimeStyle DisplayedTimeStyle
             }
         }
 
-        private static readonly Uri dummyUri = new Uri("mailto:[email protected]");
-
-        /// <summary>
-        /// Check if target <paramref name="packageName"/> is installed on this device.
-        /// </summary>
-        /// <param name="packageName">Package name in format: "949FFEAB.Email.cz_refxrrjvvv3cw"</param>
-        /// <returns>True is app is installed on this device, false otherwise.</returns>
-        public static async Task<bool> IsAppInstalledAsync(string packageName)
-        {
-            try
-            {
-                bool appInstalled;
-                LaunchQuerySupportStatus result = await Launcher.QueryUriSupportAsync(dummyUri, LaunchQuerySupportType.Uri, packageName);
-                switch (result)
-                {
-                    case LaunchQuerySupportStatus.Available:
-                    case LaunchQuerySupportStatus.NotSupported:
-                        appInstalled = true;
-                        break;
-                    //case LaunchQuerySupportStatus.AppNotInstalled:
-                    //case LaunchQuerySupportStatus.AppUnavailable:
-                    //case LaunchQuerySupportStatus.Unknown:
-                    default:
-                        appInstalled = false;
-                        break;
-                }
-
-                Debug.WriteLine($"App {packageName}, query status: {result}, installed: {appInstalled}");
-                return appInstalled;
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine($"Error checking if app {packageName} is installed. Error: {ex}");
-                return false;
-            }
-        }
-
         public TerminalFileModel TerminalsModel { get; set; }
 
         public StorageFile TerminalsModelFile;
@@ -350,21 +311,29 @@ private async void LoadTerminalApps()
                 TerminalsModel = JsonConvert.DeserializeObject<TerminalFileModel>(defaultContent);
             }
 
-            //Ensure Windows Terminal is not already in List
-            if (TerminalsModel.Terminals.FirstOrDefault(x => x.Path.Equals("wt.exe", StringComparison.OrdinalIgnoreCase)) == null)
+            var windowsTerminal = new TerminalModel()
             {
-                if (await IsAppInstalledAsync("Microsoft.WindowsTerminal_8wekyb3d8bbwe"))
-                {
-                    TerminalsModel.Terminals.Add(new TerminalModel()
-                    {
-                        Id = TerminalsModel.Terminals.Count + 1,
-                        Name = "Windows Terminal",
-                        Path = "wt.exe",
-                        Arguments = "-d {0}",
-                        Icon = ""
-                    });
-                    await FileIO.WriteTextAsync(TerminalsModelFile, JsonConvert.SerializeObject(TerminalsModel, Formatting.Indented));
-                }
+                Id = TerminalsModel.Terminals.Count + 1,
+                Name = "Windows Terminal",
+                Path = "wt.exe",
+                Arguments = "-d {0}",
+                Icon = ""
+            };
+
+            var fluentTerminal = new TerminalModel()
+            {
+                Id = TerminalsModel.Terminals.Count + 1,
+                Name = "Fluent Terminal",
+                Path = "flute.exe",
+                Arguments = "new \"{0}\"",
+                Icon = ""
+            };
+
+            bool isWindowsTerminalAddedOrRemoved = await TerminalsModel.AddTerminal(windowsTerminal, "Microsoft.WindowsTerminal_8wekyb3d8bbwe");
+            bool isFluentTerminalAddedOrRemoved = await TerminalsModel.AddTerminal(fluentTerminal, "53621FSApps.FluentTerminal_87x1pks76srcp");
+            if (isWindowsTerminalAddedOrRemoved || isFluentTerminalAddedOrRemoved)
+            {
+                await FileIO.WriteTextAsync(TerminalsModelFile, JsonConvert.SerializeObject(TerminalsModel, Formatting.Indented));
             }
         }