Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch out jsoncpp for nlohmann json

Browse Source 
Add llsdjson.* too!
This commit is contained in:
Lirusaito
2019-03-07 03:38:27 -05:00
parent 626351e897
commit fc488959ea
11 changed files with 267 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/CMakeLists.txt
View File

@@ -13,7 +13,7 @@ include(FMODSTUDIO)
include(GLOD)
include(FindOpenGL)
include(Hunspell)
include(JsonCpp)
include(Json)
include(LLAddBuildTest)
include(LLAppearance)
include(LLAudio)
@@ -53,7 +53,7 @@ include_directories(
${STATEMACHINE_INCLUDE_DIRS}
${DBUSGLIB_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
${JSONCPP_INCLUDE_DIR}
${JSON_INCLUDE_DIR}
${GLOD_INCLUDE_DIR}
${LLAUDIO_INCLUDE_DIRS}
${LLCHARACTER_INCLUDE_DIRS}
@@ -1652,7 +1652,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${GLOD_LIBRARIES}
${APRUTIL_LIBRARIES}
${OPENGL_LIBRARIES}
${JSONCPP_LIBRARIES}
${SDL_LIBRARY}
${SMARTHEAP_LIBRARY}
${UI_LIBRARIES}

39
indra/newview/llwebprofile.cpp
View File

@@ -38,8 +38,7 @@
#include "llpanelprofile.h" // <edit>getProfileURL (this is the original location LL put it).</edit>
#include "llviewermedia.h" // FIXME: don't use LLViewerMedia internals
// third-party JSONCPP
#include <jsoncpp/reader.h> // JSONCPP
#include "llsdjson.h"
/*
* Workflow:
@@ -78,39 +77,25 @@ public:
if (mStatus != HTTP_OK)
{
LL_WARNS() << "Failed to get upload config (" << mStatus << ")" << LL_ENDL;
LL_WARNS() << "Failed to get upload config (" << mStatus << ')' << LL_ENDL;
LLWebProfile::reportImageUploadStatus(false);
return;
}
Json::Value root;
Json::Reader reader;
if (!reader.parse(body, root))
{
LL_WARNS() << "Failed to parse upload config: " << reader.getFormattedErrorMessages() << LL_ENDL;
LLWebProfile::reportImageUploadStatus(false);
return;
}
auto root = LlsdFromJson(nlohmann::json::parse(body));
// *TODO: 404 = not supported by the grid
// *TODO: increase timeout or handle HTTP_INTERNAL_ERROR_* time errors.
// Convert config to LLSD.
const Json::Value data = root["data"];
const auto data = root["data"];
const std::string upload_url = root["url"].asString();
LLSD config;
config["acl"] = data["acl"].asString();
config["AWSAccessKeyId"] = data["AWSAccessKeyId"].asString();
config["Content-Type"] = data["Content-Type"].asString();
config["key"] = data["key"].asString();
config["policy"] = data["policy"].asString();
config["success_action_redirect"] = data["success_action_redirect"].asString();
config["signature"] = data["signature"].asString();
config["add_loc"] = data.get("add_loc", "0").asString();
config["caption"] = data.get("caption", "").asString();
LLSD config = data;
if (!data.has("add_loc")) config["add_loc"] = "0";
if (!data.has("caption")) config["caption"] = LLStringUtil::null;
// Do the actual image upload using the configuration.
LL_DEBUGS("Snapshots") << "Got upload config, POSTing image to " << upload_url << ", config=[" << config << "]" << LL_ENDL;
LL_DEBUGS("Snapshots") << "Got upload config, POSTing image to " << upload_url << ", config=[" << config << ']' << LL_ENDL;
LLWebProfile::post(mImagep, config, upload_url);
}
@@ -133,7 +118,7 @@ public:
{
if (mStatus != HTTP_OK)
{
LL_WARNS() << "Failed to upload image: " << mStatus << " " << mReason << LL_ENDL;
LL_WARNS() << "Failed to upload image: " << mStatus << ' ' << mReason << LL_ENDL;
LLWebProfile::reportImageUploadStatus(false);
return;
}
@@ -143,7 +128,7 @@ public:
strstrm << istr.rdbuf();
const std::string body = strstrm.str();
LL_INFOS() << "Image uploaded." << LL_ENDL;
LL_DEBUGS("Snapshots") << "Uploading image succeeded. Response: [" << body << "]" << LL_ENDL;
LL_DEBUGS("Snapshots") << "Uploading image succeeded. Response: [" << body << ']' << LL_ENDL;
LLWebProfile::reportImageUploadStatus(true);
}
@@ -184,8 +169,8 @@ public:
}
else
{
LL_WARNS() << "Unexpected POST status: " << mStatus << " " << mReason << LL_ENDL;
LL_DEBUGS("Snapshots") << "received_headers: [" << mReceivedHeaders << "]" << LL_ENDL;
LL_WARNS() << "Unexpected POST status: " << mStatus << ' ' << mReason << LL_ENDL;
LL_DEBUGS("Snapshots") << "received_headers: [" << mReceivedHeaders << ']' << LL_ENDL;
LLWebProfile::reportImageUploadStatus(false);
}
}

21
indra/newview/shupdatechecker.cpp
View File

@@ -16,8 +16,7 @@
#include "llbufferstream.h"
#include "llweb.h"
#include <jsoncpp/reader.h>
#include <nlohmann/json.hpp>
extern AIHTTPTimeoutPolicy getUpdateInfoResponder_timeout;
///////////////////////////////////////////////////////////////////////////////
@@ -57,20 +56,14 @@ public:
return;
}
Json::Value root;
Json::Reader reader;
if (!reader.parse(body, root))
{
LL_WARNS() << "Failed to parse update info: " << reader.getFormattedErrorMessages() << LL_ENDL;
return;
}
auto root = nlohmann::json::parse(body);
std::string viewer_version = llformat("%s (%i)", LLVersionInfo::getShortVersion().c_str(), LLVersionInfo::getBuild());
const Json::Value data = root[mType];
const auto data = root[mType];
#if LL_WINDOWS
std::string recommended_version = data["recommended"]["windows"].asString();
std::string minimum_version = data["minimum"]["windows"].asString();
std::string recommended_version = data["recommended"]["windows"];
std::string minimum_version = data["minimum"]["windows"];
#elif LL_LINUX
std::string recommended_version = data["recommended"]["linux"].asString();
std::string minimum_version = data["minimum"]["linux"].asString();
@@ -88,7 +81,7 @@ public:
args["CURRENT_VER"] = viewer_version;
args["RECOMMENDED_VER"] = recommended_version;
args["MINIMUM_VER"] = minimum_version;
args["URL"] = data["url"].asString();
args["URL"] = data["url"].get<std::string>();
args["TYPE"] = mType == "release" ? "Viewer" : "Alpha";
static LLCachedControl<S32> sLastKnownReleaseBuild("SinguLastKnownReleaseBuild", 0);
@@ -123,7 +116,7 @@ public:
}
if (!notificaiton.empty())
{
LLNotificationsUtil::add(notificaiton, args, LLSD(), boost::bind(&GetUpdateInfoResponder::onNotifyButtonPress, this, _1, _2, notificaiton, data["url"].asString()));
LLNotificationsUtil::add(notificaiton, args, LLSD(), boost::bind(&GetUpdateInfoResponder::onNotifyButtonPress, this, _1, _2, notificaiton, data["url"]));
}
}
}