From 063826638e8ef963e6b768b87083b726acb28180 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 8 Mar 2016 11:39:28 -0800
Subject: [PATCH] move handling of get all operation to sep method

---
 assignment-client/src/assets/AssetServer.cpp | 21 +++++++++++++-------
 assignment-client/src/assets/AssetServer.h   |  1 +
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index 4ff9715a7d..fadb6fcc13 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -190,13 +190,7 @@ void AssetServer::handleAssetMappingOperation(QSharedPointer<ReceivedMessage> me
             break;
         }
         case AssetMappingOperationType::GetAll: {
-            replyPacket->writePrimitive(AssetServerError::NoError);
-            auto count = _fileMappings.size();
-            replyPacket->writePrimitive(count);
-            for (auto it = _fileMappings.cbegin(); it != _fileMappings.cend(); ++ it) {
-                replyPacket->writeString(it.key());
-                replyPacket->write(QByteArray::fromHex(it.value().toString().toLocal8Bit()));
-            }
+            handleGetAllMappingOperation(*message, senderNode, *replyPacket);
             break;
         }
         case AssetMappingOperationType::Set: {
@@ -229,6 +223,19 @@ void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNode
     }
 }
 
+void AssetServer::handleGetAllMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
+    replyPacket.writePrimitive(AssetServerError::NoError);
+
+    auto count = _fileMappings.size();
+
+    replyPacket.writePrimitive(count);
+
+    for (auto it = _fileMappings.cbegin(); it != _fileMappings.cend(); ++ it) {
+        replyPacket.writeString(it.key());
+        replyPacket.write(QByteArray::fromHex(it.value().toString().toUtf8()));
+    }
+}
+
 void AssetServer::handleSetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
     if (senderNode->getCanRez()) {
         QString assetPath = message.readString();
diff --git a/assignment-client/src/assets/AssetServer.h b/assignment-client/src/assets/AssetServer.h
index c4d59a7450..45ec7c6750 100644
--- a/assignment-client/src/assets/AssetServer.h
+++ b/assignment-client/src/assets/AssetServer.h
@@ -42,6 +42,7 @@ private:
     using Mappings = QVariantHash;
 
     void handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
+    void handleGetAllMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
     void handleSetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
     void handleDeleteMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);