From d46cdd804400afcabdeb905e1d22ef06aeb6f648 Mon Sep 17 00:00:00 2001 From: Zach H Date: Sat, 7 May 2016 21:28:45 -0400 Subject: [PATCH 1/3] fix updater from bintray api issue --- cockatrice/src/dlg_update.cpp | 8 +++++++- cockatrice/src/dlg_update.h | 1 + cockatrice/src/update_checker.cpp | 8 +++++--- cockatrice/src/update_downloader.cpp | 13 ++++--------- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/cockatrice/src/dlg_update.cpp b/cockatrice/src/dlg_update.cpp index daf419fc..0a5bf578 100644 --- a/cockatrice/src/dlg_update.cpp +++ b/cockatrice/src/dlg_update.cpp @@ -85,6 +85,7 @@ void DlgUpdate::gotoDownloadPage() { void DlgUpdate::downloadUpdate() { setLabel("Downloading update..."); + enableOkButton(false); enableUpdateButton(false); uDownloader->beginDownload(updateUrl); } @@ -127,7 +128,8 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, QVaria if (reply == QMessageBox::Yes) downloadUpdate(); } - else { + else + { QMessageBox::information(this, "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" @@ -146,6 +148,10 @@ void DlgUpdate::enableUpdateButton(bool enable) { manualDownload->setEnabled(enable); } +void DlgUpdate::enableOkButton(bool enable) { + ok->setEnabled(enable); +} + void DlgUpdate::setLabel(QString newText) { text->setText(newText); } diff --git a/cockatrice/src/dlg_update.h b/cockatrice/src/dlg_update.h index c0b11670..9baa3786 100644 --- a/cockatrice/src/dlg_update.h +++ b/cockatrice/src/dlg_update.h @@ -24,6 +24,7 @@ private slots: private: QUrl updateUrl; void enableUpdateButton(bool enable); + void enableOkButton(bool enable); void beginUpdateCheck(); void setLabel(QString text); QLabel *text; diff --git a/cockatrice/src/update_checker.cpp b/cockatrice/src/update_checker.cpp index 52198743..79034671 100644 --- a/cockatrice/src/update_checker.cpp +++ b/cockatrice/src/update_checker.cpp @@ -49,7 +49,8 @@ bool UpdateChecker::downloadMatchesCurrentOS(QVariant build) return build .toMap()["name"] .toString() - .contains("qt5.exe"); + .contains("qt5") + .contains("exe"); } #else bool UpdateChecker::downloadMatchesCurrentOS(QVariant build) @@ -57,7 +58,8 @@ bool UpdateChecker::downloadMatchesCurrentOS(QVariant build) return build .toMap()["name"] .toString() - .contains("qt4.exe"); + .contains("qt4") + .contains("exe"); } #endif #else @@ -73,7 +75,7 @@ bool UpdateChecker::downloadMatchesCurrentOS(QVariant) QDate UpdateChecker::dateFromBuild(QVariant build) { QString formatString = "yyyy-MM-dd"; - QString dateString = build.toMap()["date"].toString(); + QString dateString = build.toMap()["created"].toString(); dateString = dateString.remove(formatString.length(), dateString.length()); return QDate::fromString(dateString, formatString); diff --git a/cockatrice/src/update_downloader.cpp b/cockatrice/src/update_downloader.cpp index fb827a23..b401736f 100644 --- a/cockatrice/src/update_downloader.cpp +++ b/cockatrice/src/update_downloader.cpp @@ -7,20 +7,15 @@ UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent) { } void UpdateDownloader::beginDownload(QUrl downloadUrl) { - //Save the original URL because we need it for the filename if (originalUrl.isEmpty()) originalUrl = downloadUrl; response = netMan->get(QNetworkRequest(downloadUrl)); - connect(response, SIGNAL(finished()), - this, SLOT(fileFinished())); - connect(response, SIGNAL(readyRead()), - this, SLOT(fileReadyRead())); - connect(response, SIGNAL(downloadProgress(qint64, qint64)), - this, SLOT(downloadProgress(qint64, qint64))); - connect(response, SIGNAL(error(QNetworkReply::NetworkError)), - this, SLOT(downloadError(QNetworkReply::NetworkError))); + connect(response, SIGNAL(finished()), this, SLOT(fileFinished())); + connect(response, SIGNAL(readyRead()), this, SLOT(fileReadyRead())); + connect(response, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(downloadProgress(qint64, qint64))); + connect(response, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(downloadError(QNetworkReply::NetworkError))); } void UpdateDownloader::downloadError(QNetworkReply::NetworkError) { From 449982553a8a264023cc82298df634fe005faa94 Mon Sep 17 00:00:00 2001 From: Zach H Date: Sat, 7 May 2016 21:51:37 -0400 Subject: [PATCH 2/3] remove qt4 check, not needed --- cockatrice/src/update_checker.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/cockatrice/src/update_checker.cpp b/cockatrice/src/update_checker.cpp index 79034671..f95a2bc0 100644 --- a/cockatrice/src/update_checker.cpp +++ b/cockatrice/src/update_checker.cpp @@ -43,22 +43,12 @@ bool UpdateChecker::downloadMatchesCurrentOS(QVariant build) .contains("osx"); } #elif defined(Q_OS_WIN) -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + bool UpdateChecker::downloadMatchesCurrentOS(QVariant build) { return build .toMap()["name"] .toString() - .contains("qt5") - .contains("exe"); -} -#else -bool UpdateChecker::downloadMatchesCurrentOS(QVariant build) -{ - return build - .toMap()["name"] - .toString() - .contains("qt4") .contains("exe"); } #endif From 0163d7af9977ac93ebcdb144e9c67bc14e9976bc Mon Sep 17 00:00:00 2001 From: Zach H Date: Sun, 8 May 2016 03:35:18 -0400 Subject: [PATCH 3/3] fix if/else --- cockatrice/src/update_checker.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/cockatrice/src/update_checker.cpp b/cockatrice/src/update_checker.cpp index f95a2bc0..0a413018 100644 --- a/cockatrice/src/update_checker.cpp +++ b/cockatrice/src/update_checker.cpp @@ -43,7 +43,6 @@ bool UpdateChecker::downloadMatchesCurrentOS(QVariant build) .contains("osx"); } #elif defined(Q_OS_WIN) - bool UpdateChecker::downloadMatchesCurrentOS(QVariant build) { return build @@ -51,7 +50,6 @@ bool UpdateChecker::downloadMatchesCurrentOS(QVariant build) .toString() .contains("exe"); } -#endif #else bool UpdateChecker::downloadMatchesCurrentOS(QVariant)