Update UpdateCheckAPI.

Author: AmitBM

AMDToolsDownloader/AMDToolsDownloader.go

@@ -12,7 +12,7 @@ func main() {
 
     argCount := len(os.Args[1:])
     if (argCount != 2) {
-        fmt.Printf("Usage: urlDownload url localPath\n")
+        fmt.Printf("Usage: AMDToolsDownloader url localPath\n")
         fmt.Printf("\turl - The url to the file to download\n")
         fmt.Printf("\tlocalPath - The path and filename to save the downloaded file\n")
         os.Exit(1)
@@ -25,7 +25,6 @@ func main() {
     if (err != nil) {
         panic(err)
     }
-
 }
 
 

Include/UpdateCheckApiStrings.h

@@ -112,6 +112,7 @@ const char* const STR_ERROR_DOWNLOAD_URL_NOT_FOUND_IN_ASSET = "The download url
 // High Level Error Messages.
 const char* const STR_ERROR_URL_MUST_POINT_TO_A_JSON_FILE = "URL must point to a JSON file.";
 const char* const STR_ERROR_FAILED_TO_LAUNCH_VERSION_FILE_DOWNLOADER = "Failed to launch the AMD Tools Downloader.";
+const char* const STR_ERROR_FAILED_TO_LOAD_LATEST_RELEASE_INFORMATION = "Failed to load latest release information.";
 const char* const STR_ERROR_FAILED_TO_DOWNLOAD_VERSION_FILE = "Failed to download version file.";
 const char* const STR_ERROR_FAILED_TO_LOAD_VERSION_FILE = "Failed to load version file.";
 const char* const STR_ERROR_DOWNLOADED_AN_EMPTY_VERSION_FILE = "Downloaded an empty version file.";

Include/UpdateCheckResultsDialog.h

@@ -26,7 +26,9 @@ class UpdateCheckResultsDialog : public QDialog
 
     void SetResults(const UpdateCheck::Results& results);
     void SetResults(const UpdateCheck::UpdateInfo& updateInfo);
+    void SetShowTags(bool showTags);
 
 private:
     Ui::UpdateCheckResultsDialog *ui;
+    bool m_showTags = true;
 };

Include/UpdateCheckThread.h

@@ -8,7 +8,7 @@
 //==============================================================================
 #pragma once
 
-#include <UpdateCheckApi.h>
+#include "UpdateCheckApi.h"
 #include <QThread>
 
 namespace UpdateCheck

Source/UpdateCheckApi.cpp

@@ -235,27 +235,38 @@ static bool LoadJsonFromLatestRelease(const std::string jsonFileUrl, const std::
     }
     else
     {
-        std::string latestReleaseJson;
-        if (LoadJsonFile(latestReleaseApiTempFile, latestReleaseJson, errorMessage))
+        try
         {
-            json latestReleaseJsonDoc = json::parse(latestReleaseJson);
-
-            std::string versionFileUrl;
-            if (FindAssetDownloadUrl(latestReleaseJsonDoc, jsonFileName, versionFileUrl, errorMessage))
-            {
-                wasLoaded = DownloadJsonFile(versionFileUrl, jsonString, errorMessage);
-            }
-            else
+            std::string latestReleaseJson;
+            if (LoadJsonFile(latestReleaseApiTempFile, latestReleaseJson, errorMessage))
             {
-                // Failed to find the Asset, so check for a "message" tag which may indicate an error from the GitHub Release API.
-                auto messageElement = latestReleaseJsonDoc.find(TAG_MESSAGE);
+                // Parsing the json can throw an exception if the string is
+                // not valid json. This can happen in networks that limit
+                // internet access, and result in downloading an html page.
+                json latestReleaseJsonDoc = json::parse(latestReleaseJson);
 
-                if (messageElement != latestReleaseJsonDoc.end())
+                std::string versionFileUrl;
+                if (FindAssetDownloadUrl(latestReleaseJsonDoc, jsonFileName, versionFileUrl, errorMessage))
+                {
+                    wasLoaded = DownloadJsonFile(versionFileUrl, jsonString, errorMessage);
+                }
+                else
                 {
-                    errorMessage.append(messageElement->get<std::string>().c_str());
+                    // Failed to find the Asset, so check for a "message" tag which may indicate an error from the GitHub Release API.
+                    auto messageElement = latestReleaseJsonDoc.find(TAG_MESSAGE);
+
+                    if (messageElement != latestReleaseJsonDoc.end())
+                    {
+                        errorMessage.append(messageElement->get<std::string>().c_str());
+                    }
                 }
             }
         }
+        catch (...)
+        {
+            wasLoaded = false;
+            errorMessage.append(STR_ERROR_FAILED_TO_LOAD_LATEST_RELEASE_INFORMATION);
+        }
     }
 
     return wasLoaded;

Source/UpdateCheckResultsDialog.cpp

@@ -85,19 +85,23 @@ void UpdateCheckResultsDialog::SetResults(const UpdateCheck::UpdateInfo& updateI
             updateResultHtml.append(releaseIter->m_date.c_str());
             updateResultHtml.append(STR_HTML_NEWLINE);
 
-            if (!releaseIter->m_tags.empty())
+            if (m_showTags)
             {
-                updateResultHtml.append(STR_TAGS);
-                updateResultHtml.append(releaseIter->m_tags[0].c_str());
-
-                for (size_t i = 1; i != releaseIter->m_tags.size(); ++i)
+                if (!releaseIter->m_tags.empty())
                 {
-                    updateResultHtml.append(STR_TAGS_SEPARATOR);
-                    updateResultHtml.append(releaseIter->m_tags[i].c_str());
+                    updateResultHtml.append(STR_TAGS);
+                    updateResultHtml.append(releaseIter->m_tags[0].c_str());
+
+                    for (size_t i = 1; i != releaseIter->m_tags.size(); ++i)
+                    {
+                        updateResultHtml.append(STR_TAGS_SEPARATOR);
+                        updateResultHtml.append(releaseIter->m_tags[i].c_str());
+                    }
                 }
+
+                updateResultHtml.append(STR_HTML_NEWLINE);
             }
 
-            updateResultHtml.append(STR_HTML_NEWLINE);
             updateResultHtml.append(STR_HTML_NEWLINE);
 
             // Display download links.
@@ -106,8 +110,8 @@ void UpdateCheckResultsDialog::SetResults(const UpdateCheck::UpdateInfo& updateI
                 updateResultHtml.append(STR_UPDATES_DOWNLOAD_THIS_RELEASE_FROM);
                 updateResultHtml.append(STR_HTML_NEWLINE);
 
-                // Sample output: "Windows: [MSI] [ZIP] [ZIP]" with the full hyperlink as a tooltip over the MSI, ZIP, ZIP to allow
-                // users to distinquish between the two ZIP files.
+                // Sample output: "Windows: [MSI] [ZIP] [ZIP]" with the full hyper link as a tooltip over the MSI, ZIP, ZIP to allow
+                // users to distinguish between the two ZIP files.
                 for (auto platformIter = releaseIter->m_targetPlatforms.cbegin(); platformIter != releaseIter->m_targetPlatforms.cend(); ++platformIter)
                 {
                     updateResultHtml.append(STR_HTML_DIV_INDENT_40_OPEN);
@@ -134,7 +138,7 @@ void UpdateCheckResultsDialog::SetResults(const UpdateCheck::UpdateInfo& updateI
                 updateResultHtml.append(STR_HTML_NEWLINE);
             }
 
-            // Diplay additional info links.
+            // Display additional info links.
             if (!releaseIter->m_infoLinks.empty())
             {
                 updateResultHtml.append(STR_UPDATES_FOR_MORE_INFORMATION_VISIT);
@@ -179,3 +183,8 @@ void UpdateCheckResultsDialog::SetResults(const UpdateCheck::Results& results)
         SetResults(results.updateInfo);
     }
 }
+
+void UpdateCheckResultsDialog::SetShowTags(bool showTags)
+{
+    m_showTags = showTags;
+}

Source/UpdateCheckResultsDialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>532</width>
-    <height>360</height>
+    <width>400</width>
+    <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">