FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2024-12-27 08:33:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak updating, no more NSIS.

Browse Source
This commit is contained in:
Martin Rotter 2016-06-03 12:18:54 +02:00
parent 0a8ff1a0cc
commit 75849453de
5 changed files with 32 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/text/UPDATES
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<releases>
<release version="3.2.4">
<url platform="x86" os="Windows">https://bitbucket.org/skunkos/rssguard/downloads/rssguard-3.2.4-win32.exe</url>
<url platform="x86" os="Windows">https://bitbucket.org/skunkos/rssguard/downloads/rssguard-3.2.4-win32.zip</url>
</release>
</releases>

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

@ -30,15 +30,11 @@
#include <QNetworkReply>
#include <QProcess>
#if defined(Q_OS_WIN)
#include <windows.h>
#endif
FormUpdate::FormUpdate(QWidget *parent)
: QDialog(parent), m_downloader(NULL), m_readyToInstall(false), m_ui(new Ui::FormUpdate) {
m_ui->setupUi(this);
m_btnUpdate = m_ui->m_buttonBox->addButton(tr("Update"), QDialogButtonBox::ActionRole);
m_btnUpdate = m_ui->m_buttonBox->addButton(tr("Download update"), QDialogButtonBox::ActionRole);
m_btnUpdate->setToolTip(tr("Download new installation files."));
m_ui->m_lblCurrentRelease->setText(STRFY(APP_VERSION));
@ -89,7 +85,7 @@ void FormUpdate::checkForUpdates() {
if (SystemFactory::isVersionNewer(update.first.m_availableVersion, STRFY(APP_VERSION))) {
m_ui->m_lblStatus->setStatus(WidgetWithStatus::Ok,
tr("New release available."),
tr("This is new version which can be\ndownloaded and installed."));
tr("This is new version which can be\ndownloaded."));
m_btnUpdate->setEnabled(true);
m_btnUpdate->setToolTip(is_self_update_for_this_system ?
tr("Download installation file for your OS.") :
@ -157,8 +153,8 @@ void FormUpdate::updateCompleted(QNetworkReply::NetworkError status, QByteArray
switch (status) {
case QNetworkReply::NoError:
saveUpdateFile(contents);
m_ui->m_lblStatus->setStatus(WidgetWithStatus::Ok, tr("Downloaded successfully"), tr("Package was downloaded successfully."));
m_btnUpdate->setText(tr("Install update"));
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->setEnabled(true);
break;
@ -180,32 +176,15 @@ void FormUpdate::startUpdate() {
url_file = STRFY(APP_URL);
}
if (m_readyToInstall) {
// Some package is downloaded and it can be installed
// via self-update feature.
close();
qDebug("Preparing to launch external installer '%s'.", qPrintable(QDir::toNativeSeparators(m_updateFilePath)));
#if defined(Q_OS_WIN)
HINSTANCE exec_result = ShellExecute(NULL,
NULL,
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);
if (m_readyToInstall) {
if (!SystemFactory::openFolderFile(m_updateFilePath)) {
MessageBox::show(this,
QMessageBox::Warning,
tr("Cannot open directory"),
tr("Cannot open output directory. Open it manually."),
QString(),
m_updateFilePath);
}
else {
qApp->quit();
}
#endif
}
else if (update_for_this_system) {
// Nothing is downloaded yet, but update for this system

10
src/miscellaneous/systemfactory.cpp
View File

@ -27,6 +27,7 @@
#endif
#include <QString>
#include <QProcess>
#include <QFile>
#include <QDomDocument>
#include <QDomElement>
@ -240,6 +241,15 @@ bool SystemFactory::isVersionEqualOrNewer(const QString &new_version, const QStr
return new_version == base_version || isVersionNewer(new_version, base_version);
}
bool SystemFactory::openFolderFile(const QString &file_path) {
#if defined(Q_OS_WIN32)
return QProcess::startDetached(QString("explorer.exe /select, \"") + QDir::toNativeSeparators(file_path) + "\"");
#else
const QString folder = QDir::toNativeSeparators(QFileInfo(file_path).absoluteDir().absolutePath());
return QDesktopServices::openUrl(QUrl::fromLocalFile(folder));
#endif
}
UpdateInfo SystemFactory::parseUpdatesFile(const QByteArray &updates_file, const QByteArray &changelog) const {
UpdateInfo update;
QDomDocument document; document.setContent(updates_file, false);

2
src/miscellaneous/systemfactory.h
View File

@ -90,6 +90,8 @@ class SystemFactory : public QObject {
static bool isVersionNewer(const QString &new_version, const QString &base_version);
static bool isVersionEqualOrNewer(const QString &new_version, const QString &base_version);
static bool openFolderFile(const QString &file_path);
public slots:
void checkForUpdatesOnStartup();

19
src/network-web/downloadmanager.cpp
View File

@ -213,19 +213,14 @@ void DownloadItem::openFile() {
void DownloadItem::openFolder() {
if (m_output.exists()) {
const QString folder = QDir::toNativeSeparators(QFileInfo(m_output.fileName()).absoluteDir().absolutePath());
#if defined(Q_OS_WIN32)
const QString file = QDir::toNativeSeparators(m_output.fileName());
if (!QProcess::startDetached(QString("explorer.exe /select, \"") + file + "\"")) {
MessageBox::show(this, QMessageBox::Warning, tr("Cannot open directory"), tr("Cannot open output directory. Open it manually."), QString(), folder);
if (!SystemFactory::openFolderFile(m_output.fileName())) {
MessageBox::show(this,
QMessageBox::Warning,
tr("Cannot open directory"),
tr("Cannot open output directory. Open it manually."),
QString(),
m_output.fileName());
}
#else
if (!QDesktopServices::openUrl(QUrl::fromLocalFile(folder))) {
MessageBox::show(this, QMessageBox::Warning, tr("Cannot open directory"), tr("Cannot open output directory. Open it manually."), QString(), folder);
}
#endif
}
}