Skip to content

Commit

Permalink
WinUpdater: More useful options on update failure #7217
Browse files Browse the repository at this point in the history
  • Loading branch information
@ckamm
ckamm committed Jun 12, 2019
1 parent 42e4d10 commit d770df5
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 53 deletions.
139 changes: 93 additions & 46 deletions src/gui/updater/ocupdater.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ namespace OCC {
static const char updateAvailableC[] = "Updater/updateAvailable";
static const char updateTargetVersionC[] = "Updater/updateTargetVersion";
static const char seenVersionC[] = "Updater/seenVersion";
static const char autoUpdateFailedVersionC[] = "Updater/autoUpdateFailedVersion";
static const char autoUpdateAttemptedC[] = "Updater/autoUpdateAttempted";


Expand Down Expand Up @@ -275,7 +274,6 @@ void OCUpdater::slotTimedOut()

NSISUpdater::NSISUpdater(const QUrl &url)
: OCUpdater(url)
, _showFallbackMessage(false)
{
}

Expand All @@ -287,6 +285,18 @@ void NSISUpdater::slotWriteFile()
}
}

void NSISUpdater::wipeUpdateData()
{
ConfigFile cfg;
QSettings settings(cfg.configFile(), QSettings::IniFormat);
QString updateFileName = settings.value(updateAvailableC).toString();
if (!updateFileName.isEmpty())
QFile::remove(updateFileName);
settings.remove(updateAvailableC);
settings.remove(updateTargetVersionC);
settings.remove(autoUpdateAttemptedC);
}

