From 3e7d30366125d8ec004ac57c400680c7ca65b2b9 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 15 Jan 2018 09:18:22 -0800
Subject: [PATCH] export atp GetMappingRequest to js

---
 .../src/AssetScriptingInterface.cpp           | 24 ++++++++++++++++++-
 .../src/AssetScriptingInterface.h             | 18 +++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp
index 25e8c0dcf3..1c5a7ff7ba 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.cpp
+++ b/libraries/script-engine/src/AssetScriptingInterface.cpp
@@ -16,9 +16,11 @@
 #include <AssetRequest.h>
 #include <AssetUpload.h>
 #include <MappingRequest.h>
-#include <NetworkLogging.h>
 #include <NodeList.h>
 
+#include "ScriptEngineLogging.h"
+
+
 AssetScriptingInterface::AssetScriptingInterface(QScriptEngine* engine) :
     _engine(engine)
 {
@@ -53,10 +55,30 @@ void AssetScriptingInterface::setMapping(QString path, QString hash, QScriptValu
     setMappingRequest->start();
 }
 
+void AssetScriptingInterface::getMapping(QString path, QScriptValue callback) {
+    auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(path);
+    QObject::connect(request, &GetMappingRequest::finished, this, [=](GetMappingRequest* request) mutable {
+        auto result = request->getError();
+        if (callback.isFunction()) {
+            if (result == GetMappingRequest::NotFound) {
+                QScriptValueList args { "" };
+                callback.call(_engine->currentContext()->thisObject(), args);
+            } else if (result == GetMappingRequest::NoError) {
+                QScriptValueList args { request->getHash() };
+                callback.call(_engine->currentContext()->thisObject(), args);
+            } else {
+                qCDebug(scriptengine) << "error -- " << request->getError() << " -- " << request->getErrorString();
+            }
+            request->deleteLater();
+        }
+    });
+    request->start();
+}
 
 void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callback) {
 
     if (!urlString.startsWith(ATP_SCHEME)) {
+        qCDebug(scriptengine) << "AssetScriptingInterface::downloadData url must be of form atp:<hash-value>";
         return;
     }
 
diff --git a/libraries/script-engine/src/AssetScriptingInterface.h b/libraries/script-engine/src/AssetScriptingInterface.h
index 2812be65f9..0964a4f5e2 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.h
+++ b/libraries/script-engine/src/AssetScriptingInterface.h
@@ -75,7 +75,23 @@ 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 {string} assetID
+     */
+    Q_INVOKABLE void getMapping(QString path, QScriptValue callback);
+
+
     Q_INVOKABLE void setBakingEnabled(QString path, bool enabled, QScriptValue callback);
 
 #if (PR_BUILD || DEV_BUILD)