FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revived direct upgrades.

Browse Source
This commit is contained in:
Martin Rotter 2016-06-24 13:23:55 +02:00
parent cd6e5c4a8a
commit 45d20ba758
1 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/gui/dialogs/formupdate.cpp
View File

@ -30,6 +30,10 @@
#include <QNetworkReply> #include <QNetworkReply>
#include <QProcess> #include <QProcess>
#if defined(Q_OS_WIN)
#include <windows.h>
#endif
FormUpdate::FormUpdate(QWidget *parent) FormUpdate::FormUpdate(QWidget *parent)
: QDialog(parent), m_downloader(nullptr), m_readyToInstall(false), m_ui(new Ui::FormUpdate) { : QDialog(parent), m_downloader(nullptr), m_readyToInstall(false), m_ui(new Ui::FormUpdate) {
@ -105,15 +109,17 @@ void FormUpdate::checkForUpdates() {
} }
void FormUpdate::updateProgress(qint64 bytes_received, qint64 bytes_total) { void FormUpdate::updateProgress(qint64 bytes_received, qint64 bytes_total) {
qApp->processEvents(); if (bytes_received % 10 == 0) {
m_ui->m_lblStatus->setStatus(WidgetWithStatus::Information, qApp->processEvents();
tr("Downloaded %1% (update size is %2 kB).").arg(QString::number(bytes_total == 0 ? 0 : (bytes_received * 100.0) / bytes_total, m_ui->m_lblStatus->setStatus(WidgetWithStatus::Information,
'f', tr("Downloaded %1% (update size is %2 kB).").arg(QString::number(bytes_total == 0 ? 0 : (bytes_received * 100.0) / bytes_total,
2), 'f',
QString::number(bytes_total / 1000, 2),
'f', QString::number(bytes_total / 1000,
2)), 'f',
tr("Downloading update...")); 2)),
tr("Downloading update..."));
}
} }
void FormUpdate::saveUpdateFile(const QByteArray &file_contents) { void FormUpdate::saveUpdateFile(const QByteArray &file_contents) {
@ -154,7 +160,7 @@ void FormUpdate::updateCompleted(QNetworkReply::NetworkError status, QByteArray
case QNetworkReply::NoError: case QNetworkReply::NoError:
saveUpdateFile(contents); saveUpdateFile(contents);
m_ui->m_lblStatus->setStatus(WidgetWithStatus::Ok, tr("Downloaded successfully"), tr("Package was downloaded successfully.\nYou must install it manually.")); m_ui->m_lblStatus->setStatus(WidgetWithStatus::Ok, tr("Downloaded successfully"), tr("Package was downloaded successfully.\nYou must install it manually."));
m_btnUpdate->setText(tr("Go to update file")); m_btnUpdate->setText(tr("Install"));
m_btnUpdate->setEnabled(true); m_btnUpdate->setEnabled(true);
break; break;
@ -177,14 +183,28 @@ void FormUpdate::startUpdate() {
} }
if (m_readyToInstall) { if (m_readyToInstall) {
if (!SystemFactory::openFolderFile(m_updateFilePath)) { close();
MessageBox::show(this, qDebug("Preparing to launch external installer '%s'.", qPrintable(QDir::toNativeSeparators(m_updateFilePath)));
QMessageBox::Warning,
tr("Cannot open directory"), #if defined(Q_OS_WIN)
tr("Cannot open output directory. Open it manually."), HINSTANCE exec_result = ShellExecute(NULL,
QString(), NULL,
m_updateFilePath); reinterpret_cast<const WCHAR*>(QDir::toNativeSeparators(m_updateFilePath).utf16()),
NULL,
NULL,
SW_NORMAL);
if (((int)exec_result) <= 32) {
qDebug("External updater was not launched due to error.");
qApp->showGuiMessage(tr("Cannot update application"),
tr("Cannot launch external updater. Update application manually."),
QSystemTrayIcon::Warning, this);
} }
else {
qApp->quit();
}
#endif
} }
else if (update_for_this_system) { else if (update_for_this_system) {
// Nothing is downloaded yet, but update for this system // Nothing is downloaded yet, but update for this system
@ -196,6 +216,7 @@ void FormUpdate::startUpdate() {
connect(m_downloader, SIGNAL(progress(qint64,qint64)), this, SLOT(updateProgress(qint64,qint64))); connect(m_downloader, SIGNAL(progress(qint64,qint64)), this, SLOT(updateProgress(qint64,qint64)));
connect(m_downloader, SIGNAL(completed(QNetworkReply::NetworkError,QByteArray)), this, SLOT(updateCompleted(QNetworkReply::NetworkError,QByteArray))); connect(m_downloader, SIGNAL(completed(QNetworkReply::NetworkError,QByteArray)), this, SLOT(updateCompleted(QNetworkReply::NetworkError,QByteArray)));
updateProgress(0, 100);
} }
m_btnUpdate->setText(tr("Downloading update...")); m_btnUpdate->setText(tr("Downloading update..."));