d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Follow project coding style. Issue #2192.

Browse Source
This commit is contained in:
sledgehammer999 2015-12-06 13:14:07 +02:00
parent 87347cf0e5
commit 9e20553dab
2 changed files with 128 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/gui/programupdater.cpp
View File

@ -50,10 +50,11 @@ const QUrl RSS_URL("http://sourceforge.net/projects/qbittorrent/rss?path=/qbitto
const QString FILE_EXT = "EXE";
#endif
ProgramUpdater::ProgramUpdater(QObject *parent, bool invokedByUser) :
QObject(parent), m_invokedByUser(invokedByUser)
ProgramUpdater::ProgramUpdater(QObject *parent, bool invokedByUser)
: QObject(parent)
, m_invokedByUser(invokedByUser)
{
mp_manager = new QNetworkAccessManager(this);
m_networkManager = new QNetworkAccessManager(this);
Preferences* const pref = Preferences::instance();
// Proxy support
if (pref->isProxyEnabled()) {
@ -74,26 +75,28 @@ ProgramUpdater::ProgramUpdater(QObject *parent, bool invokedByUser) :
proxy.setUser(pref->getProxyUsername());
proxy.setPassword(pref->getProxyPassword());
}
mp_manager->setProxy(proxy);
m_networkManager->setProxy(proxy);
}
}
ProgramUpdater::~ProgramUpdater() {
delete mp_manager;
ProgramUpdater::~ProgramUpdater()
{
delete m_networkManager;
}
void ProgramUpdater::checkForUpdates()
{
// SIGNAL/SLOT
connect(mp_manager, SIGNAL(finished(QNetworkReply*)),
connect(m_networkManager, SIGNAL(finished(QNetworkReply*)),
this, SLOT(rssDownloadFinished(QNetworkReply*)));
// Send the request
QNetworkRequest request(RSS_URL);
request.setRawHeader("User-Agent", QString("qBittorrent/%1 ProgramUpdater (www.qbittorrent.org)").arg(VERSION).toLocal8Bit());
mp_manager->get(request);
m_networkManager->get(request);
}
void ProgramUpdater::setUpdateUrl(QString title) {
void ProgramUpdater::setUpdateUrl(QString title)
{
m_updateUrl = "http://downloads.sourceforge.net/project/qbittorrent" + title;
qDebug("The Update URL is %s", qPrintable(m_updateUrl));
}
@ -101,7 +104,7 @@ void ProgramUpdater::setUpdateUrl(QString title) {
void ProgramUpdater::rssDownloadFinished(QNetworkReply *reply)
{
// Disconnect SIGNAL/SLOT
disconnect(mp_manager, 0, this, 0);
disconnect(m_networkManager, 0, this, 0);
qDebug("Finished downloading the new qBittorrent updates RSS");
QString new_version;
if (!reply->error()) {
@ -116,10 +119,12 @@ void ProgramUpdater::rssDownloadFinished(QNetworkReply *reply)
if (in_item && xml.name() == "title") {
in_title = true;
item_title = "";
} else if (xml.name() == "item") {
}
else if (xml.name() == "item") {
in_item = true;
}
} else if (xml.isEndElement()) {
}
else if (xml.isEndElement()) {
if (in_item && xml.name() == "title") {
in_title = false;
const QString ext = Utils::Fs::fileExtension(item_title).toUpper();
@ -134,10 +139,12 @@ void ProgramUpdater::rssDownloadFinished(QNetworkReply *reply)
}
break;
}
} else if (xml.name() == "item") {
}
else if (xml.name() == "item") {
in_item = false;
}
} else if (xml.isCharacters() && !xml.isWhitespace()) {
}
else if (xml.isCharacters() && !xml.isWhitespace()) {
if (in_item && in_title)
item_title += xml.text().toString();
}
@ -164,29 +171,30 @@ QString ProgramUpdater::extractVersionNumber(const QString& title) const
if (regVer.indexIn(title) < 0) {
qWarning() << Q_FUNC_INFO << "Failed to extract version from file name:" << title;
return QString::null;
} else {
}
else {
QString version = regVer.cap(1);
qDebug() << Q_FUNC_INFO << "Extracted version:" << version;
return version;
}
}
bool ProgramUpdater::isVersionMoreRecent(const QString& remote_version) const
bool ProgramUpdater::isVersionMoreRecent(const QString &remoteVersion) const
{
QRegExp regVer("([0-9.]+)");
if (regVer.indexIn(QString(VERSION)) >= 0) {
QString local_version = regVer.cap(1);
qDebug() << Q_FUNC_INFO << "local version:" << local_version << "/" << VERSION;
QStringList remote_parts = remote_version.split('.');
QStringList local_parts = local_version.split('.');
for (int i=0; i<qMin(remote_parts.size(), local_parts.size()); ++i) {
if (remote_parts[i].toInt() > local_parts[i].toInt())
QString localVersion = regVer.cap(1);
qDebug() << Q_FUNC_INFO << "local version:" << localVersion << "/" << VERSION;
QStringList remoteParts = remoteVersion.split('.');
QStringList localParts = localVersion.split('.');
for (int i = 0; i<qMin(remoteParts.size(), localParts.size()); ++i) {
if (remoteParts[i].toInt() > localParts[i].toInt())
return true;
if (remote_parts[i].toInt() < local_parts[i].toInt())
if (remoteParts[i].toInt() < localParts[i].toInt())
return false;
}
// Compared parts were equal, if remote version is longer, then it's more recent (2.9.2.1 > 2.9.2)
if (remote_parts.size() > local_parts.size())
if (remoteParts.size() > localParts.size())
return true;
// versions are equal, check if the local version is a development release, in which case it is older (2.9.2beta < 2.9.2)
QRegExp regDevel("(alpha|beta|rc)");

6
src/gui/programupdater.h
View File

@ -48,18 +48,18 @@ public:
protected:
QString extractVersionNumber(const QString& title) const;
bool isVersionMoreRecent(const QString& new_version) const;
bool isVersionMoreRecent(const QString &remoteVersion) const;
protected slots:
void rssDownloadFinished(QNetworkReply* reply);
void setUpdateUrl(QString title);
signals:
void updateCheckFinished(bool update_available, QString version, bool invokedByUser);
void updateCheckFinished(bool updateAvailable, QString version, bool invokedByUser);
private:
QString m_updateUrl;
QNetworkAccessManager *mp_manager;
QNetworkAccessManager *m_networkManager;
bool m_invokedByUser;
};