mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move checking the cloud connection into its own files

Browse source 
This isn't UI related and shouldn't have been in a file full of UI
functionality.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-06-16 06:08:31 -07:00
parent 0fa0eb2879
commit 854f55fd89
6 changed files with 78 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -274,6 +274,7 @@ set(SUBSURFACE_CORE_LIB_SRCS
configuredivecomputer.cpp
configuredivecomputerthreads.cpp
divesitehelpers.cpp
checkcloudconnection.cpp
windowtitleupdate.cpp
${SUBSURFACE_PRINTING_SRCS}
${PLATFORM_SRC}

62
checkcloudconnection.cpp Normal file
View file

@ -0,0 +1,62 @@
#include <QObject>
#include <QTimer>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QEventLoop>
#include "pref.h"
#include "helpers.h"
#include "checkcloudconnection.h"
CheckCloudConnection::CheckCloudConnection(QObject *parent) : QObject(parent)
{
}
#define TEAPOT "/make-latte?number-of-shots=3"
#define HTTP_I_AM_A_TEAPOT 418
#define MILK "Linus does not like non-fat milk"
bool CheckCloudConnection::checkServer()
{
QTimer timer;
timer.setSingleShot(true);
QEventLoop loop;
QNetworkRequest request;
request.setRawHeader("Accept", "text/plain");
request.setRawHeader("User-Agent", getUserAgent().toUtf8());
request.setUrl(QString(prefs.cloud_base_url) + TEAPOT);
QNetworkAccessManager *mgr = new QNetworkAccessManager();
QNetworkReply *reply = mgr->get(request);
connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
timer.start(2000); // wait two seconds
loop.exec();
if (timer.isActive()) {
// didn't time out, did we get the right response?
timer.stop();
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == HTTP_I_AM_A_TEAPOT &&
reply->readAll() == QByteArray(MILK)) {
reply->deleteLater();
mgr->deleteLater();
return true;
}
// qDebug() << "did not get expected response - server unreachable" <<
// reply->error() << reply->errorString() <<
// reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() <<
// reply->readAll();
} else {
disconnect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
reply->abort();
}
reply->deleteLater();
mgr->deleteLater();
return false;
}
// helper to be used from C code
extern "C" bool canReachCloudServer()
{
return CheckCloudConnection::checkServer();
}

15
checkcloudconnection.h Normal file
View file

@ -0,0 +1,15 @@
#ifndef CHECKCLOUDCONNECTION_H
#define CHECKCLOUDCONNECTION_H
#include <QObject>
#include "checkcloudconnection.h"
class CheckCloudConnection : public QObject {
Q_OBJECT
public:
CheckCloudConnection(QObject *parent = 0);
static bool checkServer();
};
#endif // CHECKCLOUDCONNECTION_H

45
qt-ui/subsurfacewebservices.cpp
View file

@ -1007,48 +1007,3 @@ void CloudStorageAuthenticate::sslErrors(QList<QSslError> errorList)
qDebug() << err.errorString();
}
}
CheckCloudConnection::CheckCloudConnection(QObject *parent)
{
}
#define TEAPOT "/make-latte?number-of-shots=3"
#define HTTP_I_AM_A_TEAPOT 418
#define MILK "Linus does not like non-fat milk"
bool CheckCloudConnection::checkServer()
{
QTimer timer;
timer.setSingleShot(true);
QEventLoop loop;
QNetworkRequest request;
request.setRawHeader("Accept", "text/plain");
request.setRawHeader("User-Agent", getUserAgent().toUtf8());
request.setUrl(QString(prefs.cloud_base_url) + TEAPOT);
QNetworkAccessManager *mgr = new QNetworkAccessManager();
QNetworkReply *reply = mgr->get(request);
connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
timer.start(2000); // wait two seconds
loop.exec();
if (timer.isActive()) {
// didn't time out, did we get the right response?
timer.stop();
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == HTTP_I_AM_A_TEAPOT &&
reply->readAll() == QByteArray(MILK)) {
reply->deleteLater();
mgr->deleteLater();
return true;
}
// qDebug() << "did not get expected response - server unreachable" <<
// reply->error() << reply->errorString() <<
// reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() <<
// reply->readAll();
} else {
disconnect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
reply->abort();
}
reply->deleteLater();
mgr->deleteLater();
return false;
}

7
qt-ui/subsurfacewebservices.h
View file

@ -129,13 +129,6 @@ private:
};
class CheckCloudConnection : public QObject {
Q_OBJECT
public:
explicit CheckCloudConnection(QObject *parent = 0);
static bool checkServer();
};
#ifdef __cplusplus
extern "C" {
#endif

6
qthelper.cpp
View file

@ -33,7 +33,6 @@
#include <QImageReader>
#include <QtConcurrent>
#include "divepicturewidget.h"
#include "subsurfacewebservices.h"
#include "mainwindow.h"
#include <libxslt/documents.h>
@ -1068,11 +1067,6 @@ extern "C" bool getProxyString(char **buffer)
return false;
}
extern "C" bool canReachCloudServer()
{
return CheckCloudConnection::checkServer();
}
extern "C" void subsurface_mkdir(const char *dir)
{
QDir directory;