added changelog drawer
This commit is contained in:
parent
53746f2f66
commit
871037f887
13 changed files with 384 additions and 51 deletions
|
|
@ -126,6 +126,8 @@ signals:
|
|||
void forceTabBarActiveFocus();
|
||||
void forceStackActiveFocus();
|
||||
|
||||
void showChangelogDrawer();
|
||||
|
||||
private:
|
||||
QSharedPointer<ServersModel> m_serversModel;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ class SystemController : public QObject
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit SystemController(const std::shared_ptr<Settings> &setting, QObject *parent = nullptr);
|
||||
explicit SystemController(const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
|
||||
|
||||
static void saveFile(QString fileName, const QString &data);
|
||||
|
||||
|
|
|
|||
149
client/ui/controllers/updateController.cpp
Normal file
149
client/ui/controllers/updateController.cpp
Normal file
|
|
@ -0,0 +1,149 @@
|
|||
#include "updateController.h"
|
||||
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkReply>
|
||||
#include <QVersionNumber>
|
||||
#include <QtConcurrent>
|
||||
|
||||
#include "amnezia_application.h"
|
||||
#include "core/errorstrings.h"
|
||||
#include "version.h"
|
||||
|
||||
namespace {
|
||||
#ifdef Q_OS_MACOS
|
||||
const QString installerPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/AmneziaVPN.dmg";
|
||||
#elif defined Q_OS_WINDOWS
|
||||
const QString installerPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/AmneziaVPN.exe";
|
||||
#elif defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
||||
const QString installerPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/AmneziaVPN.tar.zip";
|
||||
#endif
|
||||
}
|
||||
|
||||
UpdateController::UpdateController(const std::shared_ptr<Settings> &settings, QObject *parent) : QObject(parent), m_settings(settings)
|
||||
{
|
||||
}
|
||||
|
||||
QString UpdateController::getHeaderText()
|
||||
{
|
||||
return tr("New version released: %1 (%2)").arg(m_version, m_releaseDate);
|
||||
}
|
||||
|
||||
QString UpdateController::getChangelogText()
|
||||
{
|
||||
return m_changelogText;
|
||||
}
|
||||
|
||||
void UpdateController::checkForUpdates()
|
||||
{
|
||||
QNetworkRequest request;
|
||||
request.setTransferTimeout(7000);
|
||||
QString endpoint = "https://api.github.com/repos/amnezia-vpn/amnezia-client/releases/latest";
|
||||
request.setUrl(endpoint);
|
||||
|
||||
QNetworkReply *reply = amnApp->manager()->get(request);
|
||||
|
||||
QObject::connect(reply, &QNetworkReply::finished, [this, reply]() {
|
||||
if (reply->error() == QNetworkReply::NoError) {
|
||||
QString contents = QString::fromUtf8(reply->readAll());
|
||||
QJsonObject data = QJsonDocument::fromJson(contents.toUtf8()).object();
|
||||
m_version = data.value("tag_name").toString();
|
||||
|
||||
auto currentVersion = QVersionNumber::fromString(QString(APP_VERSION));
|
||||
qDebug() << currentVersion;
|
||||
auto newVersion = QVersionNumber::fromString(m_version);
|
||||
if (newVersion > currentVersion) {
|
||||
m_changelogText = data.value("body").toString();
|
||||
|
||||
QString dateString = data.value("published_at").toString();
|
||||
QDateTime dateTime = QDateTime::fromString(dateString, "yyyy-MM-ddTHH:mm:ssZ");
|
||||
m_releaseDate = dateTime.toString("MMM dd yyyy");
|
||||
|
||||
QJsonArray assets = data.value("assets").toArray();
|
||||
|
||||
for (auto asset : assets) {
|
||||
QJsonObject assetObject = asset.toObject();
|
||||
if (assetObject.value("name").toString().contains(".dmg")) {
|
||||
m_downloadUrl = assetObject.value("browser_download_url").toString();
|
||||
}
|
||||
}
|
||||
|
||||
emit updateFound();
|
||||
}
|
||||
} else {
|
||||
if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError
|
||||
|| reply->error() == QNetworkReply::NetworkError::TimeoutError) {
|
||||
qDebug() << errorString(ErrorCode::ApiConfigTimeoutError);
|
||||
} else {
|
||||
QString err = reply->errorString();
|
||||
qDebug() << QString::fromUtf8(reply->readAll());
|
||||
qDebug() << reply->error();
|
||||
qDebug() << err;
|
||||
qDebug() << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
|
||||
qDebug() << errorString(ErrorCode::ApiConfigDownloadError);
|
||||
}
|
||||
}
|
||||
|
||||
reply->deleteLater();
|
||||
});
|
||||
|
||||
QObject::connect(reply, &QNetworkReply::errorOccurred,
|
||||
[this, reply](QNetworkReply::NetworkError error) { qDebug() << reply->errorString() << error; });
|
||||
connect(reply, &QNetworkReply::sslErrors, [this, reply](const QList<QSslError> &errors) {
|
||||
qDebug().noquote() << errors;
|
||||
qDebug() << errorString(ErrorCode::ApiConfigSslError);
|
||||
});
|
||||
}
|
||||
|
||||
void UpdateController::runInstaller()
|
||||
{
|
||||
QNetworkRequest request;
|
||||
request.setTransferTimeout(7000);
|
||||
request.setUrl(m_downloadUrl);
|
||||
|
||||
QNetworkReply *reply = amnApp->manager()->get(request);
|
||||
|
||||
QObject::connect(reply, &QNetworkReply::finished, [this, reply]() {
|
||||
if (reply->error() == QNetworkReply::NoError) {
|
||||
QFile file(installerPath);
|
||||
if (file.open(QIODevice::WriteOnly)) {
|
||||
file.write(reply->readAll());
|
||||
file.close();
|
||||
|
||||
QFutureWatcher<int> watcher;
|
||||
QFuture<int> future = QtConcurrent::run([this]() {
|
||||
QString t = installerPath;
|
||||
QRemoteObjectPendingReply<int> ipcReply = IpcClient::Interface()->mountDmg(t, true);
|
||||
ipcReply.waitForFinished();
|
||||
QProcess::execute("/Volumes/AmneziaVPN/AmneziaVPN.app/Contents/MacOS/AmneziaVPN");
|
||||
ipcReply = IpcClient::Interface()->mountDmg(t, false);
|
||||
ipcReply.waitForFinished();
|
||||
return ipcReply.returnValue();
|
||||
});
|
||||
|
||||
QEventLoop wait;
|
||||
connect(&watcher, &QFutureWatcher<ErrorCode>::finished, &wait, &QEventLoop::quit);
|
||||
watcher.setFuture(future);
|
||||
wait.exec();
|
||||
|
||||
qDebug() << future.result();
|
||||
|
||||
// emit errorOccured("");
|
||||
}
|
||||
} else {
|
||||
if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError
|
||||
|| reply->error() == QNetworkReply::NetworkError::TimeoutError) {
|
||||
qDebug() << errorString(ErrorCode::ApiConfigTimeoutError);
|
||||
} else {
|
||||
QString err = reply->errorString();
|
||||
qDebug() << QString::fromUtf8(reply->readAll());
|
||||
qDebug() << reply->error();
|
||||
qDebug() << err;
|
||||
qDebug() << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
|
||||
qDebug() << errorString(ErrorCode::ApiConfigDownloadError);
|
||||
}
|
||||
}
|
||||
|
||||
reply->deleteLater();
|
||||
});
|
||||
|
||||
}
|
||||
34
client/ui/controllers/updateController.h
Normal file
34
client/ui/controllers/updateController.h
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
#ifndef UPDATECONTROLLER_H
|
||||
#define UPDATECONTROLLER_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include "settings.h"
|
||||
|
||||
class UpdateController : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit UpdateController(const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
|
||||
|
||||
Q_PROPERTY(QString changelogText READ getChangelogText NOTIFY updateFound)
|
||||
Q_PROPERTY(QString headerText READ getHeaderText NOTIFY updateFound)
|
||||
public slots:
|
||||
QString getHeaderText();
|
||||
QString getChangelogText();
|
||||
|
||||
void checkForUpdates();
|
||||
void runInstaller();
|
||||
signals:
|
||||
void updateFound();
|
||||
void errorOccured(const QString &errorMessage);
|
||||
private:
|
||||
std::shared_ptr<Settings> m_settings;
|
||||
|
||||
QString m_changelogText;
|
||||
QString m_version;
|
||||
QString m_releaseDate;
|
||||
QString m_downloadUrl;
|
||||
};
|
||||
|
||||
#endif // UPDATECONTROLLER_H
|
||||
Loading…
Add table
Add a link
Reference in a new issue