mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-14 19:12:11 +01:00
Added function to compare versions.
So now it checks whether version you are running is older than laset released version
This commit is contained in:
parent
59a492be76
commit
d91f20d277
|
@ -19,6 +19,7 @@
|
||||||
#include "qupzilla.h"
|
#include "qupzilla.h"
|
||||||
#include "tabwidget.h"
|
#include "tabwidget.h"
|
||||||
#include "desktopnotificationsfactory.h"
|
#include "desktopnotificationsfactory.h"
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
Updater::Updater(QupZilla* mainClass, QObject* parent) :
|
Updater::Updater(QupZilla* mainClass, QObject* parent) :
|
||||||
QObject(parent)
|
QObject(parent)
|
||||||
|
@ -27,9 +28,55 @@ Updater::Updater(QupZilla* mainClass, QObject* parent) :
|
||||||
QTimer::singleShot(60*1000, this, SLOT(start()) ); //Start checking after 1 minute
|
QTimer::singleShot(60*1000, this, SLOT(start()) ); //Start checking after 1 minute
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Updater::Version Updater::parseVersionFromString(const QString &string)
|
||||||
|
{
|
||||||
|
Version ver;
|
||||||
|
ver.isValid = false;
|
||||||
|
|
||||||
|
QStringList v = string.split(".");
|
||||||
|
if (v.count() != 3)
|
||||||
|
return ver;
|
||||||
|
|
||||||
|
QStringList r = v.at(2).split("-");
|
||||||
|
|
||||||
|
ver.majorVersion = v.at(0).toInt();
|
||||||
|
ver.minorVersion = v.at(1).toInt();
|
||||||
|
ver.revisionNumber = r.at(0).toInt();
|
||||||
|
if (r.count() == 2)
|
||||||
|
ver.specialSymbol = r.at(1);
|
||||||
|
|
||||||
|
ver.isValid = true;
|
||||||
|
return ver;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Updater::isBiggerThan_SpecialSymbol(QString one, QString two)
|
||||||
|
{
|
||||||
|
if (one.contains("rc") && two.contains("b"))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (one.contains("b") && two.contains("rc"))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (one.contains("b")) {
|
||||||
|
int o = one.remove("b").toInt();
|
||||||
|
int t = two.remove("b").toInt();
|
||||||
|
|
||||||
|
return o > t;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (one.contains("rc")) {
|
||||||
|
int o = one.remove("rc").toInt();
|
||||||
|
int t = two.remove("rc").toInt();
|
||||||
|
|
||||||
|
return o > t;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void Updater::start()
|
void Updater::start()
|
||||||
{
|
{
|
||||||
startDownloadingUpdateInfo(QUrl(QupZilla::WWWADDRESS+"/update.php?v="+QupZilla::VERSION));
|
startDownloadingUpdateInfo(QUrl(QupZilla::WWWADDRESS + "/update.php?v=" + QupZilla::VERSION));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Updater::startDownloadingUpdateInfo(const QUrl &url)
|
void Updater::startDownloadingUpdateInfo(const QUrl &url)
|
||||||
|
@ -45,7 +92,9 @@ void Updater::downCompleted(QNetworkReply* reply)
|
||||||
QString html = QString(reply->readAll());
|
QString html = QString(reply->readAll());
|
||||||
if (html.startsWith("Version:")){
|
if (html.startsWith("Version:")){
|
||||||
html.remove("Version:");
|
html.remove("Version:");
|
||||||
if (html != QupZilla::VERSION) {
|
Version current = parseVersionFromString(QupZilla::VERSION);
|
||||||
|
Version updated = parseVersionFromString(html);
|
||||||
|
if (current < updated) {
|
||||||
mApp->desktopNotifications()->notify(QPixmap(":icons/qupzillaupdate.png"), tr("Update available"), tr("New version of QupZilla is ready to download."));
|
mApp->desktopNotifications()->notify(QPixmap(":icons/qupzillaupdate.png"), tr("Update available"), tr("New version of QupZilla is ready to download."));
|
||||||
// QAction* action = new QAction(QIcon(":icons/qupzillaupdate.png"), "Update", this);
|
// QAction* action = new QAction(QIcon(":icons/qupzillaupdate.png"), "Update", this);
|
||||||
// connect(action, SIGNAL(triggered()), this, SLOT(downloadNewVersion()));
|
// connect(action, SIGNAL(triggered()), this, SLOT(downloadNewVersion()));
|
||||||
|
|
|
@ -39,6 +39,39 @@ private slots:
|
||||||
void downloadNewVersion();
|
void downloadNewVersion();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
struct Version {
|
||||||
|
bool isValid;
|
||||||
|
int majorVersion;
|
||||||
|
int minorVersion;
|
||||||
|
int revisionNumber;
|
||||||
|
QString specialSymbol;
|
||||||
|
|
||||||
|
bool operator<(const Version &other) const
|
||||||
|
{
|
||||||
|
if (!this->isValid || !other.isValid)
|
||||||
|
return false;
|
||||||
|
if (this->majorVersion < other.majorVersion)
|
||||||
|
return true;
|
||||||
|
if (this->minorVersion < other.minorVersion)
|
||||||
|
return true;
|
||||||
|
if (this->revisionNumber < other.revisionNumber)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (this->revisionNumber == other.revisionNumber)
|
||||||
|
return !isBiggerThan_SpecialSymbol(this->specialSymbol, other.specialSymbol);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator>(const Version &other) const
|
||||||
|
{
|
||||||
|
return !operator<(other);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Version parseVersionFromString(const QString &string);
|
||||||
|
static bool isBiggerThan_SpecialSymbol(QString one, QString two);
|
||||||
|
|
||||||
void startDownloadingUpdateInfo(const QUrl &url);
|
void startDownloadingUpdateInfo(const QUrl &url);
|
||||||
|
|
||||||
QupZilla* p_QupZilla;
|
QupZilla* p_QupZilla;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user