Implement various updater improvements from MPN

Author: Motobug

Source/Core/Common/HttpRequest.cpp

@@ -34,18 +34,21 @@ class HttpRequest::Impl final
   s32 GetLastResponseCode();
   Response Fetch(const std::string& url, Method method, const Headers& headers, const u8* payload,
                  size_t size, AllowedReturnCodes codes = AllowedReturnCodes::Ok_Only,
-                 std::span<Multiform> multiform = {});
+                 const std::vector<Multiform>& multiform = {});
 
   static int CurlProgressCallback(Impl* impl, curl_off_t dltotal, curl_off_t dlnow,
                                   curl_off_t ultotal, curl_off_t ulnow);
   std::string EscapeComponent(const std::string& string);
+  std::string GetFinalUrl() const { return m_final_url; }
 
+  void SetProgressCallback(ProgressCallback callback);
 private:
   static inline std::once_flag s_curl_was_initialized;
   ProgressCallback m_callback;
   Headers m_response_headers;
   std::unique_ptr<CURL, decltype(&curl_easy_cleanup)> m_curl{nullptr, curl_easy_cleanup};
   std::string m_error_string;
+  std::string m_final_url;
 };
 
 HttpRequest::HttpRequest(std::chrono::milliseconds timeout_ms, ProgressCallback callback)
