blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 13:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor json utility to wxdata, add ReadJsonString function

Browse source
This commit is contained in:
Dan Paulat 2025-02-01 18:21:41 -06:00
parent 895e760fee
commit 9f33189c18
12 changed files with 245 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

28
scwx-qt/source/scwx/qt/manager/update_manager.cpp
View file

@ -1,4 +1,5 @@
#include <scwx/qt/manager/update_manager.hpp>
#include <scwx/util/json.hpp>
#include <scwx/util/logger.hpp>
#include <mutex>
@ -29,8 +30,7 @@ public:
~Impl() {}
static std::string GetVersionString(const std::string& releaseName);
static boost::json::value ParseResponseText(const std::string& s);
static std::string GetVersionString(const std::string& releaseName);
size_t PopulateReleases();
size_t AddReleases(const boost::json::value& json);
@ -70,28 +70,6 @@ UpdateManager::Impl::GetVersionString(const std::string& releaseName)
return versionString;
}
boost::json::value UpdateManager::Impl::ParseResponseText(const std::string& s)
{
boost::json::stream_parser p;
boost::system::error_code ec;
p.write(s, ec);
if (ec)
{
logger_->warn("{}", ec.message());
return nullptr;
}
p.finish(ec);
if (ec)
{
logger_->warn("{}", ec.message());
return nullptr;
}
return p.release();
}
bool UpdateManager::CheckForUpdates(const std::string& currentVersion)
{
std::unique_lock lock(p->updateMutex_);
@ -148,7 +126,7 @@ size_t UpdateManager::Impl::PopulateReleases()
// Successful REST API query
if (r.status_code == 200)
{
boost::json::value json = Impl::ParseResponseText(r.text);
boost::json::value json = util::json::ReadJsonString(r.text);
if (json == nullptr)
{
logger_->warn("Response not JSON: {}", r.header["content-type"]);