first cut at script caching

ZappoMan committed 11 years ago

Commit 36657c91 parent 099a2b58 files · +309 −4Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+18−0

 #include "EventTypes.h"
 #include "MenuItemProperties.h"
 #include "ScriptAudioInjector.h"
+#include "ScriptCache.h"
 #include "ScriptEngine.h"
 #include "TypedArrays.h"
 #include "XMLHttpRequestClass.h"
                 emit errorLoadingScript(_fileNameString);
             }
         } else {
+            /*
             QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
             QNetworkRequest networkRequest = QNetworkRequest(url);
             networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
             QNetworkReply* reply = networkAccessManager.get(networkRequest);
             connect(reply, &QNetworkReply::finished, this, &ScriptEngine::handleScriptDownload);
+            */
+            auto scriptCache = DependencyManager::get<ScriptCache>();
+            scriptCache->getScript(url, this);
         }
     }
 }
 void ScriptEngine::handleScriptDownload() {
+    /*
     QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
     if (reply->error() == QNetworkReply::NoError && reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 200) {
     }
     reply->deleteLater();
+    */
+}
+void ScriptEngine::scriptContentsAvailable(const QUrl& url, const QString& scriptContents) {
+    _scriptContents = scriptContents;
+    emit scriptLoaded(_fileNameString);
+}
+void ScriptEngine::errorInLoadingScript(const QUrl& url) {
+    qDebug() << "ERROR Loading file:" << url.toString();
+    emit errorLoadingScript(_fileNameString); // ??
 }
 void ScriptEngine::init() {