summaryrefslogtreecommitdiff
path: root/Source/Core/UICommon/AutoUpdate.cpp
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2021-12-27 19:09:47 +0100
committerAdmiral H. Curtiss <pikachu025@gmail.com>2021-12-27 21:19:28 +0100
commit96fa0919be58b015676c54469b7eaff520ee5c56 (patch)
tree3f2ac490332eee8e3512e6badfac333b891e57e2 /Source/Core/UICommon/AutoUpdate.cpp
parent8d237eb1020dd57d7521f1ea5af16045e7991bf4 (diff)
Config: Port AutoUpdate settings to new config system.
Diffstat (limited to 'Source/Core/UICommon/AutoUpdate.cpp')
-rw-r--r--Source/Core/UICommon/AutoUpdate.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/Source/Core/UICommon/AutoUpdate.cpp b/Source/Core/UICommon/AutoUpdate.cpp
index 27ccda4c26..ce316758b0 100644
--- a/Source/Core/UICommon/AutoUpdate.cpp
+++ b/Source/Core/UICommon/AutoUpdate.cpp
@@ -3,16 +3,17 @@
#include "UICommon/AutoUpdate.h"
-#include <picojson.h>
#include <string>
+#include <fmt/format.h>
+#include <picojson.h>
+
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/HttpRequest.h"
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h"
#include "Common/Version.h"
-#include "Core/ConfigManager.h"
#ifdef _WIN32
#include <Windows.h>
@@ -149,22 +150,20 @@ static std::string GetPlatformID()
#endif
}
-void AutoUpdateChecker::CheckForUpdate()
+void AutoUpdateChecker::CheckForUpdate(std::string_view update_track,
+ std::string_view hash_override)
{
// Don't bother checking if updates are not supported or not enabled.
- if (!SystemSupportsAutoUpdates() || SConfig::GetInstance().m_auto_update_track.empty())
+ if (!SystemSupportsAutoUpdates() || update_track.empty())
return;
#ifdef OS_SUPPORTS_UPDATER
CleanupFromPreviousUpdate();
#endif
- std::string version_hash = SConfig::GetInstance().m_auto_update_hash_override.empty() ?
- Common::scm_rev_git_str :
- SConfig::GetInstance().m_auto_update_hash_override;
- std::string url = "https://dolphin-emu.org/update/check/v1/" +
- SConfig::GetInstance().m_auto_update_track + "/" + version_hash + "/" +
- GetPlatformID();
+ std::string_view version_hash = hash_override.empty() ? Common::scm_rev_git_str : hash_override;
+ std::string url = fmt::format("https://dolphin-emu.org/update/check/v1/{}/{}/{}", update_track,
+ version_hash, GetPlatformID());
Common::HttpRequest req{std::chrono::seconds{10}};
auto resp = req.Get(url);