Fix download progress

Author: vicroms

include/vcpkg/base/contractual-constants.h

@@ -591,6 +591,8 @@ namespace vcpkg
     inline constexpr StringLiteral StatusNotInstalled = "not-installed";
     inline constexpr StringLiteral StatusPurge = "purge";
 
+    // App Insights JSON response fields
     inline constexpr StringLiteral AppInsightsResponseItemsReceived = "itemsReceived";
     inline constexpr StringLiteral AppInsightsResponseItemsAccepted = "itemsAccepted";
+    inline constexpr StringLiteral AppInsightsResponseErrors = "errors";
 }

src/vcpkg/base/downloads.cpp

@@ -137,16 +137,16 @@ namespace vcpkg
         return static_cast<WriteFilePointer*>(param)->write(contents, size, nmemb);
     }
 
-    static size_t progress_callback(void* clientp, double dltotal, double dlnow, double ultotal, double ulnow)
+    static size_t progress_callback(
+        void* clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
     {
         (void)ultotal;
         (void)ulnow;
         auto machine_readable_progress = static_cast<MessageSink*>(clientp);
-
-        if (dltotal > 0)
+        if (dltotal && machine_readable_progress)
         {
-            const double percent = (dlnow / dltotal) * 100.0;
-            machine_readable_progress->println(LocalizedString::from_raw(fmt::format("{:.2f}%", percent)));
+            double percentage = (static_cast<double>(dlnow) / static_cast<double>(dltotal)) * 100.0;
+            machine_readable_progress->println(LocalizedString::from_raw(fmt::format("{:.2f}%", percentage)));
         }
         return 0;
     }
@@ -512,7 +512,7 @@ namespace vcpkg
         set_common_curl_easy_options(handle, raw_url, request_headers);
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &write_file_callback);
         curl_easy_setopt(curl, CURLOPT_WRITEDATA, static_cast<void*>(&fileptr));
-        curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L); // enable progress
+        curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L); // change from default to enable progress
         curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, &progress_callback);
         curl_easy_setopt(curl, CURLOPT_XFERINFODATA, static_cast<void*>(&machine_readable_progress));
         auto curl_code = curl_easy_perform(curl);

src/vcpkg/metrics.cpp

@@ -551,7 +551,7 @@ namespace vcpkg
 
         auto maybe_received = json->get(vcpkg::AppInsightsResponseItemsReceived);
         auto maybe_accepted = json->get(vcpkg::AppInsightsResponseItemsAccepted);
-        auto maybe_errors = json->get("errors");
+        auto maybe_errors = json->get(vcpkg::AppInsightsResponseErrors);
 
         if (maybe_received && maybe_accepted && maybe_errors && maybe_received->is_integer() &&
             maybe_accepted->is_integer() && maybe_errors->is_array())
@@ -590,7 +590,6 @@ namespace vcpkg
         curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); // CURLFOLLOW_ALL
         curl_easy_setopt(curl, CURLOPT_USERAGENT, vcpkg_curl_user_agent);
 
-        curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
         std::string buff;
         curl_easy_setopt(curl, CURLOPT_WRITEDATA, static_cast<void*>(&buff));
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &string_append_cb);