Add entity url back into entity script filenames

Ryan Huffman committed 10 years ago

Commit 8e3f4b71 parent e3be3331 file · +21 −2Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 1 file). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+21−2

     // we apparently weren't a fully qualified url, so, let's assume we're relative
     // to the original URL of our script
-    QUrl parentURL = contextInfo.fileName();
+    QUrl parentURL = extractUrlFromEntityUrl(contextInfo.fileName());
     if (parentURL.isEmpty()) {
         if (_parentURL.isEmpty()) {
             parentURL = QUrl(_fileNameString);
     }, forceRedownload);
 }
+// The purpose of the following two function is to embed entity ids into entity script filenames
+// so that they show up in stacktraces
+//
+// Extract the url portion of a url that has been encoded with encodeEntityIdIntoEntityUrl(...)
+QString extractUrlFromEntityUrl(QString url) {
+    auto parts = url.split(' ', QString::SkipEmptyParts);
+    if (parts.length() > 0) {
+        return parts[0];
+    } else {
+        return "";
+    }
+}
+// Encode an entity id into an entity url
+// Example: http://www.example.com/some/path.js [EntityID:{9fdd355f-d226-4887-9484-44432d29520e}]
+QString encodeEntityIdIntoEntityUrl(QString url, QString entityID) {
+    return url + " [EntityID:" + entityID + "]";
+}
 // since all of these operations can be asynch we will always do the actual work in the response handler
 // for the download
 void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, const QString& scriptOrURL, const QString& contents, bool isURL, bool success) {
     auto scriptCache = DependencyManager::get<ScriptCache>();
     bool isFileUrl = isURL && scriptOrURL.startsWith("file://");
-    auto fileName = isURL ? scriptOrURL : "EmbeddedEntityScript";
+    auto fileName = isURL ? encodeEntityIdIntoEntityUrl(scriptOrURL, entityID) : "EmbeddedEntityScript";
     QScriptProgram program(contents, fileName);
     if (!hasCorrectSyntax(program)) {