mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cloudstorage: update remote if cloud server changes

Browse source 
If we can't reach the cloud server in the URL (which might come from the
settings or be passed in by the user), we try the alternative server(s).
If we end up changing servers, we need to update the remote that we have
already parsed from the URL.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2021-04-18 16:28:25 -07:00
parent 766f297bc4
commit 9620d11828
3 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/checkcloudconnection.cpp
View file

@ -11,6 +11,7 @@
#include "git-access.h"
#include "errorhelper.h"
#include "core/subsurface-string.h"
#include "core/membuffer.h"
#include "core/settings/qPrefCloudStorage.h"
#include "checkcloudconnection.h"
@ -197,9 +198,20 @@ void CheckCloudConnection::gotContinent(QNetworkReply *reply)
}
// helper to be used from C code
extern "C" bool canReachCloudServer()
extern "C" bool canReachCloudServer(const char **remote)
{
if (verbose)
qWarning() << "Cloud storage: checking connection to cloud server";
return CheckCloudConnection().checkServer();
qWarning() << "Cloud storage: checking connection to cloud server" << *remote;
bool connection = CheckCloudConnection().checkServer();
if (strstr(*remote, prefs.cloud_base_url) == nullptr) {
// we switched the cloud URL - likely because we couldn't reach the server passed in
// the strstr with the offset is designed so we match the right component in the name;
// the cloud_base_url ends with a '/', so we need the text starting at "git/..."
char *newremote = format_string("%s%s", prefs.cloud_base_url, strstr(*remote, "org/git/") + 4);
if (verbose)
qDebug() << "updating remote to: " << newremote;
free((void*)*remote);
*remote = newremote;
}
return connection;
}