From 0930cc4f0e3bfbcc4b001a08df1eab78521f4f7c Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Wed, 17 Jan 2018 17:08:57 -0500
Subject: [PATCH] partial getMapping PR integration

---
 .../script-engine/src/AssetScriptingInterface.cpp |  5 ++---
 .../script-engine/src/AssetScriptingInterface.h   | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp
index a7d0bad3c2..54e74564ef 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.cpp
+++ b/libraries/script-engine/src/AssetScriptingInterface.cpp
@@ -27,8 +27,7 @@
 #include <shared/QtHelpers.h>
 #include "Gzip.h"
 #include "ScriptEngine.h"
-
-//using Promise = MiniPromise::Promise;
+#include "ScriptEngineLogging.h"
 
 AssetScriptingInterface::AssetScriptingInterface(QObject* parent) : BaseAssetScriptingInterface(parent) {
     if (auto engine = qobject_cast<QScriptEngine*>(parent)) {
@@ -88,7 +87,7 @@ void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callb
 
     if (!urlString.startsWith(ATP_SCHEME)) {
         // ... for now at least log a message so user can check logs
-        qDebug() << "AssetScriptingInterface::downloadData ERROR: url does not start with " << ATP_SCHEME;
+        qCDebug(scriptengine) << "AssetScriptingInterface::downloadData url must be of form atp:<hash-value>";
         return;
     }
     QString hash = AssetUtils::extractAssetHash(urlString);
diff --git a/libraries/script-engine/src/AssetScriptingInterface.h b/libraries/script-engine/src/AssetScriptingInterface.h
index 9022316634..f1a270b6c7 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.h
+++ b/libraries/script-engine/src/AssetScriptingInterface.h
@@ -79,6 +79,21 @@ public:
      * @param {string} error
      */
     Q_INVOKABLE void setMapping(QString path, QString hash, QScriptValue callback);
+
+    /**jsdoc
+     * Look up a path to hash mapping within the connected domain's asset server
+     * @function Assets.getMapping
+     * @static
+     * @param path {string}
+     * @param callback {Assets~getMappingCallback}
+     */
+
+    /**jsdoc
+     * Called when getMapping is complete.
+     * @callback Assets~getMappingCallback
+     * @param error {string} error description if the path could not be resolved; otherwise a null value.
+     * @param assetID {string} hash value if found, else an empty string
+     */
     Q_INVOKABLE void getMapping(QString path, QScriptValue callback);
 
     Q_INVOKABLE void setBakingEnabled(QString path, bool enabled, QScriptValue callback);