Tagged v2.1.2 release

Changelog

@@ -1,35 +1,3 @@
-* Thu Mar 4 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.6
-    - BUGFIX: Fix Web UI authentication with Konqueror
-    - BUGFIX: Fix save path display in properties
-    - BUGFIX: Fix ratio calculation for directly seeded torrents (Thanks phorane)
-    - BUGFIX: Fix memory leak in RSS parser
-    - BUGFIX: Only one log window can be opened at a time
-    - BUGFIX: Command-line parameters are no longer required to be in UTF-8
-
-* Web Feb 10 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.5
-    - BUGFIX: Fix actions on selected torrents (non-selected torrents could be affected)
-    - BUGFIX: Only one program preferences dialog is allowed at a time
-    - BUGFIX: Link against boost and ssl to fix issues with gold linker
-    - BUGFIX: Fix memory leak in RSS
-    - BUGFIX: Improved HTTP gzip compression detection in downloader
-    - BUGFIX: Fix possible race condition in search engine
-
-* Mon Feb 8 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.4
-    - BUGFIX: Fix file prioritizing in a torrent
-    - BUGFIX: Make sure seeding torrents display a progress of 100%
-    - BUGFIX: Usage display was improved and localized (--help)
-    - BUGFIX: Fix possible crash when deleting a torrent
-    - BUGFIX: Fix possible crash when changing torrents label
-
-* Sun Jan 31 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.3
-    - BUGFIX: Fix "Append .!qB extension to complete files" (libtorrent v0.15)
-    - BUGFIX: Make sure bandwidth limiting dialogs are centered on screen
-    - BUGFIX: Added support for HTTP redirection
-    - BUGFIX: Fix compilation error when geoip database is embedded
-    - BUGFIX: Fix crash when double-clicking on a torrent that has no metadata to open its save path
-    - BUGFIX: Fix Scan directory preferences in Web UI
-    - BUGFIX: Clear torrent error state when resuming it
-
 * Sun Jan 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.2
     - FEATURE: Added back file prioritizing in a torrent
     - BUGFIX: Fix issue causing torrents not to be displayed in the list

configure

@@ -359,18 +359,12 @@ public:
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
-		//if(!libs.isEmpty())
-		//	conf->addLib(libs);
+		if(!libs.isEmpty())
+			conf->addLib(libs);
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
                         printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
 		else
 			conf->addDefine("LIBTORRENT_0_15");
-		// Get linking parameters
-		QStringList params;
-		QByteArray staticlibs;
-		params << "--static" << "--libs" << "libtorrent-rasterbar";
-		conf->doCommand("pkg-config", params, &staticlibs);
-		conf->addLib(staticlibs.trimmed());
 		return true;
 	}
 };

qcm/libtorrent-rasterbar.qcm

@@ -20,18 +20,12 @@ public:
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
-		//if(!libs.isEmpty())
-		//	conf->addLib(libs);
+		if(!libs.isEmpty())
+			conf->addLib(libs);
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
                         printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
 		else
 			conf->addDefine("LIBTORRENT_0_15");
-		// Get linking parameters
-		QStringList params;
-		QByteArray staticlibs;
-		params << "--static" << "--libs" << "libtorrent-rasterbar";
-		conf->doCommand("pkg-config", params, &staticlibs);
-		conf->addLib(staticlibs.trimmed());
 		return true;
 	}
 };

src/GUI.cpp

