Improvements to update checker

Author: Digitoxin1

DiskImageTool/DiskImageTool.vbproj

@@ -30,7 +30,7 @@
     <ProductName>DiskImageTool</ProductName>
     <PublisherName>Digitoxin</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.30.0.%2a</ApplicationVersion>
+    <ApplicationVersion>1.31.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -54,6 +54,7 @@
     <OutputPath>bin\Release\</OutputPath>
     <DocumentationFile>DiskImageTool.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
@@ -86,6 +87,9 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="CompactJson, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\CompactJson.1.2.3\lib\net472\CompactJson.dll</HintPath>
+    </Reference>
     <Reference Include="Hb.Windows.Forms.HexBox2, Version=2.0.1.35160, Culture=neutral, PublicKeyToken=e0e5adf0ebc99863, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Hb.Hexeditor2\sources\Hb.Windows.Forms.HexBox\bin\Release\Hb.Windows.Forms.HexBox2.dll</HintPath>
@@ -289,6 +293,7 @@
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">

DiskImageTool/Functions.vb

@@ -141,4 +141,26 @@ Module Functions
     Private Function ConvertHexToByte(Hex As String, <Out> ByRef b As Byte) As Boolean
         Return Byte.TryParse(Hex, NumberStyles.HexNumber, Thread.CurrentThread.CurrentCulture, b)
     End Function
+
+    <DllImport("shell32.dll")>
+    Private Function SHGetKnownFolderPath(<MarshalAs(UnmanagedType.LPStruct)> ByVal rfid As Guid,
+        ByVal dwFlags As UInt32,
+        ByVal hToken As IntPtr,
+        ByRef pszPath As IntPtr) As Int32
+    End Function
+
+    Public Function GetDownloadsFolder() As String
+
+        Dim Result As String = ""
+        Dim ppszPath As IntPtr
+        Dim rfid = New Guid("{374DE290-123F-4565-9164-39C4925E467B}")
+
+        If SHGetKnownFolderPath(rfid, 0, 0, ppszPath) = 0 Then
+            Result = Marshal.PtrToStringUni(ppszPath)
+            Marshal.FreeCoTaskMem(ppszPath)
+        End If
+
+        Return Result
+    End Function
+
 End Module

DiskImageTool/MainForm.vb

@@ -2,7 +2,6 @@
 Imports System.IO
 Imports System.Net
 Imports System.Text
-Imports System.Text.RegularExpressions
 Imports DiskImageTool.DiskImage
 Imports BootSectorOffsets = DiskImageTool.DiskImage.BootSector.BootSectorOffsets
 Imports BootSectorSizes = DiskImageTool.DiskImage.BootSector.BootSectorSizes
@@ -444,9 +443,8 @@ Public Class MainForm
     Private Sub CheckForUpdates()
         Dim DownloadVersion As String = ""
         Dim DownloadURL As String = ""
+        Dim Body As String = ""
         Dim UpdateAvailable As Boolean = False
-        Dim Regex As Regex
-        Dim Match As Match
 
         Cursor.Current = Cursors.WaitCursor
         Try
@@ -456,21 +454,27 @@ Public Class MainForm
             Dim Reader As New StreamReader(Response.GetResponseStream)
             Dim ResponseText = Reader.ReadToEnd
 
-            Regex = New Regex("""tag_name"":""v(\d+\.\d+(?:\.\d+)?(?:\.\d+)?)""")
-            Match = Regex.Match(ResponseText)
-            If Match.Success Then
-                If Match.Groups.Count > 1 Then
-                    DownloadVersion = Match.Groups.Item(1).Value
+            Dim json As Dictionary(Of String, Object) = CompactJson.Serializer.Parse(Of Dictionary(Of String, Object))(ResponseText)
+
+            If json.ContainsKey("tag_name") Then
+                DownloadVersion = json.Item("tag_name").ToString
+                If DownloadVersion.StartsWith("v", StringComparison.CurrentCultureIgnoreCase) Then
+                    DownloadVersion = DownloadVersion.Remove(0, 1)
                 End If
             End If
 
-            Regex = New Regex("""browser_download_url"":""([^""]+)""")
-            Match = Regex.Match(ResponseText)
-            If Match.Success Then
-                If Match.Groups.Count > 1 Then
-                    DownloadURL = Match.Groups.Item(1).Value
+            If json.ContainsKey("assets") Then
+                Dim assets() As Dictionary(Of String, Object) = CompactJson.Serializer.Parse(Of Dictionary(Of String, Object)())(json.Item("assets").ToString)
+                If assets.Length > 0 Then
+                    If assets(0).ContainsKey("browser_download_url") Then
+                        DownloadURL = assets(0).Item("browser_download_url").ToString
+                    End If
                 End If
             End If
+
+            If json.ContainsKey("body") Then
+                Body = json.Item("body").ToString
+            End If
         Catch
             MsgBox("An error occured while checking for updates.  Please try again later.", MsgBoxStyle.Exclamation)
             Exit Sub
@@ -482,11 +486,17 @@ Public Class MainForm
         End If
 
         If UpdateAvailable Then
-            Dim Msg = "A New version Of " & My.Application.Info.Title & " Is available." & vbCrLf & vbCrLf & "Do you wish to download it at this time?"
+            Dim Msg = My.Application.Info.Title & " v" & DownloadVersion & " Is available."
+            If Body <> "" Then
+                Msg = Msg & vbCrLf & vbCrLf & "Whats New" & vbCrLf & New String("—", 6) & vbCrLf & Body & vbCrLf
+            End If
+            Msg = Msg & vbCrLf & vbCrLf & "Do you wish to download it at this time?"
             If MsgBox(Msg, MsgBoxStyle.Question + MsgBoxStyle.YesNo + MsgBoxStyle.DefaultButton2) = MsgBoxResult.Yes Then
                 Dim Dialog As New SaveFileDialog With {
                     .Filter = "Zip Archive|*.zip",
-                    .FileName = Path.GetFileName(DownloadURL)
+                    .FileName = Path.GetFileName(DownloadURL),
+                    .InitialDirectory = GetDownloadsFolder(),
+                    .RestoreDirectory = True
                 }
                 Dialog.ShowDialog()
                 If Dialog.FileName <> "" Then

DiskImageTool/My Project/AssemblyInfo.vb

@@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")>
 
 <Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.30.0.0")>
+<Assembly: AssemblyFileVersion("1.31.0.0")>

DiskImageTool/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="CompactJson" version="1.2.3" targetFramework="net472" />
+</packages>