Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 8 files). Show all
Unified · Split
| @@ -34,6 +34,7 @@ · 33 unmodified lines | ||
| 34 | 34 | #include "EventTypes.h" |
| 35 | 35 | #include "MenuItemProperties.h" |
| 36 | 36 | #include "ScriptAudioInjector.h" |
| 37 | +#include "ScriptCache.h" | |
| 37 | 38 | #include "ScriptEngine.h" |
| 38 | 39 | #include "TypedArrays.h" |
| 39 | 40 | #include "XMLHttpRequestClass.h" |
| @@ -279,16 +280,22 @@ void ScriptEngine::loadURL(const QUrl& scriptURL) { · 239 unmodified lines | ||
| 279 | 280 | emit errorLoadingScript(_fileNameString); |
| 280 | 281 | } |
| 281 | 282 | } else { |
| 283 | + /* | |
| 282 | 284 | QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); |
| 283 | 285 | QNetworkRequest networkRequest = QNetworkRequest(url); |
| 284 | 286 | networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT); |
| 285 | 287 | QNetworkReply* reply = networkAccessManager.get(networkRequest); |
| 286 | 288 | connect(reply, &QNetworkReply::finished, this, &ScriptEngine::handleScriptDownload); |
| 289 | + */ | |
| 290 | + auto scriptCache = DependencyManager::get<ScriptCache>(); | |
| 291 | + scriptCache->getScript(url, this); | |
| 292 | + | |
| 287 | 293 | } |
| 288 | 294 | } |
| 289 | 295 | } |
| 290 | 296 | |
| 291 | 297 | void ScriptEngine::handleScriptDownload() { |
| 298 | + /* | |
| 292 | 299 | QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender()); |
| 293 | 300 | |
| 294 | 301 | if (reply->error() == QNetworkReply::NoError && reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 200) { |
| @@ -300,6 +307,17 @@ void ScriptEngine::handleScriptDownload() { · 5 unmodified lines | ||
| 300 | 307 | } |
| 301 | 308 | |
| 302 | 309 | reply->deleteLater(); |
| 310 | + */ | |
| 311 | +} | |
| 312 | + | |
| 313 | +void ScriptEngine::scriptContentsAvailable(const QUrl& url, const QString& scriptContents) { | |
| 314 | + _scriptContents = scriptContents; | |
| 315 | + emit scriptLoaded(_fileNameString); | |
| 316 | +} | |
| 317 | + | |
| 318 | +void ScriptEngine::errorInLoadingScript(const QUrl& url) { | |
| 319 | + qDebug() << "ERROR Loading file:" << url.toString(); | |
| 320 | + emit errorLoadingScript(_fileNameString); // ?? | |
| 303 | 321 | } |
| 304 | 322 | |
| 305 | 323 | void ScriptEngine::init() { |