From b88770228e0b91ec14fd6e12805a8297a7f94fc3 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 29 Mar 2016 10:40:56 -0700 Subject: [PATCH] convert running-scripts window to use local script files --- interface/src/Application.cpp | 1 - libraries/script-engine/src/ScriptEngines.cpp | 2 +- libraries/script-engine/src/ScriptsModel.cpp | 23 +++++++++---------- libraries/script-engine/src/ScriptsModel.h | 6 ++--- libraries/shared/src/PathUtils.cpp | 8 +++---- libraries/shared/src/PathUtils.h | 2 +- 6 files changed, 20 insertions(+), 22 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c6669303a8..901963e343 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -224,7 +224,6 @@ static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStanda static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation).append("/script.js"); #endif -const QString DEFAULT_SCRIPTS_JS_URL = "http://s3.amazonaws.com/hifi-public/scripts/defaultScripts.js"; Setting::Handle maxOctreePacketsPerSecond("maxOctreePPS", DEFAULT_MAX_OCTREE_PPS); const QHash Application::_acceptedExtensions { diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index f005368dc4..2c3f7308fa 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -216,7 +216,7 @@ QVariantList ScriptEngines::getRunning() { static const QString SETTINGS_KEY = "Settings"; void ScriptEngines::loadDefaultScripts() { - loadScript(defaultScriptsFileName()); + loadScript(defaultScriptsLocation() + "/defaultScripts.js"); } void ScriptEngines::loadOneScript(const QString& scriptFilename) { diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index 8b01c9fbed..70f0f7fa68 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -15,6 +15,7 @@ #include #include +#include #include "ScriptEngine.h" #include "ScriptEngines.h" @@ -23,11 +24,7 @@ #define __STR1__(x) __STR2__(x) #define __LOC__ __FILE__ "(" __STR1__(__LINE__) ") : Warning Msg: " - -static const QString S3_URL = "http://s3.amazonaws.com/hifi-public"; -static const QString PUBLIC_URL = "http://public.highfidelity.io"; static const QString MODELS_LOCATION = "scripts/"; - static const QString PREFIX_PARAMETER_NAME = "prefix"; static const QString MARKER_PARAMETER_NAME = "marker"; static const QString IS_TRUNCATED_NAME = "IsTruncated"; @@ -63,7 +60,7 @@ ScriptsModel::ScriptsModel(QObject* parent) : connect(&_fsWatcher, &QFileSystemWatcher::directoryChanged, this, &ScriptsModel::reloadLocalFiles); reloadLocalFiles(); - reloadRemoteFiles(); + reloadDefaultFiles(); } ScriptsModel::~ScriptsModel() { @@ -140,24 +137,24 @@ void ScriptsModel::updateScriptsLocation(const QString& newPath) { reloadLocalFiles(); } -void ScriptsModel::reloadRemoteFiles() { +void ScriptsModel::reloadDefaultFiles() { if (!_loadingScripts) { _loadingScripts = true; for (int i = _treeNodes.size() - 1; i >= 0; i--) { TreeNodeBase* node = _treeNodes.at(i); if (node->getType() == TREE_NODE_TYPE_SCRIPT && - static_cast(node)->getOrigin() == SCRIPT_ORIGIN_REMOTE) + static_cast(node)->getOrigin() == SCRIPT_ORIGIN_DEFAULT) { delete node; _treeNodes.removeAt(i); } } - requestRemoteFiles(); + requestDefaultFiles(); } } -void ScriptsModel::requestRemoteFiles(QString marker) { - QUrl url(S3_URL); +void ScriptsModel::requestDefaultFiles(QString marker) { + QUrl url(defaultScriptsLocation()); QUrlQuery query; query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION); if (!marker.isEmpty()) { @@ -218,7 +215,9 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) { xml.readNext(); lastKey = xml.text().toString(); if (jsRegex.exactMatch(xml.text().toString())) { - _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()), S3_URL + "/" + lastKey, SCRIPT_ORIGIN_REMOTE)); + _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()), + defaultScriptsLocation() + "/" + lastKey, + SCRIPT_ORIGIN_DEFAULT)); } } xml.readNext(); @@ -236,7 +235,7 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) { } if (truncated) { - requestRemoteFiles(lastKey); + requestDefaultFiles(lastKey); } // If this request was not truncated, we are done. diff --git a/libraries/script-engine/src/ScriptsModel.h b/libraries/script-engine/src/ScriptsModel.h index df9716d43b..e1902f4b23 100644 --- a/libraries/script-engine/src/ScriptsModel.h +++ b/libraries/script-engine/src/ScriptsModel.h @@ -21,7 +21,7 @@ class TreeNodeFolder; enum ScriptOrigin { SCRIPT_ORIGIN_LOCAL, - SCRIPT_ORIGIN_REMOTE + SCRIPT_ORIGIN_DEFAULT }; enum TreeNodeType { @@ -84,10 +84,10 @@ protected slots: void updateScriptsLocation(const QString& newPath); void downloadFinished(); void reloadLocalFiles(); - void reloadRemoteFiles(); + void reloadDefaultFiles(); protected: - void requestRemoteFiles(QString marker = QString()); + void requestDefaultFiles(QString marker = QString()); bool parseXML(QByteArray xmlFile); void rebuildTree(); diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index bdaf467ce9..ebaae27eb1 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -54,13 +54,13 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector possibleExtensions); QString findMostRecentFileExtension(const QString& originalFileName, QVector possibleExtensions); -QString defaultScriptsFileName(); +QString defaultScriptsLocation(); #endif // hifi_PathUtils_h