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

make sure paths are prepended with a slash

Browse source
This commit is contained in:
Stephen Birarda 2015-05-12 15:39:22 -07:00
parent edadaea604
commit 89cb3d66e4
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
domain-server/src/DomainServer.cpp
View file

@ -2216,12 +2216,13 @@ void DomainServer::respondToPathQuery(const QByteArray& receivedPacket, const Hi
pathQuery.prepend("/"); pathQuery.prepend("/");
} }
const QString PATHS_SETTINGS_KEYPATH_FORMAT = "paths.%2"; const QString PATHS_SETTINGS_KEYPATH_FORMAT = "%1.%2";
const QString PATH_VIEWPOINT_KEY = "viewpoint"; const QString PATH_VIEWPOINT_KEY = "viewpoint";
// check out paths in the _configMap to see if we have a match // check out paths in the _configMap to see if we have a match
const QVariant* pathMatch = valueForKeyPath(_settingsManager.getSettingsMap(), const QVariant* pathMatch = valueForKeyPath(_settingsManager.getSettingsMap(),
QString(PATHS_SETTINGS_KEYPATH_FORMAT).arg(pathQuery)); QString(PATHS_SETTINGS_KEYPATH_FORMAT).arg(SETTINGS_PATHS_KEY)
.arg(pathQuery));
if (pathMatch) { if (pathMatch) {
// we got a match, respond with the resulting viewpoint // we got a match, respond with the resulting viewpoint
auto nodeList = DependencyManager::get<LimitedNodeList>(); auto nodeList = DependencyManager::get<LimitedNodeList>();

13
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -297,7 +297,18 @@ void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonV
} }
} }
updateSetting(childKey, newValue.toObject()[childKey], thisMap, childDescriptionObject); QString sanitizedKey = childKey;
if (key == SETTINGS_PATHS_KEY) {
// We perform special handling for paths here.
// If we got sent a path without a leading slash then we add it.
if (!sanitizedKey.startsWith("/")) {
sanitizedKey.prepend("/");
}
}
updateSetting(sanitizedKey, newValue.toObject()[childKey], thisMap, childDescriptionObject);
} }
if (settingMap[key].toMap().isEmpty()) { if (settingMap[key].toMap().isEmpty()) {

2
domain-server/src/DomainServerSettingsManager.h
View file

@ -18,6 +18,8 @@
#include <HifiConfigVariantMap.h> #include <HifiConfigVariantMap.h>
#include <HTTPManager.h> #include <HTTPManager.h>
const QString SETTINGS_PATHS_KEY = "paths";
class DomainServerSettingsManager : public QObject { class DomainServerSettingsManager : public QObject {
Q_OBJECT Q_OBJECT
public: public: