d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Follow project coding style. Issue #2192.

adaptive-webui-19844
sledgehammer999 9 years ago
parent
87347cf0e5
commit
9e20553dab
2 changed files with 125 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 234
      src/gui/programupdater.cpp
  2. 8
      src/gui/programupdater.h

234
src/gui/programupdater.cpp
Unescape View File

@ -50,149 +50,157 @@ const QUrl RSS_URL("http://sourceforge.net/projects/qbittorrent/rss?path=/qbitto
const QString FILE_EXT = "EXE"; const QString FILE_EXT = "EXE";
#endif #endif
ProgramUpdater::ProgramUpdater(QObject *parent, bool invokedByUser) : ProgramUpdater::ProgramUpdater(QObject *parent, bool invokedByUser)
QObject(parent), m_invokedByUser(invokedByUser) : QObject(parent)
, m_invokedByUser(invokedByUser)
{ {
mp_manager = new QNetworkAccessManager(this); m_networkManager = new QNetworkAccessManager(this);
Preferences* const pref = Preferences::instance(); Preferences* const pref = Preferences::instance();
// Proxy support // Proxy support
if (pref->isProxyEnabled()) { if (pref->isProxyEnabled()) {
QNetworkProxy proxy; QNetworkProxy proxy;
switch(pref->getProxyType()) { switch(pref->getProxyType()) {
case Proxy::SOCKS4: case Proxy::SOCKS4:
case Proxy::SOCKS5: case Proxy::SOCKS5:
case Proxy::SOCKS5_PW: case Proxy::SOCKS5_PW:
proxy.setType(QNetworkProxy::Socks5Proxy); proxy.setType(QNetworkProxy::Socks5Proxy);
default: default:
proxy.setType(QNetworkProxy::HttpProxy); proxy.setType(QNetworkProxy::HttpProxy);
break; break;
} }
proxy.setHostName(pref->getProxyIp()); proxy.setHostName(pref->getProxyIp());
proxy.setPort(pref->getProxyPort()); proxy.setPort(pref->getProxyPort());
// Proxy authentication // Proxy authentication
if (pref->isProxyAuthEnabled()) { if (pref->isProxyAuthEnabled()) {
proxy.setUser(pref->getProxyUsername()); proxy.setUser(pref->getProxyUsername());
proxy.setPassword(pref->getProxyPassword()); proxy.setPassword(pref->getProxyPassword());
}
m_networkManager->setProxy(proxy);
} }
mp_manager->setProxy(proxy);
}
} }
ProgramUpdater::~ProgramUpdater() { ProgramUpdater::~ProgramUpdater()
delete mp_manager; {
delete m_networkManager;
} }
void ProgramUpdater::checkForUpdates() void ProgramUpdater::checkForUpdates()
{ {
// SIGNAL/SLOT // SIGNAL/SLOT
connect(mp_manager, SIGNAL(finished(QNetworkReply*)), connect(m_networkManager, SIGNAL(finished(QNetworkReply*)),
this, SLOT(rssDownloadFinished(QNetworkReply*))); this, SLOT(rssDownloadFinished(QNetworkReply*)));
// Send the request // Send the request
QNetworkRequest request(RSS_URL); QNetworkRequest request(RSS_URL);
request.setRawHeader("User-Agent", QString("qBittorrent/%1 ProgramUpdater (www.qbittorrent.org)").arg(VERSION).toLocal8Bit()); 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)); m_updateUrl = "http://downloads.sourceforge.net/project/qbittorrent" + title;
qDebug("The Update URL is %s", qPrintable(m_updateUrl));
} }
void ProgramUpdater::rssDownloadFinished(QNetworkReply *reply) void ProgramUpdater::rssDownloadFinished(QNetworkReply *reply)
{ {
// Disconnect SIGNAL/SLOT // Disconnect SIGNAL/SLOT
disconnect(mp_manager, 0, this, 0); disconnect(m_networkManager, 0, this, 0);
qDebug("Finished downloading the new qBittorrent updates RSS"); qDebug("Finished downloading the new qBittorrent updates RSS");
QString new_version; QString new_version;
if (!reply->error()) { if (!reply->error()) {
qDebug("No download error, good."); qDebug("No download error, good.");
QXmlStreamReader xml(reply); QXmlStreamReader xml(reply);
QString item_title; QString item_title;
bool in_title = false; bool in_title = false;
bool in_item = false; bool in_item = false;
while (!xml.atEnd()) { while (!xml.atEnd()) {
xml.readNext(); xml.readNext();
if (xml.isStartElement()) { if (xml.isStartElement()) {
if (in_item && xml.name() == "title") { if (in_item && xml.name() == "title") {
in_title = true; in_title = true;
item_title = ""; item_title = "";
} else if (xml.name() == "item") { }
in_item = true; else if (xml.name() == "item") {
} in_item = true;
} else if (xml.isEndElement()) { }
if (in_item && xml.name() == "title") { }
in_title = false; else if (xml.isEndElement()) {
const QString ext = Utils::Fs::fileExtension(item_title).toUpper(); if (in_item && xml.name() == "title") {
qDebug("Found an update with file extension: %s", qPrintable(ext)); in_title = false;
if (ext == FILE_EXT) { const QString ext = Utils::Fs::fileExtension(item_title).toUpper();
qDebug("The last update available is %s", qPrintable(item_title)); qDebug("Found an update with file extension: %s", qPrintable(ext));
new_version = extractVersionNumber(item_title); if (ext == FILE_EXT) {
if (!new_version.isEmpty()) { qDebug("The last update available is %s", qPrintable(item_title));
qDebug("Detected version is %s", qPrintable(new_version)); new_version = extractVersionNumber(item_title);
if (isVersionMoreRecent(new_version)) if (!new_version.isEmpty()) {
setUpdateUrl(item_title); qDebug("Detected version is %s", qPrintable(new_version));
if (isVersionMoreRecent(new_version))
setUpdateUrl(item_title);
}
break;
}
}
else if (xml.name() == "item") {
in_item = false;
}
}
else if (xml.isCharacters() && !xml.isWhitespace()) {
if (in_item && in_title)
item_title += xml.text().toString();
} }
break;
}
} else if (xml.name() == "item") {
in_item = false;
} }
} else if (xml.isCharacters() && !xml.isWhitespace()) {
if (in_item && in_title)
item_title += xml.text().toString();
}
} }
} emit updateCheckFinished(!m_updateUrl.isEmpty(), new_version, m_invokedByUser);
emit updateCheckFinished(!m_updateUrl.isEmpty(), new_version, m_invokedByUser); // Clean up
// Clean up reply->deleteLater();
reply->deleteLater();
} }
void ProgramUpdater::updateProgram() void ProgramUpdater::updateProgram()
{ {
Q_ASSERT(!m_updateUrl.isEmpty()); Q_ASSERT(!m_updateUrl.isEmpty());
QDesktopServices::openUrl(m_updateUrl); QDesktopServices::openUrl(m_updateUrl);
return; return;
} }
// title on Windows: /qbittorrent-win32/qbittorrent-2.4.7/qbittorrent_2.4.7_setup.exe // title on Windows: /qbittorrent-win32/qbittorrent-2.4.7/qbittorrent_2.4.7_setup.exe
// title on Mac: /qbittorrent-mac/qbittorrent-2.4.4/qbittorrent-2.4.4.dmg // title on Mac: /qbittorrent-mac/qbittorrent-2.4.4/qbittorrent-2.4.4.dmg
QString ProgramUpdater::extractVersionNumber(const QString& title) const QString ProgramUpdater::extractVersionNumber(const QString& title) const
{ {
qDebug() << Q_FUNC_INFO << title; qDebug() << Q_FUNC_INFO << title;
QRegExp regVer("qbittorrent[_-]([0-9.]+)(_setup)?(\\.exe|\\.dmg)"); QRegExp regVer("qbittorrent[_-]([0-9.]+)(_setup)?(\\.exe|\\.dmg)");
if (regVer.indexIn(title) < 0) { if (regVer.indexIn(title) < 0) {
qWarning() << Q_FUNC_INFO << "Failed to extract version from file name:" << title; qWarning() << Q_FUNC_INFO << "Failed to extract version from file name:" << title;
return QString::null; return QString::null;
} else { }
QString version = regVer.cap(1); else {
qDebug() << Q_FUNC_INFO << "Extracted version:" << version; QString version = regVer.cap(1);
return version; 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.]+)"); QRegExp regVer("([0-9.]+)");
if (regVer.indexIn(QString(VERSION)) >= 0) { if (regVer.indexIn(QString(VERSION)) >= 0) {
QString local_version = regVer.cap(1); QString localVersion = regVer.cap(1);
qDebug() << Q_FUNC_INFO << "local version:" << local_version << "/" << VERSION; qDebug() << Q_FUNC_INFO << "local version:" << localVersion << "/" << VERSION;
QStringList remote_parts = remote_version.split('.'); QStringList remoteParts = remoteVersion.split('.');
QStringList local_parts = local_version.split('.'); QStringList localParts = localVersion.split('.');
for (int i=0; i<qMin(remote_parts.size(), local_parts.size()); ++i) { for (int i = 0; i<qMin(remoteParts.size(), localParts.size()); ++i) {
if (remote_parts[i].toInt() > local_parts[i].toInt()) if (remoteParts[i].toInt() > localParts[i].toInt())
return true; return true;
if (remote_parts[i].toInt() < local_parts[i].toInt()) if (remoteParts[i].toInt() < localParts[i].toInt())
return false; return false;
}
// Compared parts were equal, if remote version is longer, then it's more recent (2.9.2.1 > 2.9.2)
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)");
if (regDevel.indexIn(VERSION) >= 0)
return true;
} }
// Compared parts were equal, if remote version is longer, then it's more recent (2.9.2.1 > 2.9.2) return false;
if (remote_parts.size() > local_parts.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)");
if (regDevel.indexIn(VERSION) >= 0)
return true;
}
return false;
} }

8
src/gui/programupdater.h
Unescape View File

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

Write Preview
Loading…
Cancel
Save