* integrate with latest master * consolidate emit entityScriptDetailsUpdated calls * limit maxRetries to 1 when isEntityServerScript()

humbletim committed 9 years ago

Commit 0f7652e1 parent 831bf932 files · +37 −21Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+34−20

     return message;
 }
+int ScriptEngine::processLevelMaxRetries { ScriptRequest::MAX_RETRIES };
 ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const QString& fileNameString) :
     _context(context),
     _scriptContents(scriptContents),
     });
     setProcessEventsInterval(MSECS_PER_SECOND);
+    if (isEntityServerScript()) {
+        qCDebug(scriptengine) << "isEntityServerScript() -- limiting maxRetries to 1";
+        processLevelMaxRetries = 1;
+    }
+    qCDebug(scriptengine) << getContext() << "processLevelMaxRetries =" << processLevelMaxRetries;
 }
 QString ScriptEngine::getContext() const {
     // If we are destroyed before the loader completes, make sure to clean it up
     connect(this, &QObject::destroyed, loader, &QObject::deleteLater);
-    loader->start();
+    loader->start(processLevelMaxRetries);
     if (!callback.isFunction() && !loader->isFinished()) {
         QEventLoop loop;
         }
     }
     return sum;
+}
 QString ScriptEngine::getEntityScriptStatus(const EntityItemID& entityID) {
     if (_entityScripts.contains(entityID))
     return true;
 }
+void ScriptEngine::setEntityScriptDetails(const EntityItemID& entityID, const EntityScriptDetails& details) {
+    _entityScripts[entityID] = details;
+    emit entityScriptDetailsUpdated();
+}
+void ScriptEngine::updateEntityScriptStatus(const EntityItemID& entityID, const EntityScriptStatus &status, const QString& errorInfo) {
+    EntityScriptDetails &details = _entityScripts[entityID];
+    details.status = status;
+    details.errorInfo = errorInfo;
+    emit entityScriptDetailsUpdated();
+}
 // since all of these operations can be asynch we will always do the actual work in the response handler
 // for the download
 void ScriptEngine::loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const EntityItemID& entityID, const QString& entityScript, bool forceRedownload) {
     {
         // set EntityScriptDetails.status to LOADING (over on theEngine's thread)
         QObject threadPunter;
-        connect(&threadPunter, &QObject::destroyed, theEngine.data(), [=]() {
+        auto engine = theEngine.data();
-            EntityScriptDetails &details = theEngine.data()->_entityScripts[entityID];
+        connect(&threadPunter, &QObject::destroyed, engine, [=]() {
+            EntityScriptDetails details = engine->_entityScripts[entityID];
             if (details.status == EntityScriptStatus::PENDING || details.status == EntityScriptStatus::UNLOADED) {
-                details.status = EntityScriptStatus::LOADING;
+                engine->updateEntityScriptStatus(entityID, EntityScriptStatus::LOADING, QThread::currentThread()->objectName());
-                emit entityScriptDetailsUpdated();
             }
         });
     }
 #endif
             strongEngine->entityScriptContentAvailable(entityID, scriptOrURL, contents, isURL, success, status);
         }
-    }, forceRedownload);
+    }, forceRedownload, processLevelMaxRetries);
 }
 // since all of these operations can be asynch we will always do the actual work in the response handler
     if (!success) {
         newDetails.status = EntityScriptStatus::ERROR_LOADING_SCRIPT;
         newDetails.errorInfo = "Failed to load script (" + status + ")";
-        _entityScripts[entityID] = newDetails;
+        setEntityScriptDetails(entityID, newDetails);
-        emit entityScriptDetailsUpdated();
         return;
     }
     if (!syntaxError.isNull() || program.isNull()) {
         newDetails.status = EntityScriptStatus::ERROR_RUNNING_SCRIPT;
         newDetails.errorInfo = QString("Bad syntax (%1)").arg(syntaxError);
-        _entityScripts[entityID] = newDetails;
+        setEntityScriptDetails(entityID, newDetails);
-        emit entityScriptDetailsUpdated();
         qCDebug(scriptengine) << newDetails.errorInfo << scriptOrURL;
         return; // done processing script
     }
     if (!exceptionMessage.isNull()) {
         newDetails.status = EntityScriptStatus::ERROR_RUNNING_SCRIPT;
         newDetails.errorInfo = exceptionMessage;
-        _entityScripts[entityID] = newDetails;
+        setEntityScriptDetails(entityID, newDetails);
-        emit entityScriptDetailsUpdated();
         qCDebug(scriptengine) << "----- ScriptEngine::entityScriptContentAvailable -- hadUncaughtExceptions (" << scriptOrURL << ")";
         return;
     }
         newDetails.status = EntityScriptStatus::ERROR_RUNNING_SCRIPT;
         newDetails.errorInfo = "Could not find constructor";
-        _entityScripts[entityID] = newDetails;
+        setEntityScriptDetails(entityID, newDetails);
-        emit entityScriptDetailsUpdated();
         qCDebug(scriptengine) << "----- ScriptEngine::entityScriptContentAvailable -- failed to run (" << scriptOrURL << ")";
         return; // done processing script
     newDetails.scriptObject = entityScriptObject;
     newDetails.lastModified = lastModified;
     newDetails.definingSandboxURL = sandboxURL;
-    _entityScripts[entityID] = newDetails;
+    setEntityScriptDetails(entityID, newDetails);
-    emit entityScriptDetailsUpdated();
     if (isURL) {
         setParentURL("");
         if (isEntityScriptRunning(entityID)) {
             callEntityScriptMethod(entityID, "unload");
         }
-        EntityScriptDetails details;
+        EntityScriptDetails newDetails;
-        details.status = EntityScriptStatus::UNLOADED;
+        newDetails.status = EntityScriptStatus::UNLOADED;
-        _entityScripts[entityID] = details;
+        setEntityScriptDetails(entityID, newDetails);
         stopAllTimersForEntityScript(entityID);
-        emit entityScriptDetailsUpdated();
     }
 }