v1.0.0-beta10

List of tools from embedded resource

Author: Juan Segura

ZXBSInstaller.Log/ServiceLayer.cs

@@ -302,19 +302,21 @@ public static void OpenUrlInBrowser(string url)
         /// <summary>
         /// Retrieves all external tools configured for use with the application.
         /// </summary>
+        /// <param name="json">Json string with the external tools information</param>
         /// <returns>An array of <see cref="ExternalTool"/> objects representing the available external tools. The array is empty
         /// if no external tools are configured or can download the config file.</returns>
-        public static ExternalTool[] GetExternalTools()
+        public static ExternalTool[] SetExternalTools(string json)
         {
             try
             {
                 UpdateStatus?.Invoke("Retrieving external tools information...", 5);
 
-                var json = File.ReadAllText("ExternalTools.json");
-                //// Download the external tools list from the configured URL
-                //using var httpClient = new HttpClient();
-                //string json = httpClient.GetStringAsync(GeneralConfig.ToolsListURL).GetAwaiter().GetResult();
                 var tools = JsonSerializer.Deserialize<ExternalTool[]>(json);
+                if (tools == null)
+                {
+                    ShowMessage("ERROR, unable to obtain the list of external tools. Download and install a new version of ZXBSInstaller.");
+                    return null;
+                }
 
                 int max = tools.Length;
                 int prg = 10;

ZXBSInstaller/Controls/MainControl.axaml.cs

@@ -109,13 +109,14 @@ private void GetExternalTools()
         });
 
         // Get tools
-        var tools = ServiceLayer.GetExternalTools();
+        var json = UITools.GetTextResource("ExternalTools.json");
+        var tools = ServiceLayer.SetExternalTools(json);
 
         HideStatusPanel();
         if (tools == null)
         {
-            // Error!
-            ShowMessage("Error retrieving the list of tools, please check your Internet connection.\r\nIt may be a temporary server error, report the error to duefectucorp@gmail.com and try again later.");
+            // No tools, no way!
+            ExitApp();
         }
         else
         {

ZXBSInstaller/UITools.cs

@@ -31,5 +31,26 @@ public static void ShowImage(string fileName, Image imgControl)
             {
             }
         }
+
+
+        /// <summary>
+        /// Read a text file from embedded resource and return the content as string
+        /// </summary>
+        /// <param name="fileName">FileName</param>
+        /// <returns></returns>
+        public static string GetTextResource(string fileName)
+        {
+            try
+            {
+                var uri = new Uri($"avares://ZXBSInstaller/{fileName}");
+                var asset = AssetLoader.Open(uri);
+                var txt= new StreamReader(asset).ReadToEnd();
+                return txt;
+            }
+            catch (Exception ex)
+            {
+                return null;
+            }
+        }
     }
 }

ZXBSInstaller/ZXBSInstaller.csproj

@@ -6,7 +6,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <ApplicationIcon>zxbs.ico</ApplicationIcon>
-    <Version>1.0.0.9</Version>
+    <Version>1.0.0.10</Version>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Assets\cancel.svg" />
@@ -33,9 +33,9 @@
     <AvaloniaResource Include="Assets\zxbsinstaller.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AvaloniaResource>
-    <Content Include="ExternalTools.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <AvaloniaResource Include="ExternalTools.json">
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+    </AvaloniaResource>
     <Content Include="zxbs.ico" />
   </ItemGroup>
 

ZXBSInstaller/version.txt

@@ -1 +1 @@
-1.0.0.9
+1.0.0.10