Merge pull request #92 from ennerperez/feature/issues-77

code_review:

* use JsonSerializerContext to avoid AOT warnnings
* since we call TryAdd by interating the installed tools, so detecting by environment variable becomes meaningless (it can not detect tools not installed by Toolbox). Just add it into founded directly
* remove unnecessary type defines
* determine the Icon used by tool while adding it to the founded list.

# Conflicts:
#	src/Native/Linux.cs
#	src/Native/MacOS.cs
#	src/Native/Windows.cs

src/App.JsonCodeGen.cs

@@ -4,6 +4,7 @@ namespace SourceGit
 {
     [JsonSourceGenerationOptions(WriteIndented = true, IgnoreReadOnlyFields = true, IgnoreReadOnlyProperties = true)]
     [JsonSerializable(typeof(Models.Version))]
+    [JsonSerializable(typeof(Models.JetBrainsState))]
     [JsonSerializable(typeof(ViewModels.Preference))]
     internal partial class JsonCodeGen : JsonSerializerContext { }
 }

src/Models/ExternalTool.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Text.Json;
 
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
@@ -19,8 +20,20 @@ namespace SourceGit.Models
         {
             get
             {
-                var icon = AssetLoader.Open(new Uri($"avares://SourceGit/Resources/ExternalToolIcons/{Icon}.png", UriKind.RelativeOrAbsolute));
+                if (string.IsNullOrWhiteSpace(Icon))
-                return new Bitmap(icon);
+                {
+                    return null;
+                }
+
+                try
+                {
+                    var icon = AssetLoader.Open(new Uri($"avares://SourceGit/Resources/ExternalToolIcons/{Icon}.png", UriKind.RelativeOrAbsolute));
+                    return new Bitmap(icon);
+                }
+                catch (Exception)
+                {
+                    return null;
+                }
             }
         }
 
@@ -36,6 +49,26 @@ namespace SourceGit.Models
         }
     }
 
+    public class JetBrainsState
+    {
+        public int Version { get; set; }
+        public string AppVersion { get; set; }
+        public List<JetBrainsTool> Tools { get; set; }
+    }
+
+    public class JetBrainsTool
+    {
+        public string ChannelId { get; set; }
+        public string ToolId { get; set; }
+        public string ProductCode { get; set; }
+        public string Tag { get; set; }
+        public string DisplayName { get; set; }
+        public string DisplayVersion { get; set; }
+        public string BuildNumber { get; set; }
+        public string InstallLocation { get; set; }
+        public string LaunchCommand { get; set; }
+    }
+
     public class ExternalToolsFinder
     {
         public List<ExternalTool> Founded
@@ -44,31 +77,6 @@ namespace SourceGit.Models
             private set;
         } = new List<ExternalTool>();
 
-        public void VSCode(Func<string> platform_finder)
-        {
-            TryAdd("Visual Studio Code", "vscode", "\"{0}\"", "VSCODE_PATH", platform_finder);
-        }
-
-        public void VSCodeInsiders(Func<string> platform_finder)
-        {
-            TryAdd("Visual Studio Code - Insiders", "vscode_insiders", "\"{0}\"", "VSCODE_INSIDERS_PATH", platform_finder);
-        }
-
-        public void Fleet(Func<string> platform_finder)
-        {
-            TryAdd("JetBrains Fleet", "fleet", "\"{0}\"", "FLEET_PATH", platform_finder);
-        }
-
-        public void Rider(Func<string> platform_finder)
-        {
-            TryAdd("JetBrains Rider", "rider", "\"{0}\"", "RIDER_PATH", platform_finder);
-        }
-
-        public void SublimeText(Func<string> platform_finder)
-        {
-            TryAdd("Sublime Text", "sublime_text", "\"{0}\"", "SUBLIME_TEXT_PATH", platform_finder);
-        }
-
         public void TryAdd(string name, string icon, string args, string env, Func<string> finder)
         {
             var path = Environment.GetEnvironmentVariable(env);
@@ -84,8 +92,52 @@ namespace SourceGit.Models
                 Name = name,
                 Icon = icon,
                 OpenCmdArgs = args,
-                Executable = path,
+                Executable = path
             });
         }