void NSISUpdater::slotDownloadFinished()
{
QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
Expand Down Expand Up @@ -329,12 +339,9 @@ void NSISUpdater::versionInfoArrived(const UpdateInfo &info)
setDownloadState(UpToDate);
} else {
QString url = info.downloadUrl();
qint64 autoUpdateFailedVersion =
Helper::stringVersionToInt(settings.value(autoUpdateFailedVersionC).toString());
if (url.isEmpty() || _showFallbackMessage || infoVersion == autoUpdateFailedVersion) {
showDialog(info);
}
if (!url.isEmpty()) {
if (url.isEmpty()) {
showNoUrlDialog(info);
} else {
_targetFile = cfg.configPath() + url.mid(url.lastIndexOf('/')+1);
if (QFile(_targetFile).exists()) {
setDownloadState(DownloadComplete);
Expand All @@ -351,14 +358,15 @@ void NSISUpdater::versionInfoArrived(const UpdateInfo &info)
}
}

void NSISUpdater::showDialog(const UpdateInfo &info)
void NSISUpdater::showNoUrlDialog(const UpdateInfo &info)
{
// if the version tag is set, there is a newer version.
QDialog *msgBox = new QDialog;
msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setWindowFlags(msgBox->windowFlags() & ~Qt::WindowContextHelpButtonHint);

QIcon infoIcon = msgBox->style()->standardIcon(QStyle::SP_MessageBoxInformation, 0, 0);
int iconSize = msgBox->style()->pixelMetric(QStyle::PM_MessageBoxIconSize, 0, 0);
QIcon infoIcon = msgBox->style()->standardIcon(QStyle::SP_MessageBoxInformation);
int iconSize = msgBox->style()->pixelMetric(QStyle::PM_MessageBoxIconSize);

msgBox->setWindowIcon(infoIcon);

Expand All @@ -385,7 +393,6 @@ void NSISUpdater::showDialog(const UpdateInfo &info)
hlayout->addWidget(lbl);

QDialogButtonBox *bb = new QDialogButtonBox;
bb->setWindowFlags(bb->windowFlags() & ~Qt::WindowContextHelpButtonHint);
QPushButton *skip = bb->addButton(tr("Skip this version"), QDialogButtonBox::ResetRole);
QPushButton *reject = bb->addButton(tr("Skip this time"), QDialogButtonBox::AcceptRole);
QPushButton *getupdate = bb->addButton(tr("Get update"), QDialogButtonBox::AcceptRole);
Expand All @@ -395,14 +402,78 @@ void NSISUpdater::showDialog(const UpdateInfo &info)
connect(getupdate, &QAbstractButton::clicked, msgBox, &QDialog::accept);

connect(skip, &QAbstractButton::clicked, this, &NSISUpdater::slotSetSeenVersion);
connect(getupdate, SIGNAL(clicked()), SLOT(slotOpenUpdateUrl()));
connect(getupdate, &QAbstractButton::clicked, this, &NSISUpdater::slotOpenUpdateUrl);

layout->addWidget(bb);

msgBox->open();
}

void NSISUpdater::showUpdateErrorDialog()
{
QDialog *msgBox = new QDialog;
msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setWindowFlags(msgBox->windowFlags() & ~Qt::WindowContextHelpButtonHint);

QIcon infoIcon = msgBox->style()->standardIcon(QStyle::SP_MessageBoxInformation);
int iconSize = msgBox->style()->pixelMetric(QStyle::PM_MessageBoxIconSize);

msgBox->setWindowIcon(infoIcon);

QVBoxLayout *layout = new QVBoxLayout(msgBox);
QHBoxLayout *hlayout = new QHBoxLayout;
layout->addLayout(hlayout);

msgBox->setWindowTitle(tr("Update Failed"));

QLabel *ico = new QLabel;
ico->setFixedSize(iconSize, iconSize);
ico->setPixmap(infoIcon.pixmap(iconSize));
QLabel *lbl = new QLabel;
QString txt = tr("<p>A new version of the %1 Client is available but the updating process failed.</p>"
"<p><b>%2</b> has been downloaded. The installed version is %3.</p>")
.arg(Utility::escape(Theme::instance()->appNameGUI()),
Utility::escape(updateInfo().versionString()), Utility::escape(clientVersion()));

lbl->setText(txt);
lbl->setTextFormat(Qt::RichText);
lbl->setWordWrap(true);

hlayout->addWidget(ico);
hlayout->addWidget(lbl);

QDialogButtonBox *bb = new QDialogButtonBox;
QPushButton *skip = bb->addButton(tr("Skip this version"), QDialogButtonBox::ResetRole);
QPushButton *askagain = bb->addButton(tr("Ask again later"), QDialogButtonBox::ResetRole);
QPushButton *retry = bb->addButton(tr("Restart and update"), QDialogButtonBox::AcceptRole);
QPushButton *getupdate = bb->addButton(tr("Update manually"), QDialogButtonBox::AcceptRole);

connect(skip, &QAbstractButton::clicked, msgBox, &QDialog::reject);
connect(askagain, &QAbstractButton::clicked, msgBox, &QDialog::reject);
connect(retry, &QAbstractButton::clicked, msgBox, &QDialog::accept);
connect(getupdate, &QAbstractButton::clicked, msgBox, &QDialog::accept);

connect(skip, &QAbstractButton::clicked, this, [this]() {
wipeUpdateData();
slotSetSeenVersion();
});
// askagain: do nothing
connect(retry, &QAbstractButton::clicked, this, [this]() {
slotStartInstaller();
qApp->quit();
});
connect(getupdate, &QAbstractButton::clicked, this, [this]() {
wipeUpdateData();
slotSetSeenVersion();
slotOpenUpdateUrl();
});

layout->addWidget(bb);

msgBox->open();
}

NSISUpdater::UpdateState NSISUpdater::updateStateOnStart()
bool NSISUpdater::handleStartup()
{
ConfigFile cfg;
QSettings settings(cfg.configFile(), QSettings::IniFormat);
Expand All @@ -411,44 +482,20 @@ NSISUpdater::UpdateState NSISUpdater::updateStateOnStart()
if (!updateFileName.isEmpty() && QFile(updateFileName).exists()) {
// did it try to execute the update?
if (settings.value(autoUpdateAttemptedC, false).toBool()) {
// clean up
settings.remove(autoUpdateAttemptedC);
settings.remove(updateAvailableC);
QFile::remove(updateFileName);
if (updateSucceeded()) {
// success: clean up even more
settings.remove(updateTargetVersionC);
settings.remove(autoUpdateFailedVersionC);
return NoUpdate;
// success: clean up
wipeUpdateData();
return false;
} else {
// auto update failed. Set autoUpdateFailedVersion as a hint
// for visual fallback notification
QString targetVersion = settings.value(updateTargetVersionC).toString();
settings.setValue(autoUpdateFailedVersionC, targetVersion);
settings.remove(updateTargetVersionC);
return UpdateFailed;
// auto update failed. Ask user what to do
showUpdateErrorDialog();
return false;
}
} else {
if (!settings.contains(autoUpdateFailedVersionC)) {
return UpdateAvailable;
}
return performUpdate();
}
}
return NoUpdate;
}

bool NSISUpdater::handleStartup()
{
switch (updateStateOnStart()) {
case NSISUpdater::UpdateAvailable:
return performUpdate();
case NSISUpdater::UpdateFailed:
_showFallbackMessage = true;
return false;
case NSISUpdater::NoUpdate:
default:
return false;
}
return false;
}

void NSISUpdater::slotSetSeenVersion()
Expand Down
11 changes: 4 additions & 7 deletions src/gui/updater/ocupdater.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ public slots:

protected slots:
void backgroundCheckForUpdate() Q_DECL_OVERRIDE;
void slotOpenUpdateUrl();

private slots:
void slotOpenUpdateUrl();
void slotVersionInfoArrived();
void slotTimedOut();

Expand All @@ -148,9 +148,6 @@ class NSISUpdater : public OCUpdater
{
Q_OBJECT
public:
enum UpdateState { NoUpdate = 0,
UpdateAvailable,
UpdateFailed };
explicit NSISUpdater(const QUrl &url);
bool handleStartup() Q_DECL_OVERRIDE;
private slots:
Expand All @@ -159,12 +156,12 @@ private slots:
void slotWriteFile();

private:
NSISUpdater::UpdateState updateStateOnStart();
void showDialog(const UpdateInfo &info);
void wipeUpdateData();
void showNoUrlDialog(const UpdateInfo &info);
void showUpdateErrorDialog();
void versionInfoArrived(const UpdateInfo &info) Q_DECL_OVERRIDE;
QScopedPointer<QTemporaryFile> _file;
QString _targetFile;
bool _showFallbackMessage;
};

/**
Expand Down

0 comments on commit d770df5

Please sign in to comment.