From f8f99721c3fdd606885db7285c592fbc6ca4e3b0 Mon Sep 17 00:00:00 2001 From: David Kelly Date: Wed, 10 Aug 2016 14:25:00 -0700 Subject: [PATCH 1/2] Minor update to add details And, now reflects data-web's slightly updated json structure for returning info on an uploaded snapshot. --- interface/src/ui/Snapshot.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/src/ui/Snapshot.cpp b/interface/src/ui/Snapshot.cpp index f6bd8e2db9..beb86af1c4 100644 --- a/interface/src/ui/Snapshot.cpp +++ b/interface/src/ui/Snapshot.cpp @@ -182,7 +182,9 @@ void SnapshotUploader::uploadSuccess(QNetworkReply& reply) { QJsonParseError jsonError; auto doc = QJsonDocument::fromJson(contents, &jsonError); if (jsonError.error == QJsonParseError::NoError) { - QString thumbnailUrl = doc.object().value("thumbnail_url").toString(); + auto dataObject = doc.object().value("data").toObject(); + QString thumbnailUrl = dataObject.value("thumbnail_url").toString(); + QString imageUrl = dataObject.value("image_url").toString(); auto addressManager = DependencyManager::get(); QString placeName = addressManager->getPlaceName(); if (placeName.isEmpty()) { @@ -193,6 +195,9 @@ void SnapshotUploader::uploadSuccess(QNetworkReply& reply) { // create json post data QJsonObject rootObject; QJsonObject userStoryObject; + QJsonObject detailsObject; + detailsObject.insert("image_url", imageUrl); + userStoryObject.insert("details", detailsObject); userStoryObject.insert("thumbnail_url", thumbnailUrl); userStoryObject.insert("place_name", placeName); userStoryObject.insert("path", currentPath); From 5c15b520404ed1afb3e66d02bbd28803c5426719 Mon Sep 17 00:00:00 2001 From: David Kelly Date: Wed, 10 Aug 2016 14:54:29 -0700 Subject: [PATCH 2/2] expose getPlaceName() as placename Nice for scripts to get the placename. Nice for us, anyways. --- libraries/networking/src/AddressManager.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index 2e9f177137..0315d749c4 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -38,6 +38,7 @@ class AddressManager : public QObject, public Dependency { Q_PROPERTY(QString protocol READ getProtocol) Q_PROPERTY(QString hostname READ getHost) Q_PROPERTY(QString pathname READ currentPath) + Q_PROPERTY(QString placename READ getPlaceName) public: Q_INVOKABLE QString protocolVersion(); using PositionGetter = std::function;