From 21c2db7cdce8ffe32658b515790999d5ba56db99 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 6 Apr 2016 12:40:59 -0700 Subject: [PATCH 1/2] attempt to make the failed-to-load-entity-script error-message be more helpful --- libraries/script-engine/src/ScriptEngine.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 31047dd423..bcd509ff53 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -1089,9 +1089,18 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co } if (!testConstructor.isFunction()) { - qCDebug(scriptengine) << "ScriptEngine::loadEntityScript() entity:" << entityID << "\n" - " NOT CONSTRUCTOR\n" - " SCRIPT:" << scriptOrURL; + QString testConstructorType = QString(testConstructor.toVariant().typeName()); + if (testConstructorType == "") { + testConstructorType = "empty"; + } + QString testConstructorValue = testConstructor.toString(); + if (testConstructorValue.size() > 80) { + testConstructorValue = testConstructorValue.mid(0, 80) + "..."; + } + qCDebug(scriptengine) << "Error -- ScriptEngine::loadEntityScript() entity:" << entityID + << "failed to load entity script -- expected a function, got " + testConstructorType + << "," << testConstructorValue + << "," << scriptOrURL; if (!isFileUrl) { scriptCache->addScriptToBadScriptList(scriptOrURL); From 672b4df7c13b0e0a9d42b38bd8fa9c2510989f57 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 6 Apr 2016 13:36:44 -0700 Subject: [PATCH 2/2] get rid of magic number --- libraries/script-engine/src/ScriptEngine.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index bcd509ff53..67e32a2ad8 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -1094,8 +1094,9 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co testConstructorType = "empty"; } QString testConstructorValue = testConstructor.toString(); - if (testConstructorValue.size() > 80) { - testConstructorValue = testConstructorValue.mid(0, 80) + "..."; + const int maxTestConstructorValueSize = 80; + if (testConstructorValue.size() > maxTestConstructorValueSize) { + testConstructorValue = testConstructorValue.mid(0, maxTestConstructorValueSize) + "..."; } qCDebug(scriptengine) << "Error -- ScriptEngine::loadEntityScript() entity:" << entityID << "failed to load entity script -- expected a function, got " + testConstructorType