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

trying again on script loading changes

Browse source
This commit is contained in:
Seth Alves 2016-04-01 11:52:47 -07:00
parent 0f288247a7
commit 35affe26e3
4 changed files with 67 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -220,7 +220,7 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) {
return;
}
QUrl url = expandScriptUrl(normalizeScriptURL(scriptURL));
QUrl url = expandScriptUrl(scriptURL);
_fileNameString = url.toString();
_isReloading = reload;
@ -847,7 +847,7 @@ QUrl ScriptEngine::resolvePath(const QString& include) const {
QUrl url(include);
// first lets check to see if it's already a full URL
if (!url.scheme().isEmpty()) {
return expandScriptUrl(normalizeScriptURL(url));
return expandScriptUrl(url);
}
// we apparently weren't a fully qualified url, so, let's assume we're relative
@ -864,7 +864,7 @@ QUrl ScriptEngine::resolvePath(const QString& include) const {
}
// at this point we should have a legitimate fully qualified URL for our parent
url = expandScriptUrl(normalizeScriptURL(parentURL.resolved(url)));
url = expandScriptUrl(parentURL.resolved(url));
return url;
}

78
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -44,16 +44,21 @@ ScriptEngines::ScriptEngines()
QUrl normalizeScriptURL(const QUrl& rawScriptURL) {
if (rawScriptURL.scheme() == "file") {
qDebug() << "+";
qDebug() << "+";
qDebug() << "+";
QUrl fullNormal = rawScriptURL;
QUrl defaultScriptLoc = defaultScriptsLocation();
#ifdef Q_OS_LINUX
#else
// Force lowercase on file scripts because of drive letter weirdness.
if (rawScriptURL.isLocalFile()) {
fullNormal.setPath(fullNormal.path().toLower());
}
#endif
// #ifdef Q_OS_LINUX
// #else
// // Force lowercase on file scripts because of drive letter weirdness.
// if (rawScriptURL.isLocalFile()) {
// fullNormal.setPath(fullNormal.path()); // .toLower());
// }
// #endif
// if this url is something "beneath" the default script url, replace the local path with ~
if (fullNormal.scheme() == defaultScriptLoc.scheme() &&
fullNormal.host() == defaultScriptLoc.host() &&
@ -69,21 +74,37 @@ QUrl normalizeScriptURL(const QUrl& rawScriptURL) {
}
}
QUrl expandScriptUrl(const QUrl& normalizedScriptURL) {
QUrl expandScriptUrl(const QUrl& rawScriptURL) {
QUrl normalizedScriptURL = normalizeScriptURL(rawScriptURL);
qDebug() << "expandScriptUrl in = " << rawScriptURL;
if (normalizedScriptURL.scheme() == "http" ||
normalizedScriptURL.scheme() == "https" ||
normalizedScriptURL.scheme() == "atp") {
qDebug() << "expandScriptUrl out(net) = " << normalizedScriptURL;
return normalizedScriptURL;
} else if (normalizedScriptURL.scheme() == "file") {
if (normalizedScriptURL.path().startsWith("/~/")) {
QUrl url = normalizedScriptURL;
qDebug() << "in expand, normalizedScriptURL = " << normalizedScriptURL;
QStringList splitPath = url.path().split("/");
QUrl defaultScriptsLoc = defaultScriptsLocation();
url.setPath(defaultScriptsLoc.path() + "/" + splitPath.mid(2).join("/")); // 2 to skip the slashes in /~/
qDebug() << "expandScriptUrl out(file 0) = " << url;
return url;
}
qDebug() << "expandScriptUrl out(file 1) = " << normalizedScriptURL;
return normalizedScriptURL;
} else {
qDebug() << "expandScriptUrl out(bad scheme) = " << normalizedScriptURL;
return QUrl("");
}
}
@ -230,7 +251,7 @@ QVariantList ScriptEngines::getRunning() {
}
QVariantMap resultNode;
resultNode.insert("name", runningScriptURL.fileName());
QUrl displayURL = expandScriptUrl(QUrl(runningScriptURL));
QUrl displayURL = expandScriptUrl(runningScriptURL);
QString displayURLString;
if (displayURL.isLocalFile()) {
displayURLString = displayURL.toLocalFile();
@ -268,7 +289,7 @@ void ScriptEngines::loadScripts() {
loadDefaultScripts();
_firstRun.set(false);
return;
}
}
// loads all saved scripts
Settings settings;
@ -310,7 +331,12 @@ void ScriptEngines::saveScripts() {
QStringList ScriptEngines::getRunningScripts() {
QReadLocker lock(&_scriptEnginesHashLock);
return _scriptEnginesHash.keys();
QList<QUrl> urls = _scriptEnginesHash.keys();
QStringList result;
for (auto url : urls) {
result.append(url.toString());
}
return result;
}
void ScriptEngines::stopAllScripts(bool restart) {
@ -318,7 +344,7 @@ void ScriptEngines::stopAllScripts(bool restart) {
if (restart) {
// Delete all running scripts from cache so that they are re-downloaded when they are restarted
auto scriptCache = DependencyManager::get<ScriptCache>();
for (QHash<QString, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
for (QHash<QUrl, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
it != _scriptEnginesHash.constEnd(); it++) {
if (!it.value()->isFinished()) {
scriptCache->deleteScript(it.key());
@ -327,7 +353,7 @@ void ScriptEngines::stopAllScripts(bool restart) {
}
// Stop and possibly restart all currently running scripts
for (QHash<QString, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
for (QHash<QUrl, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
it != _scriptEnginesHash.constEnd(); it++) {
if (it.value()->isFinished()) {
continue;
@ -350,21 +376,20 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) {
if (!scriptURL.isValid()) {
scriptURL = normalizeScriptURL(QUrl::fromLocalFile(rawScriptURL));
}
const QString scriptURLString = scriptURL.toString();
QReadLocker lock(&_scriptEnginesHashLock);
if (_scriptEnginesHash.contains(scriptURLString)) {
ScriptEngine* scriptEngine = _scriptEnginesHash[scriptURLString];
if (_scriptEnginesHash.contains(scriptURL)) {
ScriptEngine* scriptEngine = _scriptEnginesHash[scriptURL];
if (restart) {
auto scriptCache = DependencyManager::get<ScriptCache>();
scriptCache->deleteScript(QUrl(scriptURLString));
scriptCache->deleteScript(scriptURL);
connect(scriptEngine, &ScriptEngine::finished, this, [this](QString scriptName, ScriptEngine* engine) {
reloadScript(scriptName);
});
}
scriptEngine->stop();
stoppedScript = true;
qCDebug(scriptengine) << "stopping script..." << scriptURLString;
qCDebug(scriptengine) << "stopping script..." << scriptURL;
}
}
return stoppedScript;
@ -379,7 +404,7 @@ void ScriptEngines::setScriptsLocation(const QString& scriptsLocation) {
_scriptsModel.updateScriptsLocation(scriptsLocation);
}
void ScriptEngines::reloadAllScripts() {
void ScriptEngines::reloadAllScripts() {
DependencyManager::get<ScriptCache>()->clearCache();
emit scriptsReloading();
stopAllScripts(true);
@ -409,7 +434,7 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL
scriptUrl = normalizeScriptURL(scriptFilename);
}
auto scriptEngine = getScriptEngine(scriptUrl.toString());
auto scriptEngine = getScriptEngine(scriptUrl);
if (scriptEngine) {
return scriptEngine;
}
@ -435,12 +460,12 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL
return scriptEngine;
}
ScriptEngine* ScriptEngines::getScriptEngine(const QString& rawScriptURL) {
ScriptEngine* ScriptEngines::getScriptEngine(const QUrl& rawScriptURL) {
ScriptEngine* result = nullptr;
{
QReadLocker lock(&_scriptEnginesHashLock);
const QString scriptURLString = normalizeScriptURL(QUrl(rawScriptURL)).toString();
auto it = _scriptEnginesHash.find(scriptURLString);
const QUrl scriptURL = normalizeScriptURL(rawScriptURL);
auto it = _scriptEnginesHash.find(scriptURL);
if (it != _scriptEnginesHash.end()) {
result = it.value();
}
@ -459,8 +484,7 @@ void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptURL) {
QWriteLocker lock(&_scriptEnginesHashLock);
QUrl url = QUrl(rawScriptURL);
QUrl normalized = normalizeScriptURL(url);
const QString scriptURLString = normalized.toString();
_scriptEnginesHash.insertMulti(scriptURLString, scriptEngine);
_scriptEnginesHash.insertMulti(normalized, scriptEngine);
}
emit scriptCountChanged();
}
@ -486,8 +510,8 @@ void ScriptEngines::onScriptFinished(const QString& rawScriptURL, ScriptEngine*
bool removed = false;
{
QWriteLocker lock(&_scriptEnginesHashLock);
const QString scriptURLString = normalizeScriptURL(QUrl(rawScriptURL)).toString();
for (auto it = _scriptEnginesHash.find(scriptURLString); it != _scriptEnginesHash.end(); ++it) {
const QUrl scriptURL = normalizeScriptURL(QUrl(rawScriptURL));
for (auto it = _scriptEnginesHash.find(scriptURL); it != _scriptEnginesHash.end(); ++it) {
if (it.value() == engine) {
_scriptEnginesHash.erase(it);
removed = true;

10
libraries/script-engine/src/ScriptEngines.h
View file

@ -45,7 +45,7 @@ public:
void loadDefaultScripts();
void setScriptsLocation(const QString& scriptsLocation);
QStringList getRunningScripts();
ScriptEngine* getScriptEngine(const QString& scriptHash);
ScriptEngine* getScriptEngine(const QUrl& scriptHash);
ScriptsModel* scriptsModel() { return &_scriptsModel; };
ScriptsModelFilter* scriptsModelFilter() { return &_scriptsModelFilter; };
@ -65,12 +65,12 @@ public:
// Called at shutdown time
void shutdownScripting();
signals:
signals:
void scriptCountChanged();
void scriptsReloading();
void scriptLoadError(const QString& filename, const QString& error);
protected slots:
protected slots:
void onScriptFinished(const QString& fileNameString, ScriptEngine* engine);
protected:
@ -86,7 +86,7 @@ protected:
Setting::Handle<bool> _firstRun { "firstRun", true };
QReadWriteLock _scriptEnginesHashLock;
QHash<QString, ScriptEngine*> _scriptEnginesHash;
QHash<QUrl, ScriptEngine*> _scriptEnginesHash;
QSet<ScriptEngine*> _allKnownScriptEngines;
QMutex _allScriptsMutex;
std::atomic<bool> _stoppingAllScripts { false };
@ -97,6 +97,6 @@ protected:
};
QUrl normalizeScriptURL(const QUrl& rawScriptURL);
QUrl expandScriptUrl(const QUrl& normalizedScriptURL);
QUrl expandScriptUrl(const QUrl& rawScriptURL);
#endif // hifi_ScriptEngine_h

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

@ -160,6 +160,13 @@ void ScriptsModel::requestDefaultFiles(QString marker) {
// if the url indicates a local directory, use QDirIterator
QString localDir = expandScriptUrl(url).toLocalFile();
int localDirPartCount = localDir.split("/").size();
if (localDir.endsWith("/")) {
localDirPartCount--;
}
qDebug() << "|";
qDebug() << "|";
qDebug() << "|";
qDebug() << localDir;
#ifdef Q_OS_WIN
localDirPartCount++; // one for the drive letter
#endif
@ -238,7 +245,7 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) {
if (jsRegex.exactMatch(xml.text().toString())) {
QString localPath = lastKey.split("/").mid(1).join("/");
QUrl fullPath = defaultScriptsLocation();
fullPath.setPath(fullPath.path() + "/" + lastKey);
fullPath.setPath(fullPath.path() + lastKey);
const QString fullPathStr = normalizeScriptURL(fullPath).toString();
_treeNodes.append(new TreeNodeScript(localPath, fullPathStr, SCRIPT_ORIGIN_DEFAULT));
}