Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 00:36:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

working on getting history to work with serverless domains

Browse source
This commit is contained in:
Seth Alves 2018-02-18 07:55:43 -08:00
parent a060d0ddb7
commit 7a5415efbe
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -517,6 +517,7 @@ bool isDomainURL(QUrl url) {
if (!url.isValid()) {
return false;
}
// XXX check ending of path
return url.scheme() == HIFI_URL_SCHEME || url.scheme() == "file" || url.scheme() == "http" || url.scheme() == "https";
}
@ -630,7 +631,6 @@ extern DisplayPluginList getDisplayPlugins();
extern InputPluginList getInputPlugins();
extern void saveInputPluginSettings(const InputPluginList& plugins);
bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
const char** constArgv = const_cast<const char**>(argv);

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

@ -58,8 +58,8 @@ bool AddressManager::isConnected() {
QUrl AddressManager::currentAddress(bool domainOnly) const {
QUrl hifiURL;
if (!_filebasedDomainURL.isEmpty()) {
hifiURL = _filebasedDomainURL;
if (!_serverlessDomainURL.isEmpty()) {
hifiURL = _serverlessDomainURL;
} else {
hifiURL.setScheme(HIFI_URL_SCHEME);
hifiURL.setHost(_host);
@ -67,7 +67,6 @@ QUrl AddressManager::currentAddress(bool domainOnly) const {
if (_port != 0 && _port != DEFAULT_DOMAIN_SERVER_PORT) {
hifiURL.setPort(_port);
}
}
if (!domainOnly && hifiURL.scheme() == HIFI_URL_SCHEME) {
@ -154,6 +153,7 @@ void AddressManager::storeCurrentAddress() {
auto url = currentAddress();
if (url.scheme() == "file" || url.scheme() == "http" || url.scheme() == "https" || !url.host().isEmpty()) {
qDebug() << "QQQQ setting address in settings to " << url.toString();
currentAddressHandle.set(url);
} else {
qCWarning(networking) << "Ignoring attempt to save current address with an empty host" << url;
@ -331,7 +331,7 @@ bool isPossiblePlaceName(QString possiblePlaceName) {
const QRegExp PLACE_NAME_REGEX = QRegExp("^[0-9A-Za-z](([0-9A-Za-z]|-(?!-))*[^\\W_]$|$)");
result = PLACE_NAME_REGEX.indexIn(possiblePlaceName) == 0;
}
qDebug() << "isPossiblePlaceName: " << possiblePlaceName << " " << result;
qDebug() << "QQQQ isPossiblePlaceName: " << possiblePlaceName << " " << result;
return result;
}
@ -741,13 +741,12 @@ bool AddressManager::handleUsername(const QString& lookupString) {
bool AddressManager::setHost(const QString& host, LookupTrigger trigger, quint16 port) {
if (host != _host || port != _port) {
addCurrentAddressToHistory(trigger);
_port = port;
// any host change should clear the shareable place name
_shareablePlaceName.clear();
_serverlessDomainURL = QUrl();
if (host != _host) {
_host = host;
@ -767,7 +766,7 @@ bool AddressManager::setDomainInfo(const QUrl& serverlessDomainURL,
// clear any current place information
_rootPlaceID = QUuid();
_placeName.clear();
_filebasedDomainURL = serverlessDomainURL;
_serverlessDomainURL = serverlessDomainURL;
if (!serverlessDomainURL.isEmpty()) {
qCDebug(networking) << "Possible domain change required to serverless domain: " << serverlessDomainURL;

2
libraries/networking/src/AddressManager.h
View file

@ -455,7 +455,7 @@ private:
QString _host;
quint16 _port;
QString _placeName;
QUrl _filebasedDomainURL; // for serverless domains
QUrl _serverlessDomainURL; // for file-based domains
QUuid _rootPlaceID;
PositionGetter _positionGetter;
OrientationGetter _orientationGetter;