From 70bdedc4b398293d30168666517f34904573cef3 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 1 Mar 2018 16:37:19 -0800
Subject: [PATCH] Fix Edit -> Export Entities exporting gzipped json

We were not respecting the doGzip flag.
---
 libraries/octree/src/Octree.cpp              | 21 +++++++++++---------
 libraries/octree/src/Octree.h                |  4 ++--
 libraries/octree/src/OctreePersistThread.cpp |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index 334299185e..7e0c82506b 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -1778,7 +1778,7 @@ bool Octree::writeToFile(const char* fileName, const OctreeElementPointer& eleme
     return success;
 }
 
-bool Octree::toJSON(QJsonDocument* doc, const OctreeElementPointer& element) {
+bool Octree::toJSONDocument(QJsonDocument* doc, const OctreeElementPointer& element) {
     QVariantMap entityDescription;
 
     OctreeElementPointer top;
@@ -1804,18 +1804,22 @@ bool Octree::toJSON(QJsonDocument* doc, const OctreeElementPointer& element) {
     return true;
 }
 
-bool Octree::toGzippedJSON(QByteArray* data, const OctreeElementPointer& element) {
+bool Octree::toJSON(QByteArray* data, const OctreeElementPointer& element, bool doGzip) {
     QJsonDocument doc;
-    if (!toJSON(&doc, element)) {
+    if (!toJSONDocument(&doc, element)) {
         qCritical("Failed to convert Entities to QVariantMap while converting to json.");
         return false;
     }
 
-    QByteArray jsonData = doc.toJson();
+    if (doGzip) {
+        QByteArray jsonData = doc.toJson();
 
-    if (!gzip(jsonData, *data, -1)) {
-        qCritical("Unable to gzip data while saving to json.");
-        return false;
+        if (!gzip(jsonData, *data, -1)) {
+            qCritical("Unable to gzip data while saving to json.");
+            return false;
+        }
+    } else {
+        *data = doc.toJson();
     }
 
     return true;
@@ -1825,7 +1829,7 @@ bool Octree::writeToJSONFile(const char* fileName, const OctreeElementPointer& e
     qCDebug(octree, "Saving JSON SVO to file %s...", fileName);
 
     QByteArray jsonDataForFile;
-    if (!toGzippedJSON(&jsonDataForFile)) {
+    if (!toJSON(&jsonDataForFile, element, doGzip)) {
         return false;
     }
 
@@ -1837,7 +1841,6 @@ bool Octree::writeToJSONFile(const char* fileName, const OctreeElementPointer& e
         qCritical("Could not write to JSON description of entities.");
     }
 
-
     return success;
 }
 
diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index cb281593b1..c4c4508138 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -284,8 +284,8 @@ public:
     void loadOctreeFile(const char* fileName);
 
     // Octree exporters
-    bool toJSON(QJsonDocument* doc, const OctreeElementPointer& element = nullptr);
-    bool toGzippedJSON(QByteArray* data, const OctreeElementPointer& element = nullptr);
+    bool toJSONDocument(QJsonDocument* doc, const OctreeElementPointer& element = nullptr);
+    bool toJSON(QByteArray* data, const OctreeElementPointer& element = nullptr, bool doGzip = false);
     bool writeToFile(const char* filename, const OctreeElementPointer& element = nullptr, QString persistAsFileType = "json.gz");
     bool writeToJSONFile(const char* filename, const OctreeElementPointer& element = nullptr, bool doGzip = false);
     virtual bool writeToMap(QVariantMap& entityDescription, OctreeElementPointer element, bool skipDefaultValues,
diff --git a/libraries/octree/src/OctreePersistThread.cpp b/libraries/octree/src/OctreePersistThread.cpp
index 23d6b6c2aa..7c5b7eb45c 100644
--- a/libraries/octree/src/OctreePersistThread.cpp
+++ b/libraries/octree/src/OctreePersistThread.cpp
@@ -341,7 +341,7 @@ void OctreePersistThread::sendLatestEntityDataToDS() {
     const DomainHandler& domainHandler = nodeList->getDomainHandler();
 
     QByteArray data;
-    if (_tree->toGzippedJSON(&data)) {
+    if (_tree->toJSON(&data, nullptr, true)) {
         auto message = NLPacketList::create(PacketType::OctreeDataPersist, QByteArray(), true, true);
         message->write(data);
         nodeList->sendPacketList(std::move(message), domainHandler.getSockAddr());