+
+        public void VSCode(Func<string> platform_finder)
+        {
+            TryAdd("Visual Studio Code", "vscode", "\"{0}\"", "VSCODE_PATH", platform_finder);
+        }
+
+        public void VSCodeInsiders(Func<string> platform_finder)
+        {
+            TryAdd("Visual Studio Code - Insiders", "vscode_insiders", "\"{0}\"", "VSCODE_INSIDERS_PATH", platform_finder);
+        }
+
+        public void Fleet(Func<string> platform_finder)
+        {
+            TryAdd("JetBrains Fleet", "fleet", "\"{0}\"", "FLEET_PATH", platform_finder);
+        }
+
+        public void SublimeText(Func<string> platform_finder)
+        {
+            TryAdd("Sublime Text", "sublime_text", "\"{0}\"", "SUBLIME_TEXT_PATH", platform_finder);
+        }
+
+        public void FindJetBrainsFromToolbox(Func<string> platform_finder)
+        {
+            var exclude = new List<string> { "fleet", "dotmemory", "dottrace", "resharper-u", "androidstudio" };
+            var supported_icons = new List<string> { "CL", "DB", "DL", "DS", "GO", "IC", "IU", "JB", "PC", "PS", "PY", "QA", "QD", "RD", "RM", "RR", "WRS", "WS" };
+            var state = Path.Combine(platform_finder(), "state.json");
+            if (File.Exists(state))
+            {
+                var stateData = JsonSerializer.Deserialize(File.ReadAllText(state), JsonCodeGen.Default.JetBrainsState);
+                foreach (var tool in stateData.Tools)
+                {
+                    if (exclude.Contains(tool.ToolId.ToLowerInvariant()))
+                        continue;
+
+                    Founded.Add(new ExternalTool
+                    {
+                        Name = $"JetBrains {tool.DisplayName} {tool.DisplayVersion}",
+                        Icon = supported_icons.Contains(tool.ProductCode) ? $"JetBrains/{tool.ProductCode}" : $"JetBrains/JB",
+                        OpenCmdArgs = "\"{0}\"",
+                        Executable = Path.Combine(tool.InstallLocation, tool.LaunchCommand),
+                    });
+                }
+            }
+        }
     }
 }

src/Native/Linux.cs

@@ -57,8 +57,8 @@ namespace SourceGit.Native
             var finder = new Models.ExternalToolsFinder();
             finder.VSCode(() => FindExecutable("code"));
             finder.VSCodeInsiders(() => FindExecutable("code-insiders"));
-            finder.Fleet(FindJetBrainFleet);
+            finder.Fleet(FindJetBrainsFleet);
-            finder.Rider(() => string.Empty);
+            finder.FindJetBrainsFromToolbox(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}/JetBrains/Toolbox");
             finder.SublimeText(() => FindExecutable("subl"));
             return finder.Founded;
         }
@@ -175,7 +175,7 @@ namespace SourceGit.Native
             return null;
         }
 
-        private string FindJetBrainFleet()
+        private string FindJetBrainsFleet()
         {
             var path = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}/JetBrains/Toolbox/apps/fleet/bin/Fleet";
             return File.Exists(path) ? path : FindExecutable("fleet");

src/Native/MacOS.cs

@@ -33,7 +33,7 @@ namespace SourceGit.Native
             finder.VSCode(() => "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code");
             finder.VSCodeInsiders(() => "/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code");
             finder.Fleet(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}/Applications/Fleet.app/Contents/MacOS/Fleet");
-            finder.Rider(() => string.Empty);
+            finder.FindJetBrainsFromToolbox(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}/Library/Application Support/JetBrains/Toolbox");
             finder.SublimeText(() => "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl");
             return finder.Founded;
         }

src/Native/Windows.cs

@@ -111,7 +111,7 @@ namespace SourceGit.Native
             finder.VSCode(FindVSCode);
             finder.VSCodeInsiders(FindVSCodeInsiders);
             finder.Fleet(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\Programs\\Fleet\\Fleet.exe");
-            finder.Rider(FindRider);
+            finder.FindJetBrainsFromToolbox(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\JetBrains\\Toolbox");
             finder.SublimeText(FindSublimeText);
             return finder.Founded;
         }

src/SourceGit.csproj

@@ -23,6 +23,7 @@
   <ItemGroup>
     <AvaloniaResource Include="App.ico" />
     <AvaloniaResource Include="Resources/ExternalToolIcons/*" />
+    <AvaloniaResource Include="Resources/ExternalToolIcons/JetBrains/*" />
     <AvaloniaResource Include="Resources/Fonts/*" />
     <AvaloniaResource Include="Resources/ShellIcons/*" />
   </ItemGroup>