From 46449256ce26b905f145e214f23e16d0d580cdff Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 9 Feb 2018 11:32:54 -0800
Subject: [PATCH] CR

---
 .../src/assets/UploadAssetTask.cpp            | 16 +++++++++++----
 domain-server/src/BackupSupervisor.cpp        | 20 +++++++------------
 domain-server/src/BackupSupervisor.h          |  2 +-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/assignment-client/src/assets/UploadAssetTask.cpp b/assignment-client/src/assets/UploadAssetTask.cpp
index f2ba431875..d3e755212a 100644
--- a/assignment-client/src/assets/UploadAssetTask.cpp
+++ b/assignment-client/src/assets/UploadAssetTask.cpp
@@ -41,8 +41,12 @@ void UploadAssetTask::run() {
     
     uint64_t fileSize;
     buffer.read(reinterpret_cast<char*>(&fileSize), sizeof(fileSize));
-    
-    qDebug() << "UploadAssetTask reading a file of " << fileSize << "bytes.";
+
+    if (_senderNode) {
+        qDebug() << "UploadAssetTask reading a file of " << fileSize << "bytes from" << uuidStringWithoutCurlyBraces(_senderNode->getUUID());
+    } else {
+        qDebug() << "UploadAssetTask reading a file of " << fileSize << "bytes from" << _receivedMessage->getSenderSockAddr();
+    }
     
     auto replyPacket = NLPacket::create(PacketType::AssetUploadReply, -1, true);
     replyPacket->writePrimitive(messageID);
@@ -54,8 +58,12 @@ void UploadAssetTask::run() {
         
         auto hash = AssetUtils::hashData(fileData);
         auto hexHash = hash.toHex();
-        
-        qDebug() << "Hash for uploaded file is: (" << hexHash << ") ";
+
+        if (_senderNode) {
+            qDebug() << "Hash for uploaded file from" << uuidStringWithoutCurlyBraces(_senderNode->getUUID()) << "is: (" << hexHash << ")";
+        } else {
+            qDebug() << "Hash for uploaded file from" << _receivedMessage->getSenderSockAddr() << "is: (" << hexHash << ")";
+        }
         
         QFile file { _resourcesDir.filePath(QString(hexHash)) };
 
diff --git a/domain-server/src/BackupSupervisor.cpp b/domain-server/src/BackupSupervisor.cpp
index 829208913f..1bf1e9e199 100644
--- a/domain-server/src/BackupSupervisor.cpp
+++ b/domain-server/src/BackupSupervisor.cpp
@@ -1,6 +1,6 @@
 //
 //  BackupSupervisor.cpp
-//  assignment-client/src
+//  domain-server/src
 //
 //  Created by Clement Brisset on 1/12/18.
 //  Copyright 2018 High Fidelity, Inc.
@@ -106,28 +106,22 @@ bool BackupSupervisor::loadBackup(const QString& backupFile) {
     }
     QJsonParseError error;
     auto document = QJsonDocument::fromJson(file.readAll(), &error);
-    if (document.isNull()) {
-        qCritical() << "Could not parse backup file:" << backupFile;
-        qCritical() << "    Error:" << error.errorString();
-        backup.corruptedBackup = true;
-        return false;
-    }
-
-    if (!document.isObject()) {
-        qCritical() << "Backup file corrupted" << backupFile;
+    if (document.isNull() || !document.isObject()) {
+        qCritical() << "Could not parse backup file to JSON object:" << backupFile;
         backup.corruptedBackup = true;
         return false;
     }
 
     auto jsonObject = document.object();
     for (auto it = begin(jsonObject); it != end(jsonObject); ++it) {
-        if (!it.value().isString()) {
+        const auto& assetPath = it.key();
+        const auto& assetHash = it.value().toString();
+
+        if (!AssetUtils::isValidHash(assetHash)) {
             qCritical() << "Corrupted mapping in backup file" << backupFile << ":" << it.key();
             backup.corruptedBackup = true;
             return false;
         }
-        const auto& assetPath = it.key();
-        const auto& assetHash = it.value().toString();
 
         backup.mappings[assetPath] = assetHash;
         _assetsInBackups.insert(assetHash);
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/BackupSupervisor.h
index a4129fca12..f01e389c39 100644
--- a/domain-server/src/BackupSupervisor.h
+++ b/domain-server/src/BackupSupervisor.h
@@ -1,6 +1,6 @@
 //
 //  BackupSupervisor.h
-//  assignment-client/src
+//  domain-server/src
 //
 //  Created by Clement Brisset on 1/12/18.
 //  Copyright 2018 High Fidelity, Inc.