enhance: support tools installed via flatpak

Author: NathanBaulch

src/Models/ExternalMerger.cs

@@ -70,6 +70,7 @@ static ExternalMerger()
                     new ExternalMerger(5, "meld", "Meld", "/usr/bin/meld", "\"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger(6, "codium", "VSCodium", "/usr/share/codium/bin/codium", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger(7, "p4merge", "P4Merge", "/usr/local/bin/p4merge", "-tw 4 \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"", "-tw 4 \"$LOCAL\" \"$REMOTE\""),
+                    new ExternalMerger(8, "meld", "Meld (Flatpak)", "/usr/bin/flatpak", "run org.gnome.meld \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\"", "run org.gnome.meld \"$LOCAL\" \"$REMOTE\""),
                 };
             }
             else

src/Models/ExternalTool.cs

@@ -124,34 +124,34 @@ public void TryAdd(string name, string icon, Func<string> finder, Func<string, s
             }
         }
 
-        public void VSCode(Func<string> platformFinder)
+        public void VSCode(Func<string> platformFinder, Func<string, string> execArgsGenerator = null)
         {
-            TryAdd("Visual Studio Code", "vscode", platformFinder);
+            TryAdd("Visual Studio Code", "vscode", platformFinder, execArgsGenerator);
         }
 
-        public void VSCodeInsiders(Func<string> platformFinder)
+        public void VSCodeInsiders(Func<string> platformFinder, Func<string, string> execArgsGenerator = null)
         {
-            TryAdd("Visual Studio Code - Insiders", "vscode_insiders", platformFinder);
+            TryAdd("Visual Studio Code - Insiders", "vscode_insiders", platformFinder, execArgsGenerator);
         }
 
-        public void VSCodium(Func<string> platformFinder)
+        public void VSCodium(Func<string> platformFinder, Func<string, string> execArgsGenerator = null)
         {
-            TryAdd("VSCodium", "codium", platformFinder);
+            TryAdd("VSCodium", "codium", platformFinder, execArgsGenerator);
         }
 
         public void Fleet(Func<string> platformFinder)
         {
             TryAdd("Fleet", "fleet", platformFinder);
         }
 
-        public void SublimeText(Func<string> platformFinder)
+        public void SublimeText(Func<string> platformFinder, Func<string, string> execArgsGenerator = null)
         {
-            TryAdd("Sublime Text", "sublime_text", platformFinder);
+            TryAdd("Sublime Text", "sublime_text", platformFinder, execArgsGenerator);
         }
 
-        public void Zed(Func<string> platformFinder)
+        public void Zed(Func<string> platformFinder, Func<string, string> execArgsGenerator = null)
         {
-            TryAdd("Zed", "zed", platformFinder);
+            TryAdd("Zed", "zed", platformFinder, execArgsGenerator);
         }
 
         public void FindJetBrainsFromToolbox(Func<string> platformFinder)

src/Native/Linux.cs

@@ -56,6 +56,14 @@ public string FindTerminal(Models.ShellOrTerminal shell)
             finder.FindJetBrainsFromToolbox(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}/JetBrains/Toolbox");
             finder.SublimeText(() => FindExecutable("subl"));
             finder.Zed(() => FindExecutable("zeditor"));
+
+            var flatpakPath = FindExecutable("flatpak");
+            TryAddFlatpakApp(finder.VSCode, flatpakPath,"com.visualstudio.code");
+            TryAddFlatpakApp(finder.VSCodeInsiders, flatpakPath,"com.vscodium.codium-insiders");
+            TryAddFlatpakApp(finder.VSCodium, flatpakPath,"com.vscodium.codium");
+            TryAddFlatpakApp(finder.SublimeText, flatpakPath,"com.sublimetext.three");
+            TryAddFlatpakApp(finder.Zed, flatpakPath,"dev.zed.Zed");
+
             return finder.Founded;
         }
 
@@ -136,5 +144,20 @@ private string FindJetBrainsFleet()
             var path = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}/JetBrains/Toolbox/apps/fleet/bin/Fleet";
             return File.Exists(path) ? path : FindExecutable("fleet");
         }
+
+        private static void TryAddFlatpakApp(Action<Func<string>,Func<string,string>> adder, string flatpakPath, string appId)
+        {
+            if (flatpakPath != null && IsFlatpakAppInstalled(flatpakPath, appId))
+                adder(() => flatpakPath, repo => $"run {appId} \"{repo}\"");
+        }
+
+        private static bool IsFlatpakAppInstalled(string flatpakPath, string appId)
+        {
+            using var proc = Process.Start(flatpakPath, "info " + appId);
+            if (proc == null)
+                return false;
+            proc.WaitForExit();
+            return proc.ExitCode == 0;
+        }
     }
 }

src/ViewModels/Repository.cs

@@ -702,7 +702,7 @@ public ContextMenu CreateContextMenuForExternalTools()
             {
                 menu.Items.Add(new MenuItem() { Header = "-" });
 
-                foreach (var tool in Native.OS.ExternalTools)
+                foreach (var tool in tools)
                 {
                     var dupTool = tool;