jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-22 06:43:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add release channels for autoupdater (#2362)

Browse source 
Fetch releases from github and find corresponding installers on bintray
This commit is contained in:
ctrlaltca 2017-03-01 09:43:09 +01:00 • committed by GitHub
parent b9cd942308
commit 7373819c32
16 changed files with 507 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

95
cockatrice/src/dlg_update.cpp
View file

@ -1,9 +1,3 @@
#define HUMAN_DOWNLOAD_URL "https://bintray.com/cockatrice/Cockatrice/Cockatrice/_latestVersion"
#define API_DOWNLOAD_BASE_URL "https://dl.bintray.com/cockatrice/Cockatrice/"
#define DATE_LENGTH 10
#define MAX_DATE_LENGTH 100
#define SHORT_SHA1_HASH_LENGTH 7
#include <QtNetwork>
#include <QProgressDialog>
#include <QDesktopServices>
@ -16,12 +10,15 @@
#include <QApplication>
#include "dlg_update.h"
#include "releasechannel.h"
#include "settingscache.h"
#include "window_main.h"
DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent) {
//Handle layout
text = new QLabel(this);
statusLabel = new QLabel(this);
descriptionLabel = new QLabel(tr("Current release channel:") + " " + tr(settingsCache->getUpdateReleaseChannel()->getName().toUtf8()), this);
progress = new QProgressBar(this);
QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
@ -38,7 +35,8 @@ DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent) {
connect(ok, SIGNAL(clicked()), this, SLOT(closeDialog()));
QVBoxLayout *parentLayout = new QVBoxLayout(this);
parentLayout->addWidget(text);
parentLayout->addWidget(descriptionLabel);
parentLayout->addWidget(statusLabel);
parentLayout->addWidget(progress);
parentLayout->addWidget(buttonBox);
@ -47,11 +45,9 @@ DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent) {
//Check for SSL (this probably isn't necessary)
if (!QSslSocket::supportsSsl()) {
enableUpdateButton(false);
QMessageBox::critical(
this,
tr("Error"),
tr("Cockatrice was not built with SSL support, so cannot download updates! "
"Please visit the download page and update manually."));
QMessageBox::critical(this, tr("Error"),
tr("Cockatrice was not built with SSL support, so you cannot download updates automatically! "
"Please visit the download page to update manually."));
}
//Initialize the checker and downloader class
@ -62,10 +58,10 @@ DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent) {
connect(uDownloader, SIGNAL(error(QString)),
this, SLOT(downloadError(QString)));
uChecker = new UpdateChecker(this);
connect(uChecker, SIGNAL(finishedCheck(bool, bool, QVariantMap * )),
this, SLOT(finishedUpdateCheck(bool, bool, QVariantMap * )));
connect(uChecker, SIGNAL(error(QString)),
ReleaseChannel * channel = settingsCache->getUpdateReleaseChannel();
connect(channel, SIGNAL(finishedCheck(bool, bool, Release * )),
this, SLOT(finishedUpdateCheck(bool, bool, Release * )));
connect(channel, SIGNAL(error(QString)),
this, SLOT(updateCheckError(QString)));
//Check for updates
@ -79,8 +75,7 @@ void DlgUpdate::closeDialog() {
void DlgUpdate::gotoDownloadPage() {
QUrl openUrl(HUMAN_DOWNLOAD_URL);
QDesktopServices::openUrl(openUrl);
QDesktopServices::openUrl(settingsCache->getUpdateReleaseChannel()->getManualDownloadUrl());
}
void DlgUpdate::downloadUpdate() {
@ -94,12 +89,12 @@ void DlgUpdate::beginUpdateCheck() {
progress->setMinimum(0);
progress->setMaximum(0);
setLabel(tr("Checking for updates..."));
uChecker->check();
settingsCache->getUpdateReleaseChannel()->checkForUpdates();
}
void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, QVariantMap *build) {
void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, Release *release) {
QString commitHash, commitDate;
QString publishDate, versionName;
//Update the UI to say we've finished
progress->setMaximum(100);
@ -108,40 +103,34 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, QVaria
//If there are no available builds, then they can't auto update.
enableUpdateButton(isCompatible);
//If there is an update, save its URL and work out its name
if (isCompatible) {
QString endUrl = (*build)["path"].toString();
updateUrl = API_DOWNLOAD_BASE_URL + endUrl;
commitHash = (*build)["sha1"].toString().left(SHORT_SHA1_HASH_LENGTH);
commitDate = (*build)["created"].toString().remove(DATE_LENGTH, MAX_DATE_LENGTH);
}
//Give the user the appropriate message
if (needToUpdate) {
if (isCompatible) {
QMessageBox::StandardButton reply;
reply = QMessageBox::question(this, "Update Available",
"A new build (commit " + commitHash + ") from " + commitDate +
" is available. Download?",
QMessageBox::Yes | QMessageBox::No);
if (reply == QMessageBox::Yes)
downloadUpdate();
}
else
{
QMessageBox::information(this, tr("Cockatrice Update"),
tr("Your version of Cockatrice is out of date, but there are no packages"
" available for your operating system. You may have to use a developer build or build from source"
" yourself. Please visit the download page."));
}
}
else {
if (!needToUpdate) {
//If there's no need to update, tell them that. However we still allow them to run the
//downloader themselves if there's a compatible build
QMessageBox::information(this, tr("Cockatrice Update"), tr("Your version of Cockatrice is up to date."));
}
if (isCompatible) {
//If there is an update, save its URL and work out its name
updateUrl = release->getDownloadUrl();
publishDate = release->getPublishDate().toString(Qt::DefaultLocaleLongDate);
QMessageBox::StandardButton reply;
reply = QMessageBox::question(this, "Update Available",
tr("A new version is available:<br/>%1<br/>published on %2 ."
"<br/>More informations are available on the <a href=\"%3\">release changelog</a>"
"<br/>Do you want to update now?").arg(release->getName(), publishDate, release->getDescriptionUrl()),
QMessageBox::Yes | QMessageBox::No);
if (reply == QMessageBox::Yes)
downloadUpdate();
} else {
QMessageBox::information(this, tr("Cockatrice Update"),
tr("A new version is available:<br/>%1<br/>published on %2 ."
"<br/>More informations are available on the <a href=\"%3\">release changelog</a>"
"<br/>Unfortunately there are no packages available for your operating system. "
"You may have to use a developer build or build from source yourself. Please visit the download page.").arg(release->getName(), publishDate, release->getDescriptionUrl()));
}
}
void DlgUpdate::enableUpdateButton(bool enable) {
@ -153,7 +142,7 @@ void DlgUpdate::enableOkButton(bool enable) {
}
void DlgUpdate::setLabel(QString newText) {
text->setText(newText);
statusLabel->setText(newText);
}
void DlgUpdate::updateCheckError(QString errorString) {
@ -176,8 +165,8 @@ void DlgUpdate::downloadSuccessful(QUrl filepath) {
close();
} else {
setLabel(tr("Error"));
QMessageBox::critical(this, tr("Update Error"), "Unable to open the installer. You might be able to manually update"
" by closing Cockatrice and running the installer at " + filepath.toLocalFile() + ".");
QMessageBox::critical(this, tr("Update Error"),
tr("Unable to open the installer. You might be able to manually update by closing Cockatrice and running the installer at %1.").arg(filepath.toLocalFile()));
}
}