@@ -55,6 +58,15 @@ HttpRequest::HttpRequest(std::chrono::milliseconds timeout_ms, ProgressCallback
 
 HttpRequest::~HttpRequest() = default;
 
+void HttpRequest::SetProgressCallback(ProgressCallback callback)
+{
+    m_callback = std::move(callback);
+    if (m_impl)
+    {
+        m_impl->SetProgressCallback(m_callback);
+    }
+}
+
 bool HttpRequest::IsValid() const
 {
   return m_impl->IsValid();
@@ -115,8 +127,8 @@ int HttpRequest::Impl::CurlProgressCallback(Impl* impl, curl_off_t dltotal, curl
     // Call the progress callback with the current download progress
     if (impl->m_callback)
     {
-        return !impl->m_callback(static_cast<s64>(dltotal), static_cast<s64>(dlnow),
-                                 static_cast<s64>(ultotal), static_cast<s64>(ulnow));
+        return impl->m_callback(static_cast<s64>(dltotal), static_cast<s64>(dlnow),
+                                 static_cast<s64>(ultotal), static_cast<s64>(ulnow)) ? 0 : 1;
     }
     return 0; // If no callback, continue
 }
@@ -183,7 +195,7 @@ void HttpRequest::Impl::UseIPv4()
 }
 
 HttpRequest::Response HttpRequest::PostMultiform(const std::string& url,
-                                                 std::span<Multiform> multiform,
+                                                 const std::vector<Multiform>& multiform,
                                                  const Headers& headers, AllowedReturnCodes codes)
 {
   return m_impl->Fetch(url, Impl::Method::POST, headers, nullptr, 0, codes, multiform);
@@ -195,6 +207,20 @@ void HttpRequest::Impl::FollowRedirects(long max)
   curl_easy_setopt(m_curl.get(), CURLOPT_MAXREDIRS, max);
 }
 
+void HttpRequest::Impl::SetProgressCallback(ProgressCallback callback)
+{
+    m_callback = std::move(callback);
+    if (m_curl)
+    {
+        curl_easy_setopt(m_curl.get(), CURLOPT_NOPROGRESS, m_callback == nullptr);
+        if (m_callback)
+        {
+            curl_easy_setopt(m_curl.get(), CURLOPT_PROGRESSDATA, this);
+            curl_easy_setopt(m_curl.get(), CURLOPT_XFERINFOFUNCTION, CurlProgressCallback);
+        }
+    }
+}
+
 std::string HttpRequest::Impl::GetHeaderValue(std::string_view name) const
 {
   for (const auto& [key, value] : m_response_headers)
@@ -241,12 +267,12 @@ static size_t header_callback(char* buffer, size_t size, size_t nitems, void* us
 HttpRequest::Response HttpRequest::Impl::Fetch(const std::string& url, Method method,
                                                const Headers& headers, const u8* payload,
                                                size_t size, AllowedReturnCodes codes,
-                                               std::span<Multiform> multiform)
+                                               const std::vector<Multiform>& multiform)
 {
   m_response_headers.clear();
-  curl_easy_setopt(m_curl.get(), CURLOPT_POST, method == Method::POST);
+  curl_easy_setopt(m_curl.get(), CURLOPT_POST, method == Impl::Method::POST);
   curl_easy_setopt(m_curl.get(), CURLOPT_URL, url.c_str());
-  if (method == Method::POST && multiform.empty())
+  if (method == Impl::Method::POST && multiform.empty())
   {
     curl_easy_setopt(m_curl.get(), CURLOPT_POSTFIELDS, payload);
     curl_easy_setopt(m_curl.get(), CURLOPT_POSTFIELDSIZE, size);
@@ -273,9 +299,9 @@ HttpRequest::Response HttpRequest::Impl::Fetch(const std::string& url, Method me
   {
     if (!value)
       list = curl_slist_append(list, (name + ':').c_str());
-    else if (value->empty())
+    else if (value && value->empty())
       list = curl_slist_append(list, (name + ';').c_str());
-    else
+    else if (value)
       list = curl_slist_append(list, (name + ": " + *value).c_str());
   }
 
@@ -290,14 +316,20 @@ HttpRequest::Response HttpRequest::Impl::Fetch(const std::string& url, Method me
   curl_easy_setopt(m_curl.get(), CURLOPT_WRITEFUNCTION, CurlWriteCallback);
   curl_easy_setopt(m_curl.get(), CURLOPT_WRITEDATA, &buffer);
 
-  const char* type = method == Method::POST ? "POST" : "GET";
+  const char* type = method == Impl::Method::POST ? "POST" : "GET";
   const CURLcode res = curl_easy_perform(m_curl.get());
   if (res != CURLE_OK)
   {
     ERROR_LOG_FMT(COMMON, "Failed to {} {}: {}", type, url, m_error_string);
     return {};
   }
 
+ // Store the final URL after redirects
+  char* final_url = nullptr;
+  if (curl_easy_getinfo(m_curl.get(), CURLINFO_EFFECTIVE_URL, &final_url) == CURLE_OK && final_url)
+    m_final_url = final_url;
+  else
+    m_final_url.clear();
   if (codes == AllowedReturnCodes::All)
     return buffer;
 
@@ -321,4 +353,10 @@ HttpRequest::Response HttpRequest::Impl::Fetch(const std::string& url, Method me
 
   return buffer;
 }
+
+std::string HttpRequest::GetFinalUrl() const
+{
+  return m_impl->GetFinalUrl();
+}
+
 }  // namespace Common

Source/Core/Common/HttpRequest.h

@@ -28,10 +28,7 @@ class HttpRequest final
   // Return false to abort the request
   using ProgressCallback = std::function<bool(s64 dltotal, s64 dlnow, s64 ultotal, s64 ulnow)>;
 
-  void SetProgressCallback(ProgressCallback callback) {
-      m_callback = std::move(callback);
-  }
-  
+  void SetProgressCallback(ProgressCallback callback);
 
   explicit HttpRequest(std::chrono::milliseconds timeout_ms = std::chrono::milliseconds{3000},
                        ProgressCallback callback = nullptr);
@@ -60,10 +57,12 @@ class HttpRequest final
   Response Post(const std::string& url, const std::string& payload, const Headers& headers = {},
                 AllowedReturnCodes codes = AllowedReturnCodes::Ok_Only);
 
-  Response PostMultiform(const std::string& url, std::span<Multiform> multiform,
+  Response PostMultiform(const std::string& url, const std::vector<Multiform>& multiform,
                          const Headers& headers = {},
                          AllowedReturnCodes codes = AllowedReturnCodes::Ok_Only);
-
+  
+  std::string GetFinalUrl() const;
+  
 private:
   class Impl;
   std::unique_ptr<Impl> m_impl;

Source/Core/DolphinQt/CMakeLists.txt

@@ -276,8 +276,6 @@ add_executable(dolphin-emu
   Main.cpp
   MainWindow.cpp
   MainWindow.h
-  ProjectPlus/DownloadUpdateDialog.cpp
-  ProjectPlus/DownloadUpdateDialog.h
   ProjectPlus/DownloadWorker.cpp
   ProjectPlus/DownloadWorker.h
   ProjectPlus/InstallUpdateDialog.cpp

Source/Core/DolphinQt/DolphinQt.vcxproj

@@ -187,7 +187,6 @@
     <ClCompile Include="InfinityBase/InfinityBaseWindow.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="MainWindow.cpp" />
-    <ClCompile Include="ProjectPlus/DownloadUpdateDialog.cpp" />
     <ClCompile Include="ProjectPlus/DownloadWorker.cpp" />
     <ClCompile Include="ProjectPlus/InstallUpdateDialog.cpp" />
     <ClCompile Include="ProjectPlus/UpdateDialog.cpp" />
@@ -408,7 +407,6 @@
     <QtMoc Include="HotkeyScheduler.h" />
     <QtMoc Include="InfinityBase/InfinityBaseWindow.h" />
     <QtMoc Include="MainWindow.h" />
-    <QtMoc Include="ProjectPlus/DownloadUpdateDialog.h" />
     <QtMoc Include="ProjectPlus/DownloadWorker.h" />
     <QtMoc Include="ProjectPlus/InstallUpdateDialog.h" />
     <QtMoc Include="ProjectPlus/UpdateDialog.h" />
@@ -529,4 +527,4 @@
     <Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
     <Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
   </Target>
-</Project>
+</Project>

Source/Core/DolphinQt/ProjectPlus/DownloadUpdateDialog.cpp

@@ -7,7 +7,7 @@
 #include "DownloadWorker.h"
 #include "Common/HttpRequest.h"
 #include <QFile>
-#include <QMessageBox>
+#include <QDebug>
 
 DownloadWorker::DownloadWorker(const QString& url, const QString& filename)
     : url(url), filename(filename) {}
@@ -18,7 +18,11 @@ void DownloadWorker::startDownload()
 
     // Set the progress callback
     httpRequest.SetProgressCallback([this](s64 dltotal, s64 dlnow, s64 ultotal, s64 ulnow) {
-        QMetaObject::invokeMethod(this, "updateProgress", Qt::QueuedConnection, Q_ARG(s64, dlnow), Q_ARG(s64, dltotal));
+        // Debug output to see if callback is being called
+        qDebug() << "Progress callback called:" << dlnow << "/" << dltotal << "bytes";
+        
+        // Emit the progress signal directly instead of calling updateProgress
+        emit progressUpdated(static_cast<qint64>(dlnow), static_cast<qint64>(dltotal));
         return true; // Continue the download
     });
 
@@ -29,7 +33,14 @@ void DownloadWorker::startDownload()
 
     // Perform the GET request
     auto response = httpRequest.Get(url.toStdString(), headers);
-
+    
+    // Check if the final URL is the expected GitHub objects CDN
+    std::string final_url = httpRequest.GetFinalUrl();
+    if (final_url.find("objects.githubusercontent.com") == std::string::npos) {
+        emit errorOccurred(QStringLiteral("Did not reach the expected GitHub objects URL. Final URL: %1").arg(QString::fromStdString(final_url)));
+        return;
+    }
+    
     // Check the response
     if (response)
     {
@@ -53,4 +64,4 @@ void DownloadWorker::startDownload()
 void DownloadWorker::updateProgress(qint64 dlnow, qint64 dltotal) // Change s64 to qint64
 {
     emit progressUpdated(dlnow, dltotal); // Emit progress signal
-}
+}