@@ -217,10 +217,7 @@ GUI::~GUI() {
   delete status_bar;
   delete transferList;
   delete guiUpdater;
-  if (console)
-    delete console;
-  if(options)
-    delete options;
+
   if(rssWidget)
     delete rssWidget;
   delete searchEngine;
@@ -396,7 +393,7 @@ void GUI::readParamsOnSocket() {
   if(clientConnection) {
     QByteArray params = clientConnection->readAll();
     if(!params.isEmpty()) {
-      processParams(QString::fromLocal8Bit(params.constData()).split("\n"));
+      processParams(QString::fromUtf8(params.data()).split(QString::fromUtf8("\n")));
       qDebug("Received parameters from another instance");
     }
     clientConnection->deleteLater();
@@ -423,11 +420,7 @@ void GUI::on_actionSet_global_upload_limit_triggered() {
 }
 
 void GUI::on_actionShow_console_triggered() {
-  if(!console) {
-    console = new consoleDlg(this, BTSession);
-  } else {
-    console->setFocus();
-  }
+  new consoleDlg(this, BTSession);
 }
 
 void GUI::on_actionSet_global_download_limit_triggered() {
@@ -915,13 +908,8 @@ void GUI::createTrayIcon() {
 
 // Display Program Options
 void GUI::on_actionOptions_triggered() {
-  if(!options) {
-    options = new options_imp(this);
-    connect(options, SIGNAL(status_changed()), this, SLOT(optionsSaved()));
-  } else {
-    // Get focus
-    options->setFocus();
-  }
+  options = new options_imp(this);
+  connect(options, SIGNAL(status_changed()), this, SLOT(optionsSaved()));
 }
 
 /*****************************************************

src/GUI.h

@@ -55,7 +55,6 @@ class TransferListFiltersWidget;
 class QSplitter;
 class PropertiesWidget;
 class StatusBar;
-class consoleDlg;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -69,7 +68,6 @@ private:
   QTabWidget *tabs;
   StatusBar *status_bar;
   QPointer<options_imp> options;
-  QPointer<consoleDlg> console;
   QPointer<QSystemTrayIcon> systrayIcon;
   QPointer<QTimer> systrayCreator;
   QMenu *myTrayIconMenu;

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.1.6
+Comment=V2.1.2
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент

src/bittorrent.cpp

@@ -1232,14 +1232,14 @@ bool Bittorrent::enableDHT(bool b) {
 
 float Bittorrent::getRealRatio(QString hash) const{
   QTorrentHandle h = getTorrentHandle(hash);
-  Q_ASSERT(h.total_done() >= 0);
+  Q_ASSERT(h.all_time_download() >= 0);
   Q_ASSERT(h.all_time_upload() >= 0);
-  if(h.total_done() == 0) {
+  if(h.all_time_download() == 0) {
     if(h.all_time_upload() == 0)
       return 0;
     return 101;
   }
-  float ratio = (float)h.all_time_upload()/(float)h.total_done();
+  float ratio = (float)h.all_time_upload()/(float)h.all_time_download();
   Q_ASSERT(ratio >= 0.);
   if(ratio > 100.)
     ratio = 100.;
@@ -1711,11 +1711,6 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
           QString hash = h.hash();
           // Remember finished state
           TorrentPersistentData::saveSeedStatus(h);
-#ifdef LIBTORRENT_0_15
-           // Remove .!qB extension if necessary
-          if(appendqBExtension)
-            appendqBextensionToTorrent(h, false);
-#endif
           // Move to download directory if necessary
           if(!defaultTempPath.isEmpty()) {
             // Check if directory is different

src/downloadthread.cpp

@@ -56,18 +56,6 @@ void downloadThread::processDlFinished(QNetworkReply* reply) {
     // Failure
     emit downloadFailure(url, errorCodeToString(reply->error()));
   } else {
-    QVariant redirection = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
-    if(redirection.isValid()) {
-      // We should redirect
-      qDebug("Redirecting from %s to %s", url.toLocal8Bit().data(), redirection.toUrl().toString().toLocal8Bit().data());
-      redirect_mapping.insert(redirection.toUrl().toString(), url);
-      downloadUrl(redirection.toUrl().toString());
-      return;
-    }
-    // Checking if it was redirecting, restoring initial URL
-    if(redirect_mapping.contains(url)) {
-      url = redirect_mapping.take(url);
-    }
     // Success
     QString filePath;
     QTemporaryFile tmpfile;
@@ -103,7 +91,6 @@ void downloadThread::downloadUrl(QString url){
   // Spoof Firefox 3.5 user agent to avoid
   // Web server banning
   request.setRawHeader("User-Agent", "Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.1.5) Gecko/20091102 Firefox/3.5.5");
-  request.setRawHeader("Accept-Encoding", "");
   qDebug("Downloading %s...", request.url().toString().toLocal8Bit().data());
   networkManager->get(request);
 }

src/downloadthread.h

@@ -33,7 +33,6 @@
 
 #include <QNetworkReply>
 #include <QObject>
-#include <QHash>
 
 class QNetworkAccessManager;
 
@@ -42,7 +41,6 @@ class downloadThread : public QObject {
 
 private:
   QNetworkAccessManager *networkManager;
-  QHash<QString, QString> redirect_mapping;
 
 signals:
   void downloadFinished(QString url, QString file_path);

src/eventmanager.cpp

@@ -282,9 +282,7 @@ QVariantMap EventManager::getPropGeneralInfo(QString hash) const {
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
   if(h.is_valid() && h.has_metadata()) {
     // Save path
-    QString p = TorrentPersistentData::getSavePath(hash);
-    if(p.isEmpty()) p = h.save_path();
-    data["save_path"] = p;
+    data["save_path"] = TorrentPersistentData::getSavePath(hash);
     // Creation date
     data["creation_date"] = h.creation_date();
     // Comment

src/geoip.h

@@ -46,7 +46,7 @@ protected:
   static QString geoipFolder(bool embedded=false) {
     if(embedded)
       return ":/geoip/";
-    return misc::QDesktopServicesDataLocation()+"geoip"+QDir::separator();
+    return misc::qBittorrentPath()+"geoip"+QDir::separator();
 #else
   static QString geoipFolder(bool) {
     if(QFile::exists("/usr/local/share/GeoIP/GeoIP.dat"))

src/httpconnection.cpp

@@ -138,7 +138,6 @@ void HttpConnection::respond() {
     return;
   }
   QString auth = parser.value("Authorization");
-  qDebug("Auth: %s", auth.split(" ").first().toLocal8Bit().data());
   if (QString::compare(auth.split(" ").first(), "Digest", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth.toLocal8Bit(), parser.method())) {
     // Update failed attempt counter
     parent->client_failed_attempts.insert(socket->peerAddress().toString(), nb_fail+1);

src/httpserver.cpp

@@ -207,7 +207,7 @@ bool HttpServer::isAuthorized(QByteArray auth, QString method) const {
     }
     QByteArray prop_cnonce = regex_cnonce.cap(1).toLocal8Bit();
     qDebug("prop cnonce is: %s", prop_cnonce.data());
-    QRegExp regex_qop(".*qop=[\"]?(\\w+)[\"]?.*");
+    QRegExp regex_qop(".*qop=(\\w+).*");
     if(regex_qop.indexIn(auth) < 0) {
       qDebug("AUTH-PROB: missing qop");
       return false;