boost(Update): Don't autodownload when opening the update form. Only after the user click install.

Belphemur · Belphemur · commit 2029a9b44641 · 2021-05-17T19:22:03.000-04:00
See #528
diff --git a/SoundSwitch/UI/Component/ChangelogWebViewer.cs b/SoundSwitch/UI/Component/ChangelogWebViewer.cs
@@ -13,29 +13,29 @@
 ********************************************************************/
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Windows.Forms;
 using Markdig;
+using SoundSwitch.Util.Url;
 
 namespace SoundSwitch.UI.Component
 {
     public class ChangelogWebViewer : WebBrowser
     {
         public ChangelogWebViewer()
         {
-            IsWebBrowserContextMenuEnabled =  false;
-            WebBrowserShortcutsEnabled     =  false;
-            Navigating                     += OnNavigating;
+            IsWebBrowserContextMenuEnabled = false;
+            WebBrowserShortcutsEnabled = false;
+            Navigating += OnNavigating;
         }
 
         private void OnNavigating(object sender, WebBrowserNavigatingEventArgs e)
         {
             if (e.Url.ToString() == "about:blank")
                 return;
-            
+
             e.Cancel = true;
-            var url = e.Url.ToString().Replace("&", "^&");
-            Process.Start(new ProcessStartInfo("cmd", $"/c start {url}") {CreateNoWindow = true});
+            var url = e.Url.ToString();
+            BrowserUtil.OpenUrl(url);
         }
 
         private static List<string> HtmlHeaders => new()
@@ -73,7 +73,7 @@ private void OnNavigating(object sender, WebBrowserNavigatingEventArgs e)
         public void SetChangelog(IEnumerable<string> changelogLines)
         {
             var pipeline = new MarkdownPipelineBuilder().UseAdvancedExtensions().Build();
-            var lines    = HtmlHeaders;
+            var lines = HtmlHeaders;
             lines.Add("<body>");
             lines.Add(Markdown.ToHtml(string.Join("\n", changelogLines), pipeline));
             lines.Add("</body>");
diff --git a/SoundSwitch/UI/Forms/UpdateDownloadForm.Designer.cs b/SoundSwitch/UI/Forms/UpdateDownloadForm.Designer.cs
diff --git a/SoundSwitch/UI/Forms/UpdateDownloadForm.cs b/SoundSwitch/UI/Forms/UpdateDownloadForm.cs
@@ -34,17 +34,17 @@ public UpdateDownloadForm()
 
             LocalizeForm();
             downloadProgress.DisplayStyle = TextProgressBar.ProgressBarDisplayText.Both;
+            downloadProgress.Visible = false;
             TopMost = true;
         }
 
         public void DownloadRelease(Release release)
         {
+            installButton.Enabled = true;
             changeLog.SetChangelog(release.Changelog);
             Name = release.Name;
             downloadProgress.CustomText = release.Asset.name;
             downloadProgress.Value = 0;
-            installButton.Enabled = false;
-            downloadProgress.Enabled = true;
 
             _releaseFile = new WebFile(new Uri(release.Asset.browser_download_url));
 
@@ -82,21 +82,9 @@ public void DownloadRelease(Release release)
                     return;
                 }
 
-                if (installButton.InvokeRequired)
-                {
-                    installButton.BeginInvoke(new Action(() =>
-                    {
-                        installButton.Enabled = true;
-                        downloadProgress.Enabled = false;
-                    }));
-                }
-                else
-                {
-                    installButton.Enabled = true;
-                    downloadProgress.Enabled = false;
-                }
+                new UpdateRunner().RunUpdate(_releaseFile, "/SILENT");
+                BeginInvoke((Action) Close);
             };
-            _releaseFile.DownloadFile();
             ShowDialog();
         }
 
@@ -116,8 +104,10 @@ private void cancelButton_Click(object sender, EventArgs e)
 
         private void installButton_Click(object sender, EventArgs e)
         {
-            new UpdateRunner().RunUpdate(_releaseFile, "/SILENT");
-            Close();
+            downloadProgress.Enabled = true;
+            downloadProgress.Visible = true;
+            _releaseFile.DownloadFile();
+            installButton.Enabled = false;
         }
 
         private void UpdateDownloadForm_FormClosing(object sender, FormClosingEventArgs e)
diff --git a/SoundSwitch/UI/Forms/UpdateDownloadForm.resx b/SoundSwitch/UI/Forms/UpdateDownloadForm.resx
@@ -1,64 +1,4 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
+﻿<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
