Support reload-on-change for local scripts

Brad Davis committed 11 years ago

Commit 99d1e171 parent 039d9a62 files · +57 −6Browse 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+55−6

 #include <QtCore/QCoreApplication>
 #include <QtCore/QEventLoop>
+#include <QtCore/QFileInfo>
 #include <QtCore/QTimer>
 #include <QtCore/QThread>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
-#include <QScriptEngine>
+#include <QtScript/QScriptEngine>
-#include <QScriptValue>
+#include <QtScript/QScriptValue>
 #include <AudioConstants.h>
 #include <AudioEffectOptions.h>
     #endif
     auto scriptCache = DependencyManager::get<ScriptCache>();
+    bool isFileUrl = isURL && scriptOrURL.startsWith("file://");
     // first check the syntax of the script contents
     QScriptSyntaxCheckResult syntaxCheck = QScriptEngine::checkSyntax(contents);
         qCDebug(scriptengine) << "   " << syntaxCheck.errorMessage() << ":"
                 << syntaxCheck.errorLineNumber() << syntaxCheck.errorColumnNumber();
         qCDebug(scriptengine) << "    SCRIPT:" << scriptOrURL;
-        scriptCache->addScriptToBadScriptList(scriptOrURL);
+        if (!isFileUrl) {
+            scriptCache->addScriptToBadScriptList(scriptOrURL);
+        }
         return; // done processing script
     }
         qCDebug(scriptengine) << "ScriptEngine::loadEntityScript() entity:" << entityID;
         qCDebug(scriptengine) << "    NOT CONSTRUCTOR";
         qCDebug(scriptengine) << "    SCRIPT:" << scriptOrURL;
-        scriptCache->addScriptToBadScriptList(scriptOrURL);
+        if (!isFileUrl) {
+            scriptCache->addScriptToBadScriptList(scriptOrURL);
+        }
         return; // done processing script
     }
-    QScriptValue entityScriptConstructor = evaluate(contents);
+    int64_t lastModified = 0;
+    if (isFileUrl) {
+        QString file = QUrl(scriptOrURL).toLocalFile();
+        lastModified = (quint64)QFileInfo(file).lastModified().toMSecsSinceEpoch();
+    }
+    QScriptValue entityScriptConstructor = evaluate(contents);
     QScriptValue entityScriptObject = entityScriptConstructor.construct();
-    EntityScriptDetails newDetails = { scriptOrURL, entityScriptObject };
+    EntityScriptDetails newDetails = { scriptOrURL, entityScriptObject, lastModified };
     _entityScripts[entityID] = newDetails;
     if (isURL) {
         setParentURL("");
     _entityScripts.clear();
 }
+void ScriptEngine::refreshFileScript(const EntityItemID& entityID) {
+    if (!_entityScripts.contains(entityID)) {
+        return;
+    }
+    static bool recurseGuard = false;
+    if (recurseGuard) {
+        return;
+    }
+    recurseGuard = true;
+    EntityScriptDetails details = _entityScripts[entityID];
+    // Check to see if a file based script needs to be reloaded (easier debugging)
+    if (details.lastModified > 0) {
+        QString filePath = QUrl(details.scriptText).toLocalFile();
+        auto lastModified = QFileInfo(filePath).lastModified().toMSecsSinceEpoch();
+        if (lastModified > details.lastModified) {
+            qDebug() << "Reloading modified script " << details.scriptText;
+            QFile file(filePath);
+            file.open(QIODevice::ReadOnly);
+            QString scriptContents = QTextStream(&file).readAll();
+            this->unloadEntityScript(entityID);
+            this->entityScriptContentAvailable(entityID, details.scriptText, scriptContents, true, true);
+            if (!_entityScripts.contains(entityID)) {
+                qWarning() << "Reload script " << details.scriptText << " failed";
+            } else {
+                details = _entityScripts[entityID];
+            }
+        }
+    }
+    recurseGuard = false;
+}
 void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName) {
     if (QThread::currentThread() != thread()) {
         #ifdef THREAD_DEBUGGING
         "entityID:" << entityID << "methodName:" << methodName;
     #endif
+    refreshFileScript(entityID);
     if (_entityScripts.contains(entityID)) {
         EntityScriptDetails details = _entityScripts[entityID];
         QScriptValue entityScript = details.scriptObject; // previously loaded
         "entityID:" << entityID << "methodName:" << methodName << "event: mouseEvent";
     #endif
+    refreshFileScript(entityID);
     if (_entityScripts.contains(entityID)) {
         EntityScriptDetails details = _entityScripts[entityID];
         QScriptValue entityScript = details.scriptObject; // previously loaded
         "entityID:" << entityID << "methodName:" << methodName << "otherID:" << otherID << "collision: collision";
     #endif
+    refreshFileScript(entityID);
     if (_entityScripts.contains(entityID)) {
         EntityScriptDetails details = _entityScripts[entityID];
         QScriptValue entityScript = details.scriptObject; // previously loaded