Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:27:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

make scripts tree show scripts in directory passed in with --scripts

Browse source
This commit is contained in:
David Kelly 2017-06-27 18:10:54 -07:00
parent 20f713a241
commit 9417a176a1
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Application.cpp
View file

@ -915,11 +915,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
_saveAvatarOverrideUrl = true; _saveAvatarOverrideUrl = true;
} }
QString defaultScriptsLocation = getCmdOption(argc, constArgv, "--scripts");
if (!defaultScriptsLocation.isEmpty()) {
PathUtils::defaultScriptsLocation(defaultScriptsLocation);
}
_glWidget = new GLCanvas(); _glWidget = new GLCanvas();
getApplicationCompositor().setRenderingWidget(_glWidget); getApplicationCompositor().setRenderingWidget(_glWidget);
_window->setCentralWidget(_glWidget); _window->setCentralWidget(_glWidget);
@ -1186,7 +1181,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
// do this as late as possible so that all required subsystems are initialized // do this as late as possible so that all required subsystems are initialized
// If we've overridden the default scripts location, just load default scripts // If we've overridden the default scripts location, just load default scripts
// otherwise, load 'em all // otherwise, load 'em all
if (!defaultScriptsLocation.isEmpty()) {
// we just want to see if --scripts was set, we've already parsed it and done
// the change in PathUtils. Rather than pass that in the constructor, lets just
// look (this could be debated)
QDir defaultScriptsLocation(getCmdOption(argc, constArgv, "--scripts"));
if (!defaultScriptsLocation.exists()) {
scriptEngines->loadDefaultScripts(); scriptEngines->loadDefaultScripts();
scriptEngines->defaultScriptsLocationOverridden(true); scriptEngines->defaultScriptsLocationOverridden(true);
} else { } else {

10
interface/src/main.cpp
View file

@ -73,12 +73,14 @@ int main(int argc, const char* argv[]) {
QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content", "serverContentPath"); QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content", "serverContentPath");
QCommandLineOption allowMultipleInstancesOption("allowMultipleInstances", "Allow multiple instances to run"); QCommandLineOption allowMultipleInstancesOption("allowMultipleInstances", "Allow multiple instances to run");
QCommandLineOption overrideAppLocalDataPathOption("cache", "set test cache <dir>", "dir"); QCommandLineOption overrideAppLocalDataPathOption("cache", "set test cache <dir>", "dir");
QCommandLineOption overrideScriptsPathOption("scripts", "set scripts <path>", "path");
parser.addOption(urlOption); parser.addOption(urlOption);
parser.addOption(noUpdaterOption); parser.addOption(noUpdaterOption);
parser.addOption(checkMinSpecOption); parser.addOption(checkMinSpecOption);
parser.addOption(runServerOption); parser.addOption(runServerOption);
parser.addOption(serverContentPathOption); parser.addOption(serverContentPathOption);
parser.addOption(overrideAppLocalDataPathOption); parser.addOption(overrideAppLocalDataPathOption);
parser.addOption(overrideScriptsPathOption);
parser.addOption(allowMultipleInstancesOption); parser.addOption(allowMultipleInstancesOption);
parser.parse(arguments); parser.parse(arguments);
@ -99,6 +101,14 @@ int main(int argc, const char* argv[]) {
if (allowMultipleInstances) { if (allowMultipleInstances) {
instanceMightBeRunning = false; instanceMightBeRunning = false;
} }
if (parser.isSet(overrideScriptsPathOption)) {
QDir scriptsPath(parser.value(overrideScriptsPathOption));
if (scriptsPath.exists()) {
PathUtils::defaultScriptsLocation(scriptsPath.path());
}
}
if (parser.isSet(overrideAppLocalDataPathOption)) { if (parser.isSet(overrideAppLocalDataPathOption)) {
// get dir to use for cache // get dir to use for cache
QString cacheDir = parser.value(overrideAppLocalDataPathOption); QString cacheDir = parser.value(overrideAppLocalDataPathOption);