d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-22 12:34:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix program updater on Windows/Mac

Browse Source
This commit is contained in:
Christophe Dumez 2010-12-04 19:14:14 +00:00
parent f24224649d
commit 0fd8ecd9ee
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/programupdater.cpp
View File

@ -50,7 +50,7 @@ const QString FILE_EXT = "EXE";
using namespace libtorrent; using namespace libtorrent;
ProgramUpdater::ProgramUpdater(QObject *parent) : ProgramUpdater::ProgramUpdater(QObject *parent) :
QObject(parent) QObject(parent)
{ {
mp_manager = new QNetworkAccessManager(this); mp_manager = new QNetworkAccessManager(this);
Preferences pref; Preferences pref;
@ -148,13 +148,15 @@ void ProgramUpdater::rssDownloadFinished(QNetworkReply *reply)
void ProgramUpdater::updateProgram() void ProgramUpdater::updateProgram()
{ {
Q_ASSERT(!m_updateUrl.isEmpty()); Q_ASSERT(!m_updateUrl.isEmpty());
connect(mp_manager, SIGNAL(finished(QNetworkReply*)), QDesktopServices::openUrl(m_updateUrl);
return;
/*connect(mp_manager, SIGNAL(finished(QNetworkReply*)),
this, SLOT(saveUpdate(QNetworkReply*))); this, SLOT(saveUpdate(QNetworkReply*)));
// Send the request // Send the request
mp_manager->get(QNetworkRequest(QUrl(m_updateUrl))); mp_manager->get(QNetworkRequest(QUrl(m_updateUrl)));*/
} }
void ProgramUpdater::saveUpdate(QNetworkReply *reply) /*void ProgramUpdater::saveUpdate(QNetworkReply *reply)
{ {
// Disconnect SIGNAL/SLOT // Disconnect SIGNAL/SLOT
disconnect(mp_manager, 0, this, 0); disconnect(mp_manager, 0, this, 0);
@ -180,17 +182,17 @@ void ProgramUpdater::saveUpdate(QNetworkReply *reply)
} }
reply->deleteLater(); reply->deleteLater();
deleteLater(); deleteLater();
} }*/
void ProgramUpdater::installUpdate(QString update_path) /*void ProgramUpdater::installUpdate(QString update_path)
{ {
qDebug("Installing the update..."); qDebug("Installing the update at %s...", qPrintable(update_path));
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
QDesktopServices::openUrl(QUrl(QString("file:///")+update_path, QUrl::TolerantMode)); QDesktopServices::openUrl(QUrl(QString("file:///")+update_path, QUrl::TolerantMode));
#else #else
QDesktopServices::openUrl(QUrl(QString("file://")+update_path, QUrl::TolerantMode)); QDesktopServices::openUrl(QUrl(QString("file://")+update_path, QUrl::TolerantMode));
#endif #endif
} }*/
// 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
@ -217,9 +219,6 @@ QString ProgramUpdater::extractVersionNumber(QString title) const
bool ProgramUpdater::isVersionMoreRecent(QString new_version) const bool ProgramUpdater::isVersionMoreRecent(QString new_version) const
{ {
/*DEFINES += VERSION_MAJOR=2
DEFINES += VERSION_MINOR=5
DEFINES += VERSION_BUGFIX=0*/
const QStringList parts = new_version.split("."); const QStringList parts = new_version.split(".");
Q_ASSERT(parts.size() == 3); Q_ASSERT(parts.size() == 3);
const int major = parts.at(0).toInt(); const int major = parts.at(0).toInt();

4
src/programupdater.h
View File

@ -52,8 +52,8 @@ protected:
protected slots: protected slots:
void rssDownloadFinished(QNetworkReply* reply); void rssDownloadFinished(QNetworkReply* reply);
void installUpdate(QString update_path); //void installUpdate(QString update_path);
void saveUpdate(QNetworkReply* reply); //void saveUpdate(QNetworkReply* reply);
void setUpdateUrl(QString title); void setUpdateUrl(QString title);
signals: signals: