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

Merge pull request #18 from druiz17/serverless-domains

Browse source 
Support file:///~/path/to/file/ format when loading domain from goto
This commit is contained in:
Seth Alves 2018-02-16 15:14:45 -08:00 committed by GitHub
commit 9ba11ba3e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/networking/src/AddressManager.cpp
View file

@ -22,6 +22,7 @@
#include <NumericalConstants.h> #include <NumericalConstants.h>
#include <SettingHandle.h> #include <SettingHandle.h>
#include <UUID.h> #include <UUID.h>
#include <PathUtils.h>
#include "AddressManager.h" #include "AddressManager.h"
#include "NodeList.h" #include "NodeList.h"
@ -309,10 +310,13 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
} else if (lookupUrl.scheme() == "http" || lookupUrl.scheme() == "https" || lookupUrl.scheme() == "file") { } else if (lookupUrl.scheme() == "http" || lookupUrl.scheme() == "https" || lookupUrl.scheme() == "file") {
qDebug() << "QQQQ file or http before serverless domain" << lookupUrl.toString(); qDebug() << "QQQQ file or http before serverless domain" << lookupUrl.toString();
_previousLookup.clear(); _previousLookup.clear();
QUrl domainUrl = lookupUrl;
const QString path = PathUtils::expandToAppAbsolutePath(lookupUrl.path());
domainUrl.setPath(path);
emit setServersEnabled(false); emit setServersEnabled(false);
setDomainInfo(lookupUrl, QString(), 0, trigger); setDomainInfo(domainUrl, QString(), 0, trigger);
DependencyManager::get<NodeList>()->getDomainHandler().setIsConnected(true); DependencyManager::get<NodeList>()->getDomainHandler().setIsConnected(true);
emit loadServerlessDomain(lookupUrl); emit loadServerlessDomain(domainUrl);
emit lookupResultsFinished(); emit lookupResultsFinished();
return true; return true;
} }

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

@ -116,10 +116,30 @@ const QString& PathUtils::resourcesUrl() {
return staticResourcePath; return staticResourcePath;
} }
QString applicationAbsolutePath() {
QString path;
#if defined(Q_OS_OSX)
path = QCoreApplication::applicationDirPath() + "/../";
#elif defined(Q_OS_ANDROID)
path = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
#else
path = QCoreApplication::applicationDirPath() + "/";
#endif
return path;
}
QUrl PathUtils::resourcesUrl(const QString& relativeUrl) { QUrl PathUtils::resourcesUrl(const QString& relativeUrl) {
return QUrl(resourcesUrl() + relativeUrl); return QUrl(resourcesUrl() + relativeUrl);
} }
QString PathUtils::expandToAppAbsolutePath(const QString& filePath) {
QString path = filePath;
if (path.startsWith("/~/")) {
path.replace(1, 2, applicationAbsolutePath());
}
return path;
}
const QString& PathUtils::qmlBaseUrl() { const QString& PathUtils::qmlBaseUrl() {
static const QString staticResourcePath = resourcesUrl() + "qml/"; static const QString staticResourcePath = resourcesUrl() + "qml/";
return staticResourcePath; return staticResourcePath;

1
libraries/shared/src/PathUtils.h
View file

@ -37,6 +37,7 @@ public:
static QUrl resourcesUrl(const QString& relative); static QUrl resourcesUrl(const QString& relative);
static const QString& resourcesPath(); static const QString& resourcesPath();
static const QString& qmlBaseUrl(); static const QString& qmlBaseUrl();
static QString expandToAppAbsolutePath(const QString& filePath);
static QUrl qmlUrl(const QString& relative); static QUrl qmlUrl(const QString& relative);
#ifdef DEV_BUILD #ifdef DEV_BUILD
static const QString& projectRootPath(); static const QString& projectRootPath();