Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 16:23:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

working toward allowing local files in running-scripts window

Browse source
This commit is contained in:
Seth Alves 2016-03-29 11:58:21 -07:00
parent b88770228e
commit 3aa1090ced
2 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
libraries/script-engine/src/ScriptsModel.cpp
View file

@ -13,6 +13,7 @@
#include <QUrl> #include <QUrl>
#include <QUrlQuery> #include <QUrlQuery>
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <QDirIterator>
#include <NetworkAccessManager.h> #include <NetworkAccessManager.h>
#include <PathUtils.h> #include <PathUtils.h>
@ -155,18 +156,29 @@ void ScriptsModel::reloadDefaultFiles() {
void ScriptsModel::requestDefaultFiles(QString marker) { void ScriptsModel::requestDefaultFiles(QString marker) {
QUrl url(defaultScriptsLocation()); QUrl url(defaultScriptsLocation());
QUrlQuery query;
query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION);
if (!marker.isEmpty()) {
query.addQueryItem(MARKER_PARAMETER_NAME, marker);
}
url.setQuery(query);
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); if (url.isLocalFile()) {
QNetworkRequest request(url); // QDirIterator it(url.toLocalFile(), QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories);
request.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT); // while (it.hasNext()) {
QNetworkReply* reply = networkAccessManager.get(request); // QString jsFile = it.next();;
connect(reply, SIGNAL(finished()), SLOT(downloadFinished())); // _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()),
// defaultScriptsLocation() + "/" + jsFile,
// SCRIPT_ORIGIN_DEFAULT));
// }
} else {
QUrlQuery query;
query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION);
if (!marker.isEmpty()) {
query.addQueryItem(MARKER_PARAMETER_NAME, marker);
}
url.setQuery(query);
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
QNetworkReply* reply = networkAccessManager.get(request);
connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));
}
} }
void ScriptsModel::downloadFinished() { void ScriptsModel::downloadFinished() {
@ -179,8 +191,10 @@ void ScriptsModel::downloadFinished() {
if (!data.isEmpty()) { if (!data.isEmpty()) {
finished = parseXML(data); finished = parseXML(data);
} else { } else {
qCDebug(scriptengine) << "Error: Received no data when loading remote scripts"; qCDebug(scriptengine) << "Error: Received no data when loading default scripts";
} }
} else {
qDebug() << "error is" << reply->error();
} }
reply->deleteLater(); reply->deleteLater();
@ -214,6 +228,7 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) {
if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == KEY_NAME) { if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == KEY_NAME) {
xml.readNext(); xml.readNext();
lastKey = xml.text().toString(); lastKey = xml.text().toString();
qDebug() << "lastKey = " << lastKey;
if (jsRegex.exactMatch(xml.text().toString())) { if (jsRegex.exactMatch(xml.text().toString())) {
_treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()), _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()),
defaultScriptsLocation() + "/" + lastKey, defaultScriptsLocation() + "/" + lastKey,
@ -230,7 +245,7 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) {
// Error handling // Error handling
if (xml.hasError()) { if (xml.hasError()) {
qCDebug(scriptengine) << "Error loading remote scripts: " << xml.errorString(); qCDebug(scriptengine) << "Error loading default scripts: " << xml.errorString();
return true; return true;
} }

8
libraries/shared/src/PathUtils.cpp
View file

@ -56,11 +56,11 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector<QSt
QString defaultScriptsLocation() { QString defaultScriptsLocation() {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
return "file://" + QCoreApplication::applicationDirPath() + "/scripts"; // return "file:///" + QCoreApplication::applicationDirPath() + "/scripts";
return "http://s3.amazonaws.com/hifi-public/scripts";
#elif defined(Q_OS_OSX) #elif defined(Q_OS_OSX)
return "file://" + QCoreApplication::applicationDirPath() + "/../../scripts"; return "file:///" + QCoreApplication::applicationDirPath() + "/../../scripts";
#else #else
static const QString DEFAULT_SCRIPTS_JS_URL = "http://s3.amazonaws.com/hifi-public/scripts"; return "http://s3.amazonaws.com/hifi-public/scripts";
return DEFAULT_SCRIPTS_JS_URL;
#endif #endif